5 files changed, 39 insertions, 146 deletions

diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index 633c9aace1e4..20b91421c0db 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	intercal
-PORTVERSION=	0.24
-PORTREVISION=	1
+PORTVERSION=	0.29
 CATEGORIES=	lang
 MASTER_SITES=	http://www.catb.org/~esr/intercal/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The C-INTERCAL compiler, ick, and supporting libraries
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CFLAGS+=	-D_POSIX_SOURCE
+DATADIR=	${PREFIX}/share/ick
+
+MAN1=		ick.1 convickt.1
+INFO=		ick
 
 post-patch:
-#
-# Respect PREFIX
-#
-	@${REINPLACE_CMD} -E -e "s,/usr/local,${PREFIX},g" \
-		${WRKSRC}/perpetrate.c
+	@${REINPLACE_CMD} -e '/ICK_SPECIFIC_SUBDIR/s/-@PACKAGE_VERSION@// ' \
+		${WRKSRC}/buildaux/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo
index b2e3f250e477..3cf904e1a58b 100644
--- a/lang/intercal/distinfo
+++ b/lang/intercal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (intercal-0.24.tar.gz) = 8f46305ef24a92945241acf31880e7466d7d942924009fbf00ccb5fb314afaa7
-SIZE (intercal-0.24.tar.gz) = 205703
+SHA256 (intercal-0.29.tar.gz) = 401b8cb8411f193aaaf4c6f491baf7f7d0d9aa196d58b254df509287c5929f26
+SIZE (intercal-0.29.tar.gz) = 924828
diff --git a/lang/intercal/files/patch-Makefile b/lang/intercal/files/patch-Makefile
deleted file mode 100644
index 4dce88bc2eab..000000000000
--- a/lang/intercal/files/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	Thu Jul 27 23:22:03 2006
-+++ Makefile.in	Thu Jul 27 23:22:34 2006
-@@ -13,9 +13,9 @@
- # Directory in which to install libraries.
- libdir = @libdir@
- # Directory to install data files.
--datadir = @datadir@/intercal-@PACKAGE_VERSION@
-+datadir = @datadir@/intercal
- # Directory to install the include files in.
--incdir = @includedir@/intercal-@PACKAGE_VERSION@
-+incdir = @includedir@/intercal
- 
- # Program to install binaries
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/lang/intercal/files/patch-perpetrate.c b/lang/intercal/files/patch-perpetrate.c
deleted file mode 100644
index 0995780edb0c..000000000000
--- a/lang/intercal/files/patch-perpetrate.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- perpetrate.c.orig	Sun Mar  9 03:24:35 2003
-+++ perpetrate.c	Mon Oct  9 01:56:53 2006
-@@ -125,7 +125,7 @@
-     tuple	*tp;
-     atom	*op;
-     int		c, i;
--    char	*includedir, *libdir, *getenv();
-+    char	*includedir, *libdir, *loclibdir, *getenv();
-     FILE	*ifp, *ofp;
-     int		maxabstain, nextcount, bugline;
-     bool        needsyslib, firstfile;
-@@ -136,6 +136,8 @@
-       libdir = ICKLIBDIR;
-     if (!(compiler = getenv("CC")))
-       compiler = CC;
-+    
-+    loclibdir = "/usr/local/lib";
- 
-     while ((c = getopt(argc, argv, "bcdtOC@")) != EOF)
-     {
-@@ -498,8 +500,8 @@
- 	    if (!compile_only)
- 	    {
- 		(void) sprintf(buf2,
--			       "%s %s -I%s -L%s -lick -o %s",
--			       compiler, buf, includedir, libdir,
-+			       "%s %s -I%s -L%s -L%s -lick -o %s",
-+			       compiler, buf, includedir, libdir, loclibdir,
- 			       argv[optind]);
- 		(void) system(buf2);
- 		(void) unlink(buf);
diff --git a/lang/intercal/pkg-plist b/lang/intercal/pkg-plist
index 4c1534edaf72..cbd2c59e9e18 100644
--- a/lang/intercal/pkg-plist
+++ b/lang/intercal/pkg-plist
@@ -1,95 +1,33 @@
 bin/ick
-include/intercal/abcess.h
-include/intercal/fiddle.h
-include/intercal/lose.h
+bin/convickt
+include/ick/abcess.h
+include/ick/config.h
+include/ick/fiddle.h
+include/ick/ick_bool.h
+include/ick/ick_ec.h
+include/ick/ick_lose.h
+include/ick/yuk.h
 lib/libick.a
+lib/libickec.a
+lib/libickmt.a
+lib/libyuk.a
+%%DATADIR%%/atari.bin
+%%DATADIR%%/baudot.bin
+%%DATADIR%%/ebcdic.bin
+%%DATADIR%%/latin1.bin
 %%DATADIR%%/ick-wrap.c
-%%DATADIR%%/pit/CATALOG
-%%DATADIR%%/pit/Makefile
-%%DATADIR%%/pit/beer.doc
-%%DATADIR%%/pit/beer.i
-%%DATADIR%%/pit/blinkers
-%%DATADIR%%/pit/bubble.doc
-%%DATADIR%%/pit/bubble.i
-%%DATADIR%%/pit/change.doc
-%%DATADIR%%/pit/change.i
-%%DATADIR%%/pit/count.3i
-%%DATADIR%%/pit/count.doc
-%%DATADIR%%/pit/delta.fft
-%%DATADIR%%/pit/fft.doc
-%%DATADIR%%/pit/fft.i
-%%DATADIR%%/pit/flonck.doc
-%%DATADIR%%/pit/flonck.i
-%%DATADIR%%/pit/glider
-%%DATADIR%%/pit/gun
-%%DATADIR%%/pit/hail_mary.3i
-%%DATADIR%%/pit/hail_mary.doc
-%%DATADIR%%/pit/hello.i
-%%DATADIR%%/pit/icat.i
-%%DATADIR%%/pit/iching.doc
-%%DATADIR%%/pit/iching1.i
-%%DATADIR%%/pit/iching2.i
-%%DATADIR%%/pit/ins.doc
-%%DATADIR%%/pit/ins.i
-%%DATADIR%%/pit/iogerunds.doc
-%%DATADIR%%/pit/iogerunds.i
-%%DATADIR%%/pit/lib/1910.doc
-%%DATADIR%%/pit/lib/floatlib.doc
-%%DATADIR%%/pit/lib/floatlib.i
-%%DATADIR%%/pit/lib/lib2.doc
-%%DATADIR%%/pit/lib/lib2.i
-%%DATADIR%%/pit/lib/numio.doc
-%%DATADIR%%/pit/lib/numio.i
-%%DATADIR%%/pit/lib/plus.i
-%%DATADIR%%/pit/lib/syslib-orig.i
-%%DATADIR%%/pit/lib/syslib.3i
-%%DATADIR%%/pit/lib/syslib.4i
-%%DATADIR%%/pit/lib/syslib.5i
-%%DATADIR%%/pit/lib/syslib.6i
-%%DATADIR%%/pit/lib/syslib.7i
-%%DATADIR%%/pit/lib/syslib.doc
-%%DATADIR%%/pit/lib/syslib.i
-%%DATADIR%%/pit/lib/syslib3-7.doc
-%%DATADIR%%/pit/life.doc
-%%DATADIR%%/pit/life.i
-%%DATADIR%%/pit/life2.doc
-%%DATADIR%%/pit/life2.i
-%%DATADIR%%/pit/pi.doc
-%%DATADIR%%/pit/pi.i
-%%DATADIR%%/pit/pow.i
-%%DATADIR%%/pit/primes.doc
-%%DATADIR%%/pit/primes.i
-%%DATADIR%%/pit/quine.i
-%%DATADIR%%/pit/random.doc
-%%DATADIR%%/pit/random.i
-%%DATADIR%%/pit/random2.i
-%%DATADIR%%/pit/rot13.doc
-%%DATADIR%%/pit/rot13.i
-%%DATADIR%%/pit/rot13b.doc
-%%DATADIR%%/pit/rot13b.i
-%%DATADIR%%/pit/sample.i
-%%DATADIR%%/pit/sink.doc
-%%DATADIR%%/pit/sink.i
-%%DATADIR%%/pit/t_tet
-%%DATADIR%%/pit/tests/limits.3i
-%%DATADIR%%/pit/tests/limits.i
-%%DATADIR%%/pit/tests/test1.i
-%%DATADIR%%/pit/tests/test16bit.i
-%%DATADIR%%/pit/tests/test2.i
-%%DATADIR%%/pit/tests/testarray.i
-%%DATADIR%%/pit/tests/testcf.i
-%%DATADIR%%/pit/tests/testi18n.i
-%%DATADIR%%/pit/tests/testlib2.i
-%%DATADIR%%/pit/tests/testops.3i
-%%DATADIR%%/pit/tests/testops.5i
-%%DATADIR%%/pit/tests/testsplat.i
-%%DATADIR%%/pit/tophat.fft
-%%DATADIR%%/pit/tpk.doc
-%%DATADIR%%/pit/tpk.i
-%%DATADIR%%/pit/yapp.doc
-%%DATADIR%%/pit/yapp.i
-@dirrm %%DATADIR%%/pit/tests
-@dirrm %%DATADIR%%/pit/lib
-@dirrm %%DATADIR%%/pit
+%%DATADIR%%/pickwrap.c
+%%DATADIR%%/COPYING
+%%DATADIR%%/syslib.i
+%%DATADIR%%/syslib3.3i
+%%DATADIR%%/syslib4.4i
+%%DATADIR%%/syslib5.5i
+%%DATADIR%%/syslib6.6i
+%%DATADIR%%/syslib7.7i
+%%DATADIR%%/floatlib.i
+%%DATADIR%%/coopt.sh
+%%DATADIR%%/syslibc.c
+%%DATADIR%%/compunex.c
+%%DATADIR%%/ecto_b98.c
 @dirrm %%DATADIR%%
-@dirrm include/intercal
+@dirrm include/ick