4 files changed, 38 insertions, 43 deletions

diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index 13742f392594..c4eff378ff29 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	intercal
-# Version required:    0.18
+# Version required:    0.19
 # Date created:        20 March 1998
 # Whom:                Matthew Hunt <mph@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	intercal-0.18
+DISTNAME=	intercal-0.19
 CATEGORIES=	lang
 MASTER_SITES=	http://www.tuxedo.org/~esr/intercal/
 
diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo
index 3f3701d138b4..8184abf80867 100644
--- a/lang/intercal/distinfo
+++ b/lang/intercal/distinfo
@@ -1 +1 @@
-MD5 (intercal-0.18.tar.gz) = 7a96448747f224f5b768fd5c367547df
+MD5 (intercal-0.19.tar.gz) = c4dc6489ca042d4a89eb8ea1e58d7122
diff --git a/lang/intercal/files/patch-aa b/lang/intercal/files/patch-aa
index 1f6b9f178ddc..2a2157b2297e 100644
--- a/lang/intercal/files/patch-aa
+++ b/lang/intercal/files/patch-aa
@@ -1,21 +1,15 @@
---- Makefile.orig	Wed Apr 29 11:54:34 1998
-+++ Makefile	Fri Dec 11 11:30:33 1998
-@@ -8,18 +8,19 @@
+--- 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 :-))
  
--DVMT=~/WWW/intercal-0.18
-+#DVMT=~/WWW/intercal-0.18
- #DVMT=/usr/local
--DVMT=/intercal-0.18
-+#DVMT=/intercal-0.18
-+DVMT=$(PREFIX)
- 
- BINDIR = $(DVMT)/bin
--INCDIR = $(DVMT)/lib
--LIBDIR = $(DVMT)/lib
-+INCDIR = $(DVMT)/share/intercal
-+LIBDIR = $(DVMT)/lib/intercal
+-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)
  
@@ -25,7 +19,7 @@
  # DEBUG = -O
  
  # This version (0.18) is POSIX-compliant.  You should only set the POSIX
-@@ -29,18 +30,18 @@
+@@ -25,18 +25,19 @@
  # POSIX = 
  POSIX = -D_POSIX_SOURCE
  
@@ -35,7 +29,7 @@
  LDFLAGS =
  
 -CC = gcc -Wall -W
-+# CC = gcc -Wall -W
++#CC = gcc -Wall -W
  
  # You can use lex or flex
 -#LEX = lex
@@ -45,29 +39,27 @@
  
  # 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
-@@ -61,7 +62,7 @@
- 	mv lex.yy.c lexer.c 
- 
- # Uncomment the following if using a stock lex
--# LEXLIBS = -ll
-+LEXLIBS = -ll
- lextest: y.tab.h lexer.c ick.h lose.o
- 	$(CC) -DMAIN lexer.c lose.o $(LEXLIBS) -o lextest
- 
-@@ -78,9 +79,9 @@
+@@ -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)
--	cp libick.a ../pit/lib/syslib.i ../pit/lib/syslib.?i $(LIBDIR)
+-	-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
index 4520fc42bc19..9438e37e2498 100644
--- a/lang/intercal/files/patch-ab
+++ b/lang/intercal/files/patch-ab
@@ -1,12 +1,15 @@
---- perpetrate.c.orig	Fri Dec 11 11:32:40 1998
-+++ perpetrate.c	Fri Dec 11 11:33:10 1998
-@@ -56,7 +56,9 @@
- extern int yyparse(void);
- 
- /* getopt declaration */
-+#ifndef __FreeBSD__
- int getopt(int, char**, char*);
-+#endif
- 
- /* compilation options */
- bool compile_only; 	/* just compile into C, don't run the linker */
+*** 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 */