4 files changed, 28 insertions, 17 deletions

diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index befeb023c34a..7e2060236201 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	swi-pl
-PORTVERSION=	3.3.8
+PORTVERSION=	3.4.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://swi.psy.uva.nl/pub/SWI-Prolog/
 DISTNAME=	pl-${PORTVERSION}
@@ -16,15 +16,17 @@ MAINTAINER=	max@FreeBSD.org
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--host=${ARCH}-freebsd
+CONFIGURE_ARGS=	--host=${ARCH}-${OS}
 STRIP=
 MAKE_FLAGS+=	CIFLAGS=-DRTLD_LAZY -f
 MAN1=		pl.1 plrc.1 plld.1
-PLIST_SUB=	DISTNAME=${DISTNAME}
+PLIST_SUB=	DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OS}
+
+OS!=	uname -s | tr '[:upper:]' '[:lower:]'
 
 post-install:
 .for f in pl plld plrc
-	@strip ${PREFIX}/lib/${DISTNAME}/bin/${PERL_ARCH}/$f
+	@/usr/bin/strip ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-${OS}/$f
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/swi-pl/distinfo b/lang/swi-pl/distinfo
index 020b5e73bfd1..b815e0cf5eaa 100644
--- a/lang/swi-pl/distinfo
+++ b/lang/swi-pl/distinfo
@@ -1 +1 @@
-MD5 (pl-3.3.8.tar.gz) = cdab0b3d275203aad56b43ac095b15fd
+MD5 (pl-3.4.4.tar.gz) = e98378b54c80981dc1ffd4fb37ad9c99
diff --git a/lang/swi-pl/files/patch-aa b/lang/swi-pl/files/patch-aa
index 2d07c3a6f92c..5faa1d455bca 100644
--- a/lang/swi-pl/files/patch-aa
+++ b/lang/swi-pl/files/patch-aa
@@ -1,6 +1,15 @@
---- Makefile.in	1999/03/23 20:02:10	1.1
-+++ Makefile.in	1999/03/23 20:02:47
-@@ -287,7 +287,7 @@
+--- Makefile.in.orig	Fri Nov 10 00:19:19 2000
++++ Makefile.in	Tue Jan  2 06:58:30 2001
+@@ -68,7 +68,7 @@
+ CWFLAGS=@CWFLAGS@
+ CIFLAGS=@CIFLAGS@
+ CMFLAGS=@CMFLAGS@
+-CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
++CFLAGS=	@CFLAGS@ $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
+ 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)
@@ -9,7 +18,7 @@
  		-if [ ! -d $(man_prefix) ]; then $(MKDIR) $(man_prefix); fi
  		-if [ ! -d $(mandir)  ];    then $(MKDIR) $(mandir);     fi
  		-$(INSTALL_DATA) $(plmandir)/$(PL).$(mansec) $(mandir)
-@@ -295,10 +295,11 @@
+@@ -326,10 +326,11 @@
  		-$(INSTALL_DATA) $(plmandir)/plld.$(mansec) $(mandir)
  
  install_rlman:
diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist
index 05916d48119c..2c3deac70ea0 100644
--- a/lang/swi-pl/pkg-plist
+++ b/lang/swi-pl/pkg-plist
@@ -2,11 +2,11 @@ bin/pl
 bin/plld
 bin/plrc
 include/SWI-Prolog.h
-lib/%%DISTNAME%%/bin/%%PERL_ARCH%%/pl
-lib/%%DISTNAME%%/bin/%%PERL_ARCH%%/plld
-lib/%%DISTNAME%%/bin/%%PERL_ARCH%%/plrc
+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.prc
+lib/%%DISTNAME%%/boot32.prc
 lib/%%DISTNAME%%/boot/apply.pl
 lib/%%DISTNAME%%/boot/autoload.pl
 lib/%%DISTNAME%%/boot/bags.pl
@@ -61,16 +61,16 @@ lib/%%DISTNAME%%/library/url.pl
 lib/%%DISTNAME%%/man/pl.1
 lib/%%DISTNAME%%/man/plld.1
 lib/%%DISTNAME%%/man/plrc.1
-lib/%%DISTNAME%%/runtime/%%PERL_ARCH%%/libpl.a
+lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%/libpl.a
 lib/%%DISTNAME%%/swipl
-@dirrm lib/%%DISTNAME%%/bin/%%PERL_ARCH%%
+@dirrm lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/bin
 @dirrm lib/%%DISTNAME%%/boot
 @dirrm lib/%%DISTNAME%%/include
-@dirrm lib/%%DISTNAME%%/lib/%%PERL_ARCH%%
+@dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/lib
 @dirrm lib/%%DISTNAME%%/library
 @dirrm lib/%%DISTNAME%%/man
-@dirrm lib/%%DISTNAME%%/runtime/%%PERL_ARCH%%
+@dirrm lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%
 @dirrm lib/%%DISTNAME%%/runtime
 @dirrm lib/%%DISTNAME%%