Update to Gauche-0.8.13.

pkgsrc changes
- DESTDIR support
- use libtool
- make iconv work
- fix a PLIST error
- close PR pkg/37897

Upstream changes
- Sorry, too many to list here

6 files changed, 68 insertions, 152 deletions

diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 9b7ca73131c..50a86ab4743 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/11/03 22:36:49 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2008/02/25 23:14:19 tnn Exp $
 #
 
-DISTNAME=	Gauche-0.8.9
-PKGREVISION=	1
+DISTNAME=	Gauche-0.8.13
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gauche/}
 EXTRACT_SUFX=	.tgz
@@ -13,29 +12,32 @@ COMMENT=	R5RS Scheme implementation aimed to be a handy tool for daily works
 
 DEPENDS+=	slib-[0-9]*:../../devel/slib
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "options.mk"
 
 EVAL_PREFIX+=		SLIB_PREFIX=slib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=		AS="${CC} -x assembler-with-cpp -c"
 CONFIGURE_ARGS+=	--with-slib=${SLIB_PREFIX}/share/slib
-CONFIGURE_ARGS+=	--enable-multibyte=utf-8
 CONFIGURE_ARGS+=	--enable-threads=pthreads
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+.include "../../converters/libiconv/buildlink3.mk"
+.if defined(BUILDLINK_LDADD.iconv) && !empty(BUILDLINK_LDADD.iconv:M-l*)
 CONFIGURE_ARGS+=	--with-iconv-lib=${BUILDLINK_LDADD.iconv:M-l*:S/-l//:Q}
-MAKE_ENV+=	ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+MAKE_ENV+=		ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+.endif
 MAKE_JOBS_SAFE=	no
 
+USE_LIBTOOL=	yes
 USE_TOOLS+=	gzip makeinfo
 TEST_TARGET=	check
 INFO_FILES=	yes	# PLIST
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 post-install:
-	gzip -d ${PREFIX}/${PKGINFODIR}/gauche-ref*gz
+	gzip -d ${DESTDIR}${PREFIX}/${PKGINFODIR}/gauche-ref*gz
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index f7af0afe1bd..42498ce2a46 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/19 12:59:01 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/02/25 23:14:19 tnn Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -38,35 +38,51 @@ lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml-sxpath.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml-tools.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/syslog.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/termios.so
+lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/text-gettext-lib.so
+lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/text-tr-lib.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/threads.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/util-match-lib.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/vport.so
 lib/gauche/${PKGVERSION}/include/gauche.h
 lib/gauche/${PKGVERSION}/include/gauche/arch.h
 lib/gauche/${PKGVERSION}/include/gauche/bignum.h
+lib/gauche/${PKGVERSION}/include/gauche/bits.h
 lib/gauche/${PKGVERSION}/include/gauche/builtin-syms.h
 lib/gauche/${PKGVERSION}/include/gauche/char_euc_jp.h
 lib/gauche/${PKGVERSION}/include/gauche/char_none.h
 lib/gauche/${PKGVERSION}/include/gauche/char_sjis.h
 lib/gauche/${PKGVERSION}/include/gauche/char_utf_8.h
+lib/gauche/${PKGVERSION}/include/gauche/charset.h
 lib/gauche/${PKGVERSION}/include/gauche/class.h
 lib/gauche/${PKGVERSION}/include/gauche/code.h
+lib/gauche/${PKGVERSION}/include/gauche/collection.h
 lib/gauche/${PKGVERSION}/include/gauche/config.h
 lib/gauche/${PKGVERSION}/include/gauche/exception.h
 lib/gauche/${PKGVERSION}/include/gauche/extend.h
+lib/gauche/${PKGVERSION}/include/gauche/extern.h
+lib/gauche/${PKGVERSION}/include/gauche/float.h
+lib/gauche/${PKGVERSION}/include/gauche/gloc.h
+lib/gauche/${PKGVERSION}/include/gauche/hash.h
 lib/gauche/${PKGVERSION}/include/gauche/int64.h
+lib/gauche/${PKGVERSION}/include/gauche/keyword.h
+lib/gauche/${PKGVERSION}/include/gauche/load.h
 lib/gauche/${PKGVERSION}/include/gauche/mingw-compat.h
 lib/gauche/${PKGVERSION}/include/gauche/net.h
 lib/gauche/${PKGVERSION}/include/gauche/number.h
+lib/gauche/${PKGVERSION}/include/gauche/parameter.h
 lib/gauche/${PKGVERSION}/include/gauche/port.h
 lib/gauche/${PKGVERSION}/include/gauche/pthread.h
 lib/gauche/${PKGVERSION}/include/gauche/scmconst.h
+lib/gauche/${PKGVERSION}/include/gauche/string.h
+lib/gauche/${PKGVERSION}/include/gauche/symbol.h
 lib/gauche/${PKGVERSION}/include/gauche/system.h
+lib/gauche/${PKGVERSION}/include/gauche/treemap.h
 lib/gauche/${PKGVERSION}/include/gauche/uthread.h
 lib/gauche/${PKGVERSION}/include/gauche/uvector.h
 lib/gauche/${PKGVERSION}/include/gauche/vector.h
 lib/gauche/${PKGVERSION}/include/gauche/vm.h
 lib/gauche/${PKGVERSION}/include/gauche/vminsn.h
+lib/gauche/${PKGVERSION}/include/gauche/weak.h
 lib/gauche/${PKGVERSION}/include/gc.h
 lib/gauche/${PKGVERSION}/include/gc_config_macros.h
 lib/gauche/${PKGVERSION}/include/gc_pthread_redirects.h
@@ -95,12 +111,16 @@ share/gauche/${PKGVERSION}/lib/gauche-init.scm
 share/gauche/${PKGVERSION}/lib/gauche/array.scm
 share/gauche/${PKGVERSION}/lib/gauche/auxsys.scm
 share/gauche/${PKGVERSION}/lib/gauche/cgen.scm
+share/gauche/${PKGVERSION}/lib/gauche/cgen/cise.scm
+share/gauche/${PKGVERSION}/lib/gauche/cgen/literal.scm
+share/gauche/${PKGVERSION}/lib/gauche/cgen/unit.scm
 share/gauche/${PKGVERSION}/lib/gauche/charconv.scm
 share/gauche/${PKGVERSION}/lib/gauche/collection.scm
 share/gauche/${PKGVERSION}/lib/gauche/common-macros.scm
 share/gauche/${PKGVERSION}/lib/gauche/condutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/config.scm
 share/gauche/${PKGVERSION}/lib/gauche/defvalues.scm
+share/gauche/${PKGVERSION}/lib/gauche/dictionary.scm
 share/gauche/${PKGVERSION}/lib/gauche/fcntl.scm
 share/gauche/${PKGVERSION}/lib/gauche/fileutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/hashutil.scm
@@ -115,6 +135,7 @@ share/gauche/${PKGVERSION}/lib/gauche/logger.scm
 share/gauche/${PKGVERSION}/lib/gauche/logical.scm
 share/gauche/${PKGVERSION}/lib/gauche/macroutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/matrix.scm
+share/gauche/${PKGVERSION}/lib/gauche/miscutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/modutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/mop/instance-pool.scm
 share/gauche/${PKGVERSION}/lib/gauche/mop/propagate.scm
@@ -148,6 +169,7 @@ share/gauche/${PKGVERSION}/lib/gauche/termios.scm
 share/gauche/${PKGVERSION}/lib/gauche/test.scm
 share/gauche/${PKGVERSION}/lib/gauche/threads.scm
 share/gauche/${PKGVERSION}/lib/gauche/time.scm
+share/gauche/${PKGVERSION}/lib/gauche/treeutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/uvector.scm
 share/gauche/${PKGVERSION}/lib/gauche/validator.scm
 share/gauche/${PKGVERSION}/lib/gauche/version.scm
@@ -161,15 +183,17 @@ share/gauche/${PKGVERSION}/lib/math/mt-random.scm
 share/gauche/${PKGVERSION}/lib/rfc/822.scm
 share/gauche/${PKGVERSION}/lib/rfc/base64.scm
 share/gauche/${PKGVERSION}/lib/rfc/cookie.scm
+share/gauche/${PKGVERSION}/lib/rfc/ftp.scm
 share/gauche/${PKGVERSION}/lib/rfc/hmac.scm
 share/gauche/${PKGVERSION}/lib/rfc/http.scm
+share/gauche/${PKGVERSION}/lib/rfc/icmp.scm
+share/gauche/${PKGVERSION}/lib/rfc/ip.scm
 share/gauche/${PKGVERSION}/lib/rfc/md5.scm
 share/gauche/${PKGVERSION}/lib/rfc/mime.scm
 share/gauche/${PKGVERSION}/lib/rfc/quoted-printable.scm
 share/gauche/${PKGVERSION}/lib/rfc/sha1.scm
 share/gauche/${PKGVERSION}/lib/rfc/uri.scm
 share/gauche/${PKGVERSION}/lib/slib.scm
-share/gauche/${PKGVERSION}/lib/slibcat
 share/gauche/${PKGVERSION}/lib/srfi-0.scm
 share/gauche/${PKGVERSION}/lib/srfi-1.scm
 share/gauche/${PKGVERSION}/lib/srfi-11.scm
@@ -205,6 +229,7 @@ share/gauche/${PKGVERSION}/lib/text/gettext.scm
 share/gauche/${PKGVERSION}/lib/text/html-lite.scm
 share/gauche/${PKGVERSION}/lib/text/info.scm
 share/gauche/${PKGVERSION}/lib/text/parse.scm
+share/gauche/${PKGVERSION}/lib/text/progress.scm
 share/gauche/${PKGVERSION}/lib/text/sql.scm
 share/gauche/${PKGVERSION}/lib/text/tr.scm
 share/gauche/${PKGVERSION}/lib/text/tree.scm
@@ -224,6 +249,7 @@ share/gauche/${PKGVERSION}/lib/util/tree.scm
 share/gauche/${PKGVERSION}/lib/util/trie.scm
 share/gauche/${PKGVERSION}/lib/www/cgi-test.scm
 share/gauche/${PKGVERSION}/lib/www/cgi.scm
+share/gauche/${PKGVERSION}/lib/www/cgi/test.scm
 share/gauche/${PKGVERSION}/template.DIST
 share/gauche/${PKGVERSION}/template.Makefile.in
 share/gauche/${PKGVERSION}/template.configure.ac
@@ -250,6 +276,7 @@ share/gauche/${PKGVERSION}/template.test.scm
 @dirrm share/gauche/${PKGVERSION}/lib/gauche/package
 @dirrm share/gauche/${PKGVERSION}/lib/gauche/mop
 @dirrm share/gauche/${PKGVERSION}/lib/gauche/interactive
+@dirrm share/gauche/${PKGVERSION}/lib/gauche/cgen
 @dirrm share/gauche/${PKGVERSION}/lib/gauche
 @dirrm share/gauche/${PKGVERSION}/lib/file
 @dirrm share/gauche/${PKGVERSION}/lib/dbm
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index 48b4a934670..1c643de9f60 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.21 2007/01/19 12:59:01 uebayasi Exp $
+$NetBSD: distinfo,v 1.22 2008/02/25 23:14:19 tnn Exp $
 
-SHA1 (Gauche-0.8.9.tgz) = 5d150708e3363e56b7e99e483d7f8e19937e9916
-RMD160 (Gauche-0.8.9.tgz) = b9b5a78e99c65db31c4fe6e3f6e90083a928f1e6
-Size (Gauche-0.8.9.tgz) = 3080645 bytes
-SHA1 (patch-aa) = 4051468ba1fee56927f0d1bc61b7310432655279
-SHA1 (patch-ae) = ab7aacbfe88450674cf56458c6000bc895b6f91e
+SHA1 (Gauche-0.8.13.tgz) = fbbd3496a1088c5b36d446c4479f9db1dac2d1e0
+RMD160 (Gauche-0.8.13.tgz) = 0430e6b99b85b5d1b5cc636d2ebbceac9ad1c80e
+Size (Gauche-0.8.13.tgz) = 3377336 bytes
+SHA1 (patch-aa) = 5ba93d6c1310ee9fd86e6d2f7edf6ef832bf7a5c
+SHA1 (patch-ab) = 4dd53f094032099831ccdb71e5f4fb8ccb333742
+SHA1 (patch-ae) = 2cfd522b94d7468ca671d6bd1c830b6edf7f5aa5
 SHA1 (patch-af) = cfa1772da7f0dd90a9f4a53c2d1e0b27a74a24ee
 SHA1 (patch-ag) = ee9946e364d6723b0efe3b260fc5d02ccb04621d
diff --git a/lang/gauche/patches/patch-aa b/lang/gauche/patches/patch-aa
index cbdb9880e7a..e808191ea41 100644
--- a/lang/gauche/patches/patch-aa
+++ b/lang/gauche/patches/patch-aa
@@ -1,106 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2007/01/19 12:59:01 uebayasi Exp $
+$NetBSD: patch-aa,v 1.9 2008/02/25 23:14:19 tnn Exp $
 
---- configure.orig	2007-01-18 04:18:59.000000000 +0900
+--- configure.orig	2008-02-13 16:32:18.000000000 +0100
 +++ configure
-@@ -1619,7 +1619,7 @@ _ACEOF
- 
-       THREADLIBS="-lpthread -lrt"
-       ;;
--    *-*-freebsd*)
-+    *-*-freebsd*|*-*-dragonfly*)
-       { echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
- 
-@@ -7426,7 +7426,72 @@ fi
+@@ -9322,7 +9322,7 @@ fi
  
  
  
 -for ac_func in isnan isinf trunc rint
-+for ac_func in isnan isinf
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+#include <math.h>
-+
-+double val;
-+
-+int
-+main ()
-+{
-+return $ac_func (val);
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+for ac_func in trunc rint
++for ac_func in isnan isinf trunc
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -9068,7 +9133,7 @@ case $target in
-     SHLIB_MAIN_LDFLAGS=""
-     SHLIB_OK=ok
-     ;;
--  *-linux-gnu|*freebsd*)
-+  *-linux-gnu|*freebsd*|*dragonfly*)
-     SHLIB_SO_CFLAGS="-fPIC"
-     SHLIB_SO_LDFLAGS="$rpath -shared -o"
-     SHLIB_SO_SUFFIX="so"
-@@ -9466,7 +9531,9 @@ fi;
- if test "${with_iconv_lib+set}" = set; then
-   withval="$with_iconv_lib"
- 
-+  if test "x$withval" != x; then
-   ICONV_NAME="$with_iconv_lib"; ICONV_LIB="-l$with_iconv_lib"
-+  fi
- 
- fi;
- 
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/lang/gauche/patches/patch-ab b/lang/gauche/patches/patch-ab
new file mode 100644
index 00000000000..1433c12b562
--- /dev/null
+++ b/lang/gauche/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2008/02/25 23:14:19 tnn Exp $
+
+--- src/Makefile.in.orig	2008-02-08 09:06:47.000000000 +0100
++++ src/Makefile.in
+@@ -60,7 +60,7 @@ RANLIB   = @RANLIB@
+ OBJEXT   = @OBJEXT@
+ EXEEXT   = @EXEEXT@
+ SOEXT    = @SHLIB_DYLIB_SUFFIX@
+-LINK_HELPER = @LINK_HELPER@
++LINK_HELPER = libtool --mode=link
+ RPATH_TMP  = @RPATH_TMP@
+ RPATH_REAL = @RPATH_REAL@
+ SONAME_FLAG = @SONAME_FLAG@
diff --git a/lang/gauche/patches/patch-ae b/lang/gauche/patches/patch-ae
index 11c38990608..5d61fb59d4c 100644
--- a/lang/gauche/patches/patch-ae
+++ b/lang/gauche/patches/patch-ae
@@ -1,24 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2007/01/19 12:59:02 uebayasi Exp $
+$NetBSD: patch-ae,v 1.12 2008/02/25 23:14:19 tnn Exp $
 
---- gc/configure.orig	2007-01-18 04:19:02.000000000 +0900
-+++ gc/configure
-@@ -4040,7 +4040,7 @@ _ACEOF
- 	{ echo "$as_me:$LINENO: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&5
- echo "$as_me: WARNING: \"Only HP-UX 11 POSIX threads are supported.\"" >&2;}
- 	;;
--     *-*-freebsd*)
-+     *-*-freebsd* | *-*-dragonfly*)
- 	{ echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
- echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
- 	cat >>confdefs.h <<\_ACEOF
-@@ -4822,13 +4822,13 @@ darwin* | rhapsody*)
-   esac
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
+--- gc/configure.orig	Tue Oct 30 02:03:24 2007
++++ gc/configure	Tue Jan 29 14:06:16 2008
+@@ -4822,7 +4822,7 @@
      i*86 )
        # Not sure whether the presence of OpenBSD here was a mistake.
        # Let's accept both of them until this is cleared up.
@@ -27,21 +11,3 @@ $NetBSD: patch-ae,v 1.11 2007/01/19 12:59:02 uebayasi Exp $
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7324,7 +7324,7 @@ else
-     ;;
- 
-   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
-+  freebsd* | dragonfly*)
-     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-@@ -7783,7 +7783,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in