diff options
| -rw-r--r-- | lang/swi-prolog/Makefile | 17 | ||||
| -rw-r--r-- | lang/swi-prolog/distinfo | 4 | ||||
| -rw-r--r-- | lang/swi-prolog/patches/patch-ab | 147 |
3 files changed, 10 insertions, 158 deletions
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index eca93f8adc1..24cc880b991 100644 --- a/lang/swi-prolog/Makefile +++ b/lang/swi-prolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/17 14:32:28 jtb Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/20 20:33:55 jlam Exp $ DISTNAME= pl-lite-4.0.7 PKGNAME= swi-prolog-4.0.7 @@ -9,25 +9,20 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.swi.psy.uva.nl/projects/SWI-Prolog/ COMMENT= ISO/Edinburgh-style Prolog compiler -DEPENDS+= readline>=4.0:../../devel/readline - WRKSRC= ${WRKDIR}/${DISTNAME:S,-lite,,} DIST_SUBDIR= swi-prolog -GNU_CONFIGURE= yes - -USE_CURSES= yes -REPLACE_NCURSES= ${WRKSRC}/src/configure +GNU_CONFIGURE= # defined +USE_BUILDLINK_ONLY= # defined +USE_GNU_READLINE= # uses rl_event_hook() interface SWIPL= swi-prolog CONFIGURE_ENV+= PL="${SWIPL}" CPPFLAGS+= -D__unix__=1 -READLINE_PREFIX_DEFAULT=${LOCALBASE} -EVAL_PREFIX+= READLINE_PREFIX=readline -CPPFLAGS+= -I${READLINE_PREFIX}/include - PLIST_SUBST+= SWIPL=${SWIPL} PLIST_SUBST+= SWILIBDIR=${DISTNAME:S,pl-lite,'${SWIPL}',} +.include "../../devel/ncurses/buildlink.mk" +.include "../../devel/readline/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/swi-prolog/distinfo b/lang/swi-prolog/distinfo index 62c6d9a221d..1e6f9b668a7 100644 --- a/lang/swi-prolog/distinfo +++ b/lang/swi-prolog/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/06/17 14:32:28 jtb Exp $ +$NetBSD: distinfo,v 1.5 2001/06/20 20:33:55 jlam Exp $ 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 +SHA1 (patch-ab) = 647cc1f74c25ce3d47fbcdbf97bb7db1a79ca94d diff --git a/lang/swi-prolog/patches/patch-ab b/lang/swi-prolog/patches/patch-ab index a2b5e7af9f3..8280f5fe356 100644 --- a/lang/swi-prolog/patches/patch-ab +++ b/lang/swi-prolog/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2001/06/17 14:32:28 jtb Exp $ +$NetBSD: patch-ab,v 1.6 2001/06/20 20:33:56 jlam Exp $ ---- src/configure.orig Wed May 23 12:55:57 2001 +--- src/configure.orig Wed May 23 08:55:57 2001 +++ src/configure @@ -564,7 +564,7 @@ @@ -11,146 +11,3 @@ $NetBSD: patch-ab,v 1.5 2001/06/17 14:32:28 jtb Exp $ 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 |