5 files changed, 32 insertions, 30 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 55c71577e441..362d3b770009 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	swi-pl
-PORTVERSION=	5.2.8
-PORTREVISION=	2
+PORTVERSION=	5.4.5
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.swi.psy.uva.nl/pub/SWI-Prolog/
+MASTER_SITES=	ftp://ftp.swi.psy.uva.nl/SWI-Prolog/ \
+		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/
 DISTNAME=	pl-${PORTVERSION}
 
-MAINTAINER=	max@FreeBSD.org
+MAINTAINER=	g.gonter@ieee.org
 COMMENT=	Edinburgh-style Prolog compiler
 
 CONFLICTS=	ploticus-[0-9]* slffea-[0-9]* TenDRA-[0-9]*
@@ -44,4 +44,13 @@ post-patch:
 	${REINPLACE_CMD} -e '/edit/s/INSTALL_PROGRAM/BSD_INSTALL_SCRIPT/g' \
 		${WRKSRC}/src/Makefile.in
 
+post-configure:
+	${REINPLACE_CMD} -e '/MALLOC_H/s/^#define \(HAVE_.*_MALLOC_H\).*/\/\* #undef \1 \*\//g' \
+		${WRKSRC}/src/config.h
+
+post-install:
+.for f in pl plld plrc
+	@${STRIP_CMD} ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-${OPSYS:L}/$f
+.endfor
+
 .include <bsd.port.post.mk>
diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo
index d197fea55c1e..257a7511f5b6 100644
--- a/lang/swi-pl/distinfo
+++ b/lang/swi-pl/distinfo
@@ -1,2 +1,2 @@
-MD5 (pl-5.2.8.tar.gz) = a7709a102778c24216b6fafb9724e019
-SIZE (pl-5.2.8.tar.gz) = 7154851
+MD5 (pl-5.4.5.tar.gz) = 79def64cf5a1168e9360eeabe52460d2
+SIZE (pl-5.4.5.tar.gz) = 8169002
diff --git a/lang/swi-pl/files/extra-patch-src-configure b/lang/swi-pl/files/extra-patch-src-configure
index 2f86bdb16997..b014c3e76292 100644
--- a/lang/swi-pl/files/extra-patch-src-configure
+++ b/lang/swi-pl/files/extra-patch-src-configure
@@ -1,6 +1,6 @@
---- src/configure.orig	Sat Dec 20 00:49:33 2003
-+++ src/configure	Sat Dec 20 00:50:26 2003
-@@ -2960,8 +2960,8 @@
+--- 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
diff --git a/lang/swi-pl/files/patch-aa b/lang/swi-pl/files/patch-aa
index 5f90640c0ddb..f1b57f75de28 100644
--- a/lang/swi-pl/files/patch-aa
+++ b/lang/swi-pl/files/patch-aa
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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@
@@ -9,21 +9,7 @@
  LDFLAGS=@LDFLAGS@
  
  PLFOREIGN=@PLFOREIGN@
-@@ -344,16 +344,17 @@
- 		-$(INSTALL_DATA) $(srcdir)/plld.1 $(smandir)/plld.$(mansec)
- 
- 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
- 
- install-lman::
+@@ -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)
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index 625580ed096f..264906828192 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -7,6 +7,7 @@ lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/pl
 lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/plld
 lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/plrc
 lib/%%DISTNAME%%/bin/swipl
+lib/%%DISTNAME%%/boot/attvar.pl
 lib/%%DISTNAME%%/boot/apply.pl
 lib/%%DISTNAME%%/boot/autoload.pl
 lib/%%DISTNAME%%/boot/bags.pl
@@ -33,6 +34,14 @@ lib/%%DISTNAME%%/dotfiles/edit
 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
@@ -71,11 +80,9 @@ lib/%%DISTNAME%%/library/system.pl
 lib/%%DISTNAME%%/library/threadutil.pl
 lib/%%DISTNAME%%/library/tty.pl
 lib/%%DISTNAME%%/library/url.pl
-lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%/libpl.a
 lib/%%DISTNAME%%/swipl
-@dirrm lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%
-@dirrm lib/%%DISTNAME%%/runtime
 @dirrm lib/%%DISTNAME%%/man
+@dirrm lib/%%DISTNAME%%/library/clp
 @dirrm lib/%%DISTNAME%%/library
 @dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/lib