Index: ports/www/apache22/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/apache22/Makefile,v
retrieving revision 1.216
diff -u -r1.216 Makefile
--- ports/www/apache22/Makefile	11 Dec 2007 20:22:16 -0000	1.216
+++ ports/www/apache22/Makefile	16 Jan 2008 10:38:28 -0000
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -60,7 +60,8 @@
 	PGSQL "Enable PostgreSQL support for apr-dbd" Off \
 	SQLITE "Enable SQLite support for apr-dbd" Off \
 	IPV6 "Enable IPv6 support" On \
-	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off
+	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off \
+	BDB "Enable BerkeleyDB dbm" Off
 .include "${APACHEDIR}/Makefile.options"
 .endif
 
Index: ports/www/apache22/Makefile.doc
===================================================================
RCS file: /home/pcvs/ports/www/apache22/Makefile.doc,v
retrieving revision 1.11
diff -u -r1.11 Makefile.doc
--- ports/www/apache22/Makefile.doc	16 Jan 2008 09:33:45 -0000	1.11
+++ ports/www/apache22/Makefile.doc	16 Jan 2008 10:38:28 -0000
@@ -37,9 +37,10 @@
 ##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
 ##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or
 ##                                ndbm (default)
-##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3,
-##                                db4, db41, db42, db43, db44, db45, db46 
-##                                or FreeBSD (1.85, default)
+##          WITH_BDB:             Define to select bdb via bsd.databases.mk
+##                                desired version may be set with
+##                                WITH_BDB_VER or APACHE22_WITH_BDB_VER
+##          WITH_BDB_BASE:        Define to use bdb from base (1.85)
 ##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
 ##      WITH_STATIC_APACHE:       Build a static version of httpd (implies 
 ##                                WITH_STATIC_MODULES)
Index: ports/www/apache22/Makefile.modules
===================================================================
RCS file: /home/pcvs/ports/www/apache22/Makefile.modules,v
retrieving revision 1.25
diff -u -r1.25 Makefile.modules
--- ports/www/apache22/Makefile.modules	16 Jan 2008 09:33:45 -0000	1.25
+++ ports/www/apache22/Makefile.modules	16 Jan 2008 10:38:28 -0000
@@ -76,11 +76,10 @@
 
 # xDBM section
 #
-.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
+.if !defined(WITH_DBM)
+.   if defined(WITH_BDB) || defined(WITH_BDB_BASE)
 WITH_DBM=bdb
-.endif
-.if defined(WITH_DBM) && !defined(WITH_BERKELEYDB)
-WITH_BERKELEYDB=	FreeBSD
+.   endif
 .endif
 
 .if defined(WITH_DBM)
@@ -90,47 +89,13 @@
 LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
 .   elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb"
-.       if ${WITH_BERKELEYDB} == "FreeBSD"
+.	if defined(WITH_BDB_BASE)
 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 \
+.	else
+USE_BDB=		yes
+CONFIGURE_ARGS+=	--with-dbm=db${BDB_VER:S/40/4/} \
 			--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
-.       elif ${WITH_BERKELEYDB} == "db44"
-LIB_DEPENDS+=		db-4.4:${PORTSDIR}/databases/db44
-CONFIGURE_ARGS+=	--with-dbm=db44 \
-			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db44
-.       elif ${WITH_BERKELEYDB} == "db45"
-LIB_DEPENDS+=		db-4.5:${PORTSDIR}/databases/db45
-CONFIGURE_ARGS+=	--with-dbm=db45 \
-			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db45
-.       elif ${WITH_BERKELEYDB} == "db46"
-LIB_DEPENDS+=		db-4.6:${PORTSDIR}/databases/db46
-CONFIGURE_ARGS+=	--with-dbm=db46 \
-			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db46
-.       else
-IGNORE=		"Unknown Berkeley DB version"
 .       endif
 .   else
 IGNORE=		"Unknown DBM"