update to 0.24

changes:
-minor fixes
-build uses autoconf

supports DESTDIR now

9 files changed, 160 insertions, 154 deletions

diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index ef33a3e2c31..b66fb5581f7 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/06/30 00:07:18 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/18 14:02:07 drochner Exp $
 #
 
-DISTNAME=	intercal-0.20
+DISTNAME=	intercal-0.24
 CATEGORIES=	lang
 MASTER_SITES=	http://www.catb.org/~esr/intercal/
 
@@ -10,7 +10,14 @@ HOMEPAGE=	http://www.catb.org/~esr/intercal/
 COMMENT=	The ultimate language for obfuscation and job security
 
 MAKE_JOBS_SAFE=		no
-
 USE_TOOLS+=	lex yacc
+GNU_CONFIGURE=	yes
+PKG_DESTDIR_SUPPORT=	user-destdir
+INSTALLATION_DIRS+=	bin lib
+
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	post-patch
+SUBST_FILES.prefix=	perpetrate.c
+SUBST_VARS.prefix=	PREFIX
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/intercal/PLIST b/lang/intercal/PLIST
index d0e4dc10b03..2514ef4ae0d 100644
--- a/lang/intercal/PLIST
+++ b/lang/intercal/PLIST
@@ -1,52 +1,91 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:03:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/12/18 14:02:07 drochner Exp $
 bin/ick
-include/intercal/abcess.h
-include/intercal/fiddle.h
-include/intercal/ick-wrap.c
-include/intercal/lose.h
-lib/intercal/libick.a
-share/doc/intercal/NEWS
-share/doc/intercal/READ.ME
-share/examples/intercal/beer.i
-share/examples/intercal/blinkers
-share/examples/intercal/bubble.i
-share/examples/intercal/change.i
-share/examples/intercal/count.3i
-share/examples/intercal/delta.fft
-share/examples/intercal/fft.i
-share/examples/intercal/flonck.i
-share/examples/intercal/glider
-share/examples/intercal/gun
-share/examples/intercal/hail_mary.3i
-share/examples/intercal/hello.i
-share/examples/intercal/icat.i
-share/examples/intercal/iching1.i
-share/examples/intercal/iching2.i
-share/examples/intercal/ins.i
-share/examples/intercal/iogerunds.i
-share/examples/intercal/life.i
-share/examples/intercal/life2.i
-share/examples/intercal/pi.i
-share/examples/intercal/pow.i
-share/examples/intercal/primes.i
-share/examples/intercal/quine.i
-share/examples/intercal/random.i
-share/examples/intercal/random2.i
-share/examples/intercal/rot13.i
-share/examples/intercal/rot13b.i
-share/examples/intercal/sample.i
-share/examples/intercal/sink.i
-share/examples/intercal/t_tet
-share/examples/intercal/tophat.fft
-share/examples/intercal/yapp.i
-lib/intercal/floatlib.i
-lib/intercal/lib2.i
-lib/intercal/numio.i
-lib/intercal/plus.i
-lib/intercal/syslib-orig.i
-lib/intercal/syslib.3i
-lib/intercal/syslib.4i
-lib/intercal/syslib.5i
-lib/intercal/syslib.6i
-lib/intercal/syslib.7i
-lib/intercal/syslib.i
+include/${PKGNAME}/abcess.h
+include/${PKGNAME}/fiddle.h
+include/${PKGNAME}/lose.h
+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
diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo
index 6b9af822f85..be5d08913d2 100644
--- a/lang/intercal/distinfo
+++ b/lang/intercal/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/10/31 20:25:34 tv Exp $
+$NetBSD: distinfo,v 1.6 2009/12/18 14:02:07 drochner Exp $
 
-SHA1 (intercal-0.20.tar.gz) = ee31b5c2694d91e4dd704bed385595069aac6c7e
-RMD160 (intercal-0.20.tar.gz) = cafa6fd7e8de1d0ae6bc72a0492a9154b9b27ca1
-Size (intercal-0.20.tar.gz) = 169172 bytes
-SHA1 (patch-aa) = eb5b6c45f0e86c2b38f53d6a16d315bc931a431a
-SHA1 (patch-ab) = 63784f37c3635f92a1552dfec05d3b714b398a78
-SHA1 (patch-ac) = 83e2e1016e8f39f32bd2983447582713ef493543
+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
diff --git a/lang/intercal/patches/patch-aa b/lang/intercal/patches/patch-aa
index a97e434df90..37281a530d5 100644
--- a/lang/intercal/patches/patch-aa
+++ b/lang/intercal/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 07:05:16 salo Exp $
+$NetBSD: patch-aa,v 1.3 2009/12/18 14:02:07 drochner Exp $
 
---- Makefile.orig	Wed Sep 15 21:28:34 1999
-+++ Makefile	Wed Nov 22 16:54:08 2000
-@@ -3,6 +3,13 @@
- #
- VERSION=0.20
+--- Makefile.in.orig	2003-12-31 21:42:21.000000000 +0000
++++ Makefile.in
+@@ -28,7 +28,7 @@ INSTALL = @INSTALL@
+ DESTDIR=
  
-+all:
-+	cd src && ${MAKE}
-+install:
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/intercal
-+	${BSD_INSTALL_DATA} NEWS READ.ME ${PREFIX}/share/doc/intercal
-+	cd src && ${MAKE} install
-+
- dist: intercal-$(VERSION).tar.gz
- 
- intercal-$(VERSION).tar.gz:
+ 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=
diff --git a/lang/intercal/patches/patch-ab b/lang/intercal/patches/patch-ab
deleted file mode 100644
index dcfac8e1e81..00000000000
--- a/lang/intercal/patches/patch-ab
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/01/19 07:05:16 salo Exp $
-
---- src/Makefile.orig	Fri Dec 18 05:49:09 1998
-+++ src/Makefile	Wed Nov 22 17:37:20 2000
-@@ -8,11 +8,12 @@
- # all over creation behind your back.
- # (/dev/null may be another good choice :-))
- 
--BINDIR = /usr/bin
--INCDIR = /usr/include/intercal
--LIBDIR = /usr/share/intercal
--#INCDIR = $(PWD)
--#LIBDIR = $(PWD)
-+BINDIR = $(PREFIX)/bin
-+INCDIR = $(PREFIX)/include/intercal
-+LIBDIR = $(PREFIX)/lib/intercal
-+EGDIR = ${PREFIX}/share/examples/intercal
-+#INCDIR = .
-+#LIBDIR = .
- 
- YDEBUG = -vlt
- DEBUG	= -g -DDEBUG
-@@ -32,11 +33,12 @@
- CC = gcc -Wall -W
- 
- # You can use lex or flex
--#LEX = lex
--LEX = flex
-+LEX = lex
-+#LEX = flex
- 
- # You should use bison, because some yaccs won't work correctly
--YACC = bison -y
-+#YACC = bison -y
-+YACC = yacc
- 
- CSOURCES = ick.y lexer.l feh.c lose.c fiddle.c perpetrate.c
- ISOURCES = cesspool.c arrgghh.c ick-wrap.c
-@@ -74,14 +76,16 @@
- 	-ranlib libick.a
- 
- install: all
--	cp ick $(BINDIR)
--	-mkdir $(INCDIR)
--	cp lose.h abcess.h fiddle.h ick-wrap.c $(INCDIR)
--	-mkdir $(LIBDIR)
--	cp libick.a $(LIBDIR)
--	(cd ../pit; cp *.i *.3i  t_tet *.fft glider gun blinkers $(LIBDIR))
--	-mkdir $(LIBDIR)/lib
--	(cd ../pit/lib; cp *.*i $(LIBDIR)/lib) 
-+	${BSD_INSTALL_PROGRAM} ick ${BINDIR}
-+	${BSD_INSTALL_DATA_DIR} ${INCDIR}
-+	${BSD_INSTALL_DATA} lose.h abcess.h fiddle.h ick-wrap.c ${INCDIR}
-+	${BSD_INSTALL_DATA_DIR} ${LIBDIR}
-+	${BSD_INSTALL_DATA} libick.a ${LIBDIR}
-+	cd ../pit/lib && \
-+	  ${BSD_INSTALL_DATA} *.*i ${LIBDIR}
-+	${BSD_INSTALL_DATA_DIR} ${EGDIR}
-+	cd ../pit && \
-+	  ${BSD_INSTALL_DATA} *.i *.3i t_tet *.fft glider gun blinkers ${EGDIR}
- 
- clean:
- 	rm -f yacc.* y.tab.* y.output *~ *.[oa] lexer.c ick.c lextest ick
diff --git a/lang/intercal/patches/patch-ac b/lang/intercal/patches/patch-ac
deleted file mode 100644
index 2dbc1c4efb4..00000000000
--- a/lang/intercal/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/31 20:25:34 tv Exp $
-
---- src/perpetrate.c.orig	1999-09-15 23:13:19.000000000 -0400
-+++ src/perpetrate.c
-@@ -55,9 +55,6 @@ extern void yyrestart(FILE*);
- /* function created by yacc */
- extern int yyparse(void);
- 
--/* getopt declaration */
--int getopt(int, char**, char*);
--
- /* compilation options */
- bool compile_only; 	/* just compile into C, don't run the linker */
- bool traditional;	/* insist on strict INTERCAL-72 conformance */
diff --git a/lang/intercal/patches/patch-ad b/lang/intercal/patches/patch-ad
new file mode 100644
index 00000000000..fb55b47776d
--- /dev/null
+++ b/lang/intercal/patches/patch-ad
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..9f33cbab120
--- /dev/null
+++ b/lang/intercal/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2009/12/18 14:02:07 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);
+ 
+     /* set seed for random error generation */
+-#ifdef USG
+-    srand48(time((long *)0) + getpid());
++#if 1
++    srand48(time((time_t *)0) + getpid());
+ #else
+     srand(time((long *)0));
+ #endif /* UNIX */
diff --git a/lang/intercal/patches/patch-af b/lang/intercal/patches/patch-af
new file mode 100644
index 00000000000..975c1e117f0
--- /dev/null
+++ b/lang/intercal/patches/patch-af
@@ -0,0 +1,13 @@
+$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);