aboutsummaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2005-01-17 20:30:08 +0000
committerClement Laforet <clement@FreeBSD.org>2005-01-17 20:30:08 +0000
commitae9562845c7f6c125730532124e47eda57cd0612 (patch)
tree2d89b9f516a2cd1939640ff57193e8042e11a689 /www/apache22
parentc0ec0fbec9b4cbb9563c49ff19eb7302c18a195d (diff)
downloadports-ae9562845c7f6c125730532124e47eda57cd0612.tar.gz
ports-ae9562845c7f6c125730532124e47eda57cd0612.zip
Notes
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile.modules4
-rw-r--r--www/apache22/files/patch-srclib:apr-util:build:dbm.m4 (renamed from www/apache22/files/patch-srclib:apr-utils:build:dbm.m4)13
2 files changed, 16 insertions, 1 deletions
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index 1f2404e60556..6b59b1ac52de 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -81,6 +81,10 @@ CONFIGURE_ARGS+= --with-dbm=db41 \
LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --with-dbm=db42 \
--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
+. elif ${WITH_BERKELEYDB} == "db43"
+LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43
+CONFIGURE_ARGS+= --with-dbm=db43 \
+ --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
. else
IGNORE= "Unknown Berkeley DB version"
. endif
diff --git a/www/apache22/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
index 78b4b2c57d59..70fe1ef96154 100644
--- a/www/apache22/files/patch-srclib:apr-utils:build:dbm.m4
+++ b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
@@ -1,5 +1,5 @@
--- srclib/apr-util/build/dbm.m4.orig Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/build/dbm.m4 Sat Dec 11 17:08:31 2004
++++ srclib/apr-util/build/dbm.m4 Mon Jan 17 21:22:47 2005
@@ -298,8 +298,8 @@
fi
APU_CHECK_BERKELEY_DB(1, -1, -1,
@@ -53,3 +53,14 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
+@@ -422,8 +422,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "3", "-1",
+ "$places",
+- "db43/db.h db4/db.h db.h",
+- "db-4.3 db43 db4 db"
++ "db43/db.h",
++ "db-4.3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4