CVS commit: pkgsrc/lang/mono

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Aug 22 13:43:35 UTC 2017

Modified Files:
        pkgsrc/lang/mono: Makefile distinfo
Added Files:
        pkgsrc/lang/mono/patches:
            patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs
            patch-support_unistd.c

Log Message:
Handle domainname functions on SunOS correctly.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 pkgsrc/lang/mono/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/lang/mono/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs \
    pkgsrc/lang/mono/patches/patch-support_unistd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mono/Makefile
diff -u pkgsrc/lang/mono/Makefile:1.173 pkgsrc/lang/mono/Makefile:1.174
--- pkgsrc/lang/mono/Makefile:1.173     Tue Aug 22 13:14:09 2017
+++ pkgsrc/lang/mono/Makefile   Tue Aug 22 13:43:34 2017
@@ -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*}

Index: pkgsrc/lang/mono/distinfo
diff -u pkgsrc/lang/mono/distinfo:1.108 pkgsrc/lang/mono/distinfo:1.109
--- pkgsrc/lang/mono/distinfo:1.108     Tue Jan 10 10:35:28 2017
+++ pkgsrc/lang/mono/distinfo   Tue Aug 22 13:43:34 2017
@@ -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) = dc63c1d3f6a1d78b2f5bb7
 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) =
 SHA1 (patch-po_Makefile.in) = 53f967c75ae028d991f118fb3bbc5b90bb4ceea7
 SHA1 (patch-support_signal.c) = 33e0c19c21955b105d78a05b2b10d00f479a60c2
 SHA1 (patch-support_time.c) = 2031ab294d66594ff3645b03c48ffca143ab59b5
+SHA1 (patch-support_unistd.c) = 3cd39812b252c660b4cbb44d3da4353829f0ce7a

Added files:

Index: pkgsrc/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs
diff -u /dev/null pkgsrc/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs:1.1
--- /dev/null   Tue Aug 22 13:43:35 2017
+++ pkgsrc/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs Tue Aug 22 13:43:35 2017
@@ -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 {
Index: pkgsrc/lang/mono/patches/patch-support_unistd.c
diff -u /dev/null pkgsrc/lang/mono/patches/patch-support_unistd.c:1.1
--- /dev/null   Tue Aug 22 13:43:35 2017
+++ pkgsrc/lang/mono/patches/patch-support_unistd.c     Tue Aug 22 13:43:35 2017
@@ -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)