From 01ff27640c96c76a3f2de228137ea63cb8c82452 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 30 Nov 2010 20:13:29 +0000 Subject: update to 0.29 changes: -added regression-test suite -two new compiler error messages, E990 and E994 -floating-point library is now automatically included if a program NEXTs to labels in the range 5000-5999 -misc fixes --- lang/intercal/Makefile | 11 ++-- lang/intercal/PLIST | 122 +++++++++++------------------------------ lang/intercal/distinfo | 15 +++-- lang/intercal/patches/patch-aa | 22 ++++---- lang/intercal/patches/patch-ad | 13 ----- lang/intercal/patches/patch-ae | 18 +++--- lang/intercal/patches/patch-af | 13 ----- lang/intercal/patches/patch-ag | 31 +++++++++++ 8 files changed, 95 insertions(+), 150 deletions(-) delete mode 100644 lang/intercal/patches/patch-ad delete mode 100644 lang/intercal/patches/patch-af create mode 100644 lang/intercal/patches/patch-ag (limited to 'lang') diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile index 85e2ee11e2f..3fc7b318d41 100644 --- a/lang/intercal/Makefile +++ b/lang/intercal/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2010/01/02 12:49:43 drochner Exp $ +# $NetBSD: Makefile,v 1.11 2010/11/30 20:13:29 drochner Exp $ # -DISTNAME= intercal-0.24 +DISTNAME= intercal-0.29 CATEGORIES= lang MASTER_SITES= http://www.catb.org/~esr/intercal/ @@ -14,12 +14,11 @@ USE_TOOLS+= flex yacc GNU_CONFIGURE= yes PKG_DESTDIR_SUPPORT= user-destdir INSTALLATION_DIRS+= bin lib +INFO_FILES= yes CONFIGURE_ENV+= LEX="flex -l" -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= post-patch -SUBST_FILES.prefix= perpetrate.c -SUBST_VARS.prefix= PREFIX +do-test: + cd ${WRKSRC}/pit && ${MAKE} .include "../../mk/bsd.pkg.mk" diff --git a/lang/intercal/PLIST b/lang/intercal/PLIST index 2514ef4ae0d..cbcb33d1489 100644 --- a/lang/intercal/PLIST +++ b/lang/intercal/PLIST @@ -1,91 +1,35 @@ -@comment $NetBSD: PLIST,v 1.3 2009/12/18 14:02:07 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2010/11/30 20:13:30 drochner Exp $ +bin/convickt bin/ick -include/${PKGNAME}/abcess.h -include/${PKGNAME}/fiddle.h -include/${PKGNAME}/lose.h +include/ick-${PKGVERSION}/abcess.h +include/ick-${PKGVERSION}/config.h +include/ick-${PKGVERSION}/fiddle.h +include/ick-${PKGVERSION}/ick_bool.h +include/ick-${PKGVERSION}/ick_ec.h +include/ick-${PKGVERSION}/ick_lose.h +include/ick-${PKGVERSION}/yuk.h +info/ick.info lib/libick.a -share/${PKGNAME}/ick-wrap.c -share/${PKGNAME}/pit/CATALOG -share/${PKGNAME}/pit/Makefile -share/${PKGNAME}/pit/beer.doc -share/${PKGNAME}/pit/beer.i -share/${PKGNAME}/pit/blinkers -share/${PKGNAME}/pit/bubble.doc -share/${PKGNAME}/pit/bubble.i -share/${PKGNAME}/pit/change.doc -share/${PKGNAME}/pit/change.i -share/${PKGNAME}/pit/count.3i -share/${PKGNAME}/pit/count.doc -share/${PKGNAME}/pit/delta.fft -share/${PKGNAME}/pit/fft.doc -share/${PKGNAME}/pit/fft.i -share/${PKGNAME}/pit/flonck.doc -share/${PKGNAME}/pit/flonck.i -share/${PKGNAME}/pit/glider -share/${PKGNAME}/pit/gun -share/${PKGNAME}/pit/hail_mary.3i -share/${PKGNAME}/pit/hail_mary.doc -share/${PKGNAME}/pit/hello.i -share/${PKGNAME}/pit/icat.i -share/${PKGNAME}/pit/iching.doc -share/${PKGNAME}/pit/iching1.i -share/${PKGNAME}/pit/iching2.i -share/${PKGNAME}/pit/ins.doc -share/${PKGNAME}/pit/ins.i -share/${PKGNAME}/pit/iogerunds.doc -share/${PKGNAME}/pit/iogerunds.i -share/${PKGNAME}/pit/lib/1910.doc -share/${PKGNAME}/pit/lib/floatlib.doc -share/${PKGNAME}/pit/lib/floatlib.i -share/${PKGNAME}/pit/lib/lib2.doc -share/${PKGNAME}/pit/lib/lib2.i -share/${PKGNAME}/pit/lib/numio.doc -share/${PKGNAME}/pit/lib/numio.i -share/${PKGNAME}/pit/lib/plus.i -share/${PKGNAME}/pit/lib/syslib-orig.i -share/${PKGNAME}/pit/lib/syslib.3i -share/${PKGNAME}/pit/lib/syslib.4i -share/${PKGNAME}/pit/lib/syslib.5i -share/${PKGNAME}/pit/lib/syslib.6i -share/${PKGNAME}/pit/lib/syslib.7i -share/${PKGNAME}/pit/lib/syslib.doc -share/${PKGNAME}/pit/lib/syslib.i -share/${PKGNAME}/pit/lib/syslib3-7.doc -share/${PKGNAME}/pit/life.doc -share/${PKGNAME}/pit/life.i -share/${PKGNAME}/pit/life2.doc -share/${PKGNAME}/pit/life2.i -share/${PKGNAME}/pit/pi.doc -share/${PKGNAME}/pit/pi.i -share/${PKGNAME}/pit/pow.i -share/${PKGNAME}/pit/primes.doc -share/${PKGNAME}/pit/primes.i -share/${PKGNAME}/pit/quine.i -share/${PKGNAME}/pit/random.doc -share/${PKGNAME}/pit/random.i -share/${PKGNAME}/pit/random2.i -share/${PKGNAME}/pit/rot13.doc -share/${PKGNAME}/pit/rot13.i -share/${PKGNAME}/pit/rot13b.doc -share/${PKGNAME}/pit/rot13b.i -share/${PKGNAME}/pit/sample.i -share/${PKGNAME}/pit/sink.doc -share/${PKGNAME}/pit/sink.i -share/${PKGNAME}/pit/t_tet -share/${PKGNAME}/pit/tests/limits.3i -share/${PKGNAME}/pit/tests/limits.i -share/${PKGNAME}/pit/tests/test1.i -share/${PKGNAME}/pit/tests/test16bit.i -share/${PKGNAME}/pit/tests/test2.i -share/${PKGNAME}/pit/tests/testarray.i -share/${PKGNAME}/pit/tests/testcf.i -share/${PKGNAME}/pit/tests/testi18n.i -share/${PKGNAME}/pit/tests/testlib2.i -share/${PKGNAME}/pit/tests/testops.3i -share/${PKGNAME}/pit/tests/testops.5i -share/${PKGNAME}/pit/tests/testsplat.i -share/${PKGNAME}/pit/tophat.fft -share/${PKGNAME}/pit/tpk.doc -share/${PKGNAME}/pit/tpk.i -share/${PKGNAME}/pit/yapp.doc -share/${PKGNAME}/pit/yapp.i +lib/libickec.a +lib/libickmt.a +lib/libyuk.a +man/man1/convickt.1 +man/man1/ick.1 +share/ick-${PKGVERSION}/COPYING +share/ick-${PKGVERSION}/atari.bin +share/ick-${PKGVERSION}/baudot.bin +share/ick-${PKGVERSION}/compunex.c +share/ick-${PKGVERSION}/coopt.sh +share/ick-${PKGVERSION}/ebcdic.bin +share/ick-${PKGVERSION}/ecto_b98.c +share/ick-${PKGVERSION}/floatlib.i +share/ick-${PKGVERSION}/ick-wrap.c +share/ick-${PKGVERSION}/latin1.bin +share/ick-${PKGVERSION}/pickwrap.c +share/ick-${PKGVERSION}/syslib.i +share/ick-${PKGVERSION}/syslib3.3i +share/ick-${PKGVERSION}/syslib4.4i +share/ick-${PKGVERSION}/syslib5.5i +share/ick-${PKGVERSION}/syslib6.6i +share/ick-${PKGVERSION}/syslib7.7i +share/ick-${PKGVERSION}/syslibc.c diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo index be5d08913d2..3dfbe9be644 100644 --- a/lang/intercal/distinfo +++ b/lang/intercal/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.6 2009/12/18 14:02:07 drochner Exp $ +$NetBSD: distinfo,v 1.7 2010/11/30 20:13:30 drochner Exp $ -SHA1 (intercal-0.24.tar.gz) = acc33ba5a6b1e614e570519e1a48489c146851a5 -RMD160 (intercal-0.24.tar.gz) = a00d5258e38b8b6a625d521ce575e3293b9decf1 -Size (intercal-0.24.tar.gz) = 205703 bytes -SHA1 (patch-aa) = c36ad2635819e8f14e27d2f9f6326ff431f0fc89 -SHA1 (patch-ad) = e4ee7686e12bd0d994c7c50cfb0d417c768a8d99 -SHA1 (patch-ae) = b3aa920a77a996574f1eef5fc31c82f935b02027 -SHA1 (patch-af) = fdb22286fa28eb3826c654ce70e38c413b58f6b6 +SHA1 (intercal-0.29.tar.gz) = 6f496b158e5f9dbf05a81c5e75f2d61698e65b15 +RMD160 (intercal-0.29.tar.gz) = 980b83dfb9aa0c738e6135f65ff9e9bb4c01c8ff +Size (intercal-0.29.tar.gz) = 924828 bytes +SHA1 (patch-aa) = 4ed418a3fd4fd1e690a64b14bf5cb674db450e79 +SHA1 (patch-ae) = a919353b39286ab51d3167ff755e5fed1bc4be65 +SHA1 (patch-ag) = c7aa0d9090e4e9d6c1342447b1390003c5b4376c diff --git a/lang/intercal/patches/patch-aa b/lang/intercal/patches/patch-aa index 37281a530d5..107e57e0ce7 100644 --- a/lang/intercal/patches/patch-aa +++ b/lang/intercal/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2009/12/18 14:02:07 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2010/11/30 20:13:30 drochner Exp $ ---- Makefile.in.orig 2003-12-31 21:42:21.000000000 +0000 -+++ Makefile.in -@@ -28,7 +28,7 @@ INSTALL = @INSTALL@ - DESTDIR= +--- buildaux/Makefile.in.orig 2010-11-29 21:46:43.000000000 +0000 ++++ buildaux/Makefile.in +@@ -286,7 +286,7 @@ ickdatadir = $(datadir)/$(ICK_SPECIFIC_S + AM_CFLAGS = -DICKINCLUDEDIR=\"$(ickincludedir)\" \ + -DICKDATADIR=\"$(ickdatadir)\" \ + -DICKBINDIR=\"$(bindir)\" -DICKLIBDIR=\"$(libdir)\" \ +- -DYYDEBUG -DICK_HAVE_STDINT_H=@HAVE_STDINT_H@ ++ -DYYDEBUG -DICK_HAVE_STDINT_H=@HAVE_STDINT_H@ -D_POSIX_SOURCE -DUSG - CC = @CC@ --CFLAGS = @CFLAGS@ -DICKINCLUDEDIR=\"$(incdir)\" -DICKLIBDIR=\"$(datadir)\" -DYYDEBUG -+CFLAGS = @CFLAGS@ -DICKINCLUDEDIR=\"$(incdir)\" -DICKLIBDIR=\"$(datadir)\" -DYYDEBUG -D_POSIX_SOURCE -DUSG - LDFLAGS = @LDFLAGS@ - LEX = @LEX@ - LEXFLAGS= + AM_CPPFLAGS = -I$(srcdir)/src + ick_SOURCES = src/feh2.c src/dekludge.c src/ick_lose.c \ diff --git a/lang/intercal/patches/patch-ad b/lang/intercal/patches/patch-ad deleted file mode 100644 index fb55b47776d..00000000000 --- a/lang/intercal/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/12/18 14:02:07 drochner Exp $ - ---- ick.h.orig 1997-02-03 19:07:37.000000000 +0000 -+++ ick.h -@@ -1,7 +1,7 @@ - /* ick.h -- compilation types for intercal parser */ - - /* Comment this out if your version of lex automatically supplies yylineno. */ --#define YYLINENO_BY_HAND -+/*#define YYLINENO_BY_HAND*/ - - /* Comment this out if your version of lex doesn't use yyrestart(). */ - #define USE_YYRESTART diff --git a/lang/intercal/patches/patch-ae b/lang/intercal/patches/patch-ae index 9f33cbab120..aa909ee0cc0 100644 --- a/lang/intercal/patches/patch-ae +++ b/lang/intercal/patches/patch-ae @@ -1,15 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2009/12/18 14:02:07 drochner Exp $ +$NetBSD: patch-ae,v 1.2 2010/11/30 20:13:30 drochner Exp $ ---- ick-wrap.c.orig 2003-03-09 00:24:26.000000000 +0000 -+++ ick-wrap.c -@@ -25,8 +25,8 @@ int main(int argc, char *argv[]) - parseargs(argc,argv); - +--- src/ick-wrap.c.orig 2010-09-01 22:21:34.000000000 +0000 ++++ src/ick-wrap.c +@@ -59,7 +59,7 @@ $N + globalargc = argc; + #endif /* set seed for random error generation */ -#ifdef USG -- srand48(time((long *)0) + getpid()); +#if 1 -+ srand48(time((time_t *)0) + getpid()); + srand48(time(0) + getpid()); #else - srand(time((long *)0)); - #endif /* UNIX */ + srand(time(0)); diff --git a/lang/intercal/patches/patch-af b/lang/intercal/patches/patch-af deleted file mode 100644 index 975c1e117f0..00000000000 --- a/lang/intercal/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2009/12/18 14:02:07 drochner Exp $ - ---- perpetrate.c.orig 2003-03-09 00:24:35.000000000 +0000 -+++ perpetrate.c -@@ -498,7 +498,7 @@ int main(int argc, char *argv[]) - if (!compile_only) - { - (void) sprintf(buf2, -- "%s %s -I%s -L%s -lick -o %s", -+ "%s %s -I%s -L%s -L@PREFIX@/lib -lick -o %s", - compiler, buf, includedir, libdir, - argv[optind]); - (void) system(buf2); diff --git a/lang/intercal/patches/patch-ag b/lang/intercal/patches/patch-ag new file mode 100644 index 00000000000..59abdd0e555 --- /dev/null +++ b/lang/intercal/patches/patch-ag @@ -0,0 +1,31 @@ +$NetBSD: patch-ag,v 1.1 2010/11/30 20:13:30 drochner Exp $ + +--- configure.orig 2010-11-29 18:53:59.000000000 +0000 ++++ configure +@@ -3040,7 +3040,7 @@ fi + done + test -n "$YACC" || YACC="yacc" + +-if test "x$YACC" == "xyacc"; then ++if test "x$YACC" = "xyacc"; then + YACC= + # Extract the first word of "yacc", so it can be a program name with args. + set dummy yacc; ac_word=$2 +@@ -4927,7 +4927,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>co + + fi + +-if test "x$ac_cv_header_stdbool_h" == "xyes" ++if test "x$ac_cv_header_stdbool_h" = "xyes" + then + HAVE_STDBOOL_H=1 + fi +@@ -5274,7 +5274,7 @@ _ACEOF + + # Some compilers (correctly according to the standard, but dubiously for + # actual use in code) dislike mixing _Bool and varargs. +-if test "x$ac_cv_type__Bool" == "xyes" ++if test "x$ac_cv_type__Bool" = "xyes" + then + HAVE__BOOL=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether booleans can be passed via varargs" >&5 -- cgit v1.2.3