Date: Thu, 4 May 2006 14:23:37 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96749: Support Berkeley DB in Apache 2 Message-ID: <20060504062337.E148E1701D@sunpoet.net> Resent-Message-ID: <200605040630.k446UGpd033463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96749
>Category: ports
>Synopsis: Support Berkeley DB in Apache 2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu May 04 06:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 6.1-RC i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.1-RC FreeBSD 6.1-RC #3: Tue Apr 11 22:24:01 CST 2006 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386
>Description:
Support Berkeley DB in Apache 2.
>How-To-Repeat:
>Fix:
% diff -u /usr/ports/www/apache20/Makefile.modules.orig /usr/ports/www/apache20/Makefile.modules
--- /usr/ports/www/apache20/Makefile.modules.orig Mon Jan 16 02:58:37 2006
+++ /usr/ports/www/apache20/Makefile.modules Tue May 2 16:31:49 2006
@@ -58,32 +58,10 @@
. if ${WITH_BERKELEYDB} == "FreeBSD"
CONFIGURE_ARGS+= --with-dbm=db185 \
--with-berkeley-db=/usr
-. elif ${WITH_BERKELEYDB} == "db2"
-LIB_DEPENDS+= db2:${PORTSDIR}/databases/db2
-CONFIGURE_ARGS+= --with-dbm=db2 \
- --with-berkeley-db=${LOCALBASE}
-. elif ${WITH_BERKELEYDB} == "db3"
-LIB_DEPENDS+= db3:${PORTSDIR}/databases/db3
-CONFIGURE_ARGS+= --with-dbm=db3 \
- --with-berkeley-db=${LOCALBASE}
-. elif ${WITH_BERKELEYDB} == "db4"
-LIB_DEPENDS+= db4:${PORTSDIR}/databases/db4
-CONFIGURE_ARGS+= --with-dbm=db4 \
- --with-berkeley-db=${LOCALBASE}
-. elif ${WITH_BERKELEYDB} == "db41"
-LIB_DEPENDS+= db41:${PORTSDIR}/databases/db41
-CONFIGURE_ARGS+= --with-dbm=db41 \
- --with-berkeley-db=${LOCALBASE}
-. elif ${WITH_BERKELEYDB} == "db42"
-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"
+. else
+USE_BDB= YES
+WITH_BERKELEYDB?= db44
+WITH_BDB_VER= ${WITH_BERKELEYDB:C/^db//}
. endif
. else
IGNORE= "Unknown DBM"
% diff -u /usr/ports/www/apache20/files/patch-srclib:apr-util:build:dbm.m4.orig /usr/ports/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
--- /usr/ports/www/apache20/files/patch-srclib:apr-util:build:dbm.m4.orig Tue Feb 8 23:17:06 2005
+++ /usr/ports/www/apache20/files/patch-srclib:apr-util:build:dbm.m4 Tue May 2 16:44:40 2006
@@ -1,5 +1,5 @@
---- srclib/apr-util/build/dbm.m4.orig Sun Jan 16 18:27:07 2005
-+++ srclib/apr-util/build/dbm.m4 Sat Feb 5 12:14:28 2005
+--- srclib/apr-util/build/dbm.m4.orig Thu Feb 9 12:26:28 2006
++++ srclib/apr-util/build/dbm.m4 Tue May 2 16:40:06 2006
@@ -298,8 +298,8 @@
fi
APU_CHECK_BERKELEY_DB(1, -1, -1,
@@ -42,7 +42,7 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
-@@ -403,13 +403,14 @@
+@@ -403,8 +403,8 @@
fi
APU_CHECK_BERKELEY_DB("4", "2", "-1",
"$places",
@@ -53,13 +53,7 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
- fi
- ])
-+
- dnl
- dnl APU_CHECK_DB43: is DB4.3 present?
- dnl
-@@ -422,8 +423,8 @@
+@@ -422,8 +422,8 @@
fi
APU_CHECK_BERKELEY_DB("4", "3", "-1",
"$places",
@@ -70,11 +64,14 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
-@@ -524,6 +525,7 @@
- fi
- fi
+@@ -441,8 +441,8 @@
fi
-+
- AC_MSG_CHECKING(for Berkeley DB)
+ APU_CHECK_BERKELEY_DB("4", "4", "-1",
+ "$places",
+- "db44/db.h db4/db.h db.h",
+- "db-4.4 db4-4.4 db44 db4 db"
++ "db44/db.h",
++ "db-4.4"
+ )
if test "$apu_have_db" = "1"; then
- AC_MSG_RESULT(found db$apu_db_version)
+ apu_db_version=4
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060504062337.E148E1701D>