Upgrade to 0.18.

Provoked by:	Bill Fenner's distfile survey

5 files changed, 37 insertions, 19 deletions

diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index d3e8f5d2ae54..05da332392b0 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	intercal
-# Version required:    0.17
+# Version required:    0.18
 # Date created:        20 March 1998
 # Whom:                Matthew Hunt <mph@freebsd.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/17 21:52:16 mph Exp $
 #
 
-DISTNAME=	intercal-0.17
+DISTNAME=	intercal-0.18
 CATEGORIES=	lang
-MASTER_SITES=	http://earthspace.net/~esr/
+MASTER_SITES=	http://www.tuxedo.org/~esr/intercal/
 
 MAINTAINER=	mph@freebsd.org
 
diff --git a/lang/intercal/distinfo b/lang/intercal/distinfo
index ddd6f095c249..3f3701d138b4 100644
--- a/lang/intercal/distinfo
+++ b/lang/intercal/distinfo
@@ -1 +1 @@
-MD5 (intercal-0.17.tar.gz) = 27449cdca064438142b64f566deed980
+MD5 (intercal-0.18.tar.gz) = 7a96448747f224f5b768fd5c367547df
diff --git a/lang/intercal/files/patch-aa b/lang/intercal/files/patch-aa
index 12b5f3723008..1f6b9f178ddc 100644
--- a/lang/intercal/files/patch-aa
+++ b/lang/intercal/files/patch-aa
@@ -1,12 +1,14 @@
---- Makefile.orig	Fri Feb 27 02:33:59 1998
-+++ Makefile	Fri Apr 17 17:44:20 1998
-@@ -8,31 +8,31 @@
+--- Makefile.orig	Wed Apr 29 11:54:34 1998
++++ Makefile	Fri Dec 11 11:30:33 1998
+@@ -8,18 +8,19 @@
  # all over creation behind your back.
  # (/dev/null may be another good choice :-))
  
--DVMT=~/WWW/intercal-0.17
--#DVMT=/usr/local
-+#DVMT=~/WWW/intercal-0.17
+-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
@@ -21,13 +23,19 @@
 -DEBUG	= -g -DDEBUG
 +# DEBUG	= -g -DDEBUG
  # DEBUG = -O
+ 
+ # This version (0.18) is POSIX-compliant.  You should only set the POSIX
+@@ -29,18 +30,18 @@
+ # POSIX = 
+ POSIX = -D_POSIX_SOURCE
+ 
 -CFLAGS = -I. $(DEBUG) -DICKINCLUDEDIR=\"$(INCDIR)\" \
 +CFLAGS += -I. $(DEBUG) -DICKINCLUDEDIR=\"$(INCDIR)\" \
- 	-DICKLIBDIR=\"$(LIBDIR)\" -DYYDEBUG
+ 	-DICKLIBDIR=\"$(LIBDIR)\" -DYYDEBUG $(POSIX)
  LDFLAGS =
  
 -CC = gcc -Wall -W
-+#CC = gcc -Wall -W
++# CC = gcc -Wall -W
  
  # You can use lex or flex
 -#LEX = lex
@@ -35,15 +43,13 @@
 +LEX = lex
 +#LEX = flex
  
- # You can use either yacc or bison
--#YACC = yacc
+ # You should use bison, because some yaccs won't work correctly
 -YACC = bison -y
 +YACC = yacc
-+#YACC = bison -y
  
  CSOURCES = ick.y lexer.l feh.c lose.c fiddle.c perpetrate.c
  ISOURCES = cesspool.c arrgghh.c ick-wrap.c
-@@ -53,7 +53,7 @@
+@@ -61,7 +62,7 @@
  	mv lex.yy.c lexer.c 
  
  # Uncomment the following if using a stock lex
@@ -52,7 +58,7 @@
  lextest: y.tab.h lexer.c ick.h lose.o
  	$(CC) -DMAIN lexer.c lose.o $(LEXLIBS) -o lextest
  
-@@ -70,9 +70,9 @@
+@@ -78,9 +79,9 @@
  	-ranlib libick.a
  
  install: all
diff --git a/lang/intercal/files/patch-ab b/lang/intercal/files/patch-ab
new file mode 100644
index 000000000000..4520fc42bc19
--- /dev/null
+++ b/lang/intercal/files/patch-ab
@@ -0,0 +1,12 @@
+--- 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 */
diff --git a/lang/intercal/pkg-descr b/lang/intercal/pkg-descr
index f488898519cd..41331e3c2e02 100644
--- a/lang/intercal/pkg-descr
+++ b/lang/intercal/pkg-descr
@@ -4,4 +4,4 @@ languages.  This is the C-INTERCAL compiler, which compiles
 INTERCAL to C, and then invokes cc as a backend, much like the
 "f2c" Fortran compiler.
 
-The INTERCAL resource page: http://sagan.earthspace.net/intercal/
+The INTERCAL resource page: http://www.tuxedo.org/~esr/intercal/