Fix build under SCO OpenServer 5.0.7/3.2

and add workaround for empty result of nl_langinfo(CODESET).
This workaround is needed for devel/gtexinfo.

6 files changed, 160 insertions, 15 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 496a334318b..d03aea752f1 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2014/03/13 11:08:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.219 2014/03/14 22:41:10 ryoon Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -209,6 +209,7 @@ LIBSWANTED.NetBSD=	m crypt
 LIBSWANTED.OpenBSD=	m crypt
 LIBSWANTED.SunOS=	m crypt dl socket nsl
 LIBSWANTED.AIX=		m crypt dl socket nsl bind c
+LIBSWANTED.SCO_SV=	m crypt socket
 LIBSWANTED=		${LIBSWANTED.${OPSYS}}
 SUBST_VARS.policysh+=	LIBSWANTED
 
@@ -227,6 +228,7 @@ SYSLIBPATH.NetBSD=	/usr/lib
 SYSLIBPATH.OpenBSD=	/usr/lib
 SYSLIBPATH.SunOS=	/usr/lib
 SYSLIBPATH.AIX=		/usr/lib
+SYSLIBPATH.SCO_SV=	/usr/lib
 SYSLIBPATH=		${SYSLIBPATH.${OPSYS}}
 SUBST_VARS.policysh+=	SYSLIBPATH
 
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index eb3b231d22b..6376690102f 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.114 2014/01/13 09:59:16 adam Exp $
+$NetBSD: distinfo,v 1.115 2014/03/14 22:41:10 ryoon Exp $
 
 SHA1 (perl-5.18.2.tar.bz2) = b8b87ef46630b5a2287b86b6e0c69088da36adfd
 RMD160 (perl-5.18.2.tar.bz2) = 1b656ae4f53845aac11e62b71c2d84c156ebfbd0
@@ -9,14 +9,17 @@ SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d
 SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
 SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
-SHA1 (patch-ca) = 8d060de546b2ea3ab08e6b0f3b25bfe357fd8279
+SHA1 (patch-ca) = 80f96af07df5e77d0e0cdbdaeb5cca852008395f
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
+SHA1 (patch-cpan_Socket_Socket.xs) = 9390c42ad456b0ea114c2e57e4d829d630fb698e
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a
 SHA1 (patch-hints_netbsd.sh) = 027722c47bb01aa8db21e534178432cd26b49cdf
+SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216
 SHA1 (patch-hv.c) = 0ed39926d620724db6d612a717d84b4efa129162
+SHA1 (patch-locale.c) = e34500b5d0e2f868a4c9e3b3e4ae84e2ddbf1b18
 SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f
 SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
 SHA1 (patch-ze) = 211ed6065ecf2ca02f8e95283c2d67a64c2e6b41
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 267583f591f..17ed9dc615f 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
+$NetBSD: patch-ca,v 1.18 2014/03/14 22:41:10 ryoon Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 
@@ -8,7 +8,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
 
 * Several other changes.
 
---- Configure.orig	2013-08-12 02:44:47.000000000 +0000
+--- Configure.orig	2014-01-06 22:46:42.000000000 +0000
 +++ Configure
 @@ -3274,13 +3274,14 @@ EOM
  			osvers="$3"
@@ -45,7 +45,17 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
                  	;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -4722,7 +4723,7 @@ case "$plibpth" in
+@@ -3328,6 +3329,9 @@ EOM
+ 		qnx) osname=qnx
+ 			osvers="$4"
+ 			;;
++		sco_sv) osname=sco_sv
++			osvers=`$uname -r`v`$uname -v`
++			;;
+ 		solaris) osname=solaris
+ 			case "$3" in
+ 			5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
+@@ -4722,7 +4726,7 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -54,7 +64,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  *) dlist="$libpth";;
  esac
  
-@@ -4730,7 +4731,7 @@ esac
+@@ -4730,7 +4734,7 @@ esac
  libpth=''
  for xxx in $dlist
  do
@@ -63,7 +73,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -4819,7 +4820,7 @@ lib_ext=$_a
+@@ -4819,7 +4823,7 @@ lib_ext=$_a
  obj_ext=$_o
  path_sep=$p_
  
@@ -72,7 +82,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  
  : Which makefile gets called first.  This is used by make depend.
  case "$firstmakefile" in
-@@ -5119,8 +5120,10 @@ default|recommended)
+@@ -5119,8 +5123,10 @@ default|recommended)
  	# as that way the compiler can do the right implementation dependant
  	# thing. (NWC)
  	case "$gccversion" in
@@ -84,7 +94,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  		;;
  	esac
  	;;
-@@ -6486,7 +6489,9 @@ rp='Pathname for the site-specific libra
+@@ -6486,7 +6492,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -95,7 +105,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -6999,7 +7004,9 @@ case "$vendorprefix" in
+@@ -6999,7 +7007,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -106,7 +116,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -7476,6 +7483,15 @@ case "$nm_so_opt" in
+@@ -7476,6 +7486,15 @@ case "$nm_so_opt" in
  	;;
  esac
  
@@ -122,7 +132,15 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  : Figure out where the libc is located
  case "$runnm" in
  true)
-@@ -8347,7 +8363,7 @@ if "$useshrplib"; then
+@@ -8048,6 +8067,7 @@ EOM
+ 			      ;;
+ 			linux|irix*|gnu*)  dflt="-shared $optimize" ;;
+ 			next)  dflt='none' ;;
++			sco_sv)  dflt='-shared' ;;
+ 			solaris) # See [perl #66604].  On Solaris 11, gcc -m64 on amd64
+ 				# appears not to understand -G.  gcc versions at
+ 				# least as old as 3.4.3 support -shared, so just
+@@ -8347,7 +8367,7 @@ if "$useshrplib"; then
  		# next doesn't like the default...
  		;;
  	haiku)
@@ -131,7 +149,17 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  		;;
  	hpux*)
  		# hpux doesn't like the default, either.
-@@ -9431,6 +9447,13 @@ esac
+@@ -8356,6 +8376,9 @@ if "$useshrplib"; then
+ 	cygwin)
+ 		# cygwin needs only ldlibpth
+ 		;;
++	sco_sv)
++		xxx="-Wl,-R$shrpdir"
++		;;
+ 	*)
+ 		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
+ 		;;
+@@ -9431,6 +9454,13 @@ esac
  : Check if we want perlio
  useperlio="$define"
  
@@ -145,7 +173,7 @@ $NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -19243,7 +19266,15 @@ RCAT(Rei,ser)
+@@ -19243,7 +19273,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
diff --git a/lang/perl5/patches/patch-cpan_Socket_Socket.xs b/lang/perl5/patches/patch-cpan_Socket_Socket.xs
new file mode 100644
index 00000000000..1e46f6da5d7
--- /dev/null
+++ b/lang/perl5/patches/patch-cpan_Socket_Socket.xs
@@ -0,0 +1,17 @@
+$NetBSD: patch-cpan_Socket_Socket.xs,v 1.1 2014/03/14 22:41:10 ryoon Exp $
+
+* Fix build under SCO OpenServer 5.0.7/3.2
+
+--- cpan/Socket/Socket.xs.orig	2014-01-06 22:46:43.000000000 +0000
++++ cpan/Socket/Socket.xs
+@@ -75,6 +75,10 @@ NETINET_DEFINE_CONTEXT
+ # define INADDR_LOOPBACK	 0x7F000001
+ #endif /* INADDR_LOOPBACK */
+ 
++#if !defined(INET_ADDRSTRLEN)
++#define INET_ADDRSTRLEN		16
++#endif
++
+ #ifndef C_ARRAY_LENGTH
+ #define C_ARRAY_LENGTH(arr) (sizeof(arr) / sizeof(*(arr)))
+ #endif /* !C_ARRAY_LENGTH */
diff --git a/lang/perl5/patches/patch-hints_sco.sh b/lang/perl5/patches/patch-hints_sco.sh
new file mode 100644
index 00000000000..052593c2146
--- /dev/null
+++ b/lang/perl5/patches/patch-hints_sco.sh
@@ -0,0 +1,77 @@
+$NetBSD: patch-hints_sco.sh,v 1.1 2014/03/14 22:41:10 ryoon Exp $
+
+* More hints
+
+--- hints/sco.sh.orig	2013-11-04 15:15:38.000000000 +0000
++++ hints/sco.sh
+@@ -120,6 +120,7 @@ else
+         *gcc*)
+             ccflags="$ccflags -melf"
+             optimize='-O2'
++            ldflags="-shared"
+         ;;
+         *)
+             ccflags="$ccflags -w0 -belf"
+@@ -144,8 +145,8 @@ else
+         case "$cc" in
+             *gcc*)
+                 ccdlflags='-Xlinker -Bexport -L/usr/local/lib'
+-                cccdlflags='-fpic'
+-                lddlflags='-G -L/usr/local/lib'
++                cccdlflags="-fpic $cccdlflags"
++                lddlflags=" -G -L/usr/local/lib $lddlflags"
+             ;;
+             *)
+                 ccdlflags='-Wl,-Bexport -L/usr/local/lib'
+@@ -168,6 +169,51 @@ else
+     fi
+ fi
+ 
++d_gethostbyname_r="define"
++d_gethostbyaddr_r="define"
++d_gethostent_r="define"
++d_getnetbyname_r="define"
++d_getnetbyaddr_r="define"
++d_getnetent_r="define"
++d_getprotobyname_r="define"
++d_getprotoent_r="define"
++d_getprotobynumber_r="define"
++d_getservbyname_r="define"
++d_getprotobynumber_r="define"
++d_getservent_r="define"
++d_getservbyname_r="define"
++d_getservbyport_r="define"
++d_setservent_r="define"
++d_sethostent_r="define"
++d_setnetent_r="define"
++d_setprotoent_r="define"
++d_endhostent_r="define"
++d_endnetent_r="define"
++d_endprotoent_r="define"
++d_endservent_r="define"
++
++d_gethostbyname_r_proto="define"
++d_gethostbyaddr_r_proto="define"
++d_gethostent_r_proto="define"
++d_getnetbyname_r_proto="define"
++d_getnetbyaddr_r_proto="define"
++d_getnetent_r_proto="define"
++d_getprotobyname_r_proto="define"
++d_getprotoent_r_proto="define"
++d_getprotobynumber_r_proto="define"
++d_getservbyname_r_proto="define"
++d_getprotobynumber_r_proto="define"
++d_getservent_r_proto="define"
++d_getservbyname_r_proto="define"
++d_getservbyport_r_proto="define"
++d_setservent_r_proto="define"
++d_sethostent_r_proto="define"
++d_setnetent_r_proto="define"
++d_setprotoent_r_proto="define"
++d_endhostent_r_proto="define"
++d_endnetent_r_proto="define"
++d_endprotoent_r_proto="define"
++d_endservent_r_proto="define"
+ 
+ ###############################################################
+ # Various hints, common to all releases, to have it work better:
diff --git a/lang/perl5/patches/patch-locale.c b/lang/perl5/patches/patch-locale.c
new file mode 100644
index 00000000000..6b02345473a
--- /dev/null
+++ b/lang/perl5/patches/patch-locale.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-locale.c,v 1.1 2014/03/14 22:41:10 ryoon Exp $
+
+--- locale.c.orig	2014-01-06 22:46:45.000000000 +0000
++++ locale.c
+@@ -517,6 +517,13 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
+ 	 char *codeset = NULL;
+ #if defined(HAS_NL_LANGINFO) && defined(CODESET)
+ 	 codeset = nl_langinfo(CODESET);
++/*
++ * SCO OpenServer 5.0.7/3.2's nl_langinfo(CODESET) always returns empty.
++ */
++#if defined(_SCO_DS)
++	 strncpy(codeset, "646", 3);
++	 codeset[3] = '\0';
++#endif
+ #endif
+ 	 if (codeset)
+ 	      utf8locale = (foldEQ(codeset, STR_WITH_LEN("UTF-8"))