7 files changed, 68 insertions, 63 deletions

diff --git a/lang/wamcc/Makefile b/lang/wamcc/Makefile
index 7cdb8891e6db..ca053cf78b86 100644
--- a/lang/wamcc/Makefile
+++ b/lang/wamcc/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	wamcc
-PORTVERSION=	2.22
+PORTVERSION=	2.23
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/contraintes/wamcc/
-DISTFILES=	wamcc2.22.tar.Z prg.tar.Z
+DISTFILES=	wamcc2.23.tar.gz prg.tar.Z
 
 MAINTAINER=	ports@FreeBSD.Org
 COMMENT=	Prolog-to-C translator from Inria
 
-BROKEN=		"Does not compile"
-
 DIST_SUBDIR=	wamcc
 NO_WRKSUBDIR=	yes
 
+USE_GCC=	2.95 # compiled .pl files dump core w/ gcc 3.x
+
+PLIST_SUB=	CC=${CC}
+
 .include <bsd.port.mk>
diff --git a/lang/wamcc/distinfo b/lang/wamcc/distinfo
index cdfc5d939d6d..0c8c1790856c 100644
--- a/lang/wamcc/distinfo
+++ b/lang/wamcc/distinfo
@@ -1,2 +1,2 @@
-MD5 (wamcc/wamcc2.22.tar.Z) = dadc24bdee8a3167b4cffa32a936c00b
+MD5 (wamcc/wamcc2.23.tar.gz) = a766e39759be33ba462ac2b43f394c98
 MD5 (wamcc/prg.tar.Z) = fc9bee37ab3449535a5fb83c601e2da1
diff --git a/lang/wamcc/files/patch-aa b/lang/wamcc/files/patch-aa
index 782e1bdcdee2..2865eb4bca81 100644
--- a/lang/wamcc/files/patch-aa
+++ b/lang/wamcc/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Mar  7 03:21:05 1995
-+++ Makefile	Sun Oct 31 13:03:29 1999
-@@ -5,12 +5,16 @@
+--- Makefile.orig	Tue Mar  7 10:21:05 1995
++++ Makefile	Wed Jun  4 11:00:59 2003
+@@ -5,16 +5,20 @@
  # /* Makefile                                                              */
  # /*-----------------------------------------------------------------------*/
  
@@ -22,6 +22,11 @@
  
  # you can specify the name of the C compiler
  
+-CC      = gcc
++CC      ?= gcc
+ 
+ # do not change anything else
+ 
 @@ -25,24 +29,28 @@
  
  EXECS   = $(WCC) $(COMPILER) $(BMF) hex2pl pl2hex
diff --git a/lang/wamcc/files/patch-ac b/lang/wamcc/files/patch-ac
index 03a32c08a36f..632ef7ab686f 100644
--- a/lang/wamcc/files/patch-ac
+++ b/lang/wamcc/files/patch-ac
@@ -1,31 +1,67 @@
---- src/Makefile.orig	Wed Jan 29 03:37:54 1997
-+++ src/Makefile	Sat Mar 31 03:01:06 2001
-@@ -19 +19 @@
+--- src/Makefile.orig	Wed Jan 29 12:37:54 1997
++++ src/Makefile	Wed Jun  4 11:02:44 2003
+@@ -10,13 +10,13 @@
+ COMPILER  = wamcc
+ INCPATH   = `pwd`
+ LIBPATH   = `pwd`
+-CC        = gcc
++CC        ?= gcc
+ WCC       = w_$(CC)
+ 
+ 
+ # other local variables
+ 
 -CFLAGS    = -O2
 +#CFLAGS    = -O2
-@@ -52 +52 @@
+ CFLAGINLIN= -finline-functions
+ LFLAGS    =
+ BMF       = bmf_$(COMPILER)
+@@ -49,22 +49,22 @@
+ 
+ 
+ machine.o: machine.h archi.h wam_engine.h machine.c
 -	$(WCC) $(CFLAGS) -c machine.c
 +	./$(WCC) $(CFLAGS) -c machine.c
-@@ -55 +55 @@
+ 
+ wam_engine.o: machine.h archi.h wam_engine.h atom_pred.h wam_engine.c 
 -	$(WCC) $(CFLAGS) -c wam_engine.c
 +	./$(WCC) $(CFLAGS) -c wam_engine.c
-@@ -58 +58 @@
+ 
+ wam_engine_pp.o: machine.h archi.h wam_engine.h atom_pred.h wam_engine.c
 -	$(WCC) $(CFLAGS) -DWAM_PROFILE -c -o wam_engine_pp.o wam_engine.c
 +	./$(WCC) $(CFLAGS) -DWAM_PROFILE -c -o wam_engine_pp.o wam_engine.c
-@@ -61 +61 @@
+ 
+ atom_pred.o: machine.h archi.h wam_engine.h atom_pred.h atom_pred.c
 -	$(WCC) $(CFLAGS) -c atom_pred.c
 +	./$(WCC) $(CFLAGS) -c atom_pred.c
-@@ -64 +64 @@
+ 
+ debugger.o: machine.h archi.h wam_engine.h atom_pred.h debugger.c
 -	$(WCC) $(CFLAGS) -c debugger.c
 +	./$(WCC) $(CFLAGS) -c debugger.c
-@@ -67 +67 @@
+ 
+ hash.o: machine.h hash.c
 -	$(WCC) $(CFLAGS) -c hash.c
 +	./$(WCC) $(CFLAGS) -c hash.c
-@@ -82 +82 @@
+ 
+ 
+ 
+@@ -79,7 +79,7 @@
+ 
+ 
+ $(WCC): configure archi.def
 -	configure
 +	./configure
-@@ -98,2 +98,2 @@
+ 	chmod a+x $(WCC)
+ 
+ $(BMF): bmf.c
+@@ -95,8 +95,8 @@
+ 	$(CC) $(CFLAGS) $(LFLAGS) -o pl2hex pl2hex.c
+ 
+ $(COMPILER):
 -	$(WCC) $(CFLAGS) -c wamcc*.c
 -	$(WCC) $(CFLAGS) $(LFLAGS) -s -o $(COMPILER) wamcc*.o -l$(COMPILER)
 +	./$(WCC) $(CFLAGS) -c wamcc*.c
 +	./$(WCC) $(CFLAGS) $(LFLAGS) -s -o $(COMPILER) wamcc*.o -l$(COMPILER)
+ 
+ 
+ 
diff --git a/lang/wamcc/files/patch-ad b/lang/wamcc/files/patch-ad
deleted file mode 100644
index a8372a5a409f..000000000000
--- a/lang/wamcc/files/patch-ad
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/debugger.c.orig	Sun Dec 18 12:15:55 1994
-+++ src/debugger.c	Tue Sep 14 04:16:44 1999
-@@ -278,7 +278,15 @@
- 
- #define Y_Storing_Invoc_Nb(e)   (Y(e,3))                   /* see call.pl */
- 
-+static void mygets(char *str, int size)
-+{
-+	char *p;
-+	fgets(str,size,stdin);
- 
-+	p = index(str, '\n');
-+	if(p)
-+		*p = '\0';
-+}
- 
- 
- 
-@@ -959,7 +967,7 @@
-  Lib1(printf," ? ");
- 
-  *str='\0';
-- Lib1(gets,str);
-+ Lib2(mygets,str,sizeof(str) - 1);
-  if (*str=='\0')
-      Lib2(strcpy,str,"creep");
- 
-@@ -2047,7 +2055,7 @@
-      Lib1(printf,"\nNew value: ");
- 
-      *str='\0';
--     Lib1(gets,str);
-+     Lib2(mygets,str,sizeof(str) - 1);
-      if (*str=='\0')
-          return;
- 
diff --git a/lang/wamcc/files/patch-ae b/lang/wamcc/files/patch-ae
index b8b6e2009d58..41b925fc80b3 100644
--- a/lang/wamcc/files/patch-ae
+++ b/lang/wamcc/files/patch-ae
@@ -1,14 +1,12 @@
---- src/machine.c.orig	Sun Dec 18 12:15:59 1994
-+++ src/machine.c	Tue Sep 14 04:16:29 1999
-@@ -52,7 +52,11 @@
- 
+--- src/machine.c.orig	Wed Jun  4 10:56:56 2003
++++ src/machine.c	Wed Jun  4 10:57:22 2003
+@@ -53,7 +53,9 @@
  #endif
  
+ #ifndef M_pc_linux_elf
 +#if !defined(M_i386_freebsd) && !defined(M_alpha_freebsd)
-+
  extern char *sys_errlist[];
-+
 +#endif
- 
+ #endif
  
  
diff --git a/lang/wamcc/pkg-plist b/lang/wamcc/pkg-plist
index f8f3ac68ccb5..9acb1e7c1e31 100644
--- a/lang/wamcc/pkg-plist
+++ b/lang/wamcc/pkg-plist
@@ -1,7 +1,7 @@
 bin/bmf_wamcc
 bin/hex2pl
 bin/pl2hex
-bin/w_gcc
+bin/w_%%CC%%
 bin/wamcc
 include/wamcc/archi.h
 include/wamcc/atom_pred.h