5 files changed, 54 insertions, 40 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index f9cf3d826823..7cfa29198725 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	swi-pl
-PORTVERSION=	5.6.64
-PORTREVISION=	2
+PORTVERSION=	5.8.3
 CATEGORIES=	lang
-MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/ \
-		ftp://ftp.swi.psy.uva.nl/SWI-Prolog/
+MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/
 DISTNAME=	pl-${PORTVERSION}
 
 MAINTAINER=	g.gonter@ieee.org
@@ -30,7 +28,7 @@ CONFLICTS=	slffea-[0-9]* TenDRA-[0-9]*
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-XPCE_VER=	6.6.64
+XPCE_VER=	6.6.66
 
 MAN1=		pl.1 plrc.1 plld.1 xpce-client.1 xpce.1
 MANCOMPRESSED=	no
diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo
index d5e1d6f8e211..1f3102249841 100644
--- a/lang/swi-pl/distinfo
+++ b/lang/swi-pl/distinfo
@@ -1,3 +1,3 @@
-MD5 (pl-5.6.64.tar.gz) = 2f06f64007fdac076a277ee4a8c53274
-SHA256 (pl-5.6.64.tar.gz) = b0e70c3c02b7753ed440359746e7729d21c93e42689c1f0f32b148167b1b2c66
-SIZE (pl-5.6.64.tar.gz) = 12019903
+MD5 (pl-5.8.3.tar.gz) = faeb7ade8da9832f113e6748ba6cab03
+SHA256 (pl-5.8.3.tar.gz) = 0e7e523f0d83f39a9cf8bb128a776767b48318047894e08168172fcae532fc83
+SIZE (pl-5.8.3.tar.gz) = 12954831
diff --git a/lang/swi-pl/files/patch-configure b/lang/swi-pl/files/patch-configure
new file mode 100644
index 000000000000..1efad262e6ff
--- /dev/null
+++ b/lang/swi-pl/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2010-01-10 15:33:00.000000000 +0100
++++ configure	2010-03-16 22:33:27.000000000 +0100
+@@ -39,10 +39,6 @@
+     --with-world)	TARGET=world
+ 			shift
+ 			;;
+-    --without-*)	pkg=`echo $1 | sed 's/--without-//'`
+-			DISABLE_PKGS="$DISABLE_PKGS $pkg"
+-			shift
+-			;;
+     --link)		TARGET="ln-$TARGET"
+ 			shift
+ 			;;
diff --git a/lang/swi-pl/files/patch-src_mkvmi.c b/lang/swi-pl/files/patch-src_mkvmi.c
deleted file mode 100644
index d0a5030eb32e..000000000000
--- a/lang/swi-pl/files/patch-src_mkvmi.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/mkvmi.c.orig	2009-01-23 13:50:02.000000000 -0500
-+++ src/mkvmi.c	2009-04-30 16:30:34.948715970 -0400
-@@ -31,6 +31,9 @@
- #else
- #include <unistd.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <osreldate.h>
-+#endif
- 
- /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- This program creates pl-codetable.c, pl-jumptable.ic   and pl-vmi.h from
-@@ -97,7 +100,7 @@
-   return NULL;
- }
- 
--
-+#if (__FreeBSD_version >= 800000 && __FreeBSD_version <= 800057) || __FreeBSD_version < 701101
- static char *
- strndup(const char *in, size_t len)
- { char *s = malloc(len+1);
-@@ -107,6 +110,7 @@
- 
-   return s;
- }
-+#endif
- 
- 
- static int
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index 1e2cce8f21e4..568d47117ae3 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -13,7 +13,9 @@ lib/%%DISTNAME%%/boot/apply.pl
 lib/%%DISTNAME%%/boot/attvar.pl
 lib/%%DISTNAME%%/boot/autoload.pl
 lib/%%DISTNAME%%/boot/bags.pl
+lib/%%DISTNAME%%/boot/dcg.pl
 lib/%%DISTNAME%%/boot/dwim.pl
+lib/%%DISTNAME%%/boot/expand.pl
 lib/%%DISTNAME%%/boot/history.pl
 lib/%%DISTNAME%%/boot/init.pl
 lib/%%DISTNAME%%/boot/license.pl
@@ -72,6 +74,8 @@ lib/%%DISTNAME%%/doc/Manual/consulting.html
 lib/%%DISTNAME%%/doc/Manual/contrib.html
 lib/%%DISTNAME%%/doc/Manual/control.html
 lib/%%DISTNAME%%/doc/Manual/coroutining.html
+lib/%%DISTNAME%%/doc/Manual/csv.html
+lib/%%DISTNAME%%/doc/Manual/ctxmodule.html
 lib/%%DISTNAME%%/doc/Manual/cyclic.html
 lib/%%DISTNAME%%/doc/Manual/db.html
 lib/%%DISTNAME%%/doc/Manual/debug.html
@@ -106,6 +110,7 @@ lib/%%DISTNAME%%/doc/Manual/foreignthread.html
 lib/%%DISTNAME%%/doc/Manual/foreigntypes.html
 lib/%%DISTNAME%%/doc/Manual/foreignxmp.html
 lib/%%DISTNAME%%/doc/Manual/format.html
+lib/%%DISTNAME%%/doc/Manual/funcsummary.html
 lib/%%DISTNAME%%/doc/Manual/gc.html
 lib/%%DISTNAME%%/doc/Manual/gemacs.html
 lib/%%DISTNAME%%/doc/Manual/gensym.html
@@ -121,6 +126,7 @@ lib/%%DISTNAME%%/doc/Manual/hooks.html
 lib/%%DISTNAME%%/doc/Manual/idepreds.html
 lib/%%DISTNAME%%/doc/Manual/idesummary.html
 lib/%%DISTNAME%%/doc/Manual/import.html
+lib/%%DISTNAME%%/doc/Manual/importmodule.html
 lib/%%DISTNAME%%/doc/Manual/index.gif
 lib/%%DISTNAME%%/doc/Manual/index.html
 lib/%%DISTNAME%%/doc/Manual/info.gif
@@ -143,17 +149,23 @@ lib/%%DISTNAME%%/doc/Manual/manipterm.html
 lib/%%DISTNAME%%/doc/Manual/memory.html
 lib/%%DISTNAME%%/doc/Manual/metacall.html
 lib/%%DISTNAME%%/doc/Manual/metainmodule.html
+lib/%%DISTNAME%%/doc/Manual/metapred.html
+lib/%%DISTNAME%%/doc/Manual/miscarith.html
 lib/%%DISTNAME%%/doc/Manual/miscpreds.html
 lib/%%DISTNAME%%/doc/Manual/modulecompat.html
+lib/%%DISTNAME%%/doc/Manual/moduleop.html
 lib/%%DISTNAME%%/doc/Manual/modules.html
 lib/%%DISTNAME%%/doc/Manual/mt-xpce.html
+lib/%%DISTNAME%%/doc/Manual/mtoplevel.html
 lib/%%DISTNAME%%/doc/Manual/mtunbound.html
 lib/%%DISTNAME%%/doc/Manual/navigator.html
 lib/%%DISTNAME%%/doc/Manual/nbset.html
 lib/%%DISTNAME%%/doc/Manual/next.gif
 lib/%%DISTNAME%%/doc/Manual/operators.html
+lib/%%DISTNAME%%/doc/Manual/opsummary.html
 lib/%%DISTNAME%%/doc/Manual/option.html
 lib/%%DISTNAME%%/doc/Manual/ordsets.html
+lib/%%DISTNAME%%/doc/Manual/overrule.html
 lib/%%DISTNAME%%/doc/Manual/overview.html
 lib/%%DISTNAME%%/doc/Manual/pairs.html
 lib/%%DISTNAME%%/doc/Manual/pceemacs.html
@@ -162,6 +174,7 @@ lib/%%DISTNAME%%/doc/Manual/plld.html
 lib/%%DISTNAME%%/doc/Manual/portabilitystrategies.html
 lib/%%DISTNAME%%/doc/Manual/practical.html
 lib/%%DISTNAME%%/doc/Manual/preddesc.html
+lib/%%DISTNAME%%/doc/Manual/predsummary.html
 lib/%%DISTNAME%%/doc/Manual/prev.gif
 lib/%%DISTNAME%%/doc/Manual/profile.html
 lib/%%DISTNAME%%/doc/Manual/profnode.gif
@@ -177,9 +190,12 @@ lib/%%DISTNAME%%/doc/Manual/record.html
 lib/%%DISTNAME%%/doc/Manual/reexport.html
 lib/%%DISTNAME%%/doc/Manual/registry.html
 lib/%%DISTNAME%%/doc/Manual/relnotes.html
+lib/%%DISTNAME%%/doc/Manual/resmodules.html
 lib/%%DISTNAME%%/doc/Manual/runenv.html
 lib/%%DISTNAME%%/doc/Manual/runtime.html
+lib/%%DISTNAME%%/doc/Manual/sec-5.11.html
 lib/%%DISTNAME%%/doc/Manual/sicstus-chr.html
+lib/%%DISTNAME%%/doc/Manual/summary.html
 lib/%%DISTNAME%%/doc/Manual/signal.html
 lib/%%DISTNAME%%/doc/Manual/simplex.html
 lib/%%DISTNAME%%/doc/Manual/softlicense.html
@@ -301,9 +317,12 @@ lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/sgml2pl.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/sha4pl.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/socket.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/ssl4pl.so
+lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/streaminfo.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/table.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/time.so
+lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/turtle.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/unix.so
+lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/uri.so
 lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%/zlib4pl.so
 lib/%%DISTNAME%%/library/DTD/HTML4.dcl
 lib/%%DISTNAME%%/library/DTD/HTML4.dtd
@@ -376,12 +395,14 @@ lib/%%DISTNAME%%/library/clp/clpr/itf_r.pl
 lib/%%DISTNAME%%/library/clp/clpr/nf_r.pl
 lib/%%DISTNAME%%/library/clp/clpr/store_r.pl
 lib/%%DISTNAME%%/library/clp/simplex.pl
-lib/%%DISTNAME%%/library/common/README
 lib/%%DISTNAME%%/library/crypt.pl
+lib/%%DISTNAME%%/library/csv.pl
 lib/%%DISTNAME%%/library/ctypes.pl
 lib/%%DISTNAME%%/library/date.pl
 lib/%%DISTNAME%%/library/debug.pl
 lib/%%DISTNAME%%/library/dialect.pl
+lib/%%DISTNAME%%/library/dialect/ciao.pl
+lib/%%DISTNAME%%/library/dialect/commons.pl
 lib/%%DISTNAME%%/library/dialect/hprolog.pl
 lib/%%DISTNAME%%/library/dialect/iso/iso_predicates.pl
 lib/%%DISTNAME%%/library/dialect/yap.pl
@@ -404,11 +425,13 @@ lib/%%DISTNAME%%/library/helpidx.pl
 lib/%%DISTNAME%%/library/hotfix.pl
 lib/%%DISTNAME%%/library/http/README
 lib/%%DISTNAME%%/library/http/dcg_basics.pl
+lib/%%DISTNAME%%/library/http/html_head.pl
 lib/%%DISTNAME%%/library/http/html_write.pl
 lib/%%DISTNAME%%/library/http/http_authenticate.pl
 lib/%%DISTNAME%%/library/http/http_client.pl
 lib/%%DISTNAME%%/library/http/http_dispatch.pl
 lib/%%DISTNAME%%/library/http/http_error.pl
+lib/%%DISTNAME%%/library/http/http_exception.pl
 lib/%%DISTNAME%%/library/http/http_header.pl
 lib/%%DISTNAME%%/library/http/http_hook.pl
 lib/%%DISTNAME%%/library/http/http_json.pl
@@ -474,6 +497,7 @@ lib/%%DISTNAME%%/library/pldoc/zoomin.gif
 lib/%%DISTNAME%%/library/pldoc/zoomout.gif
 lib/%%DISTNAME%%/library/plunit.pl
 lib/%%DISTNAME%%/library/porter_stem.pl
+lib/%%DISTNAME%%/library/portray_text.pl
 lib/%%DISTNAME%%/library/process.pl
 lib/%%DISTNAME%%/library/prolog_clause.pl
 lib/%%DISTNAME%%/library/prolog_server.pl
@@ -501,15 +525,19 @@ lib/%%DISTNAME%%/library/semweb/dc.rdfs
 lib/%%DISTNAME%%/library/semweb/eor.rdfs
 lib/%%DISTNAME%%/library/semweb/owl.owl
 lib/%%DISTNAME%%/library/semweb/rdf_cache.pl
+lib/%%DISTNAME%%/library/semweb/rdf_compare.pl
 lib/%%DISTNAME%%/library/semweb/rdf_db.pl
 lib/%%DISTNAME%%/library/semweb/rdf_edit.pl
 lib/%%DISTNAME%%/library/semweb/rdf_http_plugin.pl
 lib/%%DISTNAME%%/library/semweb/rdf_litindex.pl
 lib/%%DISTNAME%%/library/semweb/rdf_persistency.pl
+lib/%%DISTNAME%%/library/semweb/rdf_portray.pl
 lib/%%DISTNAME%%/library/semweb/rdf_turtle.pl
+lib/%%DISTNAME%%/library/semweb/rdf_turtle_write.pl
 lib/%%DISTNAME%%/library/semweb/rdf_zlib_plugin.pl
 lib/%%DISTNAME%%/library/semweb/rdfs.pl
 lib/%%DISTNAME%%/library/semweb/rdfs.rdfs
+lib/%%DISTNAME%%/library/semweb/turtle_base.pl
 lib/%%DISTNAME%%/library/settings.pl
 lib/%%DISTNAME%%/library/sgml.pl
 lib/%%DISTNAME%%/library/sgml_write.pl
@@ -520,6 +548,7 @@ lib/%%DISTNAME%%/library/socket.pl
 lib/%%DISTNAME%%/library/sort.pl
 lib/%%DISTNAME%%/library/ssl.pl
 lib/%%DISTNAME%%/library/statistics.pl
+lib/%%DISTNAME%%/library/streaminfo.pl
 lib/%%DISTNAME%%/library/streampool.pl
 lib/%%DISTNAME%%/library/system.pl
 lib/%%DISTNAME%%/library/table.pl
@@ -536,10 +565,13 @@ lib/%%DISTNAME%%/library/ugraphs.pl
 lib/%%DISTNAME%%/library/unicode/blocks.pl
 lib/%%DISTNAME%%/library/unicode/unicode_data.pl
 lib/%%DISTNAME%%/library/unix.pl
+lib/%%DISTNAME%%/library/uri.pl
 lib/%%DISTNAME%%/library/url.pl
 lib/%%DISTNAME%%/library/utf8.pl
+lib/%%DISTNAME%%/library/vm.pl
 lib/%%DISTNAME%%/library/when.pl
 lib/%%DISTNAME%%/library/www_browser.pl
+lib/%%DISTNAME%%/library/xpath.pl
 lib/%%DISTNAME%%/library/xsdp_types.pl
 lib/%%DISTNAME%%/library/zlib.pl
 lib/%%DISTNAME%%/pl.rc
@@ -1318,7 +1350,6 @@ lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/pl/pl.rc
 lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/pl/xpce.rc
 lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/prolog/boot/pce_autoload.pl
 lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/prolog/boot/pce_boot.pl
-lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/prolog/boot/pce_compile.pl
 lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/prolog/boot/pce_editor.pl
 lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/prolog/boot/pce_error.pl
 lib/%%DISTNAME%%/xpce-%%XPCE_VER%%/prolog/boot/pce_expand.pl
@@ -1771,11 +1802,12 @@ libdata/pkgconfig/pl.pc
 @dirrm lib/%%DISTNAME%%/lib
 @dirrm lib/%%DISTNAME%%/library/DTD
 @dirrm lib/%%DISTNAME%%/library/chr
+@dirrm lib/%%DISTNAME%%/library/ciao
 @dirrm lib/%%DISTNAME%%/library/clp/clpq
 @dirrm lib/%%DISTNAME%%/library/clp/clpqr
 @dirrm lib/%%DISTNAME%%/library/clp/clpr
 @dirrm lib/%%DISTNAME%%/library/clp
-@dirrm lib/%%DISTNAME%%/library/common
+@dirrm lib/%%DISTNAME%%/library/commons
 @dirrm lib/%%DISTNAME%%/library/dialect/iso
 @dirrm lib/%%DISTNAME%%/library/dialect/yap
 @dirrm lib/%%DISTNAME%%/library/dialect