Update to version 5.0.5. Too many changes to list here.

5 files changed, 113 insertions, 90 deletions

diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index 6bd2f7725e6..e72b243d55c 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2002/04/01 15:09:44 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2002/05/03 21:31:02 jtb Exp $
 
-DISTNAME=		pl-lite-4.0.9
-PKGNAME=		swi-prolog-4.0.9
+DISTNAME=		pl-lite-5.0.5
+PKGNAME=		swi-prolog-5.0.5
 CATEGORIES=		lang
-MASTER_SITES=		http://www.swi.psy.uva.nl/cgi-bin//nph-download/SWI-Prolog/
+MASTER_SITES=		ftp://ftp.swi.psy.uva.nl/SWI-Prolog/
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.swi.psy.uva.nl/projects/SWI-Prolog/
+HOMEPAGE=		http://www.swi-prolog.org
 COMMENT=		ISO/Edinburgh-style Prolog compiler
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S,-lite,,}
diff --git a/lang/swi-prolog/PLIST b/lang/swi-prolog/PLIST
index c816bca2193..4ce7a9367df 100644
--- a/lang/swi-prolog/PLIST
+++ b/lang/swi-prolog/PLIST
@@ -1,85 +1,90 @@
-@comment $NetBSD: PLIST,v 1.4 2002/04/01 15:09:44 dmcmahill Exp $
-bin/${SWIPL}
+@comment $NetBSD: PLIST,v 1.5 2002/05/03 21:31:02 jtb Exp $
 bin/plld
 bin/plrc
+bin/swi-prolog
 include/SWI-Prolog.h
 include/SWI-Stream.h
-lib/${SWILIBDIR}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/${SWIPL}
-lib/${SWILIBDIR}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plld
-lib/${SWILIBDIR}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plrc
-lib/${SWILIBDIR}/bin/swipl
-lib/${SWILIBDIR}/boot/apply.pl
-lib/${SWILIBDIR}/boot/autoload.pl
-lib/${SWILIBDIR}/boot/bags.pl
-lib/${SWILIBDIR}/boot/dwim.pl
-lib/${SWILIBDIR}/boot/history.pl
-lib/${SWILIBDIR}/boot/init.pl
-lib/${SWILIBDIR}/boot/list.pl
-lib/${SWILIBDIR}/boot/load.pl
-lib/${SWILIBDIR}/boot/make.pl
-lib/${SWILIBDIR}/boot/messages.pl
-lib/${SWILIBDIR}/boot/parms.pl
-lib/${SWILIBDIR}/boot/profile.pl
-lib/${SWILIBDIR}/boot/qlf.pl
-lib/${SWILIBDIR}/boot/rc.pl
-lib/${SWILIBDIR}/boot/sort.pl
-lib/${SWILIBDIR}/boot/syspred.pl
-lib/${SWILIBDIR}/boot/toplevel.pl
-lib/${SWILIBDIR}/boot/topvars.pl
-lib/${SWILIBDIR}/boot/writef.pl
-lib/${SWILIBDIR}/boot${BITS}.prc
-lib/${SWILIBDIR}/include/SWI-Prolog.h
-lib/${SWILIBDIR}/include/SWI-Stream.h
-lib/${SWILIBDIR}/include/stub.c
-lib/${SWILIBDIR}/library/INDEX.pl
-lib/${SWILIBDIR}/library/MANUAL
-lib/${SWILIBDIR}/library/am_match.pl
-lib/${SWILIBDIR}/library/backcomp.pl
-lib/${SWILIBDIR}/library/bim.pl
-lib/${SWILIBDIR}/library/check.pl
-lib/${SWILIBDIR}/library/ctypes.pl
-lib/${SWILIBDIR}/library/edinburgh.pl
-lib/${SWILIBDIR}/library/edit.pl
-lib/${SWILIBDIR}/library/emacs_interface.pl
-lib/${SWILIBDIR}/library/explain.pl
-lib/${SWILIBDIR}/library/files.pl
-lib/${SWILIBDIR}/library/gensym.pl
-lib/${SWILIBDIR}/library/help.pl
-lib/${SWILIBDIR}/library/helpidx.pl
-lib/${SWILIBDIR}/library/listing.pl
-lib/${SWILIBDIR}/library/netscape.pl
-lib/${SWILIBDIR}/library/occurs.pl
-lib/${SWILIBDIR}/library/ordsets.pl
-lib/${SWILIBDIR}/library/oset.pl
-lib/${SWILIBDIR}/library/qpforeign.pl
-lib/${SWILIBDIR}/library/qsave.pl
-lib/${SWILIBDIR}/library/quintus.pl
-lib/${SWILIBDIR}/library/readln.pl
-lib/${SWILIBDIR}/library/readutil.pl
-lib/${SWILIBDIR}/library/shell.pl
-lib/${SWILIBDIR}/library/shlib.pl
-lib/${SWILIBDIR}/library/statistics.pl
-lib/${SWILIBDIR}/library/system.pl
-lib/${SWILIBDIR}/library/threadutil.pl
-lib/${SWILIBDIR}/library/tty.pl
-lib/${SWILIBDIR}/library/url.pl
-lib/${SWILIBDIR}/man/${SWIPL}.1
-lib/${SWILIBDIR}/man/plld.1
-lib/${SWILIBDIR}/man/plrc.1
-lib/${SWILIBDIR}/man/readline.3
-lib/${SWILIBDIR}/runtime/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/libpl.a
-lib/${SWILIBDIR}/swipl
-man/man1/${SWIPL}.1
+lib/${PKGNAME}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plld
+lib/${PKGNAME}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plrc
+lib/${PKGNAME}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/swi-prolog
+lib/${PKGNAME}/bin/swipl
+lib/${PKGNAME}/boot/apply.pl
+lib/${PKGNAME}/boot/autoload.pl
+lib/${PKGNAME}/boot/bags.pl
+lib/${PKGNAME}/boot/dwim.pl
+lib/${PKGNAME}/boot/history.pl
+lib/${PKGNAME}/boot/init.pl
+lib/${PKGNAME}/boot/license.pl
+lib/${PKGNAME}/boot/list.pl
+lib/${PKGNAME}/boot/load.pl
+lib/${PKGNAME}/boot/make.pl
+lib/${PKGNAME}/boot/menu.pl
+lib/${PKGNAME}/boot/messages.pl
+lib/${PKGNAME}/boot/parms.pl
+lib/${PKGNAME}/boot/profile.pl
+lib/${PKGNAME}/boot/qlf.pl
+lib/${PKGNAME}/boot/rc.pl
+lib/${PKGNAME}/boot/sort.pl
+lib/${PKGNAME}/boot/syspred.pl
+lib/${PKGNAME}/boot/toplevel.pl
+lib/${PKGNAME}/boot/topvars.pl
+lib/${PKGNAME}/boot/writef.pl
+lib/${PKGNAME}/boot${BITS}.prc
+lib/${PKGNAME}/dotfiles/README
+lib/${PKGNAME}/dotfiles/dotplrc
+lib/${PKGNAME}/dotfiles/dotxpcerc
+lib/${PKGNAME}/dotfiles/edit
+lib/${PKGNAME}/include/SWI-Prolog.h
+lib/${PKGNAME}/include/SWI-Stream.h
+lib/${PKGNAME}/include/stub.c
+lib/${PKGNAME}/library/INDEX.pl
+lib/${PKGNAME}/library/MANUAL
+lib/${PKGNAME}/library/am_match.pl
+lib/${PKGNAME}/library/backcomp.pl
+lib/${PKGNAME}/library/bim.pl
+lib/${PKGNAME}/library/check.pl
+lib/${PKGNAME}/library/ctypes.pl
+lib/${PKGNAME}/library/edinburgh.pl
+lib/${PKGNAME}/library/edit.pl
+lib/${PKGNAME}/library/emacs_interface.pl
+lib/${PKGNAME}/library/explain.pl
+lib/${PKGNAME}/library/files.pl
+lib/${PKGNAME}/library/gensym.pl
+lib/${PKGNAME}/library/help.pl
+lib/${PKGNAME}/library/helpidx.pl
+lib/${PKGNAME}/library/listing.pl
+lib/${PKGNAME}/library/main.pl
+lib/${PKGNAME}/library/netscape.pl
+lib/${PKGNAME}/library/occurs.pl
+lib/${PKGNAME}/library/ordsets.pl
+lib/${PKGNAME}/library/oset.pl
+lib/${PKGNAME}/library/qpforeign.pl
+lib/${PKGNAME}/library/qsave.pl
+lib/${PKGNAME}/library/quintus.pl
+lib/${PKGNAME}/library/readln.pl
+lib/${PKGNAME}/library/readutil.pl
+lib/${PKGNAME}/library/shell.pl
+lib/${PKGNAME}/library/shlib.pl
+lib/${PKGNAME}/library/statistics.pl
+lib/${PKGNAME}/library/system.pl
+lib/${PKGNAME}/library/threadutil.pl
+lib/${PKGNAME}/library/tty.pl
+lib/${PKGNAME}/library/url.pl
+lib/${PKGNAME}/runtime/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/libpl.a
+lib/${PKGNAME}/swipl
 man/man1/plld.1
 man/man1/plrc.1
+man/man1/swi-prolog.1
 @dirrm lib/${SWILIBDIR}/runtime/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
 @dirrm lib/${SWILIBDIR}/runtime
+@exec ${MKDIR} %D/lib/${SWILIBDIR}/man
 @dirrm lib/${SWILIBDIR}/man
 @dirrm lib/${SWILIBDIR}/library
-@exec ${MKDIR} -p /usr/pkg/lib/${SWILIBDIR}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
+@exec ${MKDIR} %D/lib/${SWILIBDIR}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
 @dirrm lib/${SWILIBDIR}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
 @dirrm lib/${SWILIBDIR}/lib
 @dirrm lib/${SWILIBDIR}/include
+@dirrm lib/${SWILIBDIR}/dotfiles
 @dirrm lib/${SWILIBDIR}/boot
 @dirrm lib/${SWILIBDIR}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
 @dirrm lib/${SWILIBDIR}/bin
diff --git a/lang/swi-prolog/distinfo b/lang/swi-prolog/distinfo
index 6dc6a867544..0fc940ed3b8 100644
--- a/lang/swi-prolog/distinfo
+++ b/lang/swi-prolog/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/07/15 12:27:38 jtb Exp $
+$NetBSD: distinfo,v 1.7 2002/05/03 21:31:02 jtb Exp $
 
-SHA1 (swi-prolog/pl-lite-4.0.9.tar.gz) = 219dc6a5b4951f7fecbce9da0d230babec848764
-Size (swi-prolog/pl-lite-4.0.9.tar.gz) = 1156825 bytes
-SHA1 (patch-aa) = 7524e0f2fcbab84554bb622e5f1795816659668a
-SHA1 (patch-ab) = c984f4d61b8c939aa9559f27020be5357d8c3e11
+SHA1 (swi-prolog/pl-lite-5.0.5.tar.gz) = ac7c0240fa153d4b7d8067131de4354afa2785e6
+Size (swi-prolog/pl-lite-5.0.5.tar.gz) = 1350527 bytes
+SHA1 (patch-aa) = 2b6164ed8cc4398c1e7cc2662016e202f61e51f2
+SHA1 (patch-ab) = 66576bfd1c48a9501070308b8925f1cf4ff0bb37
diff --git a/lang/swi-prolog/patches/patch-aa b/lang/swi-prolog/patches/patch-aa
index 459e8f4d04d..7e1a0132f19 100644
--- a/lang/swi-prolog/patches/patch-aa
+++ b/lang/swi-prolog/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2001/06/17 14:32:28 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2002/05/03 21:31:02 jtb Exp $
 
---- src/Makefile.in.orig	Tue May 22 20:54:34 2001
-+++ src/Makefile.in
-@@ -69,8 +69,9 @@
+--- src/Makefile.in.orig	Tue Apr  9 20:09:31 2002
++++ src/Makefile.in	Wed May  1 19:41:34 2002
+@@ -63,6 +63,7 @@
+ ARCH=@ARCH@
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
+ INSTALL_DATA=@INSTALL_DATA@
+ MKDIR=@MKDIR@
+ REL_LN=$(srcdir)/rel-ln
+@@ -71,8 +72,9 @@
  CWFLAGS=@CWFLAGS@
  CIFLAGS=@CIFLAGS@
  CMFLAGS=@CMFLAGS@
@@ -13,8 +21,8 @@ $NetBSD: patch-aa,v 1.3 2001/06/17 14:32:28 jtb Exp $
  
  PLFOREIGN=@PLFOREIGN@
  
-@@ -133,7 +134,7 @@
- 	swipl swiplbin
+@@ -135,7 +137,7 @@
+ 	plld
  
  .c.o:
 -	$(CC) -c -I. -I$(srcdir) -I$(srcdir)/rc $(CFLAGS) $< @COUTOPT@
@@ -22,7 +30,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/17 14:32:28 jtb Exp $
  
  system:		$(PL)
  startup:	$(STARTUPPATH)
-@@ -223,7 +224,7 @@
+@@ -242,7 +244,7 @@
  		ar x `$(CC) -print-libgcc-file-name` $@
  
  plld:		$(srcdir)/plld.c
@@ -31,3 +39,12 @@ $NetBSD: patch-aa,v 1.3 2001/06/17 14:32:28 jtb Exp $
  
  tags:		$(srcdir)/TAGS
  
+@@ -322,7 +324,7 @@
+ 		$(INSTALL_DATA) ../dotfiles/dotplrc $(PLBASE)/dotfiles
+ 		$(INSTALL_DATA) ../dotfiles/dotxpcerc $(PLBASE)/dotfiles
+ 		$(INSTALL_DATA) ../dotfiles/README $(PLBASE)/dotfiles
+-		$(INSTALL_PROGRAM) ../dotfiles/edit $(PLBASE)/dotfiles
++		$(INSTALL_SCRIPT) ../dotfiles/edit $(PLBASE)/dotfiles
+ 
+ iinclude::
+ 		cd ../include; \
diff --git a/lang/swi-prolog/patches/patch-ab b/lang/swi-prolog/patches/patch-ab
index faf82938184..8fb29135781 100644
--- a/lang/swi-prolog/patches/patch-ab
+++ b/lang/swi-prolog/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2001/07/15 12:27:38 jtb Exp $
+$NetBSD: patch-ab,v 1.8 2002/05/03 21:31:02 jtb Exp $
 
---- src/configure.orig	Sat Jul 14 22:41:44 2001
-+++ src/configure
-@@ -569,7 +569,6 @@
+--- src/configure.orig	Tue Apr 16 10:03:45 2002
++++ src/configure	Wed May  1 19:21:58 2002
+@@ -978,7 +978,7 @@
  EXTRAOBJ=""
  EXTRAHDR=""
  INSTALLTARGET=dv-install
 -PL=pl
++#PL=pl
  PLLIB=libpl.a
  RT=""
  PLVERSION=`cat ../VERSION`