Thu Jun 4 17:16:20 2015 UTC ()
Fix 32-bit SunOS build, and fix variable expansion in patch-bd.


(jperkin)
diff -r1.160 -r1.161 pkgsrc/lang/mono/Makefile
diff -r1.1 -r0 pkgsrc/lang/mono/PLIST.SunOS-i386
diff -r1.102 -r1.103 pkgsrc/lang/mono/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/mono/patches/patch-bd
cvs diff -r1.160 -r1.161 pkgsrc/lang/mono/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mono/Makefile 2015/05/26 12:19:46 1.160
+++ pkgsrc/lang/mono/Makefile 2015/06/04 17:16:20 1.161
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.160 2015/05/26 12:19:46 jperkin Exp $ 1# $NetBSD: Makefile,v 1.161 2015/06/04 17:16:20 jperkin Exp $
2 2
3DISTNAME= mono-4.0.1 3DISTNAME= mono-4.0.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://download.mono-project.com/sources/mono/ 6MASTER_SITES= http://download.mono-project.com/sources/mono/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.mono-project.com/ 10HOMEPAGE= http://www.mono-project.com/
11COMMENT= Open source implementation of the .NET Development Framework 11COMMENT= Open source implementation of the .NET Development Framework
12LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0 12LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
13 13
14BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 14BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
@@ -107,58 +107,53 @@ INSTALLATION_DIRS+= share/examples/mono/ @@ -107,58 +107,53 @@ INSTALLATION_DIRS+= share/examples/mono/
107 107
108TEST_TARGET= check 108TEST_TARGET= check
109 109
110SUBST_CLASSES+= fix-prefix 110SUBST_CLASSES+= fix-prefix
111SUBST_STAGE.fix-prefix= post-patch 111SUBST_STAGE.fix-prefix= post-patch
112SUBST_MESSAGE.fix-prefix= Fixing relative prefix 112SUBST_MESSAGE.fix-prefix= Fixing relative prefix
113SUBST_FILES.fix-prefix= ${PKGCONFIG_OVERRIDE} 113SUBST_FILES.fix-prefix= ${PKGCONFIG_OVERRIDE}
114SUBST_SED.fix-prefix= -e 's,$${pcfiledir}/../..,\@prefix\@,g' 114SUBST_SED.fix-prefix= -e 's,$${pcfiledir}/../..,\@prefix\@,g'
115 115
116SUBST_CLASSES+= fix-mcs 116SUBST_CLASSES+= fix-mcs
117SUBST_STAGE.fix-mcs= post-patch 117SUBST_STAGE.fix-mcs= post-patch
118SUBST_MESSAGE.fix-mcs= Fixing mcs default prefix 118SUBST_MESSAGE.fix-mcs= Fixing mcs default prefix
119SUBST_FILES.fix-mcs= mcs/build/config-default.make 119SUBST_FILES.fix-mcs= mcs/build/config-default.make
120SUBST_SED.fix-mcs= -e 's,/usr/local,${PREFIX},1' 120SUBST_VARS.fix-mcs= PREFIX PKGMANDIR
121SUBST_SED.fix-mcs+= -e "s|MANDIR|${PKGMANDIR}|1" 
122 121
123SUBST_CLASSES+= fix-cfgdir 122SUBST_CLASSES+= fix-cfgdir
124SUBST_STAGE.fix-cfgdir= post-patch 123SUBST_STAGE.fix-cfgdir= post-patch
125SUBST_MESSAGE.fix-cfgdir= Fixing configuration files install dir 124SUBST_MESSAGE.fix-cfgdir= Fixing configuration files install dir
126SUBST_FILES.fix-cfgdir= mcs/tools/mconfig/Makefile 125SUBST_FILES.fix-cfgdir= mcs/tools/mconfig/Makefile
127SUBST_SED.fix-cfgdir= -e 's,$$(sysconfdir)/mono,${EGDIR},g' 126SUBST_SED.fix-cfgdir= -e 's,$$(sysconfdir)/mono,${EGDIR},g'
128 127
129SUBST_CLASSES+= fix-libx11 128SUBST_CLASSES+= fix-libx11
130SUBST_STAGE.fix-libx11= pre-configure 129SUBST_STAGE.fix-libx11= pre-configure
131SUBST_MESSAGE.fix-libx11= Fixing libX11 search path configuration 130SUBST_MESSAGE.fix-libx11= Fixing libX11 search path configuration
132SUBST_FILES.fix-libx11= configure 131SUBST_FILES.fix-libx11= configure
133SUBST_SED.fix-libx11= -e 's,@X11BASE@,${X11BASE},g' 132SUBST_SED.fix-libx11= -e 's,@X11BASE@,${X11BASE},g'
134 133
135PLIST_VARS= monodoc 134PLIST_VARS= monodoc
136 135
137.include "../../mk/bsd.prefs.mk" 136.include "../../mk/bsd.prefs.mk"
138 137
139.if ${OPSYS} == "SunOS" 138.if ${OPSYS} == "SunOS"
140CFLAGS+= -D_XOPEN_SOURCE=600 139CFLAGS+= -D_XOPEN_SOURCE=600
141CONFIGURE_ARGS+= --with-mcs-docs=no 140CONFIGURE_ARGS+= --with-mcs-docs=no
 141CONFIGURE_ARGS+= --with-sgen=no
 142CONFIGURE_ARGS+= --with-sigaltstack=no
142CONFIGURE_ENV+= ac_cv_func_getdomainname=no 143CONFIGURE_ENV+= ac_cv_func_getdomainname=no
143CONFIGURE_ENV+= ac_cv_func_setdomainname=no 144CONFIGURE_ENV+= ac_cv_func_setdomainname=no
144. if ${ABI} == "32" 
145ULIMIT_CMD_datasize= ulimit -d 262144 
146ULIMIT_CMD_stacksize= ulimit -s 10240 
147. else 
148CONFIGURE_ARGS+= --with-sigaltstack=no 
149ULIMIT_CMD_datasize= ulimit -d 524288 145ULIMIT_CMD_datasize= ulimit -d 524288
150ULIMIT_CMD_stacksize= ulimit -s 10240 146ULIMIT_CMD_stacksize= ulimit -s 10240
151. endif 
152.elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*} 147.elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
153CONFIGURE_ARGS+= --with-mcs-docs=no 148CONFIGURE_ARGS+= --with-mcs-docs=no
154CONFIGURE_ARGS+= --disable-parallel-mark 149CONFIGURE_ARGS+= --disable-parallel-mark
155.else 150.else
156PLIST.monodoc= yes 151PLIST.monodoc= yes
157.endif 152.endif
158 153
159.if ${MACHINE_ARCH:M*i[34]86*} 154.if ${MACHINE_ARCH:M*i[34]86*}
160# for gcc byte atomic builtins 155# for gcc byte atomic builtins
161GNU_ARCH.i386= i586 156GNU_ARCH.i386= i586
162CFLAGS+= -march=i586 157CFLAGS+= -march=i586
163.endif 158.endif
164 159
File Deleted: pkgsrc/lang/mono/Attic/PLIST.SunOS-i386
cvs diff -r1.102 -r1.103 pkgsrc/lang/mono/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/mono/distinfo 2015/05/26 12:19:46 1.102
+++ pkgsrc/lang/mono/distinfo 2015/06/04 17:16:20 1.103
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: distinfo,v 1.102 2015/05/26 12:19:46 jperkin Exp $ 1$NetBSD: distinfo,v 1.103 2015/06/04 17:16:20 jperkin Exp $
2 2
3SHA1 (mono-4.0.1.tar.bz2) = 9c7c27caa69e6a1673753437fd6824e0d33fe2ac 3SHA1 (mono-4.0.1.tar.bz2) = 9c7c27caa69e6a1673753437fd6824e0d33fe2ac
4RMD160 (mono-4.0.1.tar.bz2) = 3adcb49d7da9a4d81b7f5bc2108d13c20d94ab15 4RMD160 (mono-4.0.1.tar.bz2) = 3adcb49d7da9a4d81b7f5bc2108d13c20d94ab15
5Size (mono-4.0.1.tar.bz2) = 97197403 bytes 5Size (mono-4.0.1.tar.bz2) = 97197403 bytes
6SHA1 (patch-aa) = 84e5bca2b6d9715271c343f774c81186858d90c9 6SHA1 (patch-aa) = 84e5bca2b6d9715271c343f774c81186858d90c9
7SHA1 (patch-ad) = ebd47980f0141f7cbd0c6bbcfc15942cebc263f1 7SHA1 (patch-ad) = ebd47980f0141f7cbd0c6bbcfc15942cebc263f1
8SHA1 (patch-ae) = 25869b98f9197243aea799b75b238d92f58e8845 8SHA1 (patch-ae) = 25869b98f9197243aea799b75b238d92f58e8845
9SHA1 (patch-af) = 6a458a91dc34420d45238b5dad01ed63f0bd9e00 9SHA1 (patch-af) = 6a458a91dc34420d45238b5dad01ed63f0bd9e00
10SHA1 (patch-ai) = d06c382d188f4263a2a505ca3d3ee491baa3af28 10SHA1 (patch-ai) = d06c382d188f4263a2a505ca3d3ee491baa3af28
11SHA1 (patch-aj) = 33b75ec2662cc442f602b21b03fee1e5c39e3a76 11SHA1 (patch-aj) = 33b75ec2662cc442f602b21b03fee1e5c39e3a76
12SHA1 (patch-ak) = 919379dbf2a35c23010c87d9e95e124e8e84d04a 12SHA1 (patch-ak) = 919379dbf2a35c23010c87d9e95e124e8e84d04a
13SHA1 (patch-al) = 07462d3f9cf2aa08b1fb837400084d32a7062eee 13SHA1 (patch-al) = 07462d3f9cf2aa08b1fb837400084d32a7062eee
14SHA1 (patch-am) = ff0af9c120ebeb59edcdb727c7d36aa5939c73af 14SHA1 (patch-am) = ff0af9c120ebeb59edcdb727c7d36aa5939c73af
15SHA1 (patch-ap) = e0590d7014ae4ef74ee9f9c39f069411a66c8f76 15SHA1 (patch-ap) = e0590d7014ae4ef74ee9f9c39f069411a66c8f76
16SHA1 (patch-aq) = 91f8384c62e4a7a1b2079038495a1a78364926c9 16SHA1 (patch-aq) = 91f8384c62e4a7a1b2079038495a1a78364926c9
17SHA1 (patch-ar) = e225bfaa1a18aa5997a1a6472889da3a0ec533cc 17SHA1 (patch-ar) = e225bfaa1a18aa5997a1a6472889da3a0ec533cc
18SHA1 (patch-as) = 101c0119f498a389613a3cd54497e85b3aece1c2 18SHA1 (patch-as) = 101c0119f498a389613a3cd54497e85b3aece1c2
19SHA1 (patch-ba) = f501f1fa3e603660dc8f64ea6bc020b4f4c08a57 19SHA1 (patch-ba) = f501f1fa3e603660dc8f64ea6bc020b4f4c08a57
20SHA1 (patch-bc) = 1fbb3d78683dc29944eb69d2b033f34539da2b39 20SHA1 (patch-bc) = 1fbb3d78683dc29944eb69d2b033f34539da2b39
21SHA1 (patch-bd) = f5794809dd4a19d97322525693f65ab2f844104d 21SHA1 (patch-bd) = a6706236caae06c5defa5c8e2488380cc64f93ab
22SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f 22SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f
23SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d 23SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d
24SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb 24SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb
25SHA1 (patch-cc) = d26c9e04f04896f0e7b2edab61cd347d76e0fcaf 25SHA1 (patch-cc) = d26c9e04f04896f0e7b2edab61cd347d76e0fcaf
26SHA1 (patch-configure) = 52cc34a703269505175cbba54bdd0a80fed9b2d0 26SHA1 (patch-configure) = 52cc34a703269505175cbba54bdd0a80fed9b2d0
27SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd 27SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd
28SHA1 (patch-data_Makefile.in) = 0c54664b1a59714c6bec02547d70eaa7dee47928 28SHA1 (patch-data_Makefile.in) = 0c54664b1a59714c6bec02547d70eaa7dee47928
29SHA1 (patch-data_mono-nunit.pc.in) = 59e0a932727b842ac90c2d0b702481d62f72cab8 29SHA1 (patch-data_mono-nunit.pc.in) = 59e0a932727b842ac90c2d0b702481d62f72cab8
30SHA1 (patch-data_net_4_0_Browsers_Makefile.in) = ab4baa45dd75b87786cbc7d942611915d5ae1f72 30SHA1 (patch-data_net_4_0_Browsers_Makefile.in) = ab4baa45dd75b87786cbc7d942611915d5ae1f72
31SHA1 (patch-data_net_4_5_Browsers_Makefile.in) = e4cab08ffa040020684edb3a9fbc8e448d2faf35 31SHA1 (patch-data_net_4_5_Browsers_Makefile.in) = e4cab08ffa040020684edb3a9fbc8e448d2faf35
32SHA1 (patch-data_net_4_5_Makefile.in) = 778be615f4f21f2561e47e082302c09f02c6f8f6 32SHA1 (patch-data_net_4_5_Makefile.in) = 778be615f4f21f2561e47e082302c09f02c6f8f6
33SHA1 (patch-db) = 185ae2e5cbac9bca99443efbc5a8ae63423656cf 33SHA1 (patch-db) = 185ae2e5cbac9bca99443efbc5a8ae63423656cf
34SHA1 (patch-dc) = 725c82a9ac4ae9c01045149504a6df6a64d808a3 34SHA1 (patch-dc) = 725c82a9ac4ae9c01045149504a6df6a64d808a3
cvs diff -r1.6 -r1.7 pkgsrc/lang/mono/patches/Attic/patch-bd (expand / switch to unified diff)

--- pkgsrc/lang/mono/patches/Attic/patch-bd 2014/11/30 08:40:51 1.6
+++ pkgsrc/lang/mono/patches/Attic/patch-bd 2015/06/04 17:16:20 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-bd,v 1.6 2014/11/30 08:40:51 spz Exp $ 1$NetBSD: patch-bd,v 1.7 2015/06/04 17:16:20 jperkin Exp $
2 2
3Add MANDIR, but don't hardcode it (fixed in post-patch by SUBST_*). 3Add MANDIR, but don't hardcode it (fixed in post-patch by SUBST_*).
4 4
5--- mcs/build/config-default.make.orig 2014-09-22 13:23:05.000000000 +0000 5--- mcs/build/config-default.make.orig 2014-09-22 13:23:05.000000000 +0000
6+++ mcs/build/config-default.make 6+++ mcs/build/config-default.make
7@@ -17,8 +17,9 @@ LIBRARY_FLAGS = /noconfig 7@@ -17,8 +17,9 @@ LIBRARY_FLAGS = /noconfig
8 ifndef CFLAGS 8 ifndef CFLAGS
9 CFLAGS = -g -O2 9 CFLAGS = -g -O2
10 endif 10 endif
11-prefix = /usr/local 11-prefix = /usr/local
12+prefix = /usr/pkg 12+prefix = @PREFIX@
13 exec_prefix = $(prefix) 13 exec_prefix = $(prefix)
14+mandir = $(prefix)/man 14+mandir = @PKGMANDIR@
15 mono_libdir = $(exec_prefix)/lib 15 mono_libdir = $(exec_prefix)/lib
16 sysconfdir = $(prefix)/etc 16 sysconfdir = $(prefix)/etc
17 #RUNTIME = mono 17 #RUNTIME = mono