request add db45/db46 support to devel/apr port

snowcrash+fuzzyocr schneecrash+fuzzyocr at gmail.com
Tue Aug 14 09:33:45 PDT 2007


this, i believe, does the trick ...


diff -ur aprORIG/Makefile apr/Makefile
--- aprORIG/Makefile    Mon Aug  6 21:17:39 2007
+++ apr/Makefile        Mon Aug  6 21:16:56 2007
@@ -8,8 +8,8 @@
 # APR_UTIL_WITHOUT_THREADS:    disable threads support
 # APR_UTIL_WITH_GDBM:          force dependency on the GNU dbm
 # APR_UTIL_WITHOUT_GDBM:       unconditionally disable the use of GNU dbm
-# APR_UTIL_WITH_BERKELEY_DB:   force dependency on Sleepycat's Berkeley DB 4.2
-# APR_UTIL_WITHOUT_BERKELEY_DB:        unconditionally disable the use of db4.2
+# APR_UTIL_WITH_BERKELEY_DB:   force dependency on Sleepycat's Berkeley DB 4.6
+# APR_UTIL_WITHOUT_BERKELEY_DB:        unconditionally disable the use of db4.6
 # (the database bindings are detected and recorded automatically if these
 # switches are not set)
 # APR_UTIL_WITH_LDAP:          force dependency on OpenLDAP
@@ -78,8 +78,8 @@

 .if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
 APR_UTIL_CONF_ARGS+=   --without-berkeley-db
-.elif defined(APR_UTIL_WITH_BERKELEY_DB) ||
exists(${LOCALBASE}/lib/libdb-4.2.so.2)
-USE_BDB=       42+
+.elif defined(APR_UTIL_WITH_BERKELEY_DB) ||
exists(${LOCALBASE}/lib/libdb-4.6.so.)
+USE_BDB=       46+
 APR_UTIL_CONF_ARGS+=   --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=
${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
@@ -125,9 +125,9 @@
        @${ECHO_MSG} "Berkeley DB support is disabled."
 .elif defined(APR_UTIL_WITH_BERKELEY_DB)
        @${ECHO_MSG} "Berkeley DB support forced."
-.elif exists(${LOCALBASE}/lib/libdb-4.2.so.2)
-       @${ECHO_MSG} "Berkeley db4.2 support is enabled."
-       @${ECHO_MSG} "You can disable Berkeley db4.2 support by
defining APR_UTIL_WITHOUT_BERKELEY_DB."
+.elif exists(${LOCALBASE}/lib/libdb-4.6.so.0)
+       @${ECHO_MSG} "Berkeley db4.6 support is enabled."
+       @${ECHO_MSG} "You can disable Berkeley db4.6 support by
defining APR_UTIL_WITHOUT_BERKELEY_DB."
 .else
        @${ECHO_MSG} "Berkeley DB was not found."
        @${ECHO_MSG} "You can force Berkeley DB support by defining
APR_UTIL_WITH_BERKELEY_DB."


More information about the freebsd-ports mailing list