6 files changed, 116 insertions, 191 deletions

diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index 1f9035ef3719..9cf631b069ab 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -6,21 +6,15 @@
 #
 
 PORTNAME=	intercal
-PORTVERSION=	0.20
+PORTVERSION=	0.24
 CATEGORIES=	lang
 MASTER_SITES=	http://www.catb.org/~esr/intercal/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ssedov@mbsd.msk.ru
 COMMENT=	The C-INTERCAL compiler, ick, and supporting libraries
 
-WRKSRC=		$(WRKDIR)/$(DISTNAME)/src
-
-pre-install:
-	${MKDIR} ${PREFIX}/share/intercal
-	${MKDIR} ${PREFIX}/lib/intercal
-
-post-install:
-	${MKDIR} ${PREFIX}/share/intercal/pit
-	${CP} -R $(WRKDIR)/$(DISTNAME)/pit/*  ${PREFIX}/share/intercal/pit
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -D_POSIX_SOURCE"
 
 .include <bsd.port.mk>
diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo
index 9935dbaa8943..0b7b79170107 100644
--- a/lang/intercal/distinfo
+++ b/lang/intercal/distinfo
@@ -1,3 +1,3 @@
-MD5 (intercal-0.20.tar.gz) = 7ac506a2e12e8fc5f21e594e871864d1
-SHA256 (intercal-0.20.tar.gz) = f094aec7260d94c67d780c17ee119465d0011342e12fff9538edc638663de81e
-SIZE (intercal-0.20.tar.gz) = 169172
+MD5 (intercal-0.24.tar.gz) = d302a3a8170c11be2289a5bb09395ce8
+SHA256 (intercal-0.24.tar.gz) = 8f46305ef24a92945241acf31880e7466d7d942924009fbf00ccb5fb314afaa7
+SIZE (intercal-0.24.tar.gz) = 205703
diff --git a/lang/intercal/files/patch-Makefile b/lang/intercal/files/patch-Makefile
new file mode 100644
index 000000000000..4dce88bc2eab
--- /dev/null
+++ b/lang/intercal/files/patch-Makefile
@@ -0,0 +1,14 @@
+--- 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-aa b/lang/intercal/files/patch-aa
deleted file mode 100644
index 2a2157b2297e..000000000000
--- a/lang/intercal/files/patch-aa
+++ /dev/null
@@ -1,65 +0,0 @@
---- Makefile.old	Mon Nov  1 00:56:19 1999
-+++ Makefile	Mon Nov  1 00:56:58 1999
-@@ -8,14 +8,14 @@
- # all over creation behind your back.
- # (/dev/null may be another good choice :-))
- 
--BINDIR = /usr/bin
--INCDIR = /usr/include/intercal
--LIBDIR = /usr/share/intercal
-+BINDIR = $(PREFIX)/bin
-+INCDIR = $(PREFIX)/share/intercal
-+LIBDIR = $(PREFIX)/lib/intercal
- #INCDIR = $(PWD)
- #LIBDIR = $(PWD)
- 
- YDEBUG = -vlt
--DEBUG	= -g -DDEBUG
-+# DEBUG	= -g -DDEBUG
- # DEBUG = -O
- 
- # This version (0.18) is POSIX-compliant.  You should only set the POSIX
-@@ -25,18 +25,19 @@
- # POSIX = 
- POSIX = -D_POSIX_SOURCE
- 
--CFLAGS = -I. $(DEBUG) -DICKINCLUDEDIR=\"$(INCDIR)\" \
-+CFLAGS += -I. $(DEBUG) -DICKINCLUDEDIR=\"$(INCDIR)\" \
- 	-DICKLIBDIR=\"$(LIBDIR)\" -DYYDEBUG $(POSIX)
- LDFLAGS =
- 
--CC = gcc -Wall -W
-+#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 +75,10 @@
- 	-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) lose.h abcess.h fiddle.h ick-wrap.c $(INCDIR)
-+	$(BSD_INSTALL_DATA) libick.a ../pit/lib/syslib.i ../pit/lib/syslib.?i $(LIBDIR)
-+
- 
- clean:
- 	rm -f yacc.* y.tab.* y.output *~ *.[oa] lexer.c ick.c lextest ick
diff --git a/lang/intercal/files/patch-ab b/lang/intercal/files/patch-ab
deleted file mode 100644
index 9438e37e2498..000000000000
--- a/lang/intercal/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-*** perpetrate.c.old	Fri Dec 18 04:59:39 1998
---- perpetrate.c	Mon Nov  1 00:29:16 1999
-***************
-*** 55,62 ****
---- 55,64 ----
-  /* function created by yacc */
-  extern int yyparse(void);
-  
-+ #ifndef __FreeBSD__
-  /* getopt declaration */
-  int getopt(int, char**, char*);
-+ #endif
-  
-  /* compilation options */
-  bool compile_only; 	/* just compile into C, don't run the linker */
diff --git a/lang/intercal/pkg-plist b/lang/intercal/pkg-plist
index 14b95ff0729c..4c1534edaf72 100644
--- a/lang/intercal/pkg-plist
+++ b/lang/intercal/pkg-plist
@@ -1,98 +1,95 @@
 bin/ick
-lib/intercal/libick.a
-lib/intercal/syslib.3i
-lib/intercal/syslib.4i
-lib/intercal/syslib.5i
-lib/intercal/syslib.6i
-lib/intercal/syslib.7i
-lib/intercal/syslib.i
-share/intercal/abcess.h
-share/intercal/fiddle.h
-share/intercal/ick-wrap.c
-share/intercal/lose.h
-share/intercal/pit/CATALOG
-share/intercal/pit/Makefile
-share/intercal/pit/beer.doc
-share/intercal/pit/beer.i
-share/intercal/pit/blinkers
-share/intercal/pit/bubble.doc
-share/intercal/pit/bubble.i
-share/intercal/pit/change.doc
-share/intercal/pit/change.i
-share/intercal/pit/count.3i
-share/intercal/pit/count.doc
-share/intercal/pit/delta.fft
-share/intercal/pit/fft.doc
-share/intercal/pit/fft.i
-share/intercal/pit/flonck.doc
-share/intercal/pit/flonck.i
-share/intercal/pit/glider
-share/intercal/pit/gun
-share/intercal/pit/hail_mary.3i
-share/intercal/pit/hail_mary.doc
-share/intercal/pit/hello.i
-share/intercal/pit/icat.i
-share/intercal/pit/iching.doc
-share/intercal/pit/iching1.i
-share/intercal/pit/iching2.i
-share/intercal/pit/ins.doc
-share/intercal/pit/ins.i
-share/intercal/pit/iogerunds.doc
-share/intercal/pit/iogerunds.i
-share/intercal/pit/lib/1910.doc
-share/intercal/pit/lib/floatlib.doc
-share/intercal/pit/lib/floatlib.i
-share/intercal/pit/lib/lib2.doc
-share/intercal/pit/lib/lib2.i
-share/intercal/pit/lib/numio.doc
-share/intercal/pit/lib/numio.i
-share/intercal/pit/lib/plus.i
-share/intercal/pit/lib/syslib-orig.i
-share/intercal/pit/lib/syslib.3i
-share/intercal/pit/lib/syslib.4i
-share/intercal/pit/lib/syslib.5i
-share/intercal/pit/lib/syslib.6i
-share/intercal/pit/lib/syslib.7i
-share/intercal/pit/lib/syslib.doc
-share/intercal/pit/lib/syslib.i
-share/intercal/pit/lib/syslib3-7.doc
-share/intercal/pit/life.doc
-share/intercal/pit/life.i
-share/intercal/pit/life2.doc
-share/intercal/pit/life2.i
-share/intercal/pit/pi.doc
-share/intercal/pit/pi.i
-share/intercal/pit/pow.i
-share/intercal/pit/primes.doc
-share/intercal/pit/primes.i
-share/intercal/pit/quine.i
-share/intercal/pit/random.doc
-share/intercal/pit/random.i
-share/intercal/pit/random2.i
-share/intercal/pit/rot13.doc
-share/intercal/pit/rot13.i
-share/intercal/pit/rot13b.doc
-share/intercal/pit/rot13b.i
-share/intercal/pit/sample.i
-share/intercal/pit/sink.doc
-share/intercal/pit/sink.i
-share/intercal/pit/t_tet
-share/intercal/pit/tests/limits.3i
-share/intercal/pit/tests/limits.i
-share/intercal/pit/tests/test1.i
-share/intercal/pit/tests/test16bit.i
-share/intercal/pit/tests/test2.i
-share/intercal/pit/tests/testarray.i
-share/intercal/pit/tests/testcf.i
-share/intercal/pit/tests/testlib2.i
-share/intercal/pit/tests/testops.3i
-share/intercal/pit/tests/testops.5i
-share/intercal/pit/tests/testsplat.i
-share/intercal/pit/tophat.fft
-share/intercal/pit/yapp.doc
-share/intercal/pit/yapp.i
-@dirrm lib/intercal
-@dirrm share/intercal/pit/lib
-@dirrm share/intercal/pit/tests
-@dirrm share/intercal/pit
-@dirrm share/intercal
+include/intercal/abcess.h
+include/intercal/fiddle.h
+include/intercal/lose.h
+lib/libick.a
+%%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
+@dirrm %%DATADIR%%
+@dirrm include/intercal