diff options
| -rw-r--r-- | lang/swi-prolog/Makefile | 6 | ||||
| -rw-r--r-- | lang/swi-prolog/distinfo | 10 | ||||
| -rw-r--r-- | lang/swi-prolog/patches/patch-aa | 11 | ||||
| -rw-r--r-- | lang/swi-prolog/patches/patch-ab | 149 | ||||
| -rw-r--r-- | lang/swi-prolog/pkg/PLIST | 3 |
5 files changed, 163 insertions, 16 deletions
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index 7f2d52909c0..eca93f8adc1 100644 --- a/lang/swi-prolog/Makefile +++ b/lang/swi-prolog/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:40 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/17 14:32:28 jtb Exp $ -DISTNAME= pl-lite-4.0.5 -PKGNAME= swi-prolog-4.0.5 +DISTNAME= pl-lite-4.0.7 +PKGNAME= swi-prolog-4.0.7 CATEGORIES= lang MASTER_SITES= http://www.swi.psy.uva.nl/cgi-bin//nph-download/SWI-Prolog/ diff --git a/lang/swi-prolog/distinfo b/lang/swi-prolog/distinfo index acc40fad124..62c6d9a221d 100644 --- a/lang/swi-prolog/distinfo +++ b/lang/swi-prolog/distinfo @@ -1,6 +1,6 @@ -SHA1 (patch-aa) = 57b76926cf19944c014070ba65887b2c5cff1a21 +$NetBSD: distinfo,v 1.4 2001/06/17 14:32:28 jtb Exp $ -SHA1 (swi-prolog/pl-lite-4.0.5.tar.gz) = 6c0aac9e414990c0e245074a97c2a319bc13a5bf -Size (swi-prolog/pl-lite-4.0.5.tar.gz) = 1121630 bytes -SHA1 (patch-aa) = 57b76926cf19944c014070ba65887b2c5cff1a21 -SHA1 (patch-ab) = 7efd2c6caacdc6473743cbfcdf0cd5142f26d5a6 +SHA1 (swi-prolog/pl-lite-4.0.7.tar.gz) = ba4c0f6b138736e3dc66f474c5e19feb0b0dfa24 +Size (swi-prolog/pl-lite-4.0.7.tar.gz) = 1145445 bytes +SHA1 (patch-aa) = 7524e0f2fcbab84554bb622e5f1795816659668a +SHA1 (patch-ab) = 58090f33310ed620ca007ad6c8ed3984621795fa diff --git a/lang/swi-prolog/patches/patch-aa b/lang/swi-prolog/patches/patch-aa index 963f93dc5c0..459e8f4d04d 100644 --- a/lang/swi-prolog/patches/patch-aa +++ b/lang/swi-prolog/patches/patch-aa @@ -1,10 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2001/04/29 16:01:17 jtb Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/17 14:32:28 jtb Exp $ ---- src/Makefile.in.orig Mon Apr 9 16:03:48 2001 +--- src/Makefile.in.orig Tue May 22 20:54:34 2001 +++ src/Makefile.in -@@ -71,6 +71,7 @@ +@@ -69,8 +69,9 @@ + CWFLAGS=@CWFLAGS@ + CIFLAGS=@CIFLAGS@ CMFLAGS=@CMFLAGS@ - CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) +-CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) ++CFLAGS+= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) LDFLAGS=@LDFLAGS@ +CPPFLAGS=@CPPFLAGS@ diff --git a/lang/swi-prolog/patches/patch-ab b/lang/swi-prolog/patches/patch-ab index 87e4769c632..a2b5e7af9f3 100644 --- a/lang/swi-prolog/patches/patch-ab +++ b/lang/swi-prolog/patches/patch-ab @@ -1,13 +1,156 @@ -$NetBSD: patch-ab,v 1.4 2001/05/22 01:21:17 jtb Exp $ +$NetBSD: patch-ab,v 1.5 2001/06/17 14:32:28 jtb Exp $ ---- src/configure.orig Tue May 22 01:17:01 2001 +--- src/configure.orig Wed May 23 12:55:57 2001 +++ src/configure -@@ -563,7 +563,7 @@ +@@ -564,7 +564,7 @@ EXTRAOBJ="" INSTALLTARGET=dv-install -PL=pl +#PL=pl + PLLIB=libpl.a RT="" PLVERSION=`cat ../VERSION` +@@ -761,40 +761,6 @@ + GCC= + fi +-ac_test_CFLAGS="${CFLAGS+set}" +-ac_save_CFLAGS="$CFLAGS" +-CFLAGS= +-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:769: checking whether ${CC-cc} accepts -g" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- echo 'void f(){}' > conftest.c +-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then +- ac_cv_prog_cc_g=yes +-else +- ac_cv_prog_cc_g=no +-fi +-rm -f conftest* +- +-fi +- +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi + + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +@@ -2223,14 +2189,14 @@ + echo "$ac_t""no" 1>&6 + fi + +-echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 +-echo "configure:2228: checking for main in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 ++echo "configure:2228: checking for main in -lcurses" >&5 ++ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" ++LIBS="-lcurses $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2236 "configure" + #include "confdefs.h" +@@ -2254,19 +2220,19 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF + #define $ac_tr_lib 1 + EOF + +- LIBS="-lncurses $LIBS" ++ LIBS="-lcurses $LIBS" + + else + echo "$ac_t""no" 1>&6 + fi + +-if test ! "$ac_cv_lib_ncurses_main" = "yes"; then ++if test ! "$ac_cv_lib_curses_main" = "yes"; then + echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 + echo "configure:2272: checking for main in -lcurses" >&5 + ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` +@@ -2311,7 +2277,7 @@ + fi + + fi +-if test ! "$ac_cv_lib_ncurses_main" = "yes" -a \ ++if test ! "$ac_cv_lib_curses_main" = "yes" -a \ + ! "$ac_cv_lib_curses_main" = "yes"; then + echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 + echo "configure:2318: checking for main in -ltermcap" >&5 +@@ -2479,14 +2445,14 @@ + fi + + if test ! "$ac_cv_lib_readline_main" = "yes"; then +- echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 +-echo "configure:2484: checking for main in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 ++echo "configure:2484: checking for main in -lcurses" >&5 ++ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" ++LIBS="-lcurses $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2492 "configure" + #include "confdefs.h" +@@ -2510,19 +2476,19 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF + #define $ac_tr_lib 1 + EOF + +- LIBS="-lncurses $LIBS" ++ LIBS="-lcurses $LIBS" + + else + echo "$ac_t""no" 1>&6 + fi + +- if test ! "$ac_cv_lib_ncurses_main" = "yes"; then ++ if test ! "$ac_cv_lib_curses_main" = "yes"; then + echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 + echo "configure:2528: checking for main in -lcurses" >&5 + ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` +@@ -2567,7 +2533,7 @@ + fi + + fi +- if test "$ac_cv_lib_ncurses_main" = "yes" || test "$ac_cv_lib_curses_main" = "yes"; then ++ if test "$ac_cv_lib_curses_main" = "yes" || test "$ac_cv_lib_curses_main" = "yes"; then + echo "Found curses library. See if -lreadline works now" + unset ac_cv_lib_readline_main + echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6 diff --git a/lang/swi-prolog/pkg/PLIST b/lang/swi-prolog/pkg/PLIST index 774096c7e54..4b616a47929 100644 --- a/lang/swi-prolog/pkg/PLIST +++ b/lang/swi-prolog/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/04/29 16:01:17 jtb Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/06/17 14:32:28 jtb Exp $ bin/${SWIPL} bin/plld bin/plrc @@ -53,6 +53,7 @@ lib/${SWILIBDIR}/library/oset.pl lib/${SWILIBDIR}/library/qsave.pl lib/${SWILIBDIR}/library/quintus.pl lib/${SWILIBDIR}/library/readln.pl +lib/${SWILIBDIR}/library/readutil.pl lib/${SWILIBDIR}/library/shell.pl lib/${SWILIBDIR}/library/shlib.pl lib/${SWILIBDIR}/library/statistics.pl |