Handle domainname functions on SunOS correctly. Bump PKGREVISION.

4 files changed, 47 insertions, 5 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 23db5aff1bb..16a2acae2da 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2017/08/22 13:14:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.174 2017/08/22 13:43:34 jperkin Exp $
 
 DISTNAME=	mono-4.0.4.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	http://download.mono-project.com/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
@@ -138,13 +138,20 @@ PLIST_VARS=	monodoc
 
 .include "../../mk/bsd.prefs.mk"
 
+SUBST_CLASSES+=			fix-domlib
+SUBST_STAGE.fix-domlib=		pre-configure
+SUBST_FILES.fix-domlib=		mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
+.if ${OPSYS} == "SunOS"
+SUBST_SED.fix-domlib=		-e 's,@DOMAINLIB@,libnsl,g'
+.else
+SUBST_SED.fix-domlib=		-e 's,@DOMAINLIB@,libc,g'
+.endif
+
 .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
 ULIMIT_CMD_datasize=	ulimit -d 524288
 ULIMIT_CMD_stacksize=	ulimit -s 10240
 .elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 0eb837680ba..1788e76f701 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.108 2017/01/10 10:35:28 he Exp $
+$NetBSD: distinfo,v 1.109 2017/08/22 13:43:34 jperkin Exp $
 
 SHA1 (mono-4.0.4.1.tar.bz2) = 12f3dbdac92e937cafba1d4e5a168c4cf2620935
 RMD160 (mono-4.0.4.1.tar.bz2) = 27c2d2682786444ee52199134cb84cc59894b093
@@ -42,6 +42,7 @@ SHA1 (patch-dl) = dc63c1d3f6a1d78b2f5bb725cdff6824e2307dc5
 SHA1 (patch-do) = 0bda0d2e482be218fb502e0c4ea945a41d078d27
 SHA1 (patch-libgc_misc.c) = 52c68e7b6f1b58f480286bd135591f97a3e13125
 SHA1 (patch-man_mprof-report.1) = 0a80c164614cc9af5f01822005193d80f1d89946
+SHA1 (patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs) = 2c312a28f24a45ca2802dcbe032fd7007ddd60a3
 SHA1 (patch-mono_dis_Makefile.in) = f000112e2712faf29104489e45feae8d6fc45169
 SHA1 (patch-mono_metadata_icall.c) = 191a7fccb174855026cb11dd0f6ac450bb920ec7
 SHA1 (patch-mono_metadata_mono-perfcounters.c) = 8cfbfa62fe4201a20bc07645ccf6b13487a64fc3
@@ -62,3 +63,4 @@ SHA1 (patch-mono_utils_mono-threads.c) = 1cf1bd2416fc36df0e456774281c7d4a1bfa50f
 SHA1 (patch-po_Makefile.in) = 53f967c75ae028d991f118fb3bbc5b90bb4ceea7
 SHA1 (patch-support_signal.c) = 33e0c19c21955b105d78a05b2b10d00f479a60c2
 SHA1 (patch-support_time.c) = 2031ab294d66594ff3645b03c48ffca143ab59b5
+SHA1 (patch-support_unistd.c) = 3cd39812b252c660b4cbb44d3da4353829f0ce7a
diff --git a/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs b/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs
new file mode 100644
index 00000000000..e34be748353
--- /dev/null
+++ b/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs
@@ -0,0 +1,15 @@
+$NetBSD: patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs,v 1.1 2017/08/22 13:43:35 jperkin Exp $
+
+Support getdomainname being in a library other than libc.
+
+--- mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs.orig	2015-08-25 20:33:28.000000000 +0000
++++ mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
+@@ -96,7 +96,7 @@ namespace System.Net.NetworkInformation
+ 		[DllImport ("libc")]
+ 		static extern int gethostname ([MarshalAs (UnmanagedType.LPArray, SizeParamIndex = 1)] byte [] name, int len);
+ 
+-		[DllImport ("libc")]
++		[DllImport ("@DOMAINLIB@")]
+ 		static extern int getdomainname ([MarshalAs (UnmanagedType.LPArray, SizeParamIndex = 1)] byte [] name, int len);
+ 
+ 		public override string DhcpScopeName {
diff --git a/lang/mono/patches/patch-support_unistd.c b/lang/mono/patches/patch-support_unistd.c
new file mode 100644
index 00000000000..5b905054f6d
--- /dev/null
+++ b/lang/mono/patches/patch-support_unistd.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-support_unistd.c,v 1.1 2017/08/22 13:43:35 jperkin Exp $
+
+Support private domainname functions from SunOS libnsl.
+
+--- support/unistd.c.orig	2015-08-25 20:33:41.000000000 +0000
++++ support/unistd.c
+@@ -209,6 +209,11 @@ Mono_Posix_Syscall_sethostid (gint64 hos
+ }
+ #endif /* def HAVE_SETHOSTID */
+ 
++#ifdef __sun
++int getdomainname(char *, int);
++int setdomainname(char *, int);
++#endif
++
+ #ifdef HAVE_GETDOMAINNAME
+ gint32
+ Mono_Posix_Syscall_getdomainname (char *name, mph_size_t len)