diff options
author | Keri Harris <keri@gentoo.org> | 2006-09-12 09:17:13 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2006-09-12 09:17:13 +0000 |
commit | 008f5c85388ca9f08f01ce35c73f6f21fc2d7c2b (patch) | |
tree | a47ff7fddb693df768346fa435309bd908604670 | |
parent | stable on amd64 (diff) | |
download | gentoo-2-008f5c85388ca9f08f01ce35c73f6f21fc2d7c2b.tar.gz gentoo-2-008f5c85388ca9f08f01ce35c73f6f21fc2d7c2b.tar.bz2 gentoo-2-008f5c85388ca9f08f01ce35c73f6f21fc2d7c2b.zip |
Version bump.
(Portage version: 2.1.1)
-rw-r--r-- | dev-lang/swi-prolog/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19 | 3 | ||||
-rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch | 336 | ||||
-rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch | 86 | ||||
-rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch | 29 | ||||
-rw-r--r-- | dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild | 128 |
6 files changed, 590 insertions, 1 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 3ad8d430353f..31de69af00a6 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.30 2006/09/01 10:20:47 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.31 2006/09/12 09:17:13 keri Exp $ + +*swi-prolog-5.6.19 (12 Sep 2006) + + 12 Sep 2006; keri <keri@gentoo.org> +files/swi-prolog-CFLAGS-r2.patch, + +files/swi-prolog-PLBASE-r2.patch, +files/swi-prolog-portage-r1.patch, + +swi-prolog-5.6.19.ebuild: + Version bump. *swi-prolog-5.6.18 (01 Sep 2006) diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19 new file mode 100644 index 000000000000..15ca5339f863 --- /dev/null +++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19 @@ -0,0 +1,3 @@ +MD5 b9ac4e8549246aea2fc3c79d4914ca97 pl-5.6.19.tar.gz 11532046 +RMD160 63dc2fccb2fd93a042e5cd5b55438e093c45af04 pl-5.6.19.tar.gz 11532046 +SHA256 9897a7a08cd920ee6ad48f3da38d9add92f2992cf9e4339c9b17d055118702d8 pl-5.6.19.tar.gz 11532046 diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch new file mode 100644 index 000000000000..65cc25ba1daf --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch @@ -0,0 +1,336 @@ +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-PLBASE-r2.patch b/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch new file mode 100644 index 000000000000..d88e78659e61 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-PLBASE-r2.patch @@ -0,0 +1,86 @@ +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-portage-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch new file mode 100644 index 000000000000..4ef650d7b194 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-portage-r1.patch @@ -0,0 +1,29 @@ +--- pl-5.6.19.orig/packages/Makefile.in 2006-08-30 20:35:12.000000000 +1200 ++++ pl-5.6.19/packages/Makefile.in 2006-09-12 06:46:42.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/swi-prolog-5.6.19.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild new file mode 100644 index 000000000000..7a93763596b9 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2006 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.19.ebuild,v 1.1 2006/09/12 09:17:13 keri Exp $ + +inherit eutils + +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 ~ppc-macos ~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 ) + virtual/x11 ) )" + +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-r1.patch + epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch + epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch + epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch + epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch + epatch "${FILESDIR}"/${PN}-ltx2htm.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 -j1 || die "emake failed" + + if ! use minimal ; then + einfo "Building SWI-Prolog additional packages" + + 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 -j1 || 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 + cd "${S}/packages" + make check || die "make check failed. See above for details." + fi +} |