gauche: Various fixes.

This package can only have possibly worked on NetBSD/x86_64 previously, now it
at least works on SunOS too.

6 files changed, 116 insertions, 76 deletions

diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index b687b9cc0b3..815dc4b3bd2 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2018/07/24 14:52:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2018/07/26 16:55:29 jperkin Exp $
 #
 
 DISTNAME=	Gauche-0.9.6
@@ -20,18 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-slib=${LOCALBASE}/share/slib
 CONFIGURE_ARGS+=	--enable-threads=pthreads
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
-
-CHECK_BUILTIN.iconv:=	yes
-.include "../../converters/libiconv/builtin.mk"
-CHECK_BUILTIN.iconv:=	no
-
-.if !empty(USE_BUILTIN.iconv:M[nN][oO])
-CONFIGURE_ARGS+=	--with-iconv-lib=${BUILDLINK_LIBNAME.iconv}
-ICONV_LDFLAGS=	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib \
-		-L${BUILDLINK_PREFIX.iconv}/lib
-ALL_ENV+=		\
-	ICONV_LDFLAGS=${ICONV_LDFLAGS:Q}
-.endif
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
 USE_LANGUAGES=	c c99
 USE_LIBTOOL=	yes
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index c64dcf4944a..63189330a1e 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2018/07/24 14:52:18 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2018/07/26 16:55:29 jperkin Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -64,60 +64,60 @@ lib/gauche-0.9/${PKGVERSION}/include/gc_pthread_redirects.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_tiny_fl.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_typed.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_version.h
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/binary--io.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/crypt--bcrypt.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/data--queue.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/data--sparse.so
-${PLIST.gdbm}lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/dbm--gdbm.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/dbm--ndbm.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/file--util.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--charconv.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--collection.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--dictionary.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--fcntl.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--generator.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--hook.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--net.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--parameter.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--record.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--sequence.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--syslog.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--termios.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--threads.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--unicode.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--uvector.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--vport.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-cesconv
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-config
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-install
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-package
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gosh
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-0.9.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-0.9.so.0
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-0.9.so.0.6
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-static-0.9.a
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/math--mt-random.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/os--windows.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/parser--peg.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--822.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--md5.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--mime.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--sha.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--tls--mbed.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--tls.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--zlib.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-1.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-13.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-133.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-19.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-43.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--serializer.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--ssax.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--sxpath.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--tools.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/text--gettext.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/text--tr.so
-lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/util--match.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/binary--io.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/crypt--bcrypt.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/data--queue.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/data--sparse.so
+${PLIST.gdbm}lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/dbm--gdbm.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/dbm--ndbm.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/file--util.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--charconv.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--collection.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--dictionary.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--fcntl.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--generator.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--hook.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--net.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--parameter.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--record.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--sequence.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--syslog.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--termios.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--threads.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--unicode.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--uvector.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--vport.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-cesconv
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-config
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-install
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-package
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gosh
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-0.9.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-0.9.so.0
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-0.9.so.0.6
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-static-0.9.a
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/math--mt-random.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/os--windows.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/parser--peg.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--822.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--md5.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--mime.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--sha.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--tls--mbed.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--tls.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--zlib.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-1.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-13.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-133.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-19.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-43.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--serializer.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--ssax.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--sxpath.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--tools.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/text--gettext.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/text--tr.so
+lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/util--match.so
 lib/libgauche-0.9.so
 lib/libgauche-0.9.so.0
 lib/libgauche-0.9.so.0.6
@@ -506,4 +506,4 @@ share/gauche-0.9/${PKGVERSION}/template.module.scm
 share/gauche-0.9/${PKGVERSION}/template.package.scm
 share/gauche-0.9/${PKGVERSION}/template.test.scm
 @pkgdir share/gauche-0.9/site/lib
-@pkgdir lib/gauche-0.9/site/x86_64--netbsd
+@pkgdir lib/gauche-0.9/site/${MACHINE_GNU_PLATFORM}
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index 2076b184331..7bbbd07d7af 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.38 2018/07/24 14:52:18 ryoon Exp $
+$NetBSD: distinfo,v 1.39 2018/07/26 16:55:29 jperkin Exp $
 
 SHA1 (Gauche-0.9.6.tgz) = 20f2a0a4b37c40ce0175e627d5767b32d8f4eb5d
 RMD160 (Gauche-0.9.6.tgz) = 36d77c87881978c408daf7958bc41048aa4b2edd
 SHA512 (Gauche-0.9.6.tgz) = 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
 Size (Gauche-0.9.6.tgz) = 6927530 bytes
-SHA1 (patch-aa) = 0cc7f563f1750bff4c9630bc4a2d8ce95d3b323d
+SHA1 (patch-aa) = 41f2160ffdb8ad66e77d9d30950e820dd07b18a8
 SHA1 (patch-af) = 0962445f5eab8d788283455f60386aa1cfd70230
 SHA1 (patch-ag) = 524048e151225dc73d00c31623be25e84206920a
+SHA1 (patch-ext_tls_axTLS_ssl_os__port.h) = 347babc3449082d01e6905a3f6a6016ba3b55652
+SHA1 (patch-ext_zlib_Makefile.in) = 29fab7f300a880d1509fa144ec15612289445a96
diff --git a/lang/gauche/patches/patch-aa b/lang/gauche/patches/patch-aa
index 8f351303cbf..b0124636cc0 100644
--- a/lang/gauche/patches/patch-aa
+++ b/lang/gauche/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.15 2016/10/13 00:30:13 enami Exp $
+$NetBSD: patch-aa,v 1.16 2018/07/26 16:55:29 jperkin Exp $
 
 * Use correct CFLAGS on SunOS.
 * XXX something about arm
 * XXX something about rint()
 
---- configure.orig	2016-10-08 10:31:17.000000000 +0000
+--- configure.orig	2018-07-03 11:43:06.000000000 +0000
 +++ configure
-@@ -3374,8 +3376,8 @@ GAUCHE_CONFIGURE_ARGS=`echo "$ac_configu
+@@ -4650,8 +4650,8 @@ GAUCHE_CONFIGURE_ARGS=`echo "$ac_configu
  
  
  case $host in
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.15 2016/10/13 00:30:13 enami Exp $
  esac
  
  ac_ext=c
-@@ -5510,6 +5512,9 @@ $as_echo "#define SCM_TARGET_X86_64 1" >
+@@ -6253,6 +6253,9 @@ $as_echo "#define SCM_TARGET_X86_64 1" >
    alpha*) :
  
      CFLAGS="$CFLAGS -mieee" ;; #(
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.15 2016/10/13 00:30:13 enami Exp $
    arm*) :
  
  
-@@ -6719,7 +6724,7 @@ _ACEOF
+@@ -7462,7 +7465,7 @@ _ACEOF
  
  fi
  
@@ -36,3 +36,21 @@ $NetBSD: patch-aa,v 1.15 2016/10/13 00:30:13 enami Exp $
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -8278,7 +8281,7 @@ if test "${with_iconv+set}" = set; then
+      ;; #(
+   *) :
+     ICONV_CPPFLAGS="-I$with_iconv/include"
+-	    ICONV_LDFLAGS="-L$with_iconv/lib" ;;
++	    ICONV_LDFLAGS="${COMPILER_RPATH_FLAG}$with_iconv/lib -L$with_iconv/lib" ;;
+ esac
+ 
+ fi
+@@ -10157,7 +10160,7 @@ if test "${with_zlib+set}" = set; then :
+      ;; #(
+   *) :
+     ZLIB_CPPFLAGS="-I$with_zlib/include"
+-	    ZLIB_LDFLAGS="-L$with_zlib/lib" ;;
++	    ZLIB_LDFLAGS="${COMPILER_RPATH_FLAG}$with_zlib/lib -L$with_zlib/lib" ;;
+ esac
+ 
+ fi
diff --git a/lang/gauche/patches/patch-ext_tls_axTLS_ssl_os__port.h b/lang/gauche/patches/patch-ext_tls_axTLS_ssl_os__port.h
new file mode 100644
index 00000000000..ebca7fd9c55
--- /dev/null
+++ b/lang/gauche/patches/patch-ext_tls_axTLS_ssl_os__port.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-ext_tls_axTLS_ssl_os__port.h,v 1.1 2018/07/26 16:55:29 jperkin Exp $
+
+Provide endian support on SunOS.
+
+--- ext/tls/axTLS/ssl/os_port.h.orig	2017-04-14 08:07:25.000000000 +0000
++++ ext/tls/axTLS/ssl/os_port.h
+@@ -162,6 +162,9 @@ EXP_FUNC int STDCALL getdomainname(char
+ #define be64toh(x) OSSwapBigToHostInt64(x)
+ #elif  defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/endian.h>
++#elif defined(__sun)
++#include <sys/byteorder.h>
++#define be64toh(x) BE_64(x)
+ #else
+ #include <asm/byteorder.h>
+ #endif
diff --git a/lang/gauche/patches/patch-ext_zlib_Makefile.in b/lang/gauche/patches/patch-ext_zlib_Makefile.in
new file mode 100644
index 00000000000..f041ce17bf3
--- /dev/null
+++ b/lang/gauche/patches/patch-ext_zlib_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_zlib_Makefile.in,v 1.1 2018/07/26 16:55:29 jperkin Exp $
+
+Ensure correct zlib library is linked.
+
+--- ext/zlib/Makefile.in.orig	2017-04-14 08:07:25.000000000 +0000
++++ ext/zlib/Makefile.in
+@@ -21,7 +21,7 @@ XCLEANFILES = rfc--zlib.c zlib.sci
+ all : $(LIBFILES)
+ 
+ rfc--zlib.$(SOEXT) : $(OBJECTS)
+-	$(MODLINK) rfc--zlib.$(SOEXT) $(OBJECTS) $(EXT_LIBGAUCHE) $(LIBS)
++	$(MODLINK) rfc--zlib.$(SOEXT) $(OBJECTS) $(EXT_LIBGAUCHE) $(XLDFLAGS) $(LIBS)
+ 
+ $(OBJECTS) : gauche-zlib.h
+