diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-06-20 08:04:24 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-06-20 08:04:24 +0000 |
| commit | c78e91a96add989697875a52d5bdeecff7683083 (patch) | |
| tree | fd45783baf16ae1d68e6bb6052cdf4ba06d8be89 /dev-lang | |
| parent | stable x86, bug 182481 (diff) | |
| download | gentoo-2-c78e91a96add989697875a52d5bdeecff7683083.tar.gz gentoo-2-c78e91a96add989697875a52d5bdeecff7683083.tar.bz2 gentoo-2-c78e91a96add989697875a52d5bdeecff7683083.zip | |
Remove old version.
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-lang')
21 files changed, 15 insertions, 1635 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 87b713d27414..d0a60551e928 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.94 2007/06/20 07:36:16 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.95 2007/06/20 08:04:24 keri Exp $ + + 20 Jun 2007; keri <keri@gentoo.org> -files/swi-prolog-5.6.18-CFLAGS.patch, + -files/swi-prolog-5.6.18-PLBASE.patch, + -files/swi-prolog-5.6.18-portage.patch, -files/swi-prolog-CFLAGS-r1.patch, + -files/swi-prolog-PLBASE-r1.patch, -files/swi-prolog-cppproxy.patch, + -files/swi-prolog-db-docs.patch, -files/swi-prolog-db-versioned.patch, + -files/swi-prolog-gmp-sparc-alignment.patch, + -files/swi-prolog-jpl-install.patch, -files/swi-prolog-jpl-ppc.patch, + -files/swi-prolog-libtai.patch, -files/swi-prolog-parallel-build.patch, + -files/swi-prolog-portage.patch, + -files/swi-prolog-semweb-sparc-alignment.patch, + -files/swi-prolog-test_date.patch, -files/swi-prolog-thread-tests.patch, + -files/swi-prolog-xpce-test.patch, -swi-prolog-5.6.17-r1.ebuild: + Remove old version. *swi-prolog-5.6.35 (20 Jun 2007) diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17-r1 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17-r1 deleted file mode 100644 index 56aaea0e1546..000000000000 --- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3858e1f3073deac18ca1f76986f8b69c pl-5.6.17.tar.gz 10652203 -RMD160 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab pl-5.6.17.tar.gz 10652203 -SHA256 4768761ec4ad4c7160373950bc21d6124c3641dfff9dbe5db4dd7c48433e0072 pl-5.6.17.tar.gz 10652203 diff --git a/dev-lang/swi-prolog/files/swi-prolog-5.6.18-CFLAGS.patch b/dev-lang/swi-prolog/files/swi-prolog-5.6.18-CFLAGS.patch deleted file mode 100644 index 65cc25ba1daf..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-5.6.18-CFLAGS.patch +++ /dev/null @@ -1,336 +0,0 @@ -diff -ur pl-5.6.18.orig/packages/clib/configure pl-5.6.18/packages/clib/configure ---- pl-5.6.18.orig/packages/clib/configure 2006-01-11 09:41:55.000000000 +1300 -+++ pl-5.6.18/packages/clib/configure 2006-09-01 19:39:18.000000000 +1200 -@@ -3117,7 +3117,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3709,7 +3709,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.18/packages/clib/maildrop/rfc2045/configure ---- pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure 2005-07-25 02:37:57.000000000 +1200 -+++ pl-5.6.18/packages/clib/maildrop/rfc2045/configure 2006-09-01 19:40:33.000000000 +1200 -@@ -3155,7 +3155,7 @@ - - if test "$GCC" = yes ; then - CXXFLAGS="$CXXFLAGS -Wall" -- CFLAGS="$CFLAGS -Wall" -+ CFLAGS="$CFLAGS -fpic -Wall" - fi - - -diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure pl-5.6.18/packages/clib/maildrop/rfc822/configure ---- pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure 2005-07-25 02:37:57.000000000 +1200 -+++ pl-5.6.18/packages/clib/maildrop/rfc822/configure 2006-09-01 19:41:37.000000000 +1200 -@@ -3144,7 +3144,7 @@ - - if test "$GCC" = yes ; then - CXXFLAGS="$CXXFLAGS -Wall" -- CFLAGS="$CFLAGS -Wall" -+ CFLAGS="$CFLAGS -fpic -Wall" - fi - - -diff -ur pl-5.6.18.orig/packages/cppproxy/configure pl-5.6.18/packages/cppproxy/configure ---- pl-5.6.18.orig/packages/cppproxy/configure 2006-01-23 22:29:29.000000000 +1300 -+++ pl-5.6.18/packages/cppproxy/configure 2006-09-01 19:42:51.000000000 +1200 -@@ -3111,7 +3111,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3703,7 +3703,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/db/configure pl-5.6.18/packages/db/configure ---- pl-5.6.18.orig/packages/db/configure 2006-07-31 19:54:07.000000000 +1200 -+++ pl-5.6.18/packages/db/configure 2006-09-01 19:44:12.000000000 +1200 -@@ -3139,13 +3139,13 @@ - fi - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O - CWFLAGS= - fi --CFLAGS="$CMFLAGS $CIFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -diff -ur pl-5.6.18.orig/packages/jpl/configure pl-5.6.18/packages/jpl/configure ---- pl-5.6.18.orig/packages/jpl/configure 2006-08-09 19:58:24.000000000 +1200 -+++ pl-5.6.18/packages/jpl/configure 2006-09-01 19:45:49.000000000 +1200 -@@ -3077,10 +3077,10 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS="-Wall" - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/ltx2htm/configure pl-5.6.18/packages/ltx2htm/configure ---- pl-5.6.18.orig/packages/ltx2htm/configure 2004-09-22 02:28:17.000000000 +1200 -+++ pl-5.6.18/packages/ltx2htm/configure 2006-09-01 19:49:17.000000000 +1200 -@@ -1351,7 +1351,7 @@ - CC=$PLLD - LD=$PLLD - LDSOFLAGS=-shared -- -+CMFLAGS=-fpic - SO="$PLSOEXT" - - TARGETS="unix.$SO socket.$SO cgi.$SO memfile.$SO" -@@ -2925,7 +2925,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3455,7 +3455,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS=-O2 -+ COFLAGS="$CFLAGS" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/nlp/configure pl-5.6.18/packages/nlp/configure ---- pl-5.6.18.orig/packages/nlp/configure 2005-11-26 23:54:48.000000000 +1300 -+++ pl-5.6.18/packages/nlp/configure 2006-09-01 19:50:31.000000000 +1200 -@@ -3111,7 +3111,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3703,7 +3703,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/odbc/configure pl-5.6.18/packages/odbc/configure ---- pl-5.6.18.orig/packages/odbc/configure 2006-02-16 09:48:34.000000000 +1300 -+++ pl-5.6.18/packages/odbc/configure 2006-09-01 19:52:33.000000000 +1200 -@@ -3147,7 +3147,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3739,7 +3739,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/semweb/configure pl-5.6.18/packages/semweb/configure ---- pl-5.6.18.orig/packages/semweb/configure 2006-03-08 03:43:04.000000000 +1300 -+++ pl-5.6.18/packages/semweb/configure 2006-09-01 19:53:47.000000000 +1200 -@@ -3145,7 +3145,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -4294,7 +4294,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O3 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/sgml/configure pl-5.6.18/packages/sgml/configure ---- pl-5.6.18.orig/packages/sgml/configure 2006-02-04 04:38:50.000000000 +1300 -+++ pl-5.6.18/packages/sgml/configure 2006-09-01 19:55:24.000000000 +1200 -@@ -3184,16 +3184,12 @@ - fi - - if test ! -z "$GCC"; then -- if test $gmake = yes; then -- COFLAGS='$(shell if test -r .coflags; then cat .coflags; else echo "-O2"; fi)' -- else -- COFLAGS="-O2 -fno-strict-aliasing" -- fi -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS="$CWFLAGS -Wall" - else - COFLAGS=-O - fi --CFLAGS="$CMFLAGS" -+ - echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 - echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 - if test "${ac_cv_c_bigendian+set}" = set; then -diff -ur pl-5.6.18.orig/packages/ssl/configure pl-5.6.18/packages/ssl/configure ---- pl-5.6.18.orig/packages/ssl/configure 2006-02-04 04:38:50.000000000 +1300 -+++ pl-5.6.18/packages/ssl/configure 2006-09-01 19:56:34.000000000 +1200 -@@ -3147,7 +3147,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3739,7 +3739,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/table/configure pl-5.6.18/packages/table/configure ---- pl-5.6.18.orig/packages/table/configure 2005-01-31 23:47:37.000000000 +1300 -+++ pl-5.6.18/packages/table/configure 2006-09-01 19:58:05.000000000 +1200 -@@ -3112,7 +3112,7 @@ - - fi - --CFLAGS="$CMFLAGS" -+ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3704,7 +3704,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O -diff -ur pl-5.6.18.orig/packages/xpce/src/configure pl-5.6.18/packages/xpce/src/configure ---- pl-5.6.18.orig/packages/xpce/src/configure 2006-04-05 19:29:14.000000000 +1200 -+++ pl-5.6.18/packages/xpce/src/configure 2006-09-01 19:59:11.000000000 +1200 -@@ -4391,7 +4391,7 @@ - fi - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - if test "$ac_cv_header_stdc" = "yes" || test "$syslibh" = "yes"; then - CWFLAGS=-Wall - else -@@ -4401,7 +4401,7 @@ - COFLAGS=-O - CWFLAGS= - fi --CFLAGS="$CMFLAGS" -+ - echo "$as_me:$LINENO: checking for inline" >&5 - echo $ECHO_N "checking for inline... $ECHO_C" >&6 - if test "${ac_cv_c_inline+set}" = set; then -diff -ur pl-5.6.18.orig/src/Makefile.in pl-5.6.18/src/Makefile.in ---- pl-5.6.18.orig/src/Makefile.in 2006-08-25 20:33:32.000000000 +1200 -+++ pl-5.6.18/src/Makefile.in 2006-09-01 19:36:22.000000000 +1200 -@@ -69,7 +69,7 @@ - CWFLAGS=@CWFLAGS@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) - LDFLAGS=@LDFLAGS@ - - PLFOREIGN=@PLFOREIGN@ -diff -ur pl-5.6.18.orig/src/configure pl-5.6.18/src/configure ---- pl-5.6.18.orig/src/configure 2006-08-07 20:21:19.000000000 +1200 -+++ pl-5.6.18/src/configure 2006-09-01 19:35:33.000000000 +1200 -@@ -3807,7 +3807,7 @@ - esac - fi - else -- COFLAGS=$CFLAGS -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - fi - - -@@ -14816,7 +14816,7 @@ - LNLIBS="$LIBS" - fi - --echo " CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS" -+echo " CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS" - echo " LDFLAGS=$LDFLAGS" - echo " LIBS=$LIBS" - -diff -ur pl-5.6.18.orig/src/libtai/Makefile.in pl-5.6.18/src/libtai/Makefile.in ---- pl-5.6.18.orig/src/libtai/Makefile.in 2006-07-11 20:41:05.000000000 +1200 -+++ pl-5.6.18/src/libtai/Makefile.in 2006-09-01 19:37:28.000000000 +1200 -@@ -29,7 +29,7 @@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ - LDFLAGS=@LDFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) - - INSTALL=@INSTALL@ - INSTALL_PROGRAM=@INSTALL_PROGRAM@ -diff -ur pl-5.6.18.orig/src/rc/Makefile.in pl-5.6.18/src/rc/Makefile.in ---- pl-5.6.18.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200 -+++ pl-5.6.18/src/rc/Makefile.in 2006-09-01 19:36:56.000000000 +1200 -@@ -30,7 +30,7 @@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ - LDFLAGS=@LDFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) - - INSTALL=@INSTALL@ - INSTALL_PROGRAM=@INSTALL_PROGRAM@ diff --git a/dev-lang/swi-prolog/files/swi-prolog-5.6.18-PLBASE.patch b/dev-lang/swi-prolog/files/swi-prolog-5.6.18-PLBASE.patch deleted file mode 100644 index d88e78659e61..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-5.6.18-PLBASE.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -ur pl-5.6.18.orig/packages/Makefile.in pl-5.6.18/packages/Makefile.in ---- pl-5.6.18.orig/packages/Makefile.in 2006-08-30 20:35:12.000000000 +1200 -+++ pl-5.6.18/packages/Makefile.in 2006-09-01 20:21:48.000000000 +1200 -@@ -30,7 +30,7 @@ - bindir=@bindir@ - PL=@PL@@RT@ - PLVERSION=@PLVERSION@ --PLBASE=$(prefix)/lib/@PL@-$(PLVERSION) -+PLBASE=@libdir@/@PL@-$(PLVERSION) - PKGDOC=$(PLBASE)/doc/packages - PLLIBS=@LIBS@ - PLARCH=@ARCH@ -diff -ur pl-5.6.18.orig/packages/ltx2htm/Makefile.in pl-5.6.18/packages/ltx2htm/Makefile.in ---- pl-5.6.18.orig/packages/ltx2htm/Makefile.in 2006-08-25 21:19:59.000000000 +1200 -+++ pl-5.6.18/packages/ltx2htm/Makefile.in 2006-09-01 20:22:55.000000000 +1200 -@@ -33,7 +33,7 @@ - INSTALL_DATA=@INSTALL_DATA@ - - # Don't change, this is also in latex2html.in! --LIBDIR=$(prefix)/lib/latex2html -+LIBDIR=@libdir@/latex2html - - OBJ= tex.o psfile.o - LIB= latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd \ -diff -ur pl-5.6.18.orig/src/Makefile.in pl-5.6.18/src/Makefile.in ---- pl-5.6.18.orig/src/Makefile.in 2006-08-25 20:33:32.000000000 +1200 -+++ pl-5.6.18/src/Makefile.in 2006-09-01 20:15:51.000000000 +1200 -@@ -36,6 +36,7 @@ - srcdir=@srcdir@ - @VPATH@ @srcdir@ - bindir=@bindir@ -+libdir=@libdir@ - mandir=@mandir@ - mansec=1 - lmansec=3 -@@ -46,7 +47,7 @@ - PLVERSION=@PLVERSION@ - PL=@PL@@RT@ - PLV=@PL@@RT@-@PLVERSION@ --PLBASE=$(prefix)/lib/@PL@@RT@-@PLVERSION@ -+PLBASE=$(libdir)/@PL@@RT@-@PLVERSION@ - BOOTFILE=@BOOTFILE@ - - CC=@CC@ -@@ -360,7 +361,7 @@ - $(INSTALL_DATA) libplimp.a $(DESTDIR)$(PLBASE)/lib/$(ARCH) - - idirs:: -- if [ ! -d $(DESTDIR)$(prefix)/lib ]; then $(MKDIR) $(DESTDIR)$(prefix)/lib; fi -+ if [ ! -d $(DESTDIR)$(libdir) ]; then $(MKDIR) $(DESTDIR)$(libdir); fi - if [ ! -d $(DESTDIR)$(PLBASE) ]; then $(MKDIR) $(DESTDIR)$(PLBASE); fi - for d in $(installdirs); do \ - if [ ! -d $(DESTDIR)$(PLBASE)/$$d ]; then \ -@@ -430,7 +431,7 @@ - # runtime-only environment installation - # - --RTHOME= $(DESTDIR)$(prefix)/lib/$(PLV) -+RTHOME= $(DESTDIR)$(libdir)/$(PLV) - RTDIRS= $(RTHOME) $(RTHOME)/bin $(RTHOME)/lib $(RTHOME)/lib/$(ARCH) \ - $(RTHOME)/man $(RTHOME)/bin/$(ARCH) $(RTHOME)/include - -diff -ur pl-5.6.18.orig/src/configure pl-5.6.18/src/configure ---- pl-5.6.18.orig/src/configure 2006-08-07 20:21:19.000000000 +1200 -+++ pl-5.6.18/src/configure 2006-09-01 20:20:23.000000000 +1200 -@@ -2546,7 +2546,7 @@ - - - test "x$prefix" = xNONE && prefix=$ac_default_prefix --PLBASE=$prefix/lib/$PL-$PLVERSION -+PLBASE=$libdir/$PL-$PLVERSION - - - for ac_prog in gmake make -diff -ur pl-5.6.18.orig/src/rc/Makefile.in pl-5.6.18/src/rc/Makefile.in ---- pl-5.6.18.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200 -+++ pl-5.6.18/src/rc/Makefile.in 2006-09-01 20:11:08.000000000 +1200 -@@ -14,7 +14,7 @@ - srcdir=@srcdir@ - @VPATH@ @srcdir@ - bindir=$(exec_prefix)/bin --PLBASE=$(prefix)/lib/@PL@-$(PLVERSION) -+PLBASE=@libdir@/@PL@-$(PLVERSION) - man_prefix=$(prefix)/man - mansec=1 - lmansec=3 diff --git a/dev-lang/swi-prolog/files/swi-prolog-5.6.18-portage.patch b/dev-lang/swi-prolog/files/swi-prolog-5.6.18-portage.patch deleted file mode 100644 index 5bbe1e408d4e..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-5.6.18-portage.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- pl-5.6.18.orig/packages/Makefile.in 2006-08-30 20:35:12.000000000 +1200 -+++ pl-5.6.18/packages/Makefile.in 2006-09-01 20:07:28.000000000 +1200 -@@ -81,7 +81,7 @@ - - install:: - for p in $(PKG); do \ -- if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \ -+ if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \ - done - @echo "*** Forcing update of library index ***" - rm -f $(DESTDIR)$(PLLIB)/INDEX.pl -@@ -120,7 +120,7 @@ - echo "**********************"; \ - echo "* Package $$p"; \ - echo "**********************"; \ -- ( cd $$p && $(CONFIG) ); \ -+ ( cd $$p && $(CONFIG) ) || exit 1; \ - fi; \ - done - -@@ -137,7 +137,7 @@ - - check:: - for p in $(PKG); do \ -- if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \ -+ if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \ - done - - # test environment diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r1.patch deleted file mode 100644 index 101420fec7a5..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r1.patch +++ /dev/null @@ -1,310 +0,0 @@ ---- pl-5.6.17.orig/src/configure 2006-07-11 20:31:16.000000000 +1200 -+++ pl-5.6.17/src/configure 2006-08-26 17:49:55.000000000 +1200 -@@ -3807,7 +3807,7 @@ - esac - fi - else -- COFLAGS=$CFLAGS -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - fi - - -@@ -14213,7 +14213,7 @@ - LNLIBS="$LIBS" - fi - --echo " CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS" -+echo " CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS" - echo " LDFLAGS=$LDFLAGS" - echo " LIBS=$LIBS" - ---- pl-5.6.17.orig/src/Makefile.in 2006-07-15 01:51:53.000000000 +1200 -+++ pl-5.6.17/src/Makefile.in 2006-08-26 17:47:12.000000000 +1200 -@@ -69,7 +69,7 @@ - CWFLAGS=@CWFLAGS@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) - LDFLAGS=@LDFLAGS@ - - PLFOREIGN=@PLFOREIGN@ ---- pl-5.6.17.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200 -+++ pl-5.6.17/src/rc/Makefile.in 2006-08-26 17:47:52.000000000 +1200 -@@ -30,7 +30,7 @@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ - LDFLAGS=@LDFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) - - INSTALL=@INSTALL@ - INSTALL_PROGRAM=@INSTALL_PROGRAM@ ---- pl-5.6.17.orig/src/libtai/Makefile.in 2006-07-11 20:41:05.000000000 +1200 -+++ pl-5.6.17/src/libtai/Makefile.in 2006-08-26 17:52:02.000000000 +1200 -@@ -29,7 +29,7 @@ - CIFLAGS=@CIFLAGS@ - CMFLAGS=@CMFLAGS@ - LDFLAGS=@LDFLAGS@ --CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) -+CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) - - INSTALL=@INSTALL@ - INSTALL_PROGRAM=@INSTALL_PROGRAM@ ---- pl-5.6.17.orig/packages/clib/configure 2006-01-11 09:41:55.000000000 +1300 -+++ pl-5.6.17/packages/clib/configure 2006-08-26 16:23:26.000000000 +1200 -@@ -3117,7 +3117,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3709,7 +3708,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/clib/maildrop/rfc2045/configure 2005-07-25 02:37:57.000000000 +1200 -+++ pl-5.6.17/packages/clib/maildrop/rfc2045/configure 2006-08-26 16:31:05.000000000 +1200 -@@ -3155,7 +3155,7 @@ - - if test "$GCC" = yes ; then - CXXFLAGS="$CXXFLAGS -Wall" -- CFLAGS="$CFLAGS -Wall" -+ CFLAGS="$CFLAGS -fpic -Wall" - fi - - -pl-5.6.17/packages/clib/maildrop/rfc822/configure ---- pl-5.6.17.orig/packages/clib/maildrop/rfc822/configure 2005-07-25 02:37:57.000000000 +1200 -+++ pl-5.6.17/packages/clib/maildrop/rfc822/configure 2006-08-26 16:32:11.000000000 +1200 -@@ -3144,7 +3144,7 @@ - - if test "$GCC" = yes ; then - CXXFLAGS="$CXXFLAGS -Wall" -- CFLAGS="$CFLAGS -Wall" -+ CFLAGS="$CFLAGS -fpic -Wall" - fi - - ---- pl-5.6.17.orig/packages/cppproxy/configure 2006-01-23 22:29:29.000000000 +1300 -+++ pl-5.6.17/packages/cppproxy/configure 2006-08-26 16:40:49.000000000 +1200 -@@ -3111,7 +3111,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3703,7 +3702,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/db/configure.in 2006-07-07 23:29:11.000000000 +1200 -+++ pl-5.6.17/packages/db/configure.in 2006-08-26 18:35:22.000000000 +1200 -@@ -93,13 +93,13 @@ - AC_ISC_POSIX - AC_HEADER_STDC - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O - CWFLAGS= - fi --CFLAGS="$CMFLAGS $CIFLAGS" -+ - AC_FUNC_ALLOCA - AC_C_BIGENDIAN - ---- pl-5.6.17.orig/packages/jpl/configure.in 2005-01-31 23:47:37.000000000 +1300 -+++ pl-5.6.17/packages/jpl/configure.in 2006-08-26 18:50:11.000000000 +1200 -@@ -70,10 +70,10 @@ - AC_PROG_INSTALL - AC_ISC_POSIX - AC_HEADER_STDC --CFLAGS="$CMFLAGS" -+ - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS="-Wall -Wno-strict-aliasing" - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/ltx2htm/configure 2004-09-22 02:28:17.000000000 +1200 -+++ pl-5.6.17/packages/ltx2htm/configure 2006-08-26 15:58:58.000000000 +1200 -@@ -1351,6 +1351,7 @@ - CC=$PLLD - LD=$PLLD - LDSOFLAGS=-shared -+CMFLAGS=-fpic - - SO="$PLSOEXT" - -@@ -2925,7 +2926,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3455,7 +3455,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS=-O2 -+ COFLAGS="$CFLAGS" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/nlp/configure 2005-11-26 23:54:48.000000000 +1300 -+++ pl-5.6.17/packages/nlp/configure 2006-08-26 17:33:02.000000000 +1200 -@@ -3111,7 +3111,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3703,7 +3702,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/odbc/configure 2006-02-16 09:48:34.000000000 +1300 -+++ pl-5.6.17/packages/odbc/configure 2006-08-26 17:34:38.000000000 +1200 -@@ -3147,7 +3147,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3739,7 +3738,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/semweb/configure 2006-03-08 03:43:04.000000000 +1300 -+++ pl-5.6.17/packages/semweb/configure 2006-08-26 17:35:48.000000000 +1200 -@@ -3145,7 +3145,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -4294,7 +4293,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O3 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/sgml/configure 2006-02-04 04:38:50.000000000 +1300 -+++ pl-5.6.17/packages/sgml/configure 2006-08-26 17:37:53.000000000 +1200 -@@ -3184,16 +3184,12 @@ - fi - - if test ! -z "$GCC"; then -- if test $gmake = yes; then -- COFLAGS='$(shell if test -r .coflags; then cat .coflags; else echo "-O2"; fi)' -- else -- COFLAGS="-O2 -fno-strict-aliasing" -- fi -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS="$CWFLAGS -Wall" - else - COFLAGS=-O - fi --CFLAGS="$CMFLAGS" -+ - echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 - echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 - if test "${ac_cv_c_bigendian+set}" = set; then ---- pl-5.6.17.orig/packages/ssl/configure 2006-02-04 04:38:50.000000000 +1300 -+++ pl-5.6.17/packages/ssl/configure 2006-08-26 17:40:02.000000000 +1200 -@@ -3147,7 +3147,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3739,7 +3738,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/table/configure 2005-01-31 23:47:37.000000000 +1300 -+++ pl-5.6.17/packages/table/configure 2006-08-26 17:41:22.000000000 +1200 -@@ -3112,7 +3112,6 @@ - - fi - --CFLAGS="$CMFLAGS" - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo "$as_me:$LINENO: checking for working alloca.h" >&5 -@@ -3704,7 +3703,7 @@ - - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - CWFLAGS=-Wall - else - COFLAGS=-O ---- pl-5.6.17.orig/packages/xpce/src/configure 2006-04-05 19:29:14.000000000 +1200 -+++ pl-5.6.17/packages/xpce/src/configure 2006-08-26 17:43:18.000000000 +1200 -@@ -4391,7 +4391,7 @@ - fi - - if test ! -z "$GCC"; then -- COFLAGS="-O2 -fno-strict-aliasing" -+ COFLAGS="$CFLAGS -fno-strict-aliasing" - if test "$ac_cv_header_stdc" = "yes" || test "$syslibh" = "yes"; then - CWFLAGS=-Wall - else -@@ -4401,7 +4401,7 @@ - COFLAGS=-O - CWFLAGS= - fi --CFLAGS="$CMFLAGS" -+ - echo "$as_me:$LINENO: checking for inline" >&5 - echo $ECHO_N "checking for inline... $ECHO_C" >&6 - if test "${ac_cv_c_inline+set}" = set; then diff --git a/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r1.patch deleted file mode 100644 index 058427316ae7..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r1.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- pl-5.6.17.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200 -+++ pl-5.6.17/src/rc/Makefile.in 2006-08-26 19:44:07.000000000 +1200 -@@ -14,7 +14,7 @@ - srcdir=@srcdir@ - @VPATH@ @srcdir@ - bindir=$(exec_prefix)/bin --PLBASE=$(prefix)/lib/@PL@-$(PLVERSION) -+PLBASE=@libdir@/@PL@-$(PLVERSION) - man_prefix=$(prefix)/man - mansec=1 - lmansec=3 ---- pl-5.6.17.orig/src/Makefile.in 2006-07-15 01:51:53.000000000 +1200 -+++ pl-5.6.17/src/Makefile.in 2006-08-26 19:44:07.000000000 +1200 -@@ -36,6 +36,7 @@ - srcdir=@srcdir@ - @VPATH@ @srcdir@ - bindir=@bindir@ -+libdir=@libdir@ - mandir=@mandir@ - mansec=1 - lmansec=3 -@@ -46,7 +47,7 @@ - PLVERSION=@PLVERSION@ - PL=@PL@@RT@ - PLV=@PL@@RT@-@PLVERSION@ --PLBASE=$(prefix)/lib/@PL@@RT@-@PLVERSION@ -+PLBASE=$(libdir)/@PL@@RT@-@PLVERSION@ - BOOTFILE=@BOOTFILE@ - - CC=@CC@ -@@ -360,7 +361,7 @@ - $(INSTALL_DATA) libplimp.a $(DESTDIR)$(PLBASE)/lib/$(ARCH) - - idirs:: -- if [ ! -d $(DESTDIR)$(prefix)/lib ]; then $(MKDIR) $(DESTDIR)$(prefix)/lib; fi -+ if [ ! -d $(DESTDIR)$(libdir) ]; then $(MKDIR) $(DESTDIR)$(libdir); fi - if [ ! -d $(DESTDIR)$(PLBASE) ]; then $(MKDIR) $(DESTDIR)$(PLBASE); fi - for d in $(installdirs); do \ - if [ ! -d $(DESTDIR)$(PLBASE)/$$d ]; then \ -@@ -423,7 +424,7 @@ - # runtime-only environment installation - # - --RTHOME= $(DESTDIR)$(prefix)/lib/$(PLV) -+RTHOME= $(DESTDIR)$(libdir)/$(PLV) - RTDIRS= $(RTHOME) $(RTHOME)/bin $(RTHOME)/lib $(RTHOME)/lib/$(ARCH) \ - $(RTHOME)/man $(RTHOME)/bin/$(ARCH) $(RTHOME)/include - ---- pl-5.6.17.orig/src/configure 2006-07-11 20:31:16.000000000 +1200 -+++ pl-5.6.17/src/configure 2006-08-26 19:56:00.000000000 +1200 -@@ -2546,7 +2546,7 @@ - - - test "x$prefix" = xNONE && prefix=$ac_default_prefix --PLBASE=$prefix/lib/$PL-$PLVERSION -+PLBASE=$libdir/$PL-$PLVERSION - - - for ac_prog in gmake make ---- pl-5.6.17.orig/packages/Makefile.in 2005-11-13 03:15:23.000000000 +1300 -+++ pl-5.6.17/packages/Makefile.in 2006-08-26 19:44:07.000000000 +1200 -@@ -28,9 +28,10 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - bindir=@bindir@ -+libdir=@libdir@ - PL=@PL@@RT@ - PLVERSION=@PLVERSION@ --PLBASE=$(prefix)/lib/@PL@-$(PLVERSION) -+PLBASE=$(libdir)/@PL@-$(PLVERSION) - PKGDOC=$(PLBASE)/doc/packages - PLLIBS=@LIBS@ - PLARCH=@ARCH@ ---- pl-5.6.17.orig/packages/ltx2htm/Makefile.in 2005-12-02 21:53:05.000000000 +1300 -+++ pl-5.6.17/packages/ltx2htm/Makefile.in 2006-08-30 20:44:21.000000000 +1200 -@@ -33,7 +33,7 @@ - INSTALL_DATA=@INSTALL_DATA@ - - # Don't change, this is also in latex2html.in! --LIBDIR=$(prefix)/lib/latex2html -+LIBDIR=@libdir@/latex2html - - OBJ= tex.o psfile.o - LIB= latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd diff --git a/dev-lang/swi-prolog/files/swi-prolog-cppproxy.patch b/dev-lang/swi-prolog/files/swi-prolog-cppproxy.patch deleted file mode 100644 index ba18dbbdd7b3..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-cppproxy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pl-5.6.7.orig/packages/configure.in 2005-11-30 05:26:17.000000000 +1300 -+++ pl-5.6.7/packages/configure.in 2006-02-15 21:16:23.000000000 +1300 -@@ -54,7 +54,7 @@ - - - if [ -z "$PKG" ]; then -- PKG="clib cpp odbc table xpce sgml sgml/RDF semweb http chr clpqr nlp ssl jpl" -+ PKG="clib cpp cppproxy odbc table xpce sgml sgml/RDF semweb http chr clpqr nlp ssl jpl" - fi - - configoptions="" diff --git a/dev-lang/swi-prolog/files/swi-prolog-db-docs.patch b/dev-lang/swi-prolog/files/swi-prolog-db-docs.patch deleted file mode 100644 index 12b7389fe918..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-db-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- pl-5.6.17.orig/packages/db/Makefile.in 2005-12-15 04:54:38.000000000 +1300 -+++ pl-5.6.17/packages/db/Makefile.in 2006-08-27 10:41:12.000000000 +1200 -@@ -9,6 +9,7 @@ - PL=@PL@ - PLBASE=@PLBASE@ - PLARCH=@PLARCH@ -+PKGDOC=$(PLBASE)/doc/packages - PCEHOME=/staff/jan/src/xpce - DESTDIR= - -@@ -57,6 +58,10 @@ - $(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(PLBASE)/library - $(PL) -f none -g make -t halt - -+html-install:: -+ mkdir -p $(DESTDIR)$(PKGDOC) -+ $(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC) -+ - uninstall: - (cd $(PLBASE)/library && rm -f $(LIBPL)) - $(PL) -f none -g make -t halt diff --git a/dev-lang/swi-prolog/files/swi-prolog-db-versioned.patch b/dev-lang/swi-prolog/files/swi-prolog-db-versioned.patch deleted file mode 100644 index 969a3e851a58..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-db-versioned.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- pl-5.6.17.orig/packages/db/configure.in 2006-07-07 23:29:11.000000000 +1200 -+++ pl-5.6.17/packages/db/configure.in 2006-08-27 11:08:41.000000000 +1200 -@@ -112,20 +112,17 @@ - AC_DEFINE(HAVE_LIBNSL, 1, - [Define if you have the nsl library])) - --AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$LIBDB''_db_create]) --AC_CACHE_CHECK([for db_create in -l$LIBDB], ac_Lib, -- [ac_check_lib_save_LIBS=$LIBS -+AC_CHECK_HEADERS(db.h) -+AC_MSG_CHECKING(db_create in -ldb) - LIBS="-l$LIBDB $LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <db.h>]], - [[db_create(0,0,0)]])], -- [AS_VAR_SET(ac_Lib, yes) -- LIBS="-l$LIBDB $LIBS" -- HAVEDB=yes], -- [AS_VAR_SET(ac_Lib, no) -- HAVEDB=no]) --LIBS=$ac_check_lib_save_LIBS]) -- --AC_CHECK_HEADERS(db.h) -+ [HAVEDB=yes -+ AC_MSG_RESULT(yes) -+ ], -+ [HAVEDB=no -+ AC_MSG_RESULT(no) -+ ]) - - AC_MSG_CHECKING(Whether environment is sane) - if test "$HAVEDB" = "yes"; then diff --git a/dev-lang/swi-prolog/files/swi-prolog-gmp-sparc-alignment.patch b/dev-lang/swi-prolog/files/swi-prolog-gmp-sparc-alignment.patch deleted file mode 100644 index 16b8da83edb2..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-gmp-sparc-alignment.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- pl-5.6.20.orig/src/pl-gmp.c 2006-08-28 20:19:17.000000000 +1200 -+++ pl-5.6.20/src/pl-gmp.c 2006-10-02 22:25:15.000000000 +1300 -@@ -126,10 +126,8 @@ - - p++; - if ( wsize == sizeof(int64_t)/sizeof(word) ) -- { int64_t *ip = (int64_t *)p; -- -- n->type = V_INTEGER; -- n->value.i = *ip; -+ { n->type = V_INTEGER; -+ memcpy(&n->value.i, p, sizeof(int64_t)); - } else - { n->type = V_MPZ; - diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-install.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-install.patch deleted file mode 100644 index 61e794e2d972..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-jpl-install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pl-5.6.16.orig/packages/jpl/Makefile.in 2006-02-04 04:38:49.000000000 +1300 -+++ pl-5.6.16/packages/jpl/Makefile.in 2006-07-08 16:26:06.000000000 +1200 -@@ -157,7 +157,7 @@ - if [ -f examples/java/$$d/$$plfile ]; then \ - $(INSTALL_DATA) examples/java/$$d/$$plfile $(DESTDIR)$(EXJAVA)/$$d ;\ - fi; \ -- $(INSTALL_DATA) examples/java/$$d/$$d.class $(DESTDIR)$(EXJAVA)/$$d ;\ -+ $(INSTALL_DATA) examples/java/$$d/$$d*.class $(DESTDIR)$(EXJAVA)/$$d ;\ - done - $(INSTALL_DATA) examples/java/SemWeb/test.rdf $(DESTDIR)$(EXJAVA)/SemWeb - diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-ppc.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-ppc.patch deleted file mode 100644 index f132cea2f512..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-jpl-ppc.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- pl-5.6.17.orig/packages/jpl/Makefile.in 2006-02-04 04:38:49.000000000 +1300 -+++ pl-5.6.17/packages/jpl/Makefile.in 2006-08-26 14:24:40.000000000 +1200 -@@ -34,6 +34,7 @@ - JAVA_HOME=@JAVA_HOME@ - JAVAC=@JAVAC@ - JAVALIBS=@JAVALIBS@ -+JAVALDPATH=@JAVALDPATH@ - - DOCTOTEX=$(PCEHOME)/bin/doc2tex - PLTOTEX=$(PCEHOME)/bin/pl2tex -@@ -68,7 +69,7 @@ - ################################################################ - - check:: TestJPL.class -- $(PL) -q -f check.pl -g test,halt -t 'halt(1)' -+ LD_LIBRARY_PATH=$(JAVALDPATH) $(PL) -q -f check.pl -g test,halt -t 'halt(1)' - - TestJPL.class: TestJPL.java - $(JAVAC) -classpath jpl.jar TestJPL.java -pl-5.6.17/packages/jpl/ac/ac_jni_include_dirs.m4 ---- pl-5.6.17.orig/packages/jpl/ac/ac_jni_include_dirs.m4 2006-02-04 04:38:49.000000000 +1300 -+++ pl-5.6.17/packages/jpl/ac/ac_jni_include_dirs.m4 2006-08-26 10:16:50.000000000 +1200 -@@ -54,19 +54,32 @@ - done - - case "$host_cpu" in -- i?86) _JNI_LIBDIRS="i386" -+ i?86) -+ _JNI_LIBDIRS="lib/i386" - _JNI_LIBSUBDIR="client" - ;; -- x86_64) _JNI_LIBDIRS="amd64" -+ x86_64) -+ _JNI_LIBDIRS="lib/amd64" - _JNI_LIBSUBDIR="server" - ;; -- *) _JNI_LIBDIRS="" -+ powerpc) -+ case "$host_os" in -+ linux*) -+ _JNI_LIBDIRS="bin" -+ _JNI_LIBSUBDIR="classic" -+ ;; -+ *) -+ _JNI_LIBDIRS="" -+ esac -+ ;; -+ *) -+ _JNI_LIBDIRS="" - esac - - for d in $_JNI_LIBDIRS; do -- echo "Trying $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR" -- if test -d $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR; then -- JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/lib/$d" -+ echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR" -+ if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then -+ JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/$d" - fi - done - -pl-5.6.17/packages/jpl/configure.in ---- pl-5.6.17.orig/packages/jpl/configure.in 2005-01-31 23:47:37.000000000 +1300 -+++ pl-5.6.17/packages/jpl/configure.in 2006-08-26 18:50:11.000000000 +1200 -@@ -18,6 +18,7 @@ - AC_SUBST(LDSOFLAGS) - AC_SUBST(JAVA_HOME) - AC_SUBST(JAVALIBS) -+AC_SUBST(JAVALDPATH) - - AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading], - [case "$enableval" in -@@ -84,6 +85,9 @@ - *darwin*) - JAVALIBS="-Wl,-framework,JavaVM" - ;; -+ *powerpc-linux*) -+ JAVALIBS="-ljava -ljvm" -+ ;; - *) - JAVALIBS="-ljava -lverify -ljvm" - ;; -@@ -128,6 +132,7 @@ - - for d in $JNI_CLIENT_DIRS; do - LDSOFLAGS="$LDSOFLAGS -L$d" -+ JAVALDPATH="$JAVALDPATH:$d" - done - - if test "$java_abs_paths" = yes; then diff --git a/dev-lang/swi-prolog/files/swi-prolog-libtai.patch b/dev-lang/swi-prolog/files/swi-prolog-libtai.patch deleted file mode 100644 index 1d6be873a74c..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-libtai.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pl-5.6.17.orig/src/pl-tai.c 2006-07-28 21:20:12.000000000 +1200 -+++ pl-5.6.17/src/pl-tai.c 2006-08-30 21:55:37.000000000 +1200 -@@ -664,7 +664,7 @@ - break; - case '+': - { char buf[26]; -- -+ cal_ftm(ftm, HAS_WYDAY); - asctime_r(&ftm->tm, buf); - buf[24] = EOS; - OUTSTR(buf); diff --git a/dev-lang/swi-prolog/files/swi-prolog-parallel-build.patch b/dev-lang/swi-prolog/files/swi-prolog-parallel-build.patch deleted file mode 100644 index 5c047ec129e1..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-parallel-build.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- pl-5.6.20.orig/src/Makefile.in 2006-09-04 20:46:22.000000000 +1200 -+++ pl-5.6.20/src/Makefile.in 2006-09-24 21:49:51.000000000 +1200 -@@ -208,9 +208,9 @@ - endif - endif - --rc-lib: -+rc-lib: $(RCOBJ) - @(cd rc && $(MAKE) COFLAGS="$(COFLAGS)") --tai-lib: -+tai-lib: $(TAIOBJ) - @(cd libtai && $(MAKE) COFLAGS="$(COFLAGS)") - - ../library/INDEX.pl: ../library ../library/[a-z]*.pl $(DEVPL) $(STARTUPPATH) ---- pl-5.6.20.orig/packages/xpce/src/Makefile.in 2006-09-11 00:25:06.000000000 +1200 -+++ pl-5.6.20/packages/xpce/src/Makefile.in 2006-09-24 21:51:35.000000000 +1200 -@@ -199,14 +199,14 @@ - - xpce-pl: xpce pl-itf - --pl-itf: pl -+pl-itf: pl libXPCE - cd ../pl/src; \ - CANONICAL_PATHS=$(PCEHOME); export CANONICAL_PATHS; \ - $(MAKE) PLLD=$(PLLD) PL=$(PLBUILD) $(PLTARGET) - rm -f ../lib/$(PLARCH) - (cd ../lib && ln -s ../$(builddir) $(PLARCH)) - --pl-shared: pl -+pl-shared: pl libXPCE - cd ../pl/src; \ - CANONICAL_PATHS=$(PCEHOME); export CANONICAL_PATHS; \ - $(MAKE) soall -@@ -298,7 +298,7 @@ - # Building the directories - ################################################################ - --prepare: directories names version h/interface.h -+prepare: directories names h/interface.h - - directories: h $(MODULES) $(VWS) - diff --git a/dev-lang/swi-prolog/files/swi-prolog-portage.patch b/dev-lang/swi-prolog/files/swi-prolog-portage.patch deleted file mode 100644 index 9e5d6a15fd6b..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-portage.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- pl-5.6.4.orig/packages/Makefile.in 2005-11-13 03:15:23.000000000 +1300 -+++ pl-5.6.4/packages/Makefile.in 2006-02-13 23:09:00.000000000 +1300 -@@ -76,7 +76,7 @@ - - install:: - for p in $(PKG); do \ -- if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \ -+ if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \ - done - @echo "*** Forcing update of library index ***" - rm -f $(DESTDIR)$(PLLIB)/INDEX.pl -@@ -110,7 +110,7 @@ - echo "**********************"; \ - echo "* Package $$p"; \ - echo "**********************"; \ -- ( cd $$p && $(CONFIG) ); \ -+ ( cd $$p && $(CONFIG) ) || exit 1; \ - fi; \ - done - -@@ -127,7 +127,7 @@ - - check:: - for p in $(PKG); do \ -- if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \ -+ if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \ - done - - # test environment ---- pl-5.6.17.orig/packages/db/Makefile.in 2005-12-15 04:54:38.000000000 +1300 -+++ pl-5.6.17/packages/db/Makefile.in 2006-08-27 10:42:25.000000000 +1200 -@@ -61,6 +61,8 @@ - (cd $(PLBASE)/library && rm -f $(LIBPL)) - $(PL) -f none -g make -t halt - -+check:: -+ - ################################################################ - # Documentation - ################################################################ diff --git a/dev-lang/swi-prolog/files/swi-prolog-semweb-sparc-alignment.patch b/dev-lang/swi-prolog/files/swi-prolog-semweb-sparc-alignment.patch deleted file mode 100644 index b73480777523..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-semweb-sparc-alignment.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- pl-5.6.17.orig/packages/semweb/avl.h 2006-03-07 04:23:47.000000000 +1300 -+++ pl-5.6.17/packages/semweb/avl.h 2006-08-15 21:59:09.000000000 +1200 -@@ -58,7 +58,11 @@ - /* structure for a node in an AVL tree */ - typedef struct avl_node - { struct avl_node *subtree[2]; /* LEFT and RIGHT subtrees */ -+#ifndef __sparc__ - short bal; /* balance factor */ -+#else -+ long bal; /* balance factor */ -+#endif - char data[1]; /* data on my back */ - } AVLnode, *AVLtree; - diff --git a/dev-lang/swi-prolog/files/swi-prolog-test_date.patch b/dev-lang/swi-prolog/files/swi-prolog-test_date.patch deleted file mode 100644 index dc11203a49de..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-test_date.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- pl-5.6.17.orig/src/Tests/library/test_date.pl 2006-07-28 08:29:29.000000000 +1200 -+++ pl-5.6.17/src/Tests/library/test_date.pl 2006-07-29 21:44:38.000000000 +1200 -@@ -25,50 +25,50 @@ - * TIME_FORMAT/3 TESTS * - *******************************/ - --ok(1152794050, '~a', 'Thu'). --ok(1152794050, '~A', 'Thursday'). --ok(1152794050, '~b', 'Jul'). --ok(1152794050, '~B', 'July'). --ok(1152794050, '~c', 'Thu Jul 13 14:34:10 2006'). --ok(1152794050, '~p', ['P', 'PM']). --%ok(1152794050, '~P', 'pm'). % non-standard --ok(1152794050, '~x', '07/13/06'). --ok(1152794050, '~X', '14:34:10'). --ok(1152794050, '~C', '20'). --ok(1152794050, '~d', '13'). --ok(1152794050, '~D', '07/13/06'). --ok(1152794050, '~e', '13'). -+ok(1152794050, '%a', 'Thu'). -+ok(1152794050, '%A', 'Thursday'). -+ok(1152794050, '%b', 'Jul'). -+ok(1152794050, '%B', 'July'). -+ok(1152794050, '%c', 'Thu Jul 13 12:34:10 2006'). -+ok(1152794050, '%p', ['P', 'PM']). -+%ok(1152794050, '%P', 'pm'). % non-standard -+ok(1152794050, '%x', '07/13/06'). -+ok(1152794050, '%X', '12:34:10'). -+ok(1152794050, '%C', '20'). -+ok(1152794050, '%d', '13'). -+ok(1152794050, '%D', '07/13/06'). -+ok(1152794050, '%e', '13'). - %ok(1152794050, '%E', ''). --ok(1152794050, '~F', '2006-07-13'). --ok(1152794050, '~g', '06'). --ok(1152794050, '~G', '2006'). --ok(1152794050, '~V', '28'). --ok(1152794050, '~h', 'Jul'). --ok(1152794050, '~H', '14'). --ok(1152794050, '~I', '02'). --ok(1152794050, '~j', '194'). --ok(1152794050, '~k', '14'). --ok(1152794050, '~l', ' 2'). --ok(1152794050, '~m', '07'). --ok(1152794050, '~M', '34'). --ok(1152794050, '~n', '\n'). --%ok(1152794050, '~O', ''). --ok(1152794050, '~r', '02:34:10 PM'). --ok(1152794050, '~R', '14:34'). --ok(1152794050, '~s', '1152794050'). --ok(1152794050, '~S', '10'). --ok(1152794050, '~t', '\t'). --ok(1152794050, '~T', '14:34:10'). --ok(1152794050, '~u', '4'). --ok(1152794050, '~U', '28'). --ok(1152794050, '~w', '4'). --ok(1152794050, '~W', '28'). --ok(1152794050, '~y', '06'). --ok(1152794050, '~Y', '2006'). --ok(1152794050, '~z', '+0200'). --ok(1152794050, '~Z', 'CEST'). --ok(1152794050, '~+', 'Thu Jul 13 14:34:10 2006'). --ok(1152794050, '~~', '~'). -+ok(1152794050, '%F', '2006-07-13'). -+ok(1152794050, '%g', '06'). -+ok(1152794050, '%G', '2006'). -+ok(1152794050, '%V', '28'). -+ok(1152794050, '%h', 'Jul'). -+ok(1152794050, '%H', '12'). -+ok(1152794050, '%I', '00'). -+ok(1152794050, '%j', '194'). -+ok(1152794050, '%k', '12'). -+ok(1152794050, '%l', ' 0'). -+ok(1152794050, '%m', '07'). -+ok(1152794050, '%M', '34'). -+ok(1152794050, '%n', '\n'). -+%ok(1152794050, '%O', ''). -+ok(1152794050, '%r', '00:34:10 PM'). -+ok(1152794050, '%R', '12:34'). -+ok(1152794050, '%s', '1152794050'). -+ok(1152794050, '%S', '10'). -+ok(1152794050, '%t', '\t'). -+ok(1152794050, '%T', '12:34:10'). -+ok(1152794050, '%u', '4'). -+ok(1152794050, '%U', '28'). -+ok(1152794050, '%w', '4'). -+ok(1152794050, '%W', '28'). -+ok(1152794050, '%y', '06'). -+ok(1152794050, '%Y', '2006'). -+ok(1152794050, '%z', '-0000'). -+ok(1152794050, '%Z', 'UTC'). -+ok(1152794050, '%+', 'Thu Jul 13 12:34:10 2006'). -+ok(1152794050, '%%', '%'). - - % test_format/0 - % -@@ -77,15 +77,16 @@ - - test_format :- - setlocale(time, OldLocale, 'C'), -- ( ok(Time, Fmt, Atom), -- ( format_time(atom(A), Fmt, Time) -+ ( ok(TimeStamp, Fmt, Atom), -+ stamp_date_time(TimeStamp, DateTime, 'UTC'), -+ ( format_time(atom(A), Fmt, DateTime) - -> ( ( A == Atom - ; memberchk(A, Atom) - ) - -> true - ; format('~q: got ~q, expected ~q~n', [Fmt, A, Atom]) - ) -- ; format('format_time(~q, ~q, ~q) failed~n', [atom(A), Fmt, Time]) -+ ; format('format_time(~q, ~q, ~q) failed~n', [atom(A), Fmt, DateTime]) - ), - fail - ; true -@@ -100,7 +101,7 @@ - % test_date(+Date, +Time, -FormatTests). - - test_date(1970-1-1, 0:0:0.0, % Epoch -- [ '~s' = '0' -+ [ '%s' = '0' - ]). - test_date(0-1-1, 0:0:0.0, []). % Year 0 - test_date(2000-1-1, 0:0:0.0, []). % Year 2000 -@@ -141,13 +142,13 @@ - russian_day(A) :- - setlocale(time, Old, 'ru_RU.utf8'), - get_time(X), -- format_time(atom(A), '~A', X), -+ format_time(atom(A), '%A', X), - setlocale(time, _, Old). - - utc :- - get_time(Stamp), - stamp_date_time(Stamp, DateTime, 'UTC'), -- format_time(current_output, '~F ~T ~Z', DateTime). -+ format_time(current_output, '%F %T %Z', DateTime). - - /******************************* - * ERROR * diff --git a/dev-lang/swi-prolog/files/swi-prolog-thread-tests.patch b/dev-lang/swi-prolog/files/swi-prolog-thread-tests.patch deleted file mode 100644 index cac192faf4ac..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-thread-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- pl-5.6.17.orig/packages/clib/testsocket.pl 2004-09-22 02:28:16.000000000 +1200 -+++ pl-5.6.17/packages/clib/testsocket.pl 2006-08-27 09:57:19.000000000 +1200 -@@ -35,6 +35,12 @@ - client/1 % +Address - ]). - -+:- ( current_prolog_flag(threads, true) -+ -> true -+ ; format('Disabling tcp_test on single-threaded engine~n~n', []), -+ halt -+ ). -+ - :- asserta(user:file_search_path(foreign, '.')). - - :- use_module(socket). ---- pl-5.6.17.orig/packages/semweb/litmap_test.pl 2006-03-07 02:17:30.000000000 +1300 -+++ pl-5.6.17/packages/semweb/litmap_test.pl 2006-08-27 10:13:14.000000000 +1200 -@@ -3,6 +3,13 @@ - test/1, - test/2 - ]). -+ -+:- ( current_prolog_flag(threads, true) -+ -> true -+ ; format('Disabling literal map test on single-threaded engine~n~n', []), -+ halt -+ ). -+ - :- use_module(library(debug)). - :- use_module(library(debug)). - :- asserta(user:file_search_path(foreign, '../sgml')). ---- pl-5.6.17.orig/packages/semweb/rdf_db_test.pl 2006-03-09 03:32:48.000000000 +1300 -+++ pl-5.6.17/packages/semweb/rdf_db_test.pl 2006-08-27 10:11:29.000000000 +1200 -@@ -5,6 +5,12 @@ - Copyright (C) 1996 University of Amsterdam. All rights reserved. - */ - -+:- ( current_prolog_flag(threads, true) -+ -> true -+ ; format('Disabling RDF_DB test suite on single-threaded engine~n~n', []), -+ halt -+ ). -+ - :- asserta(file_search_path(foreign, '../sgml')). - :- asserta(file_search_path(library, '../sgml')). - :- asserta(file_search_path(library, '../sgml/RDF')). ---- pl-5.6.17.orig/packages/ssl/ssl_test.pl 2006-06-21 19:51:59.000000000 +1200 -+++ pl-5.6.17/packages/ssl/ssl_test.pl 2006-08-27 10:17:41.000000000 +1200 -@@ -29,6 +29,12 @@ - the GNU General Public License. - */ - -+:- ( current_prolog_flag(threads, true) -+ -> true -+ ; format('Disabling SSL test on single-threaded engine~n~n', []), -+ halt -+ ). -+ - :- asserta(user:file_search_path(foreign, '.')). - - :- use_module(ssl). diff --git a/dev-lang/swi-prolog/files/swi-prolog-xpce-test.patch b/dev-lang/swi-prolog/files/swi-prolog-xpce-test.patch deleted file mode 100644 index 4983b0baae66..000000000000 --- a/dev-lang/swi-prolog/files/swi-prolog-xpce-test.patch +++ /dev/null @@ -1,154 +0,0 @@ ---- pl-5.6.17.orig/packages/xpce/src/Makefile.in 2006-07-28 08:29:29.000000000 +1200 -+++ pl-5.6.17/packages/xpce/src/Makefile.in 2006-08-27 10:22:16.000000000 +1200 -@@ -125,6 +125,7 @@ - PLBINDIR=$(PLBASE)/bin/$(PLARCH) - PL=@PL@ - PLBUILD=@PLBUILD@ -+PCEBUILD=$(PCEHOME)/src/xpce.sh - PLNAME=@PLNAME@ - PLLD=@PLLD@ - -@@ -897,7 +898,8 @@ - ################################################################ - - check:: -- $(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)' -+ $(PCEBUILD) -q -g "['./find_display.pl'],find_display,halt" -t 'halt(0)' -+ $(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)' - - - ################################################################ ---- pl-5.6.17.orig/packages/xpce/src/find_display.pl 1970-01-01 12:00:00.000000000 +1200 -+++ pl-5.6.17/packages/xpce/src/find_display.pl 2006-08-28 21:47:54.000000000 +1200 -@@ -0,0 +1,13 @@ -+:- asserta(library_directory('../prolog/lib')). -+:- use_module(library(pce)). -+ -+find_display :- -+ current_input(InputStream), -+ open_null_stream(NullStream), -+ set_prolog_IO(InputStream, NullStream, NullStream), -+ ( exists_file('display_exists') -+ -> delete_file('display_exists') -+ ; true), -+ get(@display, visual_type, _), -+ open('display_exists', update, Fd), -+ close(Fd). ---- pl-5.6.17.orig/packages/xpce/src/test.pl 2006-03-30 01:42:18.000000000 +1200 -+++ pl-5.6.17/packages/xpce/src/test.pl 2006-08-28 21:47:10.000000000 +1200 -@@ -35,11 +35,23 @@ - ?- test. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -+:- asserta(library_directory('../prolog/lib')). -+:- use_module(library(pce)). -+:- use_module(library(pce_util)). -+ - :- get(@pce, version, V), - format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\ - To run all tests run ?- test.~n~n', [V]). - -+:- dynamic -+ display_enabled/0. - -+:- format('Checking for usable X server~n', []), -+ ( exists_file('display_exists') -+ -> format('X server found.~n~n', []), -+ assert(display_enabled) -+ ; format('No usable X server found. Some tests are disabled.~n~n', []) -+ ). - - /******************************* - * NAMES * -@@ -163,12 +175,12 @@ - *******************************/ - - srcsink(contents-1) :- -- numlist(32, 1000, L), -+ numlist(32, 255, L), - tmp_file(test, Tmp), -- open(Tmp, write, Out, [encoding(utf8)]), -+ open(Tmp, write, Out, [encoding(iso_latin_1)]), - maplist(put_code(Out), L), - close(Out), -- new(File, file(Tmp, utf8)), -+ new(File, file(Tmp, iso_latin_1)), - get(File, contents, String), - delete_file(Tmp), - get(String, value, Atom), -@@ -193,7 +205,7 @@ - *******************************/ - - foreign(Name) :- -- atom_codes(Name, [1087, 1083, 1072, 1090, 1085, 1072, 1103]). -+ atom_codes(Name, [102, 105, 108, 101, 110, 97, 109, 101]). - - file(env-1) :- - new(F, file('$PCEHOME/Defaults')), -@@ -202,11 +214,6 @@ - get(F, name, PceName), - same_file(PceName, PlName), - send(F, same, PlName). --file(home-1) :- -- new(F, file('~/foobar')), -- get(F, name, PceName), -- expand_file_name('~/foobar', [PlName]), -- same_file(PceName, PlName). - file(abs-1) :- - new(F, file(foobar)), - get(F, absolute_path, Abs), -@@ -221,13 +228,15 @@ - -> send(file(F), exists) - ; \+ send(file(F), exists) - )). --file(utf8-1) :- -+file(ascii-1) :- - foreign(Name), - new(F, file(Name)), -+ send(F, encoding, iso_latin_1), - send(F, open, write), - send(F, append, 'Hello world\n'), - send(F, close), - new(F2, file(Name)), -+ send(F2, encoding, iso_latin_1), - exists_file(Name), - send(F2, exists), - get(F2, contents, string('Hello world\n')), -@@ -312,12 +321,12 @@ - atom_concat(hello, Wide, New). - textbuffer(file-1) :- - new(TB, text_buffer), -- numlist(32, 1000, L), -+ numlist(32, 255, L), - atom_codes(WAtom, L), - send(TB, append, WAtom), - tmp_file(test, Tmp), -- send(TB, save, file(Tmp, utf8)), -- get(file(Tmp, utf8), contents, string(Copy)), -+ send(TB, save, file(Tmp, iso_latin_1)), -+ get(file(Tmp, iso_latin_1), contents, string(Copy)), - delete_file(Tmp), - Copy == WAtom. - textbuffer(store-1) :- -@@ -635,6 +644,10 @@ - testset(regex). % Regular expression matches - testset(type). % Check type logic - -+display_required(bom). -+display_required(selection). -+display_required(image). -+ - % testdir(Dir) - % - % Enumerate directories holding tests. -@@ -683,6 +696,10 @@ - ). - - runtest(Name) :- -+ display_required(Name), -+ \+display_enabled, -+ format('Disabling test set "~w"~n', [Name]). -+runtest(Name) :- - format('Running test set "~w" ', [Name]), - flush, - functor(Head, Name, 1), diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild deleted file mode 100644 index 679b5e8d60ee..000000000000 --- a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild,v 1.13 2007/02/23 22:03:15 keri Exp $ - -inherit autotools eutils java-pkg-opt-2 - -DESCRIPTION="free, small, and standard compliant Prolog compiler" -HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 ppc sparc x86" -IUSE="berkdb doc gmp java minimal odbc readline ssl static tetex threads X" - -DEPEND="!dev-lang/swi-prolog-lite - sys-libs/ncurses - odbc? ( dev-db/unixODBC ) - berkdb? ( sys-libs/db ) - readline? ( sys-libs/readline ) - gmp? ( dev-libs/gmp ) - ssl? ( dev-libs/openssl ) - java? ( >=virtual/jdk-1.4 ) - X? ( - media-libs/jpeg - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-proto/xproto )" - -S="${WORKDIR}/pl-${PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e "s/man boot library/boot library/" src/Makefile.in - epatch "${FILESDIR}"/${PN}-portage.patch - epatch "${FILESDIR}"/${PN}-CFLAGS-r1.patch - epatch "${FILESDIR}"/${PN}-parallel-build.patch - epatch "${FILESDIR}"/${PN}-PLBASE-r1.patch - epatch "${FILESDIR}"/${PN}-test_date.patch - epatch "${FILESDIR}"/${PN}-cppproxy.patch - epatch "${FILESDIR}"/${PN}-db-versioned.patch - epatch "${FILESDIR}"/${PN}-db-docs.patch - epatch "${FILESDIR}"/${PN}-gmp-sparc-alignment.patch - epatch "${FILESDIR}"/${PN}-jpl-ppc.patch - epatch "${FILESDIR}"/${PN}-jpl-install.patch - epatch "${FILESDIR}"/${PN}-libtai.patch - epatch "${FILESDIR}"/${PN}-ltx2htm.patch - epatch "${FILESDIR}"/${PN}-semweb-sparc-alignment.patch - epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch - epatch "${FILESDIR}"/${PN}-ssl-cert.patch - epatch "${FILESDIR}"/${PN}-thread-tests.patch - epatch "${FILESDIR}"/${PN}-xpce-test.patch -} - -src_compile() { - einfo "Building SWI-Prolog compiler" - - local threadconf - if use java && ! use minimal || use threads ; then - threadconf="--enable-mt" - else - threadconf="--disable-mt" - fi - - cd "${S}"/src - econf \ - --libdir=/usr/$(get_libdir) \ - ${threadconf} \ - $(use_enable gmp) \ - $(use_enable readline) \ - $(use_enable !static shared) \ - --disable-custom-flags \ - || die "econf failed" - emake || die "emake failed" - - if ! use minimal ; then - einfo "Building SWI-Prolog additional packages" - - for package in db jpl - do - cd "${S}/packages/${package}" - eautoreconf - done - - cd "${S}/packages" - econf \ - --libdir=/usr/$(get_libdir) \ - ${threadconf} \ - $(use_enable !static shared) \ - --without-C-sicstus \ - --with-chr \ - --with-clib \ - --with-clpqr \ - --with-cpp \ - --with-cppproxy \ - $(use_with berkdb db) \ - --with-http \ - --without-jasmine \ - $(use_with java jpl) \ - $(use_with tetex ltx2htm) \ - --with-nlp \ - $(use_with odbc) \ - --with-semweb \ - --with-sgml \ - --with-sgml/RDF \ - $(use_with ssl) \ - --with-table \ - $(use_with X xpce) \ - || die "packages econf failed" - - emake || die "packages emake failed" - fi -} - -src_install() { - make -C src DESTDIR="${D}" install || die "install src failed" - - if ! use minimal ; then - make -C packages DESTDIR="${D}" install || die "install packages failed" - if use doc ; then - make -C packages DESTDIR="${D}" html-install || die "html-install failed" - make -C packages/cppproxy DESTDIR="${D}" install-examples || die "install-examples failed" - fi - fi - - dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README README.GUI VERSION -} - -src_test() { - cd "${S}/src" - make check || die "make check failed. See above for details." - - if ! use minimal ; then - addpredict / - cd "${S}/packages" - make check || die "make check failed. See above for details." - fi -} |