b50a4b0708
- Mk/bsd.database.mk rewrite, new default to db5. - db6 is eligible by default only if installed on the system. - Bump PORTREVISION of all ports that directly depend on BerkeleyDB or where USE_BDB is found in the port's directory - Patch a few ports such that they will pick up or work with newer versions. - Add UPDATING entry - Drive-by format fix for pks - Drop BerkeleyDB option from mail/popular for now, requires more work. - Exp-run logs linked from the PR below. - Ports that do not build (IGNORE, BROKEN, etc.) have pro-forma changes for new Berkeley DB, but are untested. NOTE: please read UPDATING and the Wiki page before proceeding! Announcement: http://lists.freebsd.org/pipermail/freebsd-ports-announce/2014-August/000090.html Wiki reference: https://wiki.freebsd.org/Ports/BerkeleyDBCleanup PR: 192690 Approved by: portmgr (implicit, PORTREVISION bump on unstaged ports)
47 lines
2 KiB
Text
47 lines
2 KiB
Text
--- ./configure.orig 2011-10-25 17:29:46.000000000 +0200
|
|
+++ ./configure 2014-08-15 17:35:24.000000000 +0200
|
|
@@ -14035,16 +14035,8 @@
|
|
as_fn_error $? "This release of cfengine requires a version of BerkeleyDB 4.4 or later" "$LINENO" 5
|
|
else
|
|
if test "x$BERKELEYDB_DIR" = "xdefault" ; then
|
|
- for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6 BerkeleyDB.4.7 BerkeleyDB.4.8; do
|
|
- for d in $prefix /opt /usr/local /usr/pkg /usr; do
|
|
- test -d "$d/$v" && BERKELEYDB_DIR="$d/$v"
|
|
- done
|
|
- done
|
|
- fi
|
|
-
|
|
- if test "x$BERKELEYDB_DIR" = "xdefault" ; then
|
|
for d in $prefix /opt /usr/local /usr; do
|
|
- for v in db-4 db4 db3 db db40 db41 db42 db43 db44 db45 db46 db47 db48 db50 db51; do
|
|
+ for v in db48 db5 db6; do
|
|
|
|
if test -f "$d/include/$v/db.h" ; then
|
|
echo "Found header in $d/include/$v "
|
|
@@ -14083,7 +14075,7 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-for ac_lib in '' db-4 db4 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
|
|
+for ac_lib in '' db-6 db-5 db-4.8 ; do
|
|
if test -z "$ac_lib"; then
|
|
ac_res="none required"
|
|
else
|
|
@@ -14167,7 +14159,7 @@
|
|
elif test -d "$BERKELEYDB_DIR"; then
|
|
|
|
BERKELEYDB_CFLAGS="-I$BERKELEYDB_DIR/include"
|
|
- for v in . db48 db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
|
|
+ for v in . db6 db5 db48 ; do
|
|
if test -f "$BERKELEYDB_DIR/include/$v/db.h"; then
|
|
BERKELEYDB_INCLUDEDIR="$BERKELEYDB_DIR/include/$v"
|
|
BERKELEYDB_CFLAGS="-I$BERKELEYDB_INCLUDEDIR"
|
|
@@ -14177,7 +14169,7 @@
|
|
|
|
if test -f "$BERKELEYDB_INCLUDEDIR/db.h"; then
|
|
BERKELEYDB_LIBS="-ldb"
|
|
- for v in db-4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
|
|
+ for v in db-6 db-5 db-4.8 ; do
|
|
if test -f "$BERKELEYDB_DIR/lib/lib$v.so"; then
|
|
BERKELEYDB_LIBS="-l$v"
|
|
break
|