summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorasau <asau@pkgsrc.org>2010-02-10 21:56:40 +0000
committerasau <asau@pkgsrc.org>2010-02-10 21:56:40 +0000
commit2ba96c988cef6a4c254462ce59c64d46d1748075 (patch)
treec3aa4dff88c734d3e0a584488d57ef9f5cc06b39 /lang
parentd5c94f216789eaa8f1dcbe330506d850697dc02c (diff)
downloadpkgsrc-2ba96c988cef6a4c254462ce59c64d46d1748075.tar.gz
Update to SWI Prolog 5.9.7.
Lots of changes since 5.6.17.
Diffstat (limited to 'lang')
-rw-r--r--lang/swi-prolog-lite/Makefile17
-rw-r--r--lang/swi-prolog-lite/Makefile.common9
-rw-r--r--lang/swi-prolog-lite/PLIST262
-rw-r--r--lang/swi-prolog-lite/buildlink3.mk6
-rw-r--r--lang/swi-prolog-lite/distinfo27
-rw-r--r--lang/swi-prolog-lite/patches/patch-aa33
-rw-r--r--lang/swi-prolog-lite/patches/patch-ab13
-rw-r--r--lang/swi-prolog-lite/patches/patch-ac13
-rw-r--r--lang/swi-prolog-lite/patches/patch-ad26
-rw-r--r--lang/swi-prolog-lite/patches/patch-ae31
-rw-r--r--lang/swi-prolog-lite/patches/patch-af22
-rw-r--r--lang/swi-prolog-lite/patches/patch-ag13
-rw-r--r--lang/swi-prolog-lite/patches/patch-ah14
-rw-r--r--lang/swi-prolog-lite/patches/patch-ai19
-rw-r--r--lang/swi-prolog-lite/patches/patch-aj14
-rw-r--r--lang/swi-prolog-lite/patches/patch-ak70
-rw-r--r--lang/swi-prolog-lite/patches/patch-al27
-rw-r--r--lang/swi-prolog-lite/patches/patch-am15
-rw-r--r--lang/swi-prolog-lite/patches/patch-an26
-rw-r--r--lang/swi-prolog-lite/patches/patch-ao20
-rw-r--r--lang/swi-prolog-lite/patches/patch-ap22
-rw-r--r--lang/swi-prolog-lite/patches/patch-aq25
22 files changed, 350 insertions, 374 deletions
diff --git a/lang/swi-prolog-lite/Makefile b/lang/swi-prolog-lite/Makefile
index 829d79765bd..465c86a703f 100644
--- a/lang/swi-prolog-lite/Makefile
+++ b/lang/swi-prolog-lite/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.14 2009/05/20 00:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/10 21:56:40 asau Exp $
.include "Makefile.common"
PKGNAME= swi-prolog-lite-${SWIPLVERS}
-PKGREVISION= 4
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= ISO/Edinburgh-style Prolog compiler
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
-OVERRIDE_DIRDEPTH= 3
+CONFIGURE_DIRS= src
USE_GNU_READLINE= yes # uses rl_event_hook() interface
CONFIGURE_ENV+= PL=swi-prolog
-CONFIGURE_ARGS+= --disable-mt
+CONFIGURE_ENV+= ARCH=${MACHINE_GNU_PLATFORM} # make PLIST consistent
USE_TOOLS+= gmake bash:run
REPLACE_BASH+= dotfiles/edit
-#CPPFLAGS+= -DPREFIX=\"${PREFIX}\"
-#CPPFLAGS+= -DSWIPLVERS=\"${SWIPLVERS}\"
.include "../../mk/bsd.prefs.mk"
@@ -30,10 +29,12 @@ PLIST_SUBST+= BITS=32
post-install:
${INSTALL_DATA} ${FILESDIR}/shlib.pl \
- ${PREFIX}/lib/swi-prolog-${SWIPLVERS}/library/shlib.pl
+ ${DESTDIR}${PREFIX}/lib/swi-prolog-${SWIPLVERS}/library/shlib.pl
+
+TEST_TARGET= check
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-#.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common
index 6051bd460dc..22dfb37d57f 100644
--- a/lang/swi-prolog-lite/Makefile.common
+++ b/lang/swi-prolog-lite/Makefile.common
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile.common,v 1.5 2007/02/22 19:26:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2010/02/10 21:56:41 asau Exp $
-SWIPLVERS= 5.6.17
+SWIPLVERS= 5.9.7
DISTNAME= pl-${SWIPLVERS}
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.swi.psy.uva.nl/SWI-Prolog/
+MASTER_SITES= http://www.swi-prolog.org/download/stable/src/ \
+ http://www.swi-prolog.org/download/devel/src/
HOMEPAGE= http://www.swi-prolog.org/
DIST_SUBDIR= swi-prolog
DISTINFO_FILE= ${.CURDIR}/../../lang/swi-prolog-lite/distinfo
PATCHDIR= ${.CURDIR}/../../lang/swi-prolog-lite/patches
-
-PLIST_SUBST+= APPEND_ELF=${APPEND_ELF:Q}
diff --git a/lang/swi-prolog-lite/PLIST b/lang/swi-prolog-lite/PLIST
index 1ee4ea5fbf5..140e1ff1d3e 100644
--- a/lang/swi-prolog-lite/PLIST
+++ b/lang/swi-prolog-lite/PLIST
@@ -1,31 +1,239 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:34:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/02/10 21:56:41 asau Exp $
bin/plld
bin/plrc
bin/swi-prolog
-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/pkgconfig/pl.pc
+lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/plld
+lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/plrc
+lib/swi-prolog-${PKGVERSION}/bin/${MACHINE_GNU_PLATFORM}/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/dcg.pl
lib/swi-prolog-${PKGVERSION}/boot/dwim.pl
+lib/swi-prolog-${PKGVERSION}/boot/expand.pl
lib/swi-prolog-${PKGVERSION}/boot/history.pl
lib/swi-prolog-${PKGVERSION}/boot/init.pl
lib/swi-prolog-${PKGVERSION}/boot/license.pl
lib/swi-prolog-${PKGVERSION}/boot/load.pl
-lib/swi-prolog-${PKGVERSION}/boot/menu.pl
lib/swi-prolog-${PKGVERSION}/boot/messages.pl
lib/swi-prolog-${PKGVERSION}/boot/parms.pl
lib/swi-prolog-${PKGVERSION}/boot/qlf.pl
lib/swi-prolog-${PKGVERSION}/boot/rc.pl
-lib/swi-prolog-${PKGVERSION}/boot/sort.pl
lib/swi-prolog-${PKGVERSION}/boot/syspred.pl
lib/swi-prolog-${PKGVERSION}/boot/toplevel.pl
lib/swi-prolog-${PKGVERSION}/boot/topvars.pl
lib/swi-prolog-${PKGVERSION}/boot/writef.pl
-lib/swi-prolog-${PKGVERSION}/boot${BITS}.prc
+lib/swi-prolog-${PKGVERSION}/boot32.prc
+lib/swi-prolog-${PKGVERSION}/demo/README
+lib/swi-prolog-${PKGVERSION}/demo/likes.pl
+lib/swi-prolog-${PKGVERSION}/doc/Manual/64bits.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/Bibliography.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/Contents.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/DCG.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/DDE.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/DLL.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/DocIndex.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/IDE.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/IO.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/SyntaxAndSemantics.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/acknowledge.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/aggregate.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/allsolutions.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/apply.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/applylist.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/arith.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/assoc.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/attvar.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/autoload.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/block3.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/broadcast.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/broadcast.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/builtin.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/builtinlist.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/charconv.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/chario.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/chars.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/charsio.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/chartype.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/check.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/chr.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/chrintro.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/clicense.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/clpclp_distinct.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/clpfd.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/clpqr.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/cmdline.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/compare.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/compilation.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/consulting.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/contrib.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/control.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/coroutining.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/csv.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/ctxmodule.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/cyclic.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/db.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/debug.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/debugger.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/debugging.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/debugoverview.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/defmodule.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/dialect.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/dynamic-modules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/dynamic.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/dynstatic.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/editreload.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/errors.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/examineprog.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/examples.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/excepthook.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/exception.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/exception3.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/extendarith.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/extvar.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/files.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/findappfile.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/findhome.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/flags.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/forall2.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreign.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreigninclude.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreignlink.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreignnotes.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreignoverview.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreignthread.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreigntypes.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/foreignxmp.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/format.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/funcsummary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/gc.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/gemacs.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/gensym.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/glossary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/guidelines.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/guitracer.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/gvar.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/hack.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/help.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/history.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/home.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/hooks.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/idepreds.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/idesummary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/import.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/importmodule.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/index.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/index.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/info.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/initfile.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/initgoal.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/intlibs.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/intro.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/iso.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/libpl.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/library.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/license.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/limits.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/listing.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/lists.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/loadfilehook.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/manipatom.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/manipmodule.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/manipstack.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/manipterm.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/memory.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/metacall.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/metainmodule.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/metapred.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/miscarith.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/miscpreds.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/modulecompat.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/moduleop.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/modules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/mt-xpce.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/mtoplevel.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/mtunbound.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/navigator.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/nbset.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/next.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/operators.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/opsummary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/option.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/ordsets.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/overrule.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/overview.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/pairs.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/pceemacs.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/pio.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/plld.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/portabilitystrategies.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/practical.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/preddesc.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/predsummary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/prev.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/profile.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/profnode.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/projectfiles.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/prologxref.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/protocol.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/qsaveforeign.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/qsavelimits.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/quickstart.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/readline.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/readutil.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/record.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/reexport.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/registry.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/relnotes.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/resmodules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/runenv.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/runtime.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/sec-5.11.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/sicstus-chr.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/signal.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/simplex.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/softlicense.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/sponsor.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/statistics.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/status.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/streamstat.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/strings.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/summary.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/swiorother.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/swiprolog.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/syntax.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/system.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/termrw.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/thmonitor.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/threadcom.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/threadcreate.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/threadpool.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/threads.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/threadsync.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/thutil.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/toplevel.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/topvars.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/tracehook.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/tty.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/typetest.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/ugraphs.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/up.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/url.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/usemodules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/useresource.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/usingmodules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/whichmodules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/whymodules.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/widechars.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/www_browser.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/xpce.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/xref.html
+lib/swi-prolog-${PKGVERSION}/doc/Manual/xrefchatdep.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/xrefchatfile.gif
+lib/swi-prolog-${PKGVERSION}/doc/Manual/yellow_pages.gif
lib/swi-prolog-${PKGVERSION}/dotfiles/README
lib/swi-prolog-${PKGVERSION}/dotfiles/dotplrc
lib/swi-prolog-${PKGVERSION}/dotfiles/dotxpcerc
@@ -33,55 +241,86 @@ 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}/lib/${MACHINE_GNU_PLATFORM}/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/aggregate.pl
lib/swi-prolog-${PKGVERSION}/library/am_match.pl
+lib/swi-prolog-${PKGVERSION}/library/apply.pl
+lib/swi-prolog-${PKGVERSION}/library/apply_macros.pl
lib/swi-prolog-${PKGVERSION}/library/assoc.pl
lib/swi-prolog-${PKGVERSION}/library/backcomp.pl
+lib/swi-prolog-${PKGVERSION}/library/base64.pl
lib/swi-prolog-${PKGVERSION}/library/bim.pl
+lib/swi-prolog-${PKGVERSION}/library/broadcast.pl
+lib/swi-prolog-${PKGVERSION}/library/charsio.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/clpfd.pl
lib/swi-prolog-${PKGVERSION}/library/clp/simplex.pl
+lib/swi-prolog-${PKGVERSION}/library/csv.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/dialect.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/ciao.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/commons.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/hprolog.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/iso/iso_predicates.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/yap.pl
+lib/swi-prolog-${PKGVERSION}/library/dialect/yap/README.TXT
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
+lib/swi-prolog-${PKGVERSION}/library/error.pl
lib/swi-prolog-${PKGVERSION}/library/explain.pl
lib/swi-prolog-${PKGVERSION}/library/files.pl
lib/swi-prolog-${PKGVERSION}/library/gensym.pl
+lib/swi-prolog-${PKGVERSION}/library/heaps.pl
lib/swi-prolog-${PKGVERSION}/library/help.pl
lib/swi-prolog-${PKGVERSION}/library/helpidx.pl
+lib/swi-prolog-${PKGVERSION}/library/hotfix.pl
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/nb_rbtrees.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/oset.pl
+lib/swi-prolog-${PKGVERSION}/library/pairs.pl
+lib/swi-prolog-${PKGVERSION}/library/persistency.pl
+lib/swi-prolog-${PKGVERSION}/library/pio.pl
+lib/swi-prolog-${PKGVERSION}/library/portray_text.pl
lib/swi-prolog-${PKGVERSION}/library/prolog_clause.pl
+lib/swi-prolog-${PKGVERSION}/library/prolog_source.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/pure_input.pl
lib/swi-prolog-${PKGVERSION}/library/qpforeign.pl
lib/swi-prolog-${PKGVERSION}/library/qsave.pl
lib/swi-prolog-${PKGVERSION}/library/quintus.pl
+lib/swi-prolog-${PKGVERSION}/library/rbtrees.pl
lib/swi-prolog-${PKGVERSION}/library/readln.pl
lib/swi-prolog-${PKGVERSION}/library/readutil.pl
+lib/swi-prolog-${PKGVERSION}/library/record.pl
+lib/swi-prolog-${PKGVERSION}/library/settings.pl
lib/swi-prolog-${PKGVERSION}/library/shell.pl
lib/swi-prolog-${PKGVERSION}/library/shlib.pl
+lib/swi-prolog-${PKGVERSION}/library/sort.pl
lib/swi-prolog-${PKGVERSION}/library/statistics.pl
lib/swi-prolog-${PKGVERSION}/library/system.pl
+lib/swi-prolog-${PKGVERSION}/library/terms.pl
+lib/swi-prolog-${PKGVERSION}/library/thread.pl
+lib/swi-prolog-${PKGVERSION}/library/thread_pool.pl
lib/swi-prolog-${PKGVERSION}/library/threadutil.pl
lib/swi-prolog-${PKGVERSION}/library/tty.pl
lib/swi-prolog-${PKGVERSION}/library/ugraphs.pl
@@ -89,11 +328,10 @@ 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}/library/utf8.pl
+lib/swi-prolog-${PKGVERSION}/library/vm.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
man/man1/swi-prolog.1
-@pkgdir lib/swi-prolog-${PKGVERSION}/man
-@pkgdir lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
diff --git a/lang/swi-prolog-lite/buildlink3.mk b/lang/swi-prolog-lite/buildlink3.mk
index d442fa8fafb..92034793e19 100644
--- a/lang/swi-prolog-lite/buildlink3.mk
+++ b/lang/swi-prolog-lite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/05/20 00:58:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/02/10 21:56:41 asau Exp $
BUILDLINK_TREE+= swi-prolog-lite
@@ -6,11 +6,11 @@ BUILDLINK_TREE+= swi-prolog-lite
SWI_PROLOG_LITE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.swi-prolog-lite+= swi-prolog-lite>=5.2.9
-BUILDLINK_ABI_DEPENDS.swi-prolog-lite?= swi-prolog-lite>=5.6.17nb4
BUILDLINK_PKGSRCDIR.swi-prolog-lite?= ../../lang/swi-prolog-lite
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.endif # SWI_PROLOG_LITE_BUILDLINK3_MK
+#.include "../../devel/gmp/buildlink3.mk" ?
+.endif # SWI_PROLOG_LITE_BUILDLINK3_MK
BUILDLINK_TREE+= -swi-prolog-lite
diff --git a/lang/swi-prolog-lite/distinfo b/lang/swi-prolog-lite/distinfo
index d30a0c6c9ee..79e21262337 100644
--- a/lang/swi-prolog-lite/distinfo
+++ b/lang/swi-prolog-lite/distinfo
@@ -1,20 +1,9 @@
-$NetBSD: distinfo,v 1.8 2009/10/31 19:34:31 tnn Exp $
+$NetBSD: distinfo,v 1.9 2010/02/10 21:56:41 asau Exp $
-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) = 1cf00bae2f4014ce3385ca4deb92caaa539b9c89
-SHA1 (patch-ae) = 8ff4586151109986137240aa436ba2144eb04c69
-SHA1 (patch-af) = 6ca56f948950cc198fe255f064cc30fb6c1a58fb
-SHA1 (patch-ag) = 750c50997129c8b1ae2c3c4c317296249668430b
-SHA1 (patch-ah) = 3bfc13a920e0f3a79e6764a9ace89032989e2c67
-SHA1 (patch-ai) = 9446bc38a0a7e02de303e68c923249b615c91833
-SHA1 (patch-aj) = 4450848127eab9f05113aaabfa48725336353e79
-SHA1 (patch-ak) = e767d69287f5b649048a5a6081061522c06edc18
-SHA1 (patch-al) = 14d6309b71c0cc1f67967f2692db6ca075384def
-SHA1 (patch-am) = 008c1ae8324522b185a7bf1dd07c7446dfcf2f31
-SHA1 (patch-an) = 606f076c41c3020b5c7d0730317d709220c05d4b
-SHA1 (patch-ao) = f57df2c1d1be9e7d91ded9b053a7f3cbc3af9eb6
+SHA1 (swi-prolog/pl-5.9.7.tar.gz) = 50d163bb2a24f83d1ee7811434f31266e2aaf44e
+RMD160 (swi-prolog/pl-5.9.7.tar.gz) = 720637581faa4c3bf1a96340956ec220de845db0
+Size (swi-prolog/pl-5.9.7.tar.gz) = 13077112 bytes
+SHA1 (patch-ad) = 5b54528554e63eb069e7efa7245db4ed20030512
+SHA1 (patch-ao) = ee3f49f0c889c09247bfa1761c1a633bcc6cc9e1
+SHA1 (patch-ap) = c001f721aa2d1868b8014a1a70d0b929f3d84a4e
+SHA1 (patch-aq) = 23a50b6b433de24acf785c92c815aabae729bf6c
diff --git a/lang/swi-prolog-lite/patches/patch-aa b/lang/swi-prolog-lite/patches/patch-aa
deleted file mode 100644
index 78380076d47..00000000000
--- a/lang/swi-prolog-lite/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/08/02 15:15:36 kristerw Exp $
-
---- 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)
- LDFLAGS=@LDFLAGS@
-+CPPFLAGS=@CPPFLAGS@
-
- PLFOREIGN=@PLFOREIGN@
-
-@@ -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@
-+ $(CC) -c -I. -I$(srcdir) -I$(srcdir)/rc $(CPPFLAGS) $(CFLAGS) $< @COUTOPT@
-
- system: $(PL)
- startup: $(STARTUPPATH)
-@@ -288,7 +289,7 @@
- ar x `$(CC) -print-libgcc-file-name` $@
-
- 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
-
diff --git a/lang/swi-prolog-lite/patches/patch-ab b/lang/swi-prolog-lite/patches/patch-ab
deleted file mode 100644
index a2aec1df948..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/08/02 15:15:36 kristerw Exp $
-
---- 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
-- PL=swipl
-+ #PL=swipl
- SO_EXT=dylib
- SO_pic="-fno-common"
- SO_PIC="-fno-common"
diff --git a/lang/swi-prolog-lite/patches/patch-ac b/lang/swi-prolog-lite/patches/patch-ac
deleted file mode 100644
index 80c20de0060..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $
-
---- packages/xpce/Makefile.in.orig Tue Apr 20 18:56:26 2004
-+++ packages/xpce/Makefile.in
-@@ -4,7 +4,7 @@
- # See also ./configure
- ################################################################
-
--MAKE=@MAKE@
-+MAKE=gmake
- BUILDARCH=@BUILDARCH@
-
- all::
diff --git a/lang/swi-prolog-lite/patches/patch-ad b/lang/swi-prolog-lite/patches/patch-ad
index bed16e9329f..05fc3b0a32b 100644
--- a/lang/swi-prolog-lite/patches/patch-ad
+++ b/lang/swi-prolog-lite/patches/patch-ad
@@ -1,15 +1,25 @@
-$NetBSD: patch-ad,v 1.2 2006/08/02 15:15:36 kristerw Exp $
+$NetBSD: patch-ad,v 1.3 2010/02/10 21:56:41 asau Exp $
---- 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 @@
+Fix path to include files.
+Split install target.
+
+--- packages/Makefile.in.orig 2010-01-10 16:53:32.000000000 +0300
++++ packages/Makefile.in 2010-01-19 02:29:05.000000000 +0300
+@@ -36,7 +36,7 @@
PLARCH=@ARCH@
PLLDFLAGS=@LDFLAGS@
PLDIR=$(shell dirname `pwd`)
-PLINCL=$(PLDIR)/include
--LIBDIR=$(PLDIR)/lib/$(PLARCH)
-+PLINCL=$(PLBASE)/include
-+LIBDIR=$(PLBASE)/lib/$(PLARCH)
++PLINCL=$(PLDIR)/src
+ LIBDIR=$(PLDIR)/lib/$(PLARCH)
PLSHARED=@PLSHARED@
INSTALL=@INSTALL@
- INSTALL_DATA=@INSTALL_DATA@
+@@ -83,6 +83,8 @@
+ for p in $(PKG); do \
+ if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ) || exit 1; fi; \
+ done
++
++post-install::
+ @echo "*** Forcing update of library index ***"
+ rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
+ ./pl.sh -f none -g "make_library_index('$(DESTDIR)$(PLLIB)')" -t halt
diff --git a/lang/swi-prolog-lite/patches/patch-ae b/lang/swi-prolog-lite/patches/patch-ae
deleted file mode 100644
index 12da520c3cb..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/08/02 15:15:36 kristerw Exp $
-
---- 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
-
--CPLIFLAGS= -I$(PLINCL) -I../../$(builddir) -I../../src
-+CPLIFLAGS= -I$(PLINCL) -I../../$(builddir) -I../../src -I${X11BASE}/include
- PL= pl
- PLLD= plld -pl $(PL)
- ITFOBJ= $(addprefix $(OBJDIR)/, interface.o link.o pcecall.o)
-@@ -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) $(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 $(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);
-
- ################################################################$
- # QLF generation
diff --git a/lang/swi-prolog-lite/patches/patch-af b/lang/swi-prolog-lite/patches/patch-af
deleted file mode 100644
index ef8500cf440..00000000000
--- a/lang/swi-prolog-lite/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $
-
---- packages/xpce/src/Makefile.in.orig Sat Jan 17 18:28:41 2004
-+++ packages/xpce/src/Makefile.in
-@@ -88,7 +88,7 @@ NETLIBS=@NETLIBS@
- XLIBS=@XLIBS@
- LDFLAGS=-L$(XLIB) @LDFLAGS@
- GCCLIB=@GCCLIB@
--LDSOFLAGS=@LDSOFLAGS@ -L$(XLIB)
-+LDSOFLAGS=@LDSOFLAGS@ -L$(XLIB) -Wl,-R${XLIB} -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
- SOEXTRAOBJ=@SOEXTRAOBJ@
- SO=@SO@
- VWS=@VWS@
-@@ -107,7 +107,7 @@ LIBS= $(XLIBS) $(NETLIBS) -lm
-
- COFLAGS=@COFLAGS@
- CWFLAGS=@CWFLAGS@
--CIFLAGS=-I. -I$(srcdir) @CIFLAGS@
-+CIFLAGS=-I. -I$(srcdir) @CIFLAGS@ -I${LOCALBASE}/include
- CMFLAGS=@CMFLAGS@ @DEFS@
- CFLAGS=$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-
diff --git a/lang/swi-prolog-lite/patches/patch-ag b/lang/swi-prolog-lite/patches/patch-ag
deleted file mode 100644
index cd0184d747d..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/08/02 15:15:36 kristerw Exp $
-
---- 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
-
- install: all
diff --git a/lang/swi-prolog-lite/patches/patch-ah b/lang/swi-prolog-lite/patches/patch-ah
deleted file mode 100644
index 37e0e8e54a6..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $
-
---- src/pl-xterm.c.orig Thu Apr 22 16:35:01 2004
-+++ src/pl-xterm.c
-@@ -27,7 +27,8 @@
- #endif
-
- #include "pl-incl.h"
--#if defined(HAVE_GRANTPT) && defined(O_PLMT)
-+#if defined(HAVE_GRANTPT) && defined(O_PLMT) \
-+ && !defined(__FreeBSD__) /* grantpt is borked on freebsd up to 5.2.1-rc */
-
- /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Open an alternative xterm-console. Used to support multi-threading
diff --git a/lang/swi-prolog-lite/patches/patch-ai b/lang/swi-prolog-lite/patches/patch-ai
deleted file mode 100644
index 5f41fc2d0cd..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $
-
---- packages//xpce/src/unx/process.c.orig 2002-02-01 16:05:02.000000000 +0100
-+++ packages//xpce/src/unx/process.c
-@@ -45,7 +45,13 @@ simulated using CreatePipe() and CreateP
- reduced to the facility to terminate the inferior process.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
--#ifdef __unix__
-+/* that's not passed down, and pulling in src/pl-incl.h doesn't work
-+ for some reason - HF */
-+#ifdef __NetBSD__
-+# define __unix__ 1
-+#endif
-+
-+#if defined(__unix__)
- #define HAVE_FORK 1
- #define HAVE_PTYS 1
- #define HAVE_KILL 1
diff --git a/lang/swi-prolog-lite/patches/patch-aj b/lang/swi-prolog-lite/patches/patch-aj
deleted file mode 100644
index d1946fea455..00000000000
--- a/lang/swi-prolog-lite/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/01/23 15:24:12 joerg Exp $
-
---- src/pl-setup.c.orig 2006-01-09 23:26:40.000000000 +0000
-+++ src/pl-setup.c
-@@ -993,9 +993,6 @@ todays Unix systems or VirtualAlloc() an
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
- #include <errno.h>
--#ifndef WIN32
--extern int errno;
--#endif /*WIN32*/
-
- static int size_alignment; /* Stack sizes must be aligned to this */
-
diff --git a/lang/swi-prolog-lite/patches/patch-ak b/lang/swi-prolog-lite/patches/patch-ak
deleted file mode 100644
index aead3650a5f..00000000000
--- a/lang/swi-prolog-lite/patches/patch-ak
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/10/12 14:14:13 joerg Exp $
-
---- src/pl-tai.c.orig 2006-07-28 09:20:12.000000000 +0000
-+++ src/pl-tai.c
-@@ -38,11 +38,8 @@ long set by tzset(). Not really clean .
-
- #ifdef WIN32
- #define timezone _timezone
--#define daylight _daylight
- #else
- extern char *tzname[2];
--extern long timezone;
--extern int daylight;
- #endif
-
-
-@@ -82,8 +79,21 @@ do_tzset()
-
- static int
- tz_offset()
--{ do_tzset();
-- return timezone;
-+{
-+ time_t now = time(NULL), t_gmt, t_local;
-+ struct tm gmt, local;
-+ int diff;
-+
-+ do_tzset();
-+ gmtime_r(&now, &gmt);
-+ t_gmt = mktime(&gmt);
-+ localtime_r(&now, &local);
-+ t_local = mktime(&local);
-+ diff = t_local - t_gmt;
-+ if (local.tm_isdst)
-+ diff += 3600;
-+
-+ return diff;
- }
-
-
-@@ -312,14 +322,12 @@ PRED_IMPL("stamp_date_time", 3, stamp_da
- ct.hour = tm.tm_hour;
- ct.minute = tm.tm_min;
- tzatom = tz_name_as_atom(tm.tm_isdst);
-- if ( daylight ) /* from tzset() */
-- { if ( tm.tm_isdst )
-+ if ( tm.tm_isdst )
- { utcoffset -= 3600;
- dstatom = ATOM_true;
- } else
- { dstatom = ATOM_false;
- }
-- }
- done = TRUE;
- }
- } else if ( alocal == ATOM_utc )
-@@ -721,12 +729,10 @@ PRED_IMPL("format_time", 3, format_time,
- { localtime_r(&unixt, &tb.tm);
- tb.sec = (double)tb.tm.tm_sec + modf(tb.stamp, &ip);
- tb.utcoff = tz_offset();
-- if ( daylight )
-- { if ( tb.tm.tm_isdst )
-+ if ( tb.tm.tm_isdst )
- { tb.utcoff -= 3600;
- tb.isdst = TRUE;
- }
-- }
- tb.tzname = tz_name_as_atom(tb.tm.tm_isdst);
- tb.flags = HAS_STAMP|HAS_WYDAY;
- } else
diff --git a/lang/swi-prolog-lite/patches/patch-al b/lang/swi-prolog-lite/patches/patch-al
deleted file mode 100644
index b342bd81c53..00000000000
--- a/lang/swi-prolog-lite/patches/patch-al
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-al,v 1.1 2007/10/13 07:54:31 rillig Exp $
-
-Since C99, the probability that some system header defines the type
-"bool" has risen.
-
---- packages/xpce/src/h/kernel.h.orig 2007-10-13 09:41:23.000000000 +0200
-+++ packages/xpce/src/h/kernel.h 2007-10-13 09:42:10.000000000 +0200
-@@ -1272,7 +1272,7 @@ NewClass(constant) /* @nil, @default *
- ABSTRACT_CONSTANT
- End;
-
--NewClass(bool) /* @on, @off */
-+NewClass(swi_bool) /* @on, @off */
- ABSTRACT_CONSTANT
- End;
-
-@@ -1596,8 +1596,8 @@ GLOBAL int XPCE_mt; /* we are multi-thr
- GLOBAL struct constant ConstantNil; /* MUST be first! */
- GLOBAL struct constant ConstantDefault;
- GLOBAL struct constant ConstantClassDefault;
--GLOBAL struct bool BoolOn;
--GLOBAL struct bool BoolOff;
-+GLOBAL struct swi_bool BoolOn;
-+GLOBAL struct swi_bool BoolOff;
-
- GLOBAL Var RECEIVER; /* @receiver */
- GLOBAL Var RECEIVER_CLASS; /* @receiver_class */
diff --git a/lang/swi-prolog-lite/patches/patch-am b/lang/swi-prolog-lite/patches/patch-am
deleted file mode 100644
index c49b6c8d874..00000000000
--- a/lang/swi-prolog-lite/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.1 2007/10/13 07:54:31 rillig Exp $
-
-See patch-al.
-
---- packages/xpce/src/h/types.h.orig 2006-04-05 09:29:15.000000000 +0200
-+++ packages/xpce/src/h/types.h 2007-10-13 09:41:46.000000000 +0200
-@@ -63,7 +63,7 @@ typedef struct binary_condition * Binary
- typedef struct binding * Binding;
- typedef struct assignment * Assignment;
- typedef struct block * Block;
--typedef struct bool * Bool;
-+typedef struct swi_bool * Bool;
- typedef struct c_pointer * CPointer;
- typedef struct cell * Cell;
- typedef struct chain * Chain;
diff --git a/lang/swi-prolog-lite/patches/patch-an b/lang/swi-prolog-lite/patches/patch-an
deleted file mode 100644
index 363643b8635..00000000000
--- a/lang/swi-prolog-lite/patches/patch-an
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/10/13 07:54:31 rillig Exp $
-
-See patch-al.
-
---- packages/xpce/src/ker/self.c.orig 2005-11-21 20:45:53.000000000 +0100
-+++ packages/xpce/src/ker/self.c 2007-10-13 09:42:56.000000000 +0200
-@@ -1133,7 +1133,7 @@ getVersionPce(Pce pce, Name how)
- int n;
-
- for(n=0; n<3; n++)
-- { while(*q && isdigit(*q))
-+ { while(*q && isdigit((unsigned char)*q))
- q++;
- if ( *q == '.' )
- q++;
-@@ -1478,8 +1478,8 @@ pceInitialise(int handles, const char *h
- allocRange(&ConstantNil, sizeof(struct constant));
- allocRange(&ConstantDefault, sizeof(struct constant));
- allocRange(&ConstantClassDefault, sizeof(struct constant));
-- allocRange(&BoolOff, sizeof(struct bool));
-- allocRange(&BoolOn, sizeof(struct bool));
-+ allocRange(&BoolOff, sizeof(struct swi_bool));
-+ allocRange(&BoolOn, sizeof(struct swi_bool));
- initNamesPass1();
- DEBUG_BOOT(Cprintf("Types ...\n"));
- initTypes();
diff --git a/lang/swi-prolog-lite/patches/patch-ao b/lang/swi-prolog-lite/patches/patch-ao
index fa9ad7db952..c4f267e7cbf 100644
--- a/lang/swi-prolog-lite/patches/patch-ao
+++ b/lang/swi-prolog-lite/patches/patch-ao
@@ -1,22 +1,24 @@
-$NetBSD: patch-ao,v 1.1 2009/10/31 19:34:31 tnn Exp $
+$NetBSD: patch-ao,v 1.2 2010/02/10 21:56:41 asau Exp $
---- src/pl-arith.c.orig 2009-10-31 20:31:13.000000000 +0100
-+++ src/pl-arith.c
-@@ -1752,7 +1752,7 @@ ar_lsb(Number n1, Number r)
+Avoid conflict with library function.
+
+--- src/pl-arith.c.orig 2009-10-19 17:00:42.000000000 +0400
++++ src/pl-arith.c 2009-10-20 08:54:57.000000000 +0400
+@@ -2268,7 +2268,7 @@
static int
-popcount64(int64_t i)
-+popcount64_(int64_t i)
- { int c, j;
++ar_popcount64(int64_t i)
+ { int c;
+ size_t j;
int64_t m = LL(1);
-
-@@ -1775,7 +1775,7 @@ ar_popcount(Number n1, Number r)
+@@ -2292,7 +2292,7 @@
if ( n1->value.i < 0 )
return notLessThanZero("popcount", 1, n1);
- r->value.i = popcount64(n1->value.i);
-+ r->value.i = popcount64_(n1->value.i);
++ r->value.i = ar_popcount64(n1->value.i);
r->type = V_INTEGER;
succeed;
#ifdef O_GMP
diff --git a/lang/swi-prolog-lite/patches/patch-ap b/lang/swi-prolog-lite/patches/patch-ap
new file mode 100644
index 00000000000..3609447dd84
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2010/02/10 21:56:41 asau Exp $
+
+"test" portability.
+Reported as applied upstream.
+
+--- packages/space/configure.in.orig 2010-01-10 16:35:20.000000000 +0300
++++ packages/space/configure.in 2010-01-17 19:19:50.000000000 +0300
+@@ -88,12 +88,12 @@
+
+ AC_CHECK_HEADERS(spatialindex/SpatialIndex.h,[si=1],[si=0])
+ #AC_TRY_LINK([#include <spatialindex/SpatialIndex.h>],[SpatialIndex::Point *p=new SpatialIndex::Point();],[si=1],[si=0])
+-if test $si == 0; then
++if test $si = 0; then
+ AC_ERROR("Cannot find spatialindex. Spatialindex must be installed first (http://trac.gispython.org/spatialindex/)")
+ fi
+
+ AC_CHECK_HEADERS(geos_c.h,[geos=1],[geos=0])
+-if test $si == 0; then
++if test $si = 0; then
+ AC_ERROR("Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)")
+ fi
+
diff --git a/lang/swi-prolog-lite/patches/patch-aq b/lang/swi-prolog-lite/patches/patch-aq
new file mode 100644
index 00000000000..ad3fd628b81
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-aq
@@ -0,0 +1,25 @@
+$NetBSD: patch-aq,v 1.1 2010/02/10 21:56:41 asau Exp $
+
+"test" portability.
+Reported as applied upstream.
+
+--- packages/space/configure.orig 2010-01-17 19:18:27.000000000 +0300
++++ packages/space/configure 2010-01-17 19:20:26.000000000 +0300
+@@ -3797,7 +3797,7 @@
+ done
+
+ #AC_TRY_LINK([#include <spatialindex/SpatialIndex.h>],[SpatialIndex::Point *p=new SpatialIndex::Point();],[si=1],[si=0])
+-if test $si == 0; then
++if test $si = 0; then
+ { { $as_echo "$as_me:$LINENO: error: \"Cannot find spatialindex. Spatialindex must be installed first (http://trac.gispython.org/spatialindex/)\"" >&5
+ $as_echo "$as_me: error: \"Cannot find spatialindex. Spatialindex must be installed first (http://trac.gispython.org/spatialindex/)\"" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -3951,7 +3951,7 @@
+
+ done
+
+-if test $si == 0; then
++if test $si = 0; then
+ { { $as_echo "$as_me:$LINENO: error: \"Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)\"" >&5
+ $as_echo "$as_me: error: \"Cannot find GEOS library. GEOS must be installed first (http://trac.osgeo.org/geos/)\"" >&2;}
+ { (exit 1); exit 1; }; }