diff options
-rw-r--r-- | lang/swi-prolog/DESCR | 5 | ||||
-rw-r--r-- | lang/swi-prolog/Makefile | 41 | ||||
-rw-r--r-- | lang/swi-prolog/PLIST | 91 | ||||
-rw-r--r-- | lang/swi-prolog/distinfo | 6 | ||||
-rw-r--r-- | lang/swi-prolog/patches/patch-aa | 50 | ||||
-rw-r--r-- | lang/swi-prolog/patches/patch-ab | 13 |
6 files changed, 11 insertions, 195 deletions
diff --git a/lang/swi-prolog/DESCR b/lang/swi-prolog/DESCR index 272e405267e..ed3bd14c7c9 100644 --- a/lang/swi-prolog/DESCR +++ b/lang/swi-prolog/DESCR @@ -4,5 +4,6 @@ and shares many features with Quintus and SICStus Prolog, including a compatible module system. Very fast compiler, garbage collection (also on atoms), fast and powerful C/C++ interface, autoloading, GNU-readline interface. SWI-Prolog supports architectures with 32-bit -or greater (64-bit) word-length. Packages for process management, -TCP/IP, XML/SGML, RDF, and the GUI toolkit XPCE, are also available. +or greater (64-bit) word-length. + +This is a meta-package that pulls in the interpreter and packages. diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index a566cfd69f0..16c302ac991 100644 --- a/lang/swi-prolog/Makefile +++ b/lang/swi-prolog/Makefile @@ -1,39 +1,14 @@ -# $NetBSD: Makefile,v 1.28 2004/05/09 02:26:14 snj Exp $ +# $NetBSD: Makefile,v 1.29 2004/05/20 11:18:37 hubertf Exp $ -DISTNAME= pl-lite-5.0.10 -PKGNAME= swi-prolog-5.0.10 -PKGREVISION= 2 -CATEGORIES= lang -MASTER_SITES= ftp://ftp.swi.psy.uva.nl/SWI-Prolog/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.swi-prolog.org/ -COMMENT= ISO/Edinburgh-style Prolog compiler - -DIST_SUBDIR= swi-prolog -WRKSRC= ${WRKDIR}/${DISTNAME:S,-lite,,} +.include "../swi-prolog-lite/Makefile" -GNU_CONFIGURE= # defined -USE_BUILDLINK3= yes -USE_GNU_READLINE= # uses rl_event_hook() interface - -SWIPL= swi-prolog -CONFIGURE_ENV+= PL="${SWIPL}" -CPPFLAGS+= -D__unix__=1 - -PLIST_SUBST+= SWIPL=${SWIPL} -PLIST_SUBST+= SWILIBDIR=${DISTNAME:S,pl-lite,'${SWIPL}',} -PLIST_SUBST+= APPEND_ELF=${APPEND_ELF} +PKGNAME= swi-prolog-${SWIPLVERS} +CATEGORIES= lang -.include "../../mk/bsd.prefs.mk" +MAINTAINER= hubertf@NetBSD.org +COMMENT= ISO/Edinburgh-style Prolog compiler suite -.if ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH} == sparc64 || \ - ${MACHINE_ARCH} == x86_64 -PLIST_SUBST+= BITS=64 -.else -PLIST_SUBST+= BITS=32 -.endif +DEPENDS+= swi-prolog-lite-${SWIPLVERS}:../swi-prolog-lite +DEPENDS+= swi-prolog-packages-${SWIPLVERS}:../swi-prolog-packages -.include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/swi-prolog/PLIST b/lang/swi-prolog/PLIST deleted file mode 100644 index 4ce7a9367df..00000000000 --- a/lang/swi-prolog/PLIST +++ /dev/null @@ -1,91 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2002/05/03 21:31:02 jtb Exp $ -bin/plld -bin/plrc -bin/swi-prolog -include/SWI-Prolog.h -include/SWI-Stream.h -lib/${PKGNAME}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plld -lib/${PKGNAME}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/plrc -lib/${PKGNAME}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/swi-prolog -lib/${PKGNAME}/bin/swipl -lib/${PKGNAME}/boot/apply.pl -lib/${PKGNAME}/boot/autoload.pl -lib/${PKGNAME}/boot/bags.pl -lib/${PKGNAME}/boot/dwim.pl -lib/${PKGNAME}/boot/history.pl -lib/${PKGNAME}/boot/init.pl -lib/${PKGNAME}/boot/license.pl -lib/${PKGNAME}/boot/list.pl -lib/${PKGNAME}/boot/load.pl -lib/${PKGNAME}/boot/make.pl -lib/${PKGNAME}/boot/menu.pl -lib/${PKGNAME}/boot/messages.pl -lib/${PKGNAME}/boot/parms.pl -lib/${PKGNAME}/boot/profile.pl -lib/${PKGNAME}/boot/qlf.pl -lib/${PKGNAME}/boot/rc.pl -lib/${PKGNAME}/boot/sort.pl -lib/${PKGNAME}/boot/syspred.pl -lib/${PKGNAME}/boot/toplevel.pl -lib/${PKGNAME}/boot/topvars.pl -lib/${PKGNAME}/boot/writef.pl -lib/${PKGNAME}/boot${BITS}.prc -lib/${PKGNAME}/dotfiles/README -lib/${PKGNAME}/dotfiles/dotplrc -lib/${PKGNAME}/dotfiles/dotxpcerc -lib/${PKGNAME}/dotfiles/edit -lib/${PKGNAME}/include/SWI-Prolog.h -lib/${PKGNAME}/include/SWI-Stream.h -lib/${PKGNAME}/include/stub.c -lib/${PKGNAME}/library/INDEX.pl -lib/${PKGNAME}/library/MANUAL -lib/${PKGNAME}/library/am_match.pl -lib/${PKGNAME}/library/backcomp.pl -lib/${PKGNAME}/library/bim.pl -lib/${PKGNAME}/library/check.pl -lib/${PKGNAME}/library/ctypes.pl -lib/${PKGNAME}/library/edinburgh.pl -lib/${PKGNAME}/library/edit.pl -lib/${PKGNAME}/library/emacs_interface.pl -lib/${PKGNAME}/library/explain.pl -lib/${PKGNAME}/library/files.pl -lib/${PKGNAME}/library/gensym.pl -lib/${PKGNAME}/library/help.pl -lib/${PKGNAME}/library/helpidx.pl -lib/${PKGNAME}/library/listing.pl -lib/${PKGNAME}/library/main.pl -lib/${PKGNAME}/library/netscape.pl -lib/${PKGNAME}/library/occurs.pl -lib/${PKGNAME}/library/ordsets.pl -lib/${PKGNAME}/library/oset.pl -lib/${PKGNAME}/library/qpforeign.pl -lib/${PKGNAME}/library/qsave.pl -lib/${PKGNAME}/library/quintus.pl -lib/${PKGNAME}/library/readln.pl -lib/${PKGNAME}/library/readutil.pl -lib/${PKGNAME}/library/shell.pl -lib/${PKGNAME}/library/shlib.pl -lib/${PKGNAME}/library/statistics.pl -lib/${PKGNAME}/library/system.pl -lib/${PKGNAME}/library/threadutil.pl -lib/${PKGNAME}/library/tty.pl -lib/${PKGNAME}/library/url.pl -lib/${PKGNAME}/runtime/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}/libpl.a -lib/${PKGNAME}/swipl -man/man1/plld.1 -man/man1/plrc.1 -man/man1/swi-prolog.1 -@dirrm lib/${SWILIBDIR}/runtime/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF} -@dirrm lib/${SWILIBDIR}/runtime -@exec ${MKDIR} %D/lib/${SWILIBDIR}/man -@dirrm lib/${SWILIBDIR}/man -@dirrm lib/${SWILIBDIR}/library -@exec ${MKDIR} %D/lib/${SWILIBDIR}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF} -@dirrm lib/${SWILIBDIR}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF} -@dirrm lib/${SWILIBDIR}/lib -@dirrm lib/${SWILIBDIR}/include -@dirrm lib/${SWILIBDIR}/dotfiles -@dirrm lib/${SWILIBDIR}/boot -@dirrm lib/${SWILIBDIR}/bin/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF} -@dirrm lib/${SWILIBDIR}/bin -@dirrm lib/${SWILIBDIR} diff --git a/lang/swi-prolog/distinfo b/lang/swi-prolog/distinfo deleted file mode 100644 index 04753929a2f..00000000000 --- a/lang/swi-prolog/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.8 2003/02/27 12:59:44 wulf Exp $ - -SHA1 (swi-prolog/pl-lite-5.0.10.tar.gz) = cf05274988798348005ffc93689fa7733b1403ec -Size (swi-prolog/pl-lite-5.0.10.tar.gz) = 1372342 bytes -SHA1 (patch-aa) = 2b6164ed8cc4398c1e7cc2662016e202f61e51f2 -SHA1 (patch-ab) = 66576bfd1c48a9501070308b8925f1cf4ff0bb37 diff --git a/lang/swi-prolog/patches/patch-aa b/lang/swi-prolog/patches/patch-aa deleted file mode 100644 index 7e1a0132f19..00000000000 --- a/lang/swi-prolog/patches/patch-aa +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/05/03 21:31:02 jtb 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 @@ - CWFLAGS=@CWFLAGS@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS+= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) - LDFLAGS=@LDFLAGS@ -+CPPFLAGS=@CPPFLAGS@ - - PLFOREIGN=@PLFOREIGN@ - -@@ -135,7 +137,7 @@ - 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) -@@ -242,7 +244,7 @@ - ar x `$(CC) -print-libgcc-file-name` $@ - - plld: $(srcdir)/plld.c -- $(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/patches/patch-ab b/lang/swi-prolog/patches/patch-ab deleted file mode 100644 index 8fb29135781..00000000000 --- a/lang/swi-prolog/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2002/05/03 21:31:02 jtb Exp $ - ---- src/configure.orig Tue Apr 16 10:03:45 2002 -+++ src/configure Wed May 1 19:21:58 2002 -@@ -978,7 +978,7 @@ - EXTRAOBJ="" - EXTRAHDR="" - INSTALLTARGET=dv-install --PL=pl -+#PL=pl - PLLIB=libpl.a - RT="" - PLVERSION=`cat ../VERSION` |