diff options
author | minoura <minoura> | 2002-10-02 08:25:13 +0000 |
---|---|---|
committer | minoura <minoura> | 2002-10-02 08:25:13 +0000 |
commit | 9a8c22333aa64dfe0046a2e016fedc99ff86c58a (patch) | |
tree | fb2a5faac1a76349e735c4a00a2f4e1abb561fd2 /lang | |
parent | 12a9534db5d06612b46cdabde6adbb3f3ff2982c (diff) | |
download | pkgsrc-9a8c22333aa64dfe0046a2e016fedc99ff86c58a.tar.gz |
Upgrade lang/gauche package to 0.6.3.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gauche/Makefile | 9 | ||||
-rw-r--r-- | lang/gauche/PLIST | 111 | ||||
-rw-r--r-- | lang/gauche/distinfo | 10 | ||||
-rw-r--r-- | lang/gauche/patches/patch-ad | 15 | ||||
-rw-r--r-- | lang/gauche/patches/patch-ae | 30 | ||||
-rw-r--r-- | lang/gauche/patches/patch-af | 21 | ||||
-rw-r--r-- | lang/gauche/patches/patch-ba | 68 |
7 files changed, 218 insertions, 46 deletions
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index 1533e16e8f4..0d165b81cf6 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:44 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/02 08:25:13 minoura Exp $ # -DISTNAME= Gauche-0.5.4 -PKGREVISION= 1 +DISTNAME= Gauche-0.6.3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gauche/} EXTRACT_SUFX= .tgz @@ -30,7 +29,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-slib=${PREFIX}/share/slib CONFIGURE_ARGS+= --with-iconv=${PREFIX} --with-iconv-lib=iconv CONFIGURE_ENV+= AS="${CC} -x assembler-with-cpp -c" -CFLAGS+= -I${LOCALBASE}/include + +INFO_FILES= gauche-refe.info gauche-refj.info .include "../../mk/bsd.prefs.mk" .if defined(GAUCHE_MULTIBYTE) @@ -38,4 +38,5 @@ CONFIGURE_ARGS+= --enable-multibyte=${GAUCHE_MULTIBYTE} .endif .include "../../converters/libiconv/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST index 1c9de91c746..2e917afb36d 100644 --- a/lang/gauche/PLIST +++ b/lang/gauche/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/19 07:58:25 minoura Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/10/02 08:25:13 minoura Exp $ bin/gauche-config bin/gosh lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/auxsys.so @@ -10,14 +10,19 @@ lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche.a lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche.so lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libnet.so lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libuvector.so +lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/mt-random.so lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/ndbm.so +lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/syslog.so lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/termios.so +lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/threads.so lib/gauche/${PKGVERSION}/include/gauche.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/class.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/fcntl.h lib/gauche/${PKGVERSION}/include/gauche/net.h @@ -31,6 +36,7 @@ lib/gauche/${PKGVERSION}/include/gauche/uvector.h lib/gauche/${PKGVERSION}/include/gauche/vm.h lib/gauche/${PKGVERSION}/include/gauche/vminsn.h lib/gauche/${PKGVERSION}/include/gc.h +lib/gauche/${PKGVERSION}/include/gc_pthread_redirects.h lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/example.so lib/libgauche.a lib/libgauche.so @@ -40,23 +46,28 @@ share/gauche/${PKGVERSION}/lib/dbm/ndbm.scm share/gauche/${PKGVERSION}/lib/file/filter.scm share/gauche/${PKGVERSION}/lib/file/util.scm 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/charconv.scm share/gauche/${PKGVERSION}/lib/gauche/collection.scm share/gauche/${PKGVERSION}/lib/gauche/common-macros.scm +share/gauche/${PKGVERSION}/lib/gauche/defvalues.scm share/gauche/${PKGVERSION}/lib/gauche/fcntl.scm share/gauche/${PKGVERSION}/lib/gauche/interactive.scm +share/gauche/${PKGVERSION}/lib/gauche/interactive/info.scm share/gauche/${PKGVERSION}/lib/gauche/interpolate.scm share/gauche/${PKGVERSION}/lib/gauche/let-opt.scm 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/mop/instance-pool.scm share/gauche/${PKGVERSION}/lib/gauche/net.scm share/gauche/${PKGVERSION}/lib/gauche/numerical.scm share/gauche/${PKGVERSION}/lib/gauche/object.scm share/gauche/${PKGVERSION}/lib/gauche/parameter.scm share/gauche/${PKGVERSION}/lib/gauche/parseopt.scm share/gauche/${PKGVERSION}/lib/gauche/port.scm +share/gauche/${PKGVERSION}/lib/gauche/procedure.scm share/gauche/${PKGVERSION}/lib/gauche/process.scm share/gauche/${PKGVERSION}/lib/gauche/regexp.scm share/gauche/${PKGVERSION}/lib/gauche/selector.scm @@ -65,9 +76,11 @@ share/gauche/${PKGVERSION}/lib/gauche/serializer.scm share/gauche/${PKGVERSION}/lib/gauche/serializer/aserializer.scm share/gauche/${PKGVERSION}/lib/gauche/signal.scm share/gauche/${PKGVERSION}/lib/gauche/singleton.scm +share/gauche/${PKGVERSION}/lib/gauche/syslog.scm share/gauche/${PKGVERSION}/lib/gauche/termios.scm share/gauche/${PKGVERSION}/lib/gauche/test.scm -share/gauche/${PKGVERSION}/lib/gauche/time.scm +share/gauche/${PKGVERSION}/lib/gauche/threads.scm +share/gauche/${PKGVERSION}/lib/gauche/uvector.scm share/gauche/${PKGVERSION}/lib/gauche/validator.scm share/gauche/${PKGVERSION}/lib/gauche/version.scm share/gauche/${PKGVERSION}/lib/gauche/vm/debugger.scm @@ -75,6 +88,8 @@ share/gauche/${PKGVERSION}/lib/gauche/vm/disasm.scm share/gauche/${PKGVERSION}/lib/gauche/with.scm share/gauche/${PKGVERSION}/lib/genstub share/gauche/${PKGVERSION}/lib/japanize-euc.scm +share/gauche/${PKGVERSION}/lib/math/const.scm +share/gauche/${PKGVERSION}/lib/math/mt-random.scm share/gauche/${PKGVERSION}/lib/port/jfilter.scm share/gauche/${PKGVERSION}/lib/port/stk.scm share/gauche/${PKGVERSION}/lib/rfc/822.scm @@ -118,11 +133,17 @@ share/gauche/${PKGVERSION}/lib/srfi-13/selector.scm share/gauche/${PKGVERSION}/lib/srfi-14.scm share/gauche/${PKGVERSION}/lib/srfi-14/query.scm share/gauche/${PKGVERSION}/lib/srfi-14/set.scm +share/gauche/${PKGVERSION}/lib/srfi-19.scm +share/gauche/${PKGVERSION}/lib/srfi-19/format.scm +share/gauche/${PKGVERSION}/lib/srfi-19/read-tai.scm share/gauche/${PKGVERSION}/lib/srfi-2.scm +share/gauche/${PKGVERSION}/lib/srfi-26.scm +share/gauche/${PKGVERSION}/lib/srfi-27.scm share/gauche/${PKGVERSION}/lib/srfi-4.scm share/gauche/${PKGVERSION}/lib/srfi-9.scm share/gauche/${PKGVERSION}/lib/text/csv.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/tr.scm share/gauche/${PKGVERSION}/lib/text/tree.scm @@ -132,29 +153,73 @@ share/gauche/${PKGVERSION}/lib/util/toposort.scm share/gauche/${PKGVERSION}/lib/util/tree.scm share/gauche/${PKGVERSION}/lib/www/cgi.scm share/gauche/site/lib/example.scm +@unexec ${INSTALL_INFO} --delete %D/info/gauche-refe.info %D/info/dir +info/gauche-refe.info-1.gz +info/gauche-refe.info-10.gz +info/gauche-refe.info-11.gz +info/gauche-refe.info-12.gz +info/gauche-refe.info-13.gz +info/gauche-refe.info-14.gz +info/gauche-refe.info-15.gz +info/gauche-refe.info-2.gz +info/gauche-refe.info-3.gz +info/gauche-refe.info-4.gz +info/gauche-refe.info-5.gz +info/gauche-refe.info-6.gz +info/gauche-refe.info-7.gz +info/gauche-refe.info-8.gz +info/gauche-refe.info-9.gz +info/gauche-refe.info.gz +@exec ${INSTALL_INFO} %D/info/gauche-refe.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gauche-refj.info %D/info/dir +info/gauche-refj.info-1.gz +info/gauche-refj.info-10.gz +info/gauche-refj.info-11.gz +info/gauche-refj.info-12.gz +info/gauche-refj.info-13.gz +info/gauche-refj.info-14.gz +info/gauche-refj.info-15.gz +info/gauche-refj.info-2.gz +info/gauche-refj.info-3.gz +info/gauche-refj.info-4.gz +info/gauche-refj.info-5.gz +info/gauche-refj.info-6.gz +info/gauche-refj.info-7.gz +info/gauche-refj.info-8.gz +info/gauche-refj.info-9.gz +info/gauche-refj.info.gz +@exec ${INSTALL_INFO} %D/info/gauche-refj.info %D/info/dir +share/man/man1/gauche-config.1 +share/man/man1/gosh.1 +@dirrm share/man/man1 +@dirrm share/man @dirrm share/gauche/site/lib @dirrm share/gauche/site -@dirrm share/gauche/0.5.4/lib/www -@dirrm share/gauche/0.5.4/lib/util -@dirrm share/gauche/0.5.4/lib/text -@dirrm share/gauche/0.5.4/lib/srfi-14 -@dirrm share/gauche/0.5.4/lib/srfi-13 -@dirrm share/gauche/0.5.4/lib/srfi-1 -@dirrm share/gauche/0.5.4/lib/rfc -@dirrm share/gauche/0.5.4/lib/port -@dirrm share/gauche/0.5.4/lib/gauche/vm -@dirrm share/gauche/0.5.4/lib/gauche/serializer -@dirrm share/gauche/0.5.4/lib/gauche -@dirrm share/gauche/0.5.4/lib/file -@dirrm share/gauche/0.5.4/lib/dbm -@dirrm share/gauche/0.5.4/lib -@dirrm share/gauche/0.5.4 +@dirrm share/gauche/${PKGVERSION}/lib/www +@dirrm share/gauche/${PKGVERSION}/lib/util +@dirrm share/gauche/${PKGVERSION}/lib/text +@dirrm share/gauche/${PKGVERSION}/lib/srfi-19 +@dirrm share/gauche/${PKGVERSION}/lib/srfi-14 +@dirrm share/gauche/${PKGVERSION}/lib/srfi-13 +@dirrm share/gauche/${PKGVERSION}/lib/srfi-1 +@dirrm share/gauche/${PKGVERSION}/lib/rfc +@dirrm share/gauche/${PKGVERSION}/lib/port +@dirrm share/gauche/${PKGVERSION}/lib/math +@dirrm share/gauche/${PKGVERSION}/lib/gauche/vm +@dirrm share/gauche/${PKGVERSION}/lib/gauche/serializer +@dirrm share/gauche/${PKGVERSION}/lib/gauche/mop +@dirrm share/gauche/${PKGVERSION}/lib/gauche/interactive +@dirrm share/gauche/${PKGVERSION}/lib/gauche +@dirrm share/gauche/${PKGVERSION}/lib/file +@dirrm share/gauche/${PKGVERSION}/lib/dbm +@dirrm share/gauche/${PKGVERSION}/lib +@dirrm share/gauche/${PKGVERSION} @dirrm share/gauche -@dirrm lib/gauche/site/0.5.4/i386--netbsdelf -@dirrm lib/gauche/site/0.5.4 +@dirrm lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM} +@dirrm lib/gauche/site/${PKGVERSION} @dirrm lib/gauche/site -@dirrm lib/gauche/0.5.4/include/gauche -@dirrm lib/gauche/0.5.4/include -@dirrm lib/gauche/0.5.4/i386--netbsdelf -@dirrm lib/gauche/0.5.4 +@dirrm lib/gauche/${PKGVERSION}/include/gauche +@dirrm lib/gauche/${PKGVERSION}/include +@dirrm lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM} +@dirrm lib/gauche/${PKGVERSION} @dirrm lib/gauche diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo index 14cf04480d0..33e43972759 100644 --- a/lang/gauche/distinfo +++ b/lang/gauche/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/05/19 07:58:25 minoura Exp $ +$NetBSD: distinfo,v 1.5 2002/10/02 08:25:13 minoura Exp $ -SHA1 (Gauche-0.5.4.tgz) = 614bb7d61cddcff351c6108e39a960e83ea362f3 -Size (Gauche-0.5.4.tgz) = 1440436 bytes -SHA1 (patch-ad) = 7574f5ffe95671ac01f4b5dc1775bc93f10d062e +SHA1 (Gauche-0.6.3.tgz) = e2a80b7f20a93eb7af7b649dce0b0667810bad40 +Size (Gauche-0.6.3.tgz) = 2449515 bytes +SHA1 (patch-ae) = 5504dfcefebf4bd02fcd1ea1e185753183a69326 +SHA1 (patch-af) = 8f86ac9e8799fe3d4a08e11b31bc5d8350860389 +SHA1 (patch-ba) = ab0f7e77bc116b9975897f0381edde7981030b6c diff --git a/lang/gauche/patches/patch-ad b/lang/gauche/patches/patch-ad deleted file mode 100644 index a206b2a4308..00000000000 --- a/lang/gauche/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/02/01 08:10:40 minoura Exp $ ---- gc/include/private/gcconfig.h.orig Fri Dec 21 18:40:17 2001 -+++ gc/include/private/gcconfig.h Fri Feb 1 16:37:01 2002 -@@ -1012,6 +1012,11 @@ - # endif - # ifdef NETBSD - # define OS_TYPE "NETBSD" -+# ifdef __ELF__ -+ /* minoura: I'm not sure this is safe; at least it seems to work on -+ NetBSD/i386, ELF, but I haven't confirmed. */ -+# define DYNAMIC_LOADING -+# endif - # endif - # ifdef THREE86BSD - # define OS_TYPE "THREE86BSD" diff --git a/lang/gauche/patches/patch-ae b/lang/gauche/patches/patch-ae new file mode 100644 index 00000000000..69cb6eb9a6a --- /dev/null +++ b/lang/gauche/patches/patch-ae @@ -0,0 +1,30 @@ +# $NetBSD: patch-ae,v 1.1 2002/10/02 08:25:16 minoura Exp $ +--- doc/Makefile.in.orig Sun Sep 8 04:25:49 2002 ++++ doc/Makefile.in Tue Oct 1 06:17:22 2002 +@@ -12,7 +12,7 @@ + prefix = @prefix@ + datadir = @datadir@ + mandir = $(datadir)/man/man1 +-infodir = $(datadir)/info ++infodir = $(prefix)/info + + all: info + +@@ -63,7 +63,7 @@ + texi2pdf gauche-refe.texi + + gauche-refe.texi : gauche-ref.texi extract +- gosh ./extract -en -o gauche-refe.texi gauche-ref.texi ++ $(GOSH) ./extract -en -o gauche-refe.texi gauche-ref.texi + + gauche-refe.info.gz : gauche-refe.texi + if test X$(MAKEINFO) != X -a X$(GZIP_PROGRAM) != X; then \ +@@ -85,7 +85,7 @@ + texi2pdf gauche-refj.texi + + gauche-refj.texi : gauche-ref.texi extract +- gosh ./extract -jp -o gauche-refj.texi gauche-ref.texi ++ $(GOSH) ./extract -jp -o gauche-refj.texi gauche-ref.texi + + gauche-refj.info.gz : gauche-refj.texi + if test X$(MAKEINFO) != X -a X$(GZIP_PROGRAM) != X; then \ diff --git a/lang/gauche/patches/patch-af b/lang/gauche/patches/patch-af new file mode 100644 index 00000000000..944df5761b3 --- /dev/null +++ b/lang/gauche/patches/patch-af @@ -0,0 +1,21 @@ +# $NetBSD: patch-af,v 1.1 2002/10/02 08:25:17 minoura Exp $ +--- doc/gauche-ref.texi.orig Sun Sep 22 09:58:17 2002 ++++ doc/gauche-ref.texi Tue Oct 1 06:03:49 2002 +@@ -3,9 +3,17 @@ + @c EN + @setfilename gauche-refe.info + @settitle Gauche Reference Manual ++@dircategory The Algorithmic Language Scheme ++@direntry ++* Gauche Reference: (gauche-refe.info). An R5RS Scheme implementation. ++@end direntry + @c JP + @setfilename gauche-refj.info + @settitle Gauche リファレンスマニュアル ++@dircategory The Algorithmic Language Scheme ++@direntry ++* Gauche Reference (ja): (gauche-refj.info). An R5RS Scheme implementation. ++@end direntry + @c COMMON + @comment %**end of header + diff --git a/lang/gauche/patches/patch-ba b/lang/gauche/patches/patch-ba new file mode 100644 index 00000000000..df0b4c3367b --- /dev/null +++ b/lang/gauche/patches/patch-ba @@ -0,0 +1,68 @@ +# $NetBSD: patch-ba,v 1.1 2002/10/02 08:25:17 minoura Exp $ + +There is a problem in ext/charconv/jconv.c which may +cause gosh hang, due to the wrong state management. +Specifically, it happens if you specify "iso-2022-jp" +as the output code, instead of "iso2022jp" or "iso2022-jp". + +--shiro + + + +*** ext/charconv/jconv.c 17 Jun 2002 05:41:04 -0000 1.9 +--- ext/charconv/jconv.c 26 Sep 2002 05:22:59 -0000 +*************** +*** 1294,1299 **** +--- 1294,1305 ---- + + /* case (5) */ + #ifdef HAVE_ICONV_H ++ /* NB: although iconv manages states, we need to keep track of whether ++ * we're sure in default status (JIS_ASCII) or not (we use JIS_UNKNOWN for it). ++ * It's because jconv_iconv_reset will be called twice if there is any ++ * reset sequence; the first call should emit the sequence, but the second ++ * call shoudn't. ++ */ + static size_t jconv_iconv(ScmConvInfo *info, const char **iptr, size_t *iroom, + char **optr, size_t *oroom) + { +*************** +*** 1302,1307 **** +--- 1308,1314 ---- + fprintf(stderr, "jconv_iconv %s->%s\n", info->fromCode, info->toCode); + #endif + r = iconv(info->handle, (char **)iptr, iroom, optr, oroom); ++ info->ostate = JIS_UNKNOWN; + if (r == (size_t)-1) { + if (errno == EINVAL) return INPUT_NOT_ENOUGH; + if (errno == E2BIG) return OUTPUT_NOT_ENOUGH; +*************** +*** 1315,1325 **** + static size_t jconv_iconv_reset(ScmConvInfo *info, char *optr, size_t oroom) + { + size_t oroom_prev = oroom; +! size_t r = iconv(info->handle, NULL, 0, &optr, &oroom); + if (r == (size_t)-1) { + if (errno == E2BIG) return OUTPUT_NOT_ENOUGH; + Scm_Panic("jconv_iconv_reset: unknown error number %d\n", errno); + } + return oroom_prev - oroom; + } + #endif /*HAVE_ICONV_H*/ +--- 1322,1335 ---- + static size_t jconv_iconv_reset(ScmConvInfo *info, char *optr, size_t oroom) + { + size_t oroom_prev = oroom; +! size_t r; +! if (info->ostate == JIS_ASCII) return 0; +! r = iconv(info->handle, NULL, 0, &optr, &oroom); + if (r == (size_t)-1) { + if (errno == E2BIG) return OUTPUT_NOT_ENOUGH; + Scm_Panic("jconv_iconv_reset: unknown error number %d\n", errno); + } ++ info->ostate = JIS_ASCII; + return oroom_prev - oroom; + } + #endif /*HAVE_ICONV_H*/ + + |