Mon Sep 2 16:41:01 2019 UTC ()
mono6: get PAXCTL from environment


(nia)
diff -r1.4 -r1.5 pkgsrc/lang/mono6/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/mono6/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/patch-runtime_mono-wrapper.in
cvs diff -r1.4 -r1.5 pkgsrc/lang/mono6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/Makefile 2019/09/01 12:04:38 1.4
+++ pkgsrc/lang/mono6/Attic/Makefile 2019/09/02 16:41:01 1.5
@@ -1,40 +1,43 @@ @@ -1,40 +1,43 @@
1# $NetBSD: Makefile,v 1.4 2019/09/01 12:04:38 nia Exp $ 1# $NetBSD: Makefile,v 1.5 2019/09/02 16:41:01 nia Exp $
2 2
3DISTNAME= mono-6.0.0.313 3DISTNAME= mono-6.0.0.313
4CATEGORIES= lang 4CATEGORIES= lang
5MASTER_SITES= https://download.mono-project.com/sources/mono/ 5MASTER_SITES= https://download.mono-project.com/sources/mono/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.mono-project.com/ 9HOMEPAGE= http://www.mono-project.com/
10COMMENT= Open source implementation of the .NET Development Framework 10COMMENT= Open source implementation of the .NET Development Framework
11LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0 11LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
12 12
13WRKSRC= ${WRKDIR}/${DISTNAME} 13WRKSRC= ${WRKDIR}/${DISTNAME}
14 14
15TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 15TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
16CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]* 16CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
17ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} PLATFORM= 17ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} PLATFORM=
 18ALL_ENV+= PAXCTL=${PAXCTL}
18 19
19USE_TOOLS+= bash:run cmake gmake gtar msgfmt perl:run pkg-config 20USE_TOOLS+= bash:run cmake gmake gtar msgfmt perl:run pkg-config
20USE_TOOLS+= bison autoconf automake 21USE_TOOLS+= bison autoconf automake
21USE_LIBTOOL= yes 22USE_LIBTOOL= yes
22USE_LANGUAGES+= c c99 c++ 23USE_LANGUAGES+= c c99 c++
23EXTRACT_USING= gtar 24EXTRACT_USING= gtar
24 25
25GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
26PKG_SYSCONFSUBDIR= mono 27PKG_SYSCONFSUBDIR= mono
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 29CONFIGURE_ARGS+= --disable-btls
 30CONFIGURE_ARGS+= --disable-btls-lib
28 31
29# Requires a cwrappers change: http://mail-index.netbsd.org/tech-pkg/2019/08/16/msg021791.html 32# Requires a cwrappers change: http://mail-index.netbsd.org/tech-pkg/2019/08/16/msg021791.html
30USE_CWRAPPERS= no 33USE_CWRAPPERS= no
31 34
32MAKE_FLAGS+= PERL=${PERL5:Q} mandir=${PREFIX}/${PKGMANDIR} 35MAKE_FLAGS+= PERL=${PERL5:Q} mandir=${PREFIX}/${PKGMANDIR}
33UNLIMIT_RESOURCES= datasize stacksize memorysize 36UNLIMIT_RESOURCES= datasize stacksize memorysize
34 37
35PKGCONFIG_OVERRIDE+= mono-uninstalled.pc.in data/cecil.pc.in 38PKGCONFIG_OVERRIDE+= mono-uninstalled.pc.in data/cecil.pc.in
36PKGCONFIG_OVERRIDE+= data/dotnet.pc.in data/dotnet35.pc.in data/mint.pc.in 39PKGCONFIG_OVERRIDE+= data/dotnet.pc.in data/dotnet35.pc.in data/mint.pc.in
37PKGCONFIG_OVERRIDE+= data/monodoc.pc.in 40PKGCONFIG_OVERRIDE+= data/monodoc.pc.in
38PKGCONFIG_OVERRIDE+= data/mono-cairo.pc.in data/mono-lineeditor.pc.in 41PKGCONFIG_OVERRIDE+= data/mono-cairo.pc.in data/mono-lineeditor.pc.in
39PKGCONFIG_OVERRIDE+= data/mono-nunit.pc.in data/mono-options.pc.in 42PKGCONFIG_OVERRIDE+= data/mono-nunit.pc.in data/mono-options.pc.in
40PKGCONFIG_OVERRIDE+= data/mono.pc.in 43PKGCONFIG_OVERRIDE+= data/mono.pc.in
cvs diff -r1.1 -r1.2 pkgsrc/lang/mono6/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/distinfo 2019/08/25 16:37:01 1.1
+++ pkgsrc/lang/mono6/Attic/distinfo 2019/09/02 16:41:01 1.2
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.1 2019/08/25 16:37:01 maya Exp $ 1$NetBSD: distinfo,v 1.2 2019/09/02 16:41:01 nia Exp $
2 2
3SHA1 (mono-6.0.0.313.tar.xz) = c5cccad2cb5be936f23e46b95df7628013e29e3c 3SHA1 (mono-6.0.0.313.tar.xz) = c5cccad2cb5be936f23e46b95df7628013e29e3c
4RMD160 (mono-6.0.0.313.tar.xz) = 801e5128561d2e95a6736cdfce040d8850be4e2f 4RMD160 (mono-6.0.0.313.tar.xz) = 801e5128561d2e95a6736cdfce040d8850be4e2f
5SHA512 (mono-6.0.0.313.tar.xz) = a1de452eb1c6edba503723217a4b5839563d154ff0c01852b551a41b3c98b5b617637e4e435de87bf275cfdce4066e70bfc763b607882f0b42e14196d7d5c156 5SHA512 (mono-6.0.0.313.tar.xz) = a1de452eb1c6edba503723217a4b5839563d154ff0c01852b551a41b3c98b5b617637e4e435de87bf275cfdce4066e70bfc763b607882f0b42e14196d7d5c156
6Size (mono-6.0.0.313.tar.xz) = 218124872 bytes 6Size (mono-6.0.0.313.tar.xz) = 218124872 bytes
7SHA1 (patch-configure.ac) = f932add14f5b54af5cc183cfd30f482f11f7d504 7SHA1 (patch-configure.ac) = f932add14f5b54af5cc183cfd30f482f11f7d504
8SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246 8SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
9SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9 9SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
10SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee 10SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
11SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883 11SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883
12SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606 12SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606
13SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01 13SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
14SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4 14SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
15SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 3368edee232b184879091df3d68daf4900f744c2 15SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 3368edee232b184879091df3d68daf4900f744c2
16SHA1 (patch-mono_metadata_icall.c) = 292c7bc4c959a3a5c1a982ccf2bc26a5300a0730 16SHA1 (patch-mono_metadata_icall.c) = 292c7bc4c959a3a5c1a982ccf2bc26a5300a0730
17SHA1 (patch-mono_metadata_mono-config.c) = ba690e4790c94e085214d303a9ac71a2a1d08fee 17SHA1 (patch-mono_metadata_mono-config.c) = ba690e4790c94e085214d303a9ac71a2a1d08fee
18SHA1 (patch-mono_metadata_threads.c) = e1432cced0dafce1a2712869ce79e12a2ab35973 18SHA1 (patch-mono_metadata_threads.c) = e1432cced0dafce1a2712869ce79e12a2ab35973
19SHA1 (patch-mono_mini_Makefile.am.in) = 697b0b56d9b7ddb5f61cd105c2c9c5dfac53ed9b 19SHA1 (patch-mono_mini_Makefile.am.in) = 697b0b56d9b7ddb5f61cd105c2c9c5dfac53ed9b
20SHA1 (patch-mono_native_Makefile.am) = 47e57623ebfce32f13a5fc1c19a0dbcb31dad8d4 20SHA1 (patch-mono_native_Makefile.am) = 47e57623ebfce32f13a5fc1c19a0dbcb31dad8d4
21SHA1 (patch-mono_native_mono-native-platform.h) = 845c921b4a84146b78f4f94c9380890892f5ff29 21SHA1 (patch-mono_native_mono-native-platform.h) = 845c921b4a84146b78f4f94c9380890892f5ff29
22SHA1 (patch-mono_tests_Makefile.am) = a5bf145619a50c8c256c32ffdb5b51f9e04f874c 22SHA1 (patch-mono_tests_Makefile.am) = a5bf145619a50c8c256c32ffdb5b51f9e04f874c
23SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca 23SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
24SHA1 (patch-mono_utils_mono-state.c) = 6a6d83e1779a5167e8f22ba1dedce9b3203705c4 24SHA1 (patch-mono_utils_mono-state.c) = 6a6d83e1779a5167e8f22ba1dedce9b3203705c4
25SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953 25SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953
26SHA1 (patch-runtime_mono-wrapper.in) = 6d396f9ddf92e522111421ce9b8ec26988438f48 26SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e
cvs diff -r1.1 -r1.2 pkgsrc/lang/mono6/patches/Attic/patch-runtime_mono-wrapper.in (expand / switch to unified diff)

--- pkgsrc/lang/mono6/patches/Attic/patch-runtime_mono-wrapper.in 2019/08/25 16:37:01 1.1
+++ pkgsrc/lang/mono6/patches/Attic/patch-runtime_mono-wrapper.in 2019/09/02 16:41:01 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-runtime_mono-wrapper.in,v 1.1 2019/08/25 16:37:01 maya Exp $ 1$NetBSD: patch-runtime_mono-wrapper.in,v 1.2 2019/09/02 16:41:01 nia Exp $
2 2
3Mark the mono executable as not MPROTECT safe during the build. 3Mark the mono executable as not MPROTECT safe during the build.
4 4
5--- runtime/mono-wrapper.in.orig 2019-07-18 07:46:08.000000000 +0000 5--- runtime/mono-wrapper.in.orig 2019-07-18 07:46:08.000000000 +0000
6+++ runtime/mono-wrapper.in 6+++ runtime/mono-wrapper.in
7@@ -8,4 +8,5 @@ then 7@@ -8,4 +8,5 @@ then
8 fi 8 fi
9 MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"} 9 MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
10 export MONO_CFG_DIR PATH 10 export MONO_CFG_DIR PATH
11+paxctl +m $(readlink -f "$MONO_EXECUTABLE") | true 2>/dev/null 11+$PAXCTL +m $(readlink -f "$MONO_EXECUTABLE") 2>/dev/null | true
12 exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE_WRAPPER}" --config "@mono_cfg_dir@/mono/config" "$@" 12 exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE_WRAPPER}" --config "@mono_cfg_dir@/mono/config" "$@"