Upgrade to 3.2.5.

PR:		10801
Submitted by:	Dan Cross <tenser@hurricane.phys.psu.edu>
Minor tweaks by: max

4 files changed, 109 insertions, 89 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 702fa23ea842..9a0d1dc78e4c 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for: SWI-Prolog
-# Version required:		2.8.6
+# Version required:		3.2.5
 # Date created:			10 August 1996
 # Whom:				Michael Butschky <butsch@computi.erols.com>
 #
-# $Id: Makefile,v 1.13 1999/03/08 07:28:31 asami Exp $              
+# $Id: Makefile,v 1.14 1999/03/11 21:47:12 scrappy Exp $
 #
 
-DISTNAME=	pl-2.8.6
-PKGNAME=	swi-pl-2.8.6
-CATEGORIES=     lang
+DISTNAME=	pl-3.2.5
+PKGNAME=	swi-pl-3.2.5
+CATEGORIES=	lang
 MASTER_SITES=	ftp://swi.psy.uva.nl/pub/SWI-Prolog/
 
 MAINTAINER=	max@FreeBSD.ORG
@@ -17,14 +17,15 @@ Y2K=		http://www.hio.hen.nl/faq/SWI-Prolog.html#7.__warranty
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
+CONFIGURE_ARGS=	--host=${ARCH}-freebsd
 STRIP=
 MAKE_FLAGS+=	CIFLAGS=-DRTLD_LAZY -f
-MAN1=		pl.1 chpl.1 plld.1
+MAN1=		pl.1 plrc.1 plld.1
+PLIST_SUB=	DISTNAME=${DISTNAME}
 
 post-install:
-.for f in pl pl-bite chpl
-	@strip ${PREFIX}/lib/${DISTNAME}/bin/i386-freebsd/$f
+.for f in pl pl-bite plld plrc
+	@strip ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-freebsd/$f
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo
index 76b7f0efd61c..16a15a1556f8 100644
--- a/lang/swi-pl/distinfo
+++ b/lang/swi-pl/distinfo
@@ -1 +1 @@
-MD5 (pl-2.8.6.tar.gz) = 19b82e8147fd049b233a558633bf1756
+MD5 (pl-3.2.5.tar.gz) = 315d054d9da17db525ec9bb844b9e80c
diff --git a/lang/swi-pl/files/patch-aa b/lang/swi-pl/files/patch-aa
index 82701a4404cd..2d07c3a6f92c 100644
--- a/lang/swi-pl/files/patch-aa
+++ b/lang/swi-pl/files/patch-aa
@@ -1,11 +1,27 @@
---- Makefile.in.orig	Wed May 14 17:52:28 1997
-+++ Makefile.in	Sat May 17 21:09:48 1997
-@@ -292,7 +292,7 @@
- 		-$(INSTALL_DATA) $(PLBASE)/man/$(PL).$(mansec) $(mandir)
- 		-$(INSTALL_DATA) $(PLBASE)/man/chpl.$(mansec) $(mandir)
- 		-$(INSTALL_DATA) $(PLBASE)/man/plld.$(mansec) $(mandir)
--		-$(INSTALL_DATA) $(PLBASE)/man/readline.$(lmansec) $(lmandir)
-+#		-$(INSTALL_DATA) $(PLBASE)/man/readline.$(lmansec) $(lmandir)
-  
+--- Makefile.in	1999/03/23 20:02:10	1.1
++++ Makefile.in	1999/03/23 20:02:47
+@@ -287,7 +287,7 @@
+ 		$(INSTALL_DATA) pl.1 $(plmandir)/$(PL).$(mansec)
+ 		$(INSTALL_DATA) $(srcdir)/plrc.1 $(plmandir)/plrc.$(mansec)
+ 		$(INSTALL_DATA) $(srcdir)/plld.1 $(plmandir)/plld.$(mansec)
+-		$(INSTALL_DATA) $(srcdir)/readline.3 $(plmandir)/readline.$(lmansec)
++		#$(INSTALL_DATA) $(srcdir)/readline.3 $(plmandir)/readline.$(lmansec)
+ 		-if [ ! -d $(man_prefix) ]; then $(MKDIR) $(man_prefix); fi
+ 		-if [ ! -d $(mandir)  ];    then $(MKDIR) $(mandir);     fi
+ 		-$(INSTALL_DATA) $(plmandir)/$(PL).$(mansec) $(mandir)
+@@ -295,10 +295,11 @@
+ 		-$(INSTALL_DATA) $(plmandir)/plld.$(mansec) $(mandir)
+ 
+ install_rlman:
+-		-if [ ! -d $(lmandir) ]; then $(MKDIR) $(lmandir); fi
+-		-if [ ! -r $(lmandir)/readline.$(lmansec) ]; then \
+-		  $(INSTALL_DATA) $(srcdir)/readline.3 $(lmandir)/readline.$(lmansec); \
+-		fi
++		-true
++#		-if [ ! -d $(lmandir) ]; then $(MKDIR) $(lmandir); fi
++#		-if [ ! -r $(lmandir)/readline.$(lmansec) ]; then \
++#		  $(INSTALL_DATA) $(srcdir)/readline.3 $(lmandir)/readline.$(lmansec); \
++#		fi
+ 
  #
  # runtime-only environment installation
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index b3fe04d49be1..0afb04ce4f64 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -1,74 +1,77 @@
 bin/pl
 bin/pl-bite
-bin/chpl
+bin/plrc
 bin/plld
 include/SWI-Prolog.h
-lib/pl-2.8.6/bin/i386-freebsd/pl
-lib/pl-2.8.6/bin/i386-freebsd/pl-bite
-lib/pl-2.8.6/bin/i386-freebsd/chpl
-lib/pl-2.8.6/bin/i386-freebsd/plld
-lib/pl-2.8.6/bin/swipl
-lib/pl-2.8.6/man/pl.1
-lib/pl-2.8.6/man/chpl.1
-lib/pl-2.8.6/man/plld.1
-lib/pl-2.8.6/man/readline.3
-lib/pl-2.8.6/boot/aix_foreign.pl
-lib/pl-2.8.6/boot/apply.pl
-lib/pl-2.8.6/boot/autoload.pl
-lib/pl-2.8.6/boot/bags.pl
-lib/pl-2.8.6/boot/dwim.pl
-lib/pl-2.8.6/boot/edit.pl
-lib/pl-2.8.6/boot/foreign.pl
-lib/pl-2.8.6/boot/history.pl
-lib/pl-2.8.6/boot/init.pl
-lib/pl-2.8.6/boot/list.pl
-lib/pl-2.8.6/boot/listing.pl
-lib/pl-2.8.6/boot/load.pl
-lib/pl-2.8.6/boot/parms.pl
-lib/pl-2.8.6/boot/portray.pl
-lib/pl-2.8.6/boot/profile.pl
-lib/pl-2.8.6/boot/qlf.pl
-lib/pl-2.8.6/boot/sort.pl
-lib/pl-2.8.6/boot/syspred.pl
-lib/pl-2.8.6/boot/toplevel.pl
-lib/pl-2.8.6/boot/topvars.pl
-lib/pl-2.8.6/boot/writef.pl
-lib/pl-2.8.6/library/INDEX.pl
-lib/pl-2.8.6/library/am_match.pl
-lib/pl-2.8.6/library/backcomp.pl
-lib/pl-2.8.6/library/bim.pl
-lib/pl-2.8.6/library/check.pl
-lib/pl-2.8.6/library/ctypes.pl
-lib/pl-2.8.6/library/dde.pl
-lib/pl-2.8.6/library/dld.pl
-lib/pl-2.8.6/library/emacs_interface.pl
-lib/pl-2.8.6/library/explain.pl
-lib/pl-2.8.6/library/files.pl
-lib/pl-2.8.6/library/gensym.pl
-lib/pl-2.8.6/library/help.pl
-lib/pl-2.8.6/library/help_index.pl
-lib/pl-2.8.6/library/helpidx.pl
-lib/pl-2.8.6/library/oset.pl
-lib/pl-2.8.6/library/progman.pl
-lib/pl-2.8.6/library/qlfutil.pl
-lib/pl-2.8.6/library/qp_interface.pl
-lib/pl-2.8.6/library/qsave.pl
-lib/pl-2.8.6/library/quintus.pl
-lib/pl-2.8.6/library/readln.pl
-lib/pl-2.8.6/library/shell.pl
-lib/pl-2.8.6/library/shlib.pl
-lib/pl-2.8.6/library/system.pl
-lib/pl-2.8.6/library/toolkit.pl
-lib/pl-2.8.6/library/topvars.pl
-lib/pl-2.8.6/library/tty.pl
-lib/pl-2.8.6/library/whereis.pl
-lib/pl-2.8.6/library/MANUAL
-lib/pl-2.8.6/startup/startup
-lib/pl-2.8.6/include/SWI-Prolog.h
-lib/pl-2.8.6/include/SWI-Exports
-lib/pl-2.8.6/include/SWI-Stream.h
-lib/pl-2.8.6/include/stub.c
-lib/pl-2.8.6/runtime/i386-freebsd/libpl.a
-lib/pl-2.8.6/swipl
-lib/pl-2.8.6/README.bin
-lib/pl-2.8.6/LICENSE
+lib/%%DISTNAME%%/bin/i386-freebsd/pl
+lib/%%DISTNAME%%/bin/i386-freebsd/pl-bite
+lib/%%DISTNAME%%/bin/i386-freebsd/plld
+lib/%%DISTNAME%%/bin/i386-freebsd/plrc
+lib/%%DISTNAME%%/bin/swipl
+lib/%%DISTNAME%%/man/pl.1
+lib/%%DISTNAME%%/man/plrc.1
+lib/%%DISTNAME%%/man/plld.1
+lib/%%DISTNAME%%/boot/aix_foreign.pl
+lib/%%DISTNAME%%/boot/apply.pl
+lib/%%DISTNAME%%/boot/autoload.pl
+lib/%%DISTNAME%%/boot/bags.pl
+lib/%%DISTNAME%%/boot/dwim.pl
+lib/%%DISTNAME%%/boot/foreign.pl
+lib/%%DISTNAME%%/boot/history.pl
+lib/%%DISTNAME%%/boot/init.pl
+lib/%%DISTNAME%%/boot/list.pl
+lib/%%DISTNAME%%/boot/listing.pl
+lib/%%DISTNAME%%/boot/load.pl
+lib/%%DISTNAME%%/boot/make.pl
+lib/%%DISTNAME%%/boot/messages.pl
+lib/%%DISTNAME%%/boot/parms.pl
+lib/%%DISTNAME%%/boot/profile.pl
+lib/%%DISTNAME%%/boot/qlf.pl
+lib/%%DISTNAME%%/boot/rc.pl
+lib/%%DISTNAME%%/boot/sort.pl
+lib/%%DISTNAME%%/boot/syspred.pl
+lib/%%DISTNAME%%/boot/toplevel.pl
+lib/%%DISTNAME%%/boot/topvars.pl
+lib/%%DISTNAME%%/boot/writef.pl
+lib/%%DISTNAME%%/library/INDEX.pl
+lib/%%DISTNAME%%/library/am_match.pl
+lib/%%DISTNAME%%/library/backcomp.pl
+lib/%%DISTNAME%%/library/bim.pl
+lib/%%DISTNAME%%/library/check.pl
+lib/%%DISTNAME%%/library/ctypes.pl
+lib/%%DISTNAME%%/library/dde.pl
+lib/%%DISTNAME%%/library/dld.pl
+lib/%%DISTNAME%%/library/edit.pl
+lib/%%DISTNAME%%/library/emacs_interface.pl
+lib/%%DISTNAME%%/library/explain.pl
+lib/%%DISTNAME%%/library/files.pl
+lib/%%DISTNAME%%/library/gensym.pl
+lib/%%DISTNAME%%/library/help.pl
+lib/%%DISTNAME%%/library/help_index.pl
+lib/%%DISTNAME%%/library/helpidx.pl
+lib/%%DISTNAME%%/library/oset.pl
+lib/%%DISTNAME%%/library/progman.pl
+lib/%%DISTNAME%%/library/qlfutil.pl
+lib/%%DISTNAME%%/library/qp_interface.pl
+lib/%%DISTNAME%%/library/qsave.pl
+lib/%%DISTNAME%%/library/quintus.pl
+lib/%%DISTNAME%%/library/readln.pl
+lib/%%DISTNAME%%/library/registry.pl
+lib/%%DISTNAME%%/library/tty.pl
+lib/%%DISTNAME%%/library/shell.pl
+lib/%%DISTNAME%%/library/shlib.pl
+lib/%%DISTNAME%%/library/system.pl
+lib/%%DISTNAME%%/library/toolkit.pl
+lib/%%DISTNAME%%/library/topvars.pl
+lib/%%DISTNAME%%/library/whereis.pl
+lib/%%DISTNAME%%/library/wise.pl
+lib/%%DISTNAME%%/library/MANUAL
+lib/%%DISTNAME%%/include/SWI-Prolog.h
+lib/%%DISTNAME%%/include/SWI-Exports
+lib/%%DISTNAME%%/include/SWI-Stream.h
+lib/%%DISTNAME%%/include/stub.c
+lib/%%DISTNAME%%/runtime/i386-freebsd/libpl.a
+lib/%%DISTNAME%%/boot.prc
+lib/%%DISTNAME%%/swipl
+lib/%%DISTNAME%%/README.bin
+lib/%%DISTNAME%%/LICENSE