Page MenuHomeFreeBSD
Files F168182125

D40366.id145160.diff
No OneTemporary
Actions

D40366.id145160.diff
View Options

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -1,5 +1,6 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= APACHE/apr
DISTFILES= apr-${APR_VERSION}.tar.gz \
@@ -11,10 +12,9 @@
LICENSE= APACHE20
-BUILD_DEPENDS+= automake>=1.16.1:devel/automake
LIB_DEPENDS= libexpat.so:textproc/expat2
-USES= iconv pathfix libtool cpe
+USES= autoreconf iconv pathfix libtool cpe
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -30,12 +30,13 @@
OPTIONS_DEFINE= IPV6
OPTIONS_GROUP_APU= GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE
OPTIONS_RADIO= BERKELEYDB CRYPTO
-OPTIONS_RADIO_BERKELEYDB= BDB BDB5
+OPTIONS_RADIO_BERKELEYDB= BDB BDB1 BDB5
OPTIONS_RADIO_CRYPTO= SSL NSS
OPTIONS_DEFAULT= BDB GDBM SSL
APU_DESC= Database support
BDB_DESC= Berkeley DB support (AGPLv3)
+BDB1_DESC= Berkeley DB 1.85 support (BSD 4-clause)
BDB5_DESC= Berkeley DB v5 support (deprecated)
BERKELEYDB_DESC= Berkeley DB provider
CRYPTO_DESC= Cryptography provider
@@ -86,6 +87,9 @@
BDB_VARS= ${BDB5_VARS} \
LICENSE_COMB=dual LICENSE+=AGPLv3
+BDB1_VARS= LICENSE_COMB=dual LICENSE+=BSD4CLAUSE \
+ APU_CONF_ARGS+="--with-berkeley-db=/usr/include:/usr/lib \
+ --with-dbm=db1"
BDB5_VARS= APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
GDBM_VARS= APU_CONF_ARGS+=--with-gdbm=${LOCALBASE}
LDAP_VARS= APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \
@@ -118,7 +122,7 @@
.include <bsd.port.options.mk>
-.if !${PORT_OPTIONS:MBDB} && !${PORT_OPTIONS:MBDB5}
+.if !${PORT_OPTIONS:MBDB} && !${PORT_OPTIONS:MBDB1} && !${PORT_OPTIONS:MBDB5}
APU_CONF_ARGS+= --without-berkeley-db
.endif
diff --git a/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 b/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4
--- a/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4
+++ b/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4
@@ -1,6 +1,4 @@
-diff --git apr-util-1.6.1/build/dbm.m4 apr-util-1.6.1/build/dbm.m4
-index 57bd131f..5cbee4b3 100644
---- apr-util-1.6.3/build/dbm.m4
+--- apr-util-1.6.3/build/dbm.m4.orig 2013-11-23 18:00:53 UTC
+++ apr-util-1.6.3/build/dbm.m4
@@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [
changequote([,])
@@ -11,6 +9,15 @@
# We generate a separate cache variable for each prefix and libname
# we search under. That way, we avoid caching information that
# changes if the user runs `configure' with a different set of
+@@ -293,7 +293,7 @@ AC_DEFUN([APU_CHECK_DB1], [
+ APU_CHECK_BERKELEY_DB(1, 0, 0,
+ "$places",
+ "db1/db.h db.h",
+- "db1"
++ "c db1"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=1
@@ -432,7 +432,15 @@ AC_DEFUN([APU_CHECK_DB], [
AC_MSG_ERROR(Berkeley db$db_major not found)
fi
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -98,6 +98,9 @@
%%BDB%%lib/apr-util-1/apr_dbm_db-1.so
%%BDB%%lib/apr-util-1/apr_dbm_db.a
%%BDB%%lib/apr-util-1/apr_dbm_db.so
+%%BDB1%%lib/apr-util-1/apr_dbm_db-1.so
+%%BDB1%%lib/apr-util-1/apr_dbm_db.a
+%%BDB1%%lib/apr-util-1/apr_dbm_db.so
%%GDBM%%lib/apr-util-1/apr_dbm_gdbm-1.so
%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.a
%%GDBM%%lib/apr-util-1/apr_dbm_gdbm.so

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 6:20 PM (1 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37408584
Default Alt Text
D40366.id145160.diff (3 KB)

Event Timeline