Fix 32-bit SunOS build, and fix variable expansion in patch-bd.

4 files changed, 9 insertions, 18 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 5a1dd39feb0..940b7cfb3d6 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2015/05/26 12:19:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.161 2015/06/04 17:16:20 jperkin Exp $
 
 DISTNAME=	mono-4.0.1
 PKGREVISION=	1
@@ -117,8 +117,7 @@ SUBST_CLASSES+=			fix-mcs
 SUBST_STAGE.fix-mcs=		post-patch
 SUBST_MESSAGE.fix-mcs=		Fixing mcs default prefix
 SUBST_FILES.fix-mcs=		mcs/build/config-default.make
-SUBST_SED.fix-mcs=		-e 's,/usr/local,${PREFIX},1'
-SUBST_SED.fix-mcs+=		-e "s|MANDIR|${PKGMANDIR}|1"
+SUBST_VARS.fix-mcs=		PREFIX PKGMANDIR
 
 SUBST_CLASSES+=			fix-cfgdir
 SUBST_STAGE.fix-cfgdir=		post-patch
@@ -139,16 +138,12 @@ PLIST_VARS=	monodoc
 .if ${OPSYS} == "SunOS"
 CFLAGS+=		-D_XOPEN_SOURCE=600
 CONFIGURE_ARGS+=	--with-mcs-docs=no
+CONFIGURE_ARGS+=	--with-sgen=no
+CONFIGURE_ARGS+=	--with-sigaltstack=no
 CONFIGURE_ENV+=		ac_cv_func_getdomainname=no
 CONFIGURE_ENV+=		ac_cv_func_setdomainname=no
-.  if ${ABI} == "32"
-ULIMIT_CMD_datasize=	ulimit -d 262144
-ULIMIT_CMD_stacksize=	ulimit -s 10240
-.  else
-CONFIGURE_ARGS+=	--with-sigaltstack=no
 ULIMIT_CMD_datasize=	ulimit -d 524288
 ULIMIT_CMD_stacksize=	ulimit -s 10240
-.  endif
 .elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
 CONFIGURE_ARGS+=	--with-mcs-docs=no
 CONFIGURE_ARGS+=	--disable-parallel-mark
diff --git a/lang/mono/PLIST.SunOS-i386 b/lang/mono/PLIST.SunOS-i386
deleted file mode 100644
index ccb1e7cb6a2..00000000000
--- a/lang/mono/PLIST.SunOS-i386
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.SunOS-i386,v 1.1 2013/09/13 20:47:55 jperkin Exp $
-bin/mono-sgen
-lib/libmonosgen-2.0.la
-lib/pkgconfig/monosgen-2.pc
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index d1590bf4b95..b8bdba4bcaf 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.102 2015/05/26 12:19:46 jperkin Exp $
+$NetBSD: distinfo,v 1.103 2015/06/04 17:16:20 jperkin Exp $
 
 SHA1 (mono-4.0.1.tar.bz2) = 9c7c27caa69e6a1673753437fd6824e0d33fe2ac
 RMD160 (mono-4.0.1.tar.bz2) = 3adcb49d7da9a4d81b7f5bc2108d13c20d94ab15
@@ -18,7 +18,7 @@ SHA1 (patch-ar) = e225bfaa1a18aa5997a1a6472889da3a0ec533cc
 SHA1 (patch-as) = 101c0119f498a389613a3cd54497e85b3aece1c2
 SHA1 (patch-ba) = f501f1fa3e603660dc8f64ea6bc020b4f4c08a57
 SHA1 (patch-bc) = 1fbb3d78683dc29944eb69d2b033f34539da2b39
-SHA1 (patch-bd) = f5794809dd4a19d97322525693f65ab2f844104d
+SHA1 (patch-bd) = a6706236caae06c5defa5c8e2488380cc64f93ab
 SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f
 SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d
 SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb
diff --git a/lang/mono/patches/patch-bd b/lang/mono/patches/patch-bd
index 6a0e761691b..55206c035a2 100644
--- a/lang/mono/patches/patch-bd
+++ b/lang/mono/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.6 2014/11/30 08:40:51 spz Exp $
+$NetBSD: patch-bd,v 1.7 2015/06/04 17:16:20 jperkin Exp $
 
 Add MANDIR, but don't hardcode it (fixed in post-patch by SUBST_*).
 
@@ -9,9 +9,9 @@ Add MANDIR, but don't hardcode it (fixed in post-patch by SUBST_*).
  CFLAGS = -g -O2
  endif
 -prefix = /usr/local
-+prefix = /usr/pkg
++prefix = @PREFIX@
  exec_prefix = $(prefix)
-+mandir = $(prefix)/man
++mandir = @PKGMANDIR@
  mono_libdir = $(exec_prefix)/lib
  sysconfdir = $(prefix)/etc
  #RUNTIME = mono