Upgrade to 5.0.10.

This port requires further work, as this just installs the pl-lite at the
moment.  Other packages, such as XPCE are not installed for now.

5 files changed, 43 insertions, 38 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 7e2060236201..5e35eb11305e 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -6,27 +6,23 @@
 #
 
 PORTNAME=	swi-pl
-PORTVERSION=	3.4.4
+PORTVERSION=	5.0.10
 CATEGORIES=	lang
-MASTER_SITES=	ftp://swi.psy.uva.nl/pub/SWI-Prolog/
+MASTER_SITES=	ftp://ftp.swi.psy.uva.nl/pub/SWI-Prolog/
 DISTNAME=	pl-${PORTVERSION}
 
 MAINTAINER=	max@FreeBSD.org
 
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--host=${ARCH}-${OS}
+CONFIGURE_ARGS=	--host=${MACHINE_ARCH}-${OPSYS:L}
 STRIP=
-MAKE_FLAGS+=	CIFLAGS=-DRTLD_LAZY -f
 MAN1=		pl.1 plrc.1 plld.1
-PLIST_SUB=	DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OS}
-
-OS!=	uname -s | tr '[:upper:]' '[:lower:]'
+PLIST_SUB=	DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OPSYS:L}
 
 post-install:
 .for f in pl plld plrc
-	@/usr/bin/strip ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-${OS}/$f
+	@${STRIP_CMD} ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-${OPSYS:L}/$f
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo
index b815e0cf5eaa..fb6c4aace7b7 100644
--- a/lang/swi-pl/distinfo
+++ b/lang/swi-pl/distinfo
@@ -1 +1 @@
-MD5 (pl-3.4.4.tar.gz) = e98378b54c80981dc1ffd4fb37ad9c99
+MD5 (pl-5.0.10.tar.gz) = fcb714e9706ce9d03eeb5875226ef09d
diff --git a/lang/swi-pl/files/patch-aa b/lang/swi-pl/files/patch-aa
index 5faa1d455bca..5f90640c0ddb 100644
--- a/lang/swi-pl/files/patch-aa
+++ b/lang/swi-pl/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Nov 10 00:19:19 2000
-+++ Makefile.in	Tue Jan  2 06:58:30 2001
-@@ -68,7 +68,7 @@
+--- src/Makefile.in.orig	Wed Apr 10 04:09:31 2002
++++ src/Makefile.in	Mon Nov 18 17:27:20 2002
+@@ -71,7 +71,7 @@
  CWFLAGS=@CWFLAGS@
  CIFLAGS=@CIFLAGS@
  CMFLAGS=@CMFLAGS@
@@ -9,17 +9,8 @@
  LDFLAGS=@LDFLAGS@
  
  PLFOREIGN=@PLFOREIGN@
-@@ -318,7 +318,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)
-@@ -326,10 +326,11 @@
- 		-$(INSTALL_DATA) $(plmandir)/plld.$(mansec) $(mandir)
+@@ -344,16 +344,17 @@
+ 		-$(INSTALL_DATA) $(srcdir)/plld.1 $(smandir)/plld.$(mansec)
  
  install_rlman:
 -		-if [ ! -d $(lmandir) ]; then $(MKDIR) $(lmandir); fi
@@ -32,5 +23,12 @@
 +#		  $(INSTALL_DATA) $(srcdir)/readline.3 $(lmandir)/readline.$(lmansec); \
 +#		fi
  
+ install-lman::
+ 		$(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)
+ 
  #
  # runtime-only environment installation
diff --git a/lang/swi-pl/pkg-descr b/lang/swi-pl/pkg-descr
index 026b496b3bb0..3d2c1bf96b86 100644
--- a/lang/swi-pl/pkg-descr
+++ b/lang/swi-pl/pkg-descr
@@ -2,3 +2,5 @@ Edinburgh-style Prolog compiler including modules, autoload,
 libraries, Garbage-collector, stack-expandor, C-interface,
 GNU-readline and GNU-Emacs interface, very fast compiler,
 X11 interface using XPCE (info: ftp swi.psy.uva.nl:/pub/xpce).
+
+WWW: http://www.swi-pl.org/
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index 2c3deac70ea0..04577cc50f5c 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -2,21 +2,22 @@ bin/pl
 bin/plld
 bin/plrc
 include/SWI-Prolog.h
+include/SWI-Stream.h
 lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/pl
 lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/plld
 lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/plrc
 lib/%%DISTNAME%%/bin/swipl
-lib/%%DISTNAME%%/boot32.prc
 lib/%%DISTNAME%%/boot/apply.pl
 lib/%%DISTNAME%%/boot/autoload.pl
 lib/%%DISTNAME%%/boot/bags.pl
 lib/%%DISTNAME%%/boot/dwim.pl
 lib/%%DISTNAME%%/boot/history.pl
 lib/%%DISTNAME%%/boot/init.pl
+lib/%%DISTNAME%%/boot/license.pl
 lib/%%DISTNAME%%/boot/list.pl
-lib/%%DISTNAME%%/boot/listing.pl
 lib/%%DISTNAME%%/boot/load.pl
 lib/%%DISTNAME%%/boot/make.pl
+lib/%%DISTNAME%%/boot/menu.pl
 lib/%%DISTNAME%%/boot/messages.pl
 lib/%%DISTNAME%%/boot/parms.pl
 lib/%%DISTNAME%%/boot/profile.pl
@@ -27,7 +28,11 @@ lib/%%DISTNAME%%/boot/syspred.pl
 lib/%%DISTNAME%%/boot/toplevel.pl
 lib/%%DISTNAME%%/boot/topvars.pl
 lib/%%DISTNAME%%/boot/writef.pl
-lib/%%DISTNAME%%/include/SWI-Exports
+lib/%%DISTNAME%%/boot32.prc
+lib/%%DISTNAME%%/dotfiles/README
+lib/%%DISTNAME%%/dotfiles/dotplrc
+lib/%%DISTNAME%%/dotfiles/dotxpcerc
+lib/%%DISTNAME%%/dotfiles/edit
 lib/%%DISTNAME%%/include/SWI-Prolog.h
 lib/%%DISTNAME%%/include/SWI-Stream.h
 lib/%%DISTNAME%%/include/stub.c
@@ -46,11 +51,17 @@ lib/%%DISTNAME%%/library/files.pl
 lib/%%DISTNAME%%/library/gensym.pl
 lib/%%DISTNAME%%/library/help.pl
 lib/%%DISTNAME%%/library/helpidx.pl
+lib/%%DISTNAME%%/library/listing.pl
+lib/%%DISTNAME%%/library/main.pl
 lib/%%DISTNAME%%/library/netscape.pl
+lib/%%DISTNAME%%/library/occurs.pl
+lib/%%DISTNAME%%/library/ordsets.pl
 lib/%%DISTNAME%%/library/oset.pl
+lib/%%DISTNAME%%/library/qpforeign.pl
 lib/%%DISTNAME%%/library/qsave.pl
 lib/%%DISTNAME%%/library/quintus.pl
 lib/%%DISTNAME%%/library/readln.pl
+lib/%%DISTNAME%%/library/readutil.pl
 lib/%%DISTNAME%%/library/shell.pl
 lib/%%DISTNAME%%/library/shlib.pl
 lib/%%DISTNAME%%/library/statistics.pl
@@ -58,19 +69,17 @@ lib/%%DISTNAME%%/library/system.pl
 lib/%%DISTNAME%%/library/threadutil.pl
 lib/%%DISTNAME%%/library/tty.pl
 lib/%%DISTNAME%%/library/url.pl
-lib/%%DISTNAME%%/man/pl.1
-lib/%%DISTNAME%%/man/plld.1
-lib/%%DISTNAME%%/man/plrc.1
 lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%/libpl.a
 lib/%%DISTNAME%%/swipl
-@dirrm lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%
-@dirrm lib/%%DISTNAME%%/bin
-@dirrm lib/%%DISTNAME%%/boot
-@dirrm lib/%%DISTNAME%%/include
-@dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
-@dirrm lib/%%DISTNAME%%/lib
-@dirrm lib/%%DISTNAME%%/library
-@dirrm lib/%%DISTNAME%%/man
 @dirrm lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/runtime
+@dirrm lib/%%DISTNAME%%/man
+@dirrm lib/%%DISTNAME%%/library
+@dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
+@dirrm lib/%%DISTNAME%%/lib
+@dirrm lib/%%DISTNAME%%/include
+@dirrm lib/%%DISTNAME%%/dotfiles
+@dirrm lib/%%DISTNAME%%/boot
+@dirrm lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%
+@dirrm lib/%%DISTNAME%%/bin
 @dirrm lib/%%DISTNAME%%