ports/74279: port update for lang/swi-pl

[Gerhard Gonter]

>Number:         74279
>Category:       ports
>Synopsis:       port update for lang/swi-pl
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 23 03:10:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Gerhard Gonter
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD chuck.iris-net.home 6.0-CURRENT FreeBSD 6.0-CURRENT #45: Sat Nov 20 16:33:04 CET 2004 root at chuck.iris-net.home:/usr/obj/usr/src/sys/CHUCK i386

	FreeBSD on i386

>Description:
	Update for SWI Prolog 5.4.4
	Current port version seems to be broken now anyway since the distfiles
	moved, see patch for update about that.

>How-To-Repeat:

>Fix:

	Patch for upgrading current port version (5.2.8) to latest
	available (5.4.4)

diff -ruN swi-pl-5.2.8/Makefile swi-pl-5.4.4/Makefile
--- swi-pl-5.2.8/Makefile	Fri Nov 12 11:32:08 2004
+++ swi-pl-5.4.4/Makefile	Tue Nov 23 03:53:53 2004
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	swi-pl
-PORTVERSION=	5.2.8
-PORTREVISION=	2
+PORTVERSION=	5.4.4
 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 at FreeBSD.org
@@ -43,5 +43,14 @@
 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 -ruN swi-pl-5.2.8/distinfo swi-pl-5.4.4/distinfo
--- swi-pl-5.2.8/distinfo	Wed Mar 31 05:09:12 2004
+++ swi-pl-5.4.4/distinfo	Tue Nov 16 00:40:57 2004
@@ -1,2 +1,2 @@
-MD5 (pl-5.2.8.tar.gz) = a7709a102778c24216b6fafb9724e019
-SIZE (pl-5.2.8.tar.gz) = 7154851
+MD5 (pl-5.4.4.tar.gz) = 40e15160b5413adf36eff46f23d62b6c
+SIZE (pl-5.4.4.tar.gz) = 8172856
diff -ruN swi-pl-5.2.8/files/extra-patch-src-configure swi-pl-5.4.4/files/extra-patch-src-configure
--- swi-pl-5.2.8/files/extra-patch-src-configure	Tue Jun 15 00:28:18 2004
+++ swi-pl-5.4.4/files/extra-patch-src-configure	Sat Oct  9 11:59:11 2004
@@ -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 -ruN swi-pl-5.2.8/files/patch-aa swi-pl-5.4.4/files/patch-aa
--- swi-pl-5.2.8/files/patch-aa	Mon Nov 25 01:09:04 2002
+++ swi-pl-5.4.4/files/patch-aa	Sat Oct  9 11:57:57 2004
@@ -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 -ruN swi-pl-5.2.8/pkg-plist swi-pl-5.4.4/pkg-plist
--- swi-pl-5.2.8/pkg-plist	Tue Jun 15 00:28:17 2004
+++ swi-pl-5.4.4/pkg-plist	Tue Nov 16 00:13:09 2004
@@ -7,6 +7,7 @@
 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%%/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/threadutil.pl
 lib/%%DISTNAME%%/library/tty.pl
 lib/%%DISTNAME%%/library/url.pl
-lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%/libpl.a
 lib/%%DISTNAME%%/swipl
- at dirrm lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%
- at dirrm lib/%%DISTNAME%%/runtime
 @dirrm lib/%%DISTNAME%%/man
+ at dirrm lib/%%DISTNAME%%/library/clp
 @dirrm lib/%%DISTNAME%%/library
 @dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/lib
>Release-Note:
>Audit-Trail:
>Unformatted: