Update to 5.6.2

Mark as IGNORE < 500100. Require some C99 functions.

PR:		91936
Submitted by:	Gerhard Gonter <g.gonter@ieee.org> (maintainer)

7 files changed, 60 insertions, 61 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 210c00118345..ab4a321bd9fc 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	swi-pl
-PORTVERSION=	5.4.7
+PORTVERSION=	5.6.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.swi.psy.uva.nl/SWI-Prolog/ \
 		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/
@@ -15,23 +15,25 @@ DISTNAME=	pl-${PORTVERSION}
 MAINTAINER=	g.gonter@ieee.org
 COMMENT=	Edinburgh-style Prolog compiler
 
-LIB_DEPENDS=	readline.5:${PORTSDIR}/devel/readline
-
 CONFLICTS=	slffea-[0-9]* TenDRA-[0-9]*
-NOPRECIOUSMAKEVARS=yes
+
+NOPRECIOUSMAKEVARS=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-# Find libreadline from ports:
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--host=${MACHINE_ARCH}-${OPSYS:L} --disable-mt
+
 MAN1=		pl.1 plrc.1 plld.1
+
 PLIST_SUB=	DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OPSYS:L}
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500100
+IGNORE=		doesn't support FreeBSD < 5.0. Require some C99 functions
+.endif
+
 .if (${ARCH} == "i386")
 PLIST_SUB+=	BITS=32
 .else
@@ -57,7 +59,7 @@ post-install:
 .for f in pl plld plrc
 	@${STRIP_CMD} ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-${OPSYS:L}/$f
 .endfor
-	# swi-pl creates this empty directory
+# swi-pl creates this empty directory
 	${RMDIR} ${PREFIX}/lib/${DISTNAME}/man
 
 .include <bsd.port.post.mk>
diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo
index 0109a67e9b51..f8083da84e4d 100644
--- a/lang/swi-pl/distinfo
+++ b/lang/swi-pl/distinfo
@@ -1,2 +1,3 @@
-MD5 (pl-5.4.7.tar.gz) = 5c57c9a752bd3c6f56e4ae506ab23726
-SIZE (pl-5.4.7.tar.gz) = 8166348
+MD5 (pl-5.6.2.tar.gz) = 388db0ca35f3e204e4583757d2f8fd1b
+SHA256 (pl-5.6.2.tar.gz) = 51a07677ca2aae1c29128b71c99413f3191c6e17b93be9fe45a747134c9606bd
+SIZE (pl-5.6.2.tar.gz) = 8643555
diff --git a/lang/swi-pl/files/extra-patch-src-Makefile-in b/lang/swi-pl/files/extra-patch-src-Makefile-in
index e033a092c776..b6e817879427 100644
--- a/lang/swi-pl/files/extra-patch-src-Makefile-in
+++ b/lang/swi-pl/files/extra-patch-src-Makefile-in
@@ -1,10 +1,10 @@
---- src/Makefile.in.orig	Sat Jan 29 21:27:47 2005
-+++ src/Makefile.in	Sat Jan 29 21:27:57 2005
-@@ -310,7 +310,6 @@
+--- src/Makefile.in.orig	Wed Jan 18 15:40:30 2006
++++ src/Makefile.in	Wed Jan 18 15:40:46 2006
+@@ -325,7 +325,6 @@
  
  iruntime::
- 		$(INSTALL_DATA) $(RUNTIME) $(PLBASE)/lib/$(ARCH)
--		$(RANLIB) $(PLBASE)/lib/$(ARCH)/$(PLLIB)
- 		if [ -f $(RUNTIMEDIR)/$(SHAREDV) ]; then \
- 		  $(INSTALL_DATA) $(RUNTIMEDIR)/$(SHAREDV) $(PLBASE)/lib/$(ARCH) ; \
- 		( cd $(PLBASE)/lib/$(ARCH) && rm -f $(SHARED) && ln -s $(SHAREDV) $(SHARED) ) ; \
+ 		$(INSTALL_DATA) $(RUNTIME) $(DESTDIR)$(PLBASE)/lib/$(ARCH)
+-		$(RANLIB) $(DESTDIR)$(PLBASE)/lib/$(ARCH)/$(PLLIB)
+ ifeq ($(SOEXT),dylib)
+ 		if [ -f $(RUNTIMEDIR)/$(SHARED) ]; then \
+ 		  $(INSTALL_DATA) $(RUNTIMEDIR)/$(SHARED) $(DESTDIR)$(PLBASE)/lib/$(ARCH) ; \
diff --git a/lang/swi-pl/files/extra-patch-src-configure b/lang/swi-pl/files/extra-patch-src-configure
index b014c3e76292..f4ca37025e03 100644
--- a/lang/swi-pl/files/extra-patch-src-configure
+++ b/lang/swi-pl/files/extra-patch-src-configure
@@ -1,13 +1,13 @@
---- src/configure.orig	Sat Oct  9 11:58:20 2004
-+++ src/configure	Sat Oct  9 11:58:45 2004
-@@ -3533,8 +3533,8 @@
- fi
- 
- if test "$GCC" = "yes"; then
--    COFLAGS="-O3 -fno-strict-aliasing"
--    LDFLAGS="$LDFLAGS -O3"
-+    COFLAGS="-O -fno-strict-aliasing"
-+    LDFLAGS="$LDFLAGS -O"
-     if test "$ac_cv_header_stdc" = "yes" ; then
-         CWFLAGS=-Wall
-     else
+--- src/configure.orig	Wed Jan 18 15:39:00 2006
++++ src/configure	Wed Jan 18 15:39:12 2006
+@@ -3778,8 +3778,8 @@
+ fi;
+ if test "x$custom_flags" = "xyes" ; then
+ 	if test "$GCC" = "yes"; then
+-		COFLAGS="-O3 -fno-strict-aliasing"
+-		LDFLAGS="$LDFLAGS -O3"
++		COFLAGS="-O -fno-strict-aliasing"
++		LDFLAGS="$LDFLAGS -O"
+ 		if test "$ac_cv_header_stdc" = "yes" ; then
+ 			CWFLAGS=-Wall
+ 		else
diff --git a/lang/swi-pl/files/patch-aa b/lang/swi-pl/files/patch-aa
index f1b57f75de28..3346d94a6197 100644
--- a/lang/swi-pl/files/patch-aa
+++ b/lang/swi-pl/files/patch-aa
@@ -1,20 +1,11 @@
---- src/Makefile.in.orig	Sat Oct  9 11:55:26 2004
-+++ src/Makefile.in	Sat Oct  9 11:56:32 2004
-@@ -70,7 +70,7 @@
- CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	@CFLAGS@ $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
- LDFLAGS=@LDFLAGS@
- 
- PLFOREIGN=@PLFOREIGN@
-@@ -374,7 +374,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)
+--- src/Makefile.in.orig	Wed Jan 18 03:52:30 2006
++++ src/Makefile.in	Wed Jan 18 03:53:11 2006
+@@ -405,7 +405,7 @@
+ 		$(INSTALL_DATA) pl.1 $(DESTDIR)$(plmandir)/$(PL).$(mansec)
+ 		$(INSTALL_DATA) $(srcdir)/plrc.1 $(DESTDIR)$(plmandir)/plrc.$(mansec)
+ 		$(INSTALL_DATA) $(srcdir)/plld.1 $(DESTDIR)$(plmandir)/plld.$(mansec)
+-		$(INSTALL_DATA) $(srcdir)/readline.3 $(DESTDIR)$(plmandir)/readline.$(lmansec)
++# in base or ports: $(INSTALL_DATA) $(srcdir)/readline.3 $(DESTDIR)$(plmandir)/readline.$(lmansec)
  
  #
  # runtime-only environment installation
diff --git a/lang/swi-pl/pkg-descr b/lang/swi-pl/pkg-descr
index a3dee499715c..d8a5bcdf4e19 100644
--- a/lang/swi-pl/pkg-descr
+++ b/lang/swi-pl/pkg-descr
@@ -1,6 +1,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).
+GNU-readline and GNU-Emacs interface, very fast compiler.
 
 WWW: http://www.swi-prolog.org/
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index 8b0ef5dbf09b..d7bb1a3641f1 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -1,8 +1,6 @@
 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
@@ -35,23 +33,22 @@ lib/%%DISTNAME%%/include/SWI-Prolog.h
 lib/%%DISTNAME%%/include/SWI-Stream.h
 lib/%%DISTNAME%%/include/stub.c
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/libpl.a
-lib/%%DISTNAME%%/library/clp/bounds.pl
-lib/%%DISTNAME%%/library/option.pl
-lib/%%DISTNAME%%/library/assoc.pl
-lib/%%DISTNAME%%/library/dif.pl
-lib/%%DISTNAME%%/library/when.pl
-lib/%%DISTNAME%%/library/operators.pl
-lib/%%DISTNAME%%/library/prolog_stack.pl
 lib/%%DISTNAME%%/library/INDEX.pl
 lib/%%DISTNAME%%/library/MANUAL
 lib/%%DISTNAME%%/library/am_match.pl
+lib/%%DISTNAME%%/library/assoc.pl
 lib/%%DISTNAME%%/library/backcomp.pl
 lib/%%DISTNAME%%/library/bim.pl
 lib/%%DISTNAME%%/library/check.pl
-lib/%%DISTNAME%%/library/checkselect.pl
 lib/%%DISTNAME%%/library/checklast.pl
+lib/%%DISTNAME%%/library/checkselect.pl
+lib/%%DISTNAME%%/library/clp/bounds.pl
+lib/%%DISTNAME%%/library/clp/clp_distinct.pl
+lib/%%DISTNAME%%/library/clp/clp_events.pl
+lib/%%DISTNAME%%/library/clp/simplex.pl
 lib/%%DISTNAME%%/library/ctypes.pl
 lib/%%DISTNAME%%/library/debug.pl
+lib/%%DISTNAME%%/library/dif.pl
 lib/%%DISTNAME%%/library/edinburgh.pl
 lib/%%DISTNAME%%/library/edit.pl
 lib/%%DISTNAME%%/library/emacs_interface.pl
@@ -64,10 +61,15 @@ lib/%%DISTNAME%%/library/listing.pl
 lib/%%DISTNAME%%/library/lists.pl
 lib/%%DISTNAME%%/library/main.pl
 lib/%%DISTNAME%%/library/make.pl
+lib/%%DISTNAME%%/library/nb_set.pl
 lib/%%DISTNAME%%/library/netscape.pl
 lib/%%DISTNAME%%/library/occurs.pl
+lib/%%DISTNAME%%/library/operators.pl
+lib/%%DISTNAME%%/library/option.pl
 lib/%%DISTNAME%%/library/ordsets.pl
 lib/%%DISTNAME%%/library/oset.pl
+lib/%%DISTNAME%%/library/prolog_clause.pl
+lib/%%DISTNAME%%/library/prolog_stack.pl
 lib/%%DISTNAME%%/library/qpforeign.pl
 lib/%%DISTNAME%%/library/qsave.pl
 lib/%%DISTNAME%%/library/quintus.pl
@@ -79,9 +81,13 @@ lib/%%DISTNAME%%/library/statistics.pl
 lib/%%DISTNAME%%/library/system.pl
 lib/%%DISTNAME%%/library/threadutil.pl
 lib/%%DISTNAME%%/library/tty.pl
+lib/%%DISTNAME%%/library/unicode/blocks.pl
+lib/%%DISTNAME%%/library/unicode/unicode_data.pl
 lib/%%DISTNAME%%/library/url.pl
+lib/%%DISTNAME%%/library/when.pl
 lib/%%DISTNAME%%/swipl
 @dirrm lib/%%DISTNAME%%/library/clp
+@dirrm lib/%%DISTNAME%%/library/unicode
 @dirrm lib/%%DISTNAME%%/library
 @dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/lib