CVS commit: pkgsrc/lang/mono6

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Sep  2 16:41:01 UTC 2019

Modified Files:
        pkgsrc/lang/mono6: Makefile distinfo
        pkgsrc/lang/mono6/patches: patch-runtime_mono-wrapper.in

Log Message:
mono6: get PAXCTL from environment


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/mono6/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/mono6/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mono6/Makefile
diff -u pkgsrc/lang/mono6/Makefile:1.4 pkgsrc/lang/mono6/Makefile:1.5
--- pkgsrc/lang/mono6/Makefile:1.4      Sun Sep  1 12:04:38 2019
+++ pkgsrc/lang/mono6/Makefile  Mon Sep  2 16:41:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/01 12:04:38 nia Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/02 16:41:01 nia Exp $
 
 DISTNAME=      mono-6.0.0.313
 CATEGORIES=    lang
@@ -15,6 +15,7 @@ WRKSRC=               ${WRKDIR}/${DISTNAME}
 TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 CONFLICTS=     pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
 ALL_ENV+=      MONO_SHARED_DIR=${WRKDIR} PLATFORM=
+ALL_ENV+=      PAXCTL=${PAXCTL}
 
 USE_TOOLS+=    bash:run cmake gmake gtar msgfmt perl:run pkg-config
 USE_TOOLS+=    bison autoconf automake
@@ -25,6 +26,8 @@ EXTRACT_USING=        gtar
 GNU_CONFIGURE=         yes
 PKG_SYSCONFSUBDIR=     mono
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --disable-btls
+CONFIGURE_ARGS+=       --disable-btls-lib
 
 # Requires a cwrappers change: http://mail-index.netbsd.org/tech-pkg/2019/08/16/msg021791.html
 USE_CWRAPPERS=         no

Index: pkgsrc/lang/mono6/distinfo
diff -u pkgsrc/lang/mono6/distinfo:1.1 pkgsrc/lang/mono6/distinfo:1.2
--- pkgsrc/lang/mono6/distinfo:1.1      Sun Aug 25 16:37:01 2019
+++ pkgsrc/lang/mono6/distinfo  Mon Sep  2 16:41:01 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/08/25 16:37:01 maya Exp $
+$NetBSD: distinfo,v 1.2 2019/09/02 16:41:01 nia Exp $
 
 SHA1 (mono-6.0.0.313.tar.xz) = c5cccad2cb5be936f23e46b95df7628013e29e3c
 RMD160 (mono-6.0.0.313.tar.xz) = 801e5128561d2e95a6736cdfce040d8850be4e2f
@@ -23,4 +23,4 @@ SHA1 (patch-mono_tests_Makefile.am) = a5
 SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
 SHA1 (patch-mono_utils_mono-state.c) = 6a6d83e1779a5167e8f22ba1dedce9b3203705c4
 SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953
-SHA1 (patch-runtime_mono-wrapper.in) = 6d396f9ddf92e522111421ce9b8ec26988438f48
+SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e

Index: pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in
diff -u pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in:1.1 pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in:1.2
--- pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in:1.1 Sun Aug 25 16:37:01 2019
+++ pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in     Mon Sep  2 16:41:01 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-runtime_mono-wrapper.in,v 1.1 2019/08/25 16:37:01 maya Exp $
+$NetBSD: patch-runtime_mono-wrapper.in,v 1.2 2019/09/02 16:41:01 nia Exp $
 
 Mark the mono executable as not MPROTECT safe during the build.
 
@@ -8,5 +8,5 @@ Mark the mono executable as not MPROTECT
  fi
  MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
  export MONO_CFG_DIR PATH
-+paxctl +m $(readlink -f "$MONO_EXECUTABLE") | true 2>/dev/null
++$PAXCTL +m $(readlink -f "$MONO_EXECUTABLE") 2>/dev/null | true
  exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE_WRAPPER}" --config "@mono_cfg_dir@/mono/config" "$@"