diff options
author | kristerw <kristerw> | 2006-08-02 15:15:35 +0000 |
---|---|---|
committer | kristerw <kristerw> | 2006-08-02 15:15:35 +0000 |
commit | 5573bfcfa2cd0ea846eaa5c25c4142bb3c69e861 (patch) | |
tree | d9cacdeed981deeae0706371420a09e48d097014 /lang/swi-prolog-lite | |
parent | e2900501f06fd567ceec858d5e5230572ad0423d (diff) | |
download | pkgsrc-5573bfcfa2cd0ea846eaa5c25c4142bb3c69e861.tar.gz |
Update swi-prolog* to 5.6.17.
The 5.6.x release consolidates the 5.5.x development stream started in 2004.
Highlights:
* UNICODE character set support
* Unbounded integer arithmetic and rational numbers
* New and faster CHR release
* Added clp(r) constraints over reals
* Many enhancements to the web and notably sematic web libraries
* Much more ...
Diffstat (limited to 'lang/swi-prolog-lite')
-rw-r--r-- | lang/swi-prolog-lite/Makefile | 6 | ||||
-rw-r--r-- | lang/swi-prolog-lite/Makefile.common | 4 | ||||
-rw-r--r-- | lang/swi-prolog-lite/PLIST | 26 | ||||
-rw-r--r-- | lang/swi-prolog-lite/distinfo | 18 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-aa | 35 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ab | 27 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ad | 26 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ae | 14 | ||||
-rw-r--r-- | lang/swi-prolog-lite/patches/patch-ag | 22 |
9 files changed, 85 insertions, 93 deletions
diff --git a/lang/swi-prolog-lite/Makefile b/lang/swi-prolog-lite/Makefile index 4c2d9c6feb0..4cf6d562a76 100644 --- a/lang/swi-prolog-lite/Makefile +++ b/lang/swi-prolog-lite/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:56 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/08/02 15:15:36 kristerw Exp $ .include "Makefile.common" PKGNAME= swi-prolog-lite-${SWIPLVERS} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= ISO/Edinburgh-style Prolog compiler GNU_CONFIGURE= yes -USE_GNU_READLINE= # uses rl_event_hook() interface +USE_GNU_READLINE= yes # uses rl_event_hook() interface CONFIGURE_ENV+= PL=swi-prolog CONFIGURE_ARGS+= --disable-mt +USE_TOOLS+= gmake #CPPFLAGS+= -DPREFIX=\"${PREFIX}\" #CPPFLAGS+= -DSWIPLVERS=\"${SWIPLVERS}\" diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common index 4df520ff0bb..098c76cc968 100644 --- a/lang/swi-prolog-lite/Makefile.common +++ b/lang/swi-prolog-lite/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:50:28 rillig Exp $ +# $NetBSD: Makefile.common,v 1.4 2006/08/02 15:15:36 kristerw Exp $ -SWIPLVERS= 5.2.13 +SWIPLVERS= 5.6.17 DISTNAME= pl-${SWIPLVERS} CATEGORIES= lang MASTER_SITES= ftp://ftp.swi.psy.uva.nl/SWI-Prolog/ diff --git a/lang/swi-prolog-lite/PLIST b/lang/swi-prolog-lite/PLIST index 3145c78a8e6..0240c34cd39 100644 --- a/lang/swi-prolog-lite/PLIST +++ b/lang/swi-prolog-lite/PLIST @@ -1,14 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/08/02 15:15:36 kristerw Exp $ bin/plld bin/plrc bin/swi-prolog -include/SWI-Prolog.h -include/SWI-Stream.h lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plld lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plrc lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/swi-prolog lib/swi-prolog-${PKGVERSION}/bin/swipl lib/swi-prolog-${PKGVERSION}/boot/apply.pl +lib/swi-prolog-${PKGVERSION}/boot/attvar.pl lib/swi-prolog-${PKGVERSION}/boot/autoload.pl lib/swi-prolog-${PKGVERSION}/boot/bags.pl lib/swi-prolog-${PKGVERSION}/boot/dwim.pl @@ -34,17 +33,25 @@ lib/swi-prolog-${PKGVERSION}/dotfiles/edit lib/swi-prolog-${PKGVERSION}/include/SWI-Prolog.h lib/swi-prolog-${PKGVERSION}/include/SWI-Stream.h lib/swi-prolog-${PKGVERSION}/include/stub.c +lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/libpl.a lib/swi-prolog-${PKGVERSION}/library/INDEX.pl @unexec rm -f %D/%F lib/swi-prolog-${PKGVERSION}/library/MANUAL lib/swi-prolog-${PKGVERSION}/library/am_match.pl +lib/swi-prolog-${PKGVERSION}/library/assoc.pl lib/swi-prolog-${PKGVERSION}/library/backcomp.pl lib/swi-prolog-${PKGVERSION}/library/bim.pl lib/swi-prolog-${PKGVERSION}/library/check.pl lib/swi-prolog-${PKGVERSION}/library/checklast.pl lib/swi-prolog-${PKGVERSION}/library/checkselect.pl +lib/swi-prolog-${PKGVERSION}/library/clp/bounds.pl +lib/swi-prolog-${PKGVERSION}/library/clp/clp_distinct.pl +lib/swi-prolog-${PKGVERSION}/library/clp/clp_events.pl +lib/swi-prolog-${PKGVERSION}/library/clp/simplex.pl lib/swi-prolog-${PKGVERSION}/library/ctypes.pl +lib/swi-prolog-${PKGVERSION}/library/date.pl lib/swi-prolog-${PKGVERSION}/library/debug.pl +lib/swi-prolog-${PKGVERSION}/library/dif.pl lib/swi-prolog-${PKGVERSION}/library/edinburgh.pl lib/swi-prolog-${PKGVERSION}/library/edit.pl lib/swi-prolog-${PKGVERSION}/library/emacs_interface.pl @@ -57,10 +64,14 @@ lib/swi-prolog-${PKGVERSION}/library/listing.pl lib/swi-prolog-${PKGVERSION}/library/lists.pl lib/swi-prolog-${PKGVERSION}/library/main.pl lib/swi-prolog-${PKGVERSION}/library/make.pl -lib/swi-prolog-${PKGVERSION}/library/netscape.pl +lib/swi-prolog-${PKGVERSION}/library/nb_set.pl lib/swi-prolog-${PKGVERSION}/library/occurs.pl +lib/swi-prolog-${PKGVERSION}/library/operators.pl lib/swi-prolog-${PKGVERSION}/library/option.pl lib/swi-prolog-${PKGVERSION}/library/ordsets.pl +lib/swi-prolog-${PKGVERSION}/library/prolog_clause.pl +lib/swi-prolog-${PKGVERSION}/library/prolog_stack.pl +lib/swi-prolog-${PKGVERSION}/library/prolog_xref.pl lib/swi-prolog-${PKGVERSION}/library/oset.pl lib/swi-prolog-${PKGVERSION}/library/qpforeign.pl lib/swi-prolog-${PKGVERSION}/library/qsave.pl @@ -73,8 +84,13 @@ lib/swi-prolog-${PKGVERSION}/library/statistics.pl lib/swi-prolog-${PKGVERSION}/library/system.pl lib/swi-prolog-${PKGVERSION}/library/threadutil.pl lib/swi-prolog-${PKGVERSION}/library/tty.pl +lib/swi-prolog-${PKGVERSION}/library/ugraphs.pl +lib/swi-prolog-${PKGVERSION}/library/unicode/blocks.pl +lib/swi-prolog-${PKGVERSION}/library/unicode/unicode_data.pl lib/swi-prolog-${PKGVERSION}/library/url.pl -lib/swi-prolog-${PKGVERSION}/runtime/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/libpl.a +lib/swi-prolog-${PKGVERSION}/library/utf8.pl +lib/swi-prolog-${PKGVERSION}/library/when.pl +lib/swi-prolog-${PKGVERSION}/library/www_browser.pl lib/swi-prolog-${PKGVERSION}/swipl man/man1/plld.1 man/man1/plrc.1 diff --git a/lang/swi-prolog-lite/distinfo b/lang/swi-prolog-lite/distinfo index 8af6a6bd816..88c3b0abbdb 100644 --- a/lang/swi-prolog-lite/distinfo +++ b/lang/swi-prolog-lite/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.4 2006/01/23 15:24:12 joerg Exp $ +$NetBSD: distinfo,v 1.5 2006/08/02 15:15:36 kristerw Exp $ -SHA1 (swi-prolog/pl-5.2.13.tar.gz) = 2c13a65698e0de72e84132f929f5377306c65453 -RMD160 (swi-prolog/pl-5.2.13.tar.gz) = 6b9c192c0c41b1eb0cf952cdb6cc09ef25c2d8c3 -Size (swi-prolog/pl-5.2.13.tar.gz) = 7122170 bytes -SHA1 (patch-aa) = 2b6164ed8cc4398c1e7cc2662016e202f61e51f2 -SHA1 (patch-ab) = 6482d77266eaa2619f58e2ae53d074e8d6fcd250 +SHA1 (swi-prolog/pl-5.6.17.tar.gz) = e46e98b3ec8a69de3dc2eb147a9df9cbd1a17399 +RMD160 (swi-prolog/pl-5.6.17.tar.gz) = 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab +Size (swi-prolog/pl-5.6.17.tar.gz) = 10652203 bytes +SHA1 (patch-aa) = d886e3ff14f266393bddbaa3426e00d695527080 +SHA1 (patch-ab) = cfc7e3b54b6f6b14a64faabad5e6a71bd5a6692e SHA1 (patch-ac) = 909331edb76b5d0ce5003d86775524cd29e22a79 -SHA1 (patch-ad) = 194e2ef8d8af03e63b7398f61a705d75b14677b5 -SHA1 (patch-ae) = 41f52217706600aac46f8992b15682024b3b6b47 +SHA1 (patch-ad) = 1cf00bae2f4014ce3385ca4deb92caaa539b9c89 +SHA1 (patch-ae) = 8ff4586151109986137240aa436ba2144eb04c69 SHA1 (patch-af) = 6ca56f948950cc198fe255f064cc30fb6c1a58fb -SHA1 (patch-ag) = 77543e08081f10deb17d48e4e91f3074f1202400 +SHA1 (patch-ag) = 750c50997129c8b1ae2c3c4c317296249668430b SHA1 (patch-ah) = 3bfc13a920e0f3a79e6764a9ace89032989e2c67 SHA1 (patch-ai) = 9446bc38a0a7e02de303e68c923249b615c91833 SHA1 (patch-aj) = 4450848127eab9f05113aaabfa48725336353e79 diff --git a/lang/swi-prolog-lite/patches/patch-aa b/lang/swi-prolog-lite/patches/patch-aa index bddd855de7b..78380076d47 100644 --- a/lang/swi-prolog-lite/patches/patch-aa +++ b/lang/swi-prolog-lite/patches/patch-aa @@ -1,28 +1,20 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2006/08/02 15:15:36 kristerw Exp $ ---- src/Makefile.in.orig Tue Apr 9 20:09:31 2002 -+++ src/Makefile.in Wed May 1 19:41:34 2002 -@@ -63,6 +63,7 @@ - ARCH=@ARCH@ - INSTALL=@INSTALL@ - INSTALL_PROGRAM=@INSTALL_PROGRAM@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ - MKDIR=@MKDIR@ - REL_LN=$(srcdir)/rel-ln -@@ -71,8 +72,9 @@ +--- src/Makefile.in.orig 2006-08-02 02:41:45.000000000 +0200 ++++ src/Makefile.in 2006-08-02 02:45:03.000000000 +0200 +@@ -69,8 +69,9 @@ CWFLAGS=@CWFLAGS@ CIFLAGS=@CIFLAGS@ CMFLAGS=@CMFLAGS@ -CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS+= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) ++CFLAGS+= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) LDFLAGS=@LDFLAGS@ +CPPFLAGS=@CPPFLAGS@ PLFOREIGN=@PLFOREIGN@ -@@ -135,7 +137,7 @@ - plld +@@ -153,7 +154,7 @@ + headers rc-lib tai-lib $(MKLIBS) system startup index plld .c.o: - $(CC) -c -I. -I$(srcdir) -I$(srcdir)/rc $(CFLAGS) $< @COUTOPT@ @@ -30,21 +22,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ system: $(PL) startup: $(STARTUPPATH) -@@ -242,7 +244,7 @@ +@@ -288,7 +289,7 @@ ar x `$(CC) -print-libgcc-file-name` $@ - plld: $(srcdir)/plld.c + plld: $(srcdir)/plld.c parms.h - $(CC) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/plld.c + $(CC) -I. -I$(srcdir) $(CPPFLAGS) $(CFLAGS) -o $@ $(srcdir)/plld.c tags: $(srcdir)/TAGS -@@ -322,7 +324,7 @@ - $(INSTALL_DATA) ../dotfiles/dotplrc $(PLBASE)/dotfiles - $(INSTALL_DATA) ../dotfiles/dotxpcerc $(PLBASE)/dotfiles - $(INSTALL_DATA) ../dotfiles/README $(PLBASE)/dotfiles -- $(INSTALL_PROGRAM) ../dotfiles/edit $(PLBASE)/dotfiles -+ $(INSTALL_SCRIPT) ../dotfiles/edit $(PLBASE)/dotfiles - - iinclude:: - cd ../include; \ diff --git a/lang/swi-prolog-lite/patches/patch-ab b/lang/swi-prolog-lite/patches/patch-ab index bd63b46550a..a2aec1df948 100644 --- a/lang/swi-prolog-lite/patches/patch-ab +++ b/lang/swi-prolog-lite/patches/patch-ab @@ -1,22 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2005/09/17 19:35:51 minskim Exp $ +$NetBSD: patch-ab,v 1.3 2006/08/02 15:15:36 kristerw Exp $ ---- src/configure.orig 2004-01-21 02:08:17.000000000 -0800 -+++ src/configure -@@ -1227,7 +1227,7 @@ fi - EXTRAOBJ="" - EXTRAHDR="" - INSTALLTARGET=dv-install --PL=pl -+#PL=pl - PLLIB=libpl.a - RT="" - PLVERSION=`cat ../VERSION` -@@ -11281,7 +11281,7 @@ fi +--- src/configure.orig 2006-08-02 02:46:02.000000000 +0200 ++++ src/configure 2006-08-02 02:46:52.000000000 +0200 +@@ -14115,7 +14115,7 @@ + if test "x$MKSHARED" = "x"; then + MKSHARED=yes fi - ;; - *darwin*) - PL=swipl + #PL=swipl - SO_pic="-fPIC" - cat >>confdefs.h <<\_ACEOF - #define USE_SEM_OPEN 1 + SO_EXT=dylib + SO_pic="-fno-common" + SO_PIC="-fno-common" diff --git a/lang/swi-prolog-lite/patches/patch-ad b/lang/swi-prolog-lite/patches/patch-ad index a62cab2c7c8..bed16e9329f 100644 --- a/lang/swi-prolog-lite/patches/patch-ad +++ b/lang/swi-prolog-lite/patches/patch-ad @@ -1,13 +1,15 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ +$NetBSD: patch-ad,v 1.2 2006/08/02 15:15:36 kristerw Exp $ ---- packages/Makefile.in.orig Thu Oct 16 16:06:35 2003 -+++ packages/Makefile.in -@@ -33,7 +33,7 @@ CNFG=@CNFG@ - - # Values filled from the main SWI-Prolog configure - --MAKE=@MAKE@ -+MAKE=gmake - prefix=@prefix@ - exec_prefix=@exec_prefix@ - bindir=@bindir@ +--- packages/Makefile.in.orig 2005-11-12 15:15:23.000000000 +0100 ++++ packages/Makefile.in 2006-08-02 05:24:29.000000000 +0200 +@@ -36,8 +36,8 @@ + PLARCH=@ARCH@ + PLLDFLAGS=@LDFLAGS@ + PLDIR=$(shell dirname `pwd`) +-PLINCL=$(PLDIR)/include +-LIBDIR=$(PLDIR)/lib/$(PLARCH) ++PLINCL=$(PLBASE)/include ++LIBDIR=$(PLBASE)/lib/$(PLARCH) + PLSHARED=@PLSHARED@ + INSTALL=@INSTALL@ + INSTALL_DATA=@INSTALL_DATA@ diff --git a/lang/swi-prolog-lite/patches/patch-ae b/lang/swi-prolog-lite/patches/patch-ae index 6231ca76568..12da520c3cb 100644 --- a/lang/swi-prolog-lite/patches/patch-ae +++ b/lang/swi-prolog-lite/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ +$NetBSD: patch-ae,v 1.2 2006/08/02 15:15:36 kristerw Exp $ ---- packages/xpce/pl/src/Makefile.orig 2003-10-10 12:24:18.000000000 +0200 -+++ packages/xpce/pl/src/Makefile -@@ -33,7 +33,7 @@ BINDIR= ../../$(builddir) +--- packages/xpce/pl/src/Makefile.orig 2006-08-02 02:49:06.000000000 +0200 ++++ packages/xpce/pl/src/Makefile 2006-08-02 02:51:19.000000000 +0200 +@@ -33,7 +33,7 @@ OBJDIR= ../../$(builddir)/pl CONFIG= ../../$(builddir)/config.h @@ -11,19 +11,19 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ PL= pl PLLD= plld -pl $(PL) ITFOBJ= $(addprefix $(OBJDIR)/, interface.o link.o pcecall.o) -@@ -114,14 +114,14 @@ $(XPCESO): $(SOITF) $(libXPCE) $(SOEXTR) +@@ -114,14 +114,14 @@ fi sopce$(XPCESO): - LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ + LD_RUN_PATH="$(libdir):${X11BASE}/lib:$$LD_RUN_PATH"; \ export LD_RUN_PATH; \ - $(PLLD) -shared $(SOITF) -L$(XLIB) -L$(LIBDIR) -lXPCE -o $(XPCESO); + $(PLLD) -shared $(SOITF) $(LDFLAGS) -L$(XLIB) -L$(LIBDIR) -lXPCE -o $(XPCESO); axpce$(XPCESO): - LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ + LD_RUN_PATH="$(libdir):${X11BASE}/lib:$$LD_RUN_PATH"; \ export LD_RUN_PATH; \ - $(PLLD) -shared $(SOITF) $(SOEXTR) -L$(LIBDIR) \ + $(PLLD) -shared $(LDFLAGS) $(SOITF) $(SOEXTR) -L$(LIBDIR) \ - -lXPCE $(GCCLIB) -L$(XLIB) $(XLIBS) $(NETLIBS) -o $(XPCESO); + -lXPCE $(GCCLIB) -L$(XLIB) -Wl,-R${XLIB} -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib $(XLIBS) $(NETLIBS) -o $(XPCESO); diff --git a/lang/swi-prolog-lite/patches/patch-ag b/lang/swi-prolog-lite/patches/patch-ag index c0d76124c87..cd0184d747d 100644 --- a/lang/swi-prolog-lite/patches/patch-ag +++ b/lang/swi-prolog-lite/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $ +$NetBSD: patch-ag,v 1.2 2006/08/02 15:15:36 kristerw Exp $ ---- src/pl-incl.h.orig 2004-01-05 10:43:45.000000000 +0100 -+++ src/pl-incl.h -@@ -206,7 +206,7 @@ gcc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +--- packages/xpce/pl/src/Makefile.bin.in.orig 2005-01-31 11:47:37.000000000 +0100 ++++ packages/xpce/pl/src/Makefile.bin.in 2006-08-02 16:34:35.000000000 +0200 +@@ -59,7 +59,7 @@ + @PLBASE=$(PWD); \ + if [ -d xpce ]; then \ + echo $(MAKE) PL=$$PLBASE/$(BPL); \ +- (cd xpce/prolog/lib; $(MAKE) PL=$$PLBASE/$(BPL)); \ ++ (cd xpce/prolog/lib; $(MAKE) PL=$$PLBASE/bin/$(PLARCH)/$(XPCE)); \ + fi - #ifndef __unix__ --#if defined(_AIX) || defined(__APPLE__) || defined(__unix) || defined(__BEOS__) -+#if defined(_AIX) || defined(__APPLE__) || defined(__unix) || defined(__BEOS__) || defined(__NetBSD__) - #define __unix__ 1 - #endif - #endif + install: all |