diff options
author | Dima Dorfman <dd@FreeBSD.org> | 2002-02-11 00:45:45 +0000 |
---|---|---|
committer | Dima Dorfman <dd@FreeBSD.org> | 2002-02-11 00:45:45 +0000 |
commit | 7845369aae2ebb7285b2b86d8c4e5119eb23bc59 (patch) | |
tree | f9c0d6356617150000cfbcec6b955fe88fc42337 /editors/nvi-devel/files/patch-configure | |
parent | Update to 0.6.0 (diff) |
Belatedly upgrade to 1.81.5. Notes: (a) patch-vi-relative has been
incorporated; (b) this now compiles on -current after libdb from
databases/db3 was renamed to libdb3; (c) this now compiles on -stable
(removed BROKEN since -stable has wchar.h now); and (d) fixed plist.
Diffstat (limited to 'editors/nvi-devel/files/patch-configure')
-rw-r--r-- | editors/nvi-devel/files/patch-configure | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/editors/nvi-devel/files/patch-configure b/editors/nvi-devel/files/patch-configure new file mode 100644 index 000000000000..8ee779b5196b --- /dev/null +++ b/editors/nvi-devel/files/patch-configure @@ -0,0 +1,41 @@ +# This patch makes the following changes: +# +# - -ldb -> -ldb3 +# - db3 include files in include/db3, not include +# +# As far as I can tell, both of these are FreeBSDisms, so this patch +# should not be submitted to the vendor. + +--- ../dist/configure~ Sun Feb 10 23:08:14 2002 ++++ ../dist/configure Sun Feb 10 23:08:11 2002 +@@ -10676,17 +10676,17 @@ + saveLDFLAGS="$LDFLAGS" + if test "x$with_db3" != "x"; then + LDFLAGS="-L$with_db3/lib $LDFLAGS" +- CFLAGS="-I$with_db3/include $CFLAGS" ++ CFLAGS="-I$with_db3/include/db3 $CFLAGS" + fi; + +-echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6 +-echo "configure:10684: checking for db_create in -ldb" >&5 ++echo $ac_n "checking for db_create in -ldb3""... $ac_c" 1>&6 ++echo "configure:10684: checking for db_create in -ldb3" >&5 + ac_lib_var=`echo db'_'db_create | 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="-ldb $LIBS" ++LIBS="-ldb3 $LIBS" + cat > conftest.$ac_ext <<EOF + #line 10692 "configure" + #include "confdefs.h" +@@ -10835,7 +10835,7 @@ + dl_src=../common/dldb.c + LIBS="-ldl $LIBS" + else +- LIBS="-ldb $LIBS" ++ LIBS="-ldb3 $LIBS" + if test "X$with_db3" != "X"; then + LDFLAGS="`echo $with_db3/lib | sed "$LRscript"` $LDFLAGS" + fi |