Fri Nov 22 13:38:31 2013 UTC ()
Revert -r1.5, which is wrong, and instead clear PLATFORM in ALL_ENV.
Setting PLATFORM causes the build system to look for a ${PLATFORM}.make
file; this leads to build failure if a PLATFORM environment variable
leaks in from the outside environment.


(dholland)
diff -r1.5 -r1.6 pkgsrc/lang/mono2/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/lang/mono2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mono2/Attic/Makefile 2013/11/18 18:14:38 1.5
+++ pkgsrc/lang/mono2/Attic/Makefile 2013/11/22 13:38:31 1.6
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.5 2013/11/18 18:14:38 dholland Exp $ 1# $NetBSD: Makefile,v 1.6 2013/11/22 13:38:31 dholland Exp $
2 2
3DISTNAME= mono-2.10.9 3DISTNAME= mono-2.10.9
4PKGREVISION= 4 4PKGREVISION= 4
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= kefren@NetBSD.org 9MAINTAINER= kefren@NetBSD.org
10HOMEPAGE= http://www.mono-project.com/ 10HOMEPAGE= http://www.mono-project.com/
11COMMENT= Open source implementation of the .NET Development Framework (v2) 11COMMENT= Open source implementation of the .NET Development Framework (v2)
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND x11 15LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND x11
16 16
17BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 17BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
18 18
19CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]* 19CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
20 20
21ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} 21ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} PLATFORM=
22 22
23USE_TOOLS+= bison gmake perl:run pkg-config bash:run msgfmt 23USE_TOOLS+= bison gmake perl:run pkg-config bash:run msgfmt
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
25USE_LANGUAGES+= c c++ 25USE_LANGUAGES+= c c++
26EXTRACT_USING= bsdtar 26EXTRACT_USING= bsdtar
27 27
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
30CONFIGURE_ARGS+= --with-icu=yes 30CONFIGURE_ARGS+= --with-icu=yes
31CONFIGURE_ARGS+= --with-preview=yes 31CONFIGURE_ARGS+= --with-preview=yes
32CONFIGURE_ARGS+= --with-libgdiplus=installed 32CONFIGURE_ARGS+= --with-libgdiplus=installed
33CONFIGURE_ARGS+= --disable-dtrace 33CONFIGURE_ARGS+= --disable-dtrace
34 34
@@ -148,23 +148,19 @@ SUBST_SED.fix-libx11= -e 's,@X11BASE@,$ @@ -148,23 +148,19 @@ SUBST_SED.fix-libx11= -e 's,@X11BASE@,$
148 148
149CPPFLAGS.NetBSD+= -D_KMEMUSER 149CPPFLAGS.NetBSD+= -D_KMEMUSER
150CPPFLAGS.SunOS+= -D__C99FEATURES__ 150CPPFLAGS.SunOS+= -D__C99FEATURES__
151 151
152.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) 152.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
153ULIMIT_CMD_datasize= ulimit -d 262144 153ULIMIT_CMD_datasize= ulimit -d 262144
154ULIMIT_CMD_stacksize= ulimit -s 10240 154ULIMIT_CMD_stacksize= ulimit -s 10240
155.elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) 155.elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
156CONFIGURE_ARGS+= --with-sigaltstack=no 156CONFIGURE_ARGS+= --with-sigaltstack=no
157ULIMIT_CMD_datasize= ulimit -d 524288 157ULIMIT_CMD_datasize= ulimit -d 524288
158ULIMIT_CMD_stacksize= ulimit -s 10240 158ULIMIT_CMD_stacksize= ulimit -s 10240
159.endif 159.endif
160 160
161post-extract: 
162 ${CP} ${WRKSRC}/mcs/build/platforms/linux.make \ 
163 ${WRKSRC}/mcs/build/platforms/netbsd.make 
164 
165.include "../../devel/gettext-lib/buildlink3.mk" 161.include "../../devel/gettext-lib/buildlink3.mk"
166.include "../../lang/python/application.mk" 162.include "../../lang/python/application.mk"
167.include "../../textproc/icu/buildlink3.mk" 163.include "../../textproc/icu/buildlink3.mk"
168.include "../../textproc/libxml2/buildlink3.mk" 164.include "../../textproc/libxml2/buildlink3.mk"
169.include "../../textproc/libxslt/buildlink3.mk" 165.include "../../textproc/libxslt/buildlink3.mk"
170.include "../../mk/bsd.pkg.mk" 166.include "../../mk/bsd.pkg.mk"