--- dfports/devel/apr-old/Attic/Makefile	2004/09/07 14:56:22	1.1
+++ dfports/devel/apr-old/Attic/Makefile	2004/09/19 13:02:40	1.2
@@ -66,15 +66,39 @@ PKGNAMESUFFIX=	-gdbm
 .endif
 
 .if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
-APR_UTIL_CONF_ARGS+=	--without-berkeley-db
-.elif defined(APR_UTIL_WITH_BERKELEY_DB) || exists(${LOCALBASE}/lib/libdb4.so.0)
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-APR_UTIL_CONF_ARGS+=	--with-berkeley-db=${PREFIX}
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-db4
+APR_UTIL_CONF_ARGS+=    --without-berkeley-db
+.elif defined(APR_UTIL_WITH_BERKELEY_DB)
+.if exists(${LOCALBASE}/lib/libdb4.so.0)
+WITH_BDB_VER?=  4
+.elif exists(${LOCALBASE}/lib/libdb41.so.1)
+WITH_BDB_VER?=  41
+.elif exists(${LOCALBASE}/lib/libdb-4.2.so.2)
+WITH_BDB_VER?=  42
+.endif
 .else
-PKGNAMESUFFIX=	-db4
+.if exists(${LOCALBASE}/lib/libdb4.so.0)
+WITH_BDB_VER?=  4
+.elif exists(${LOCALBASE}/lib/libdb41.so.1)
+WITH_BDB_VER?=  41
+.elif exists(${LOCALBASE}/lib/libdb-4.2.so.2)
+WITH_BDB_VER?=  42
+.endif
 .endif
+.if ${WITH_BDB_VER} == 4
+LIB_DEPENDS+=   db4.0:${PORTSDIR}/databases/db4
+BDB_LIB_VER=    db4
+.elif ${WITH_BDB_VER} == 41
+LIB_DEPENDS+=   db41.1:${PORTSDIR}/databases/db41
+BDB_LIB_VER=    db41
+.elif ${WITH_BDB_VER} == 42
+LIB_DEPENDS+=   db-4.2.2:${PORTSDIR}/databases/db42
+BDB_LIB_VER=    db-4.2
+.endif
+APR_UTIL_CONF_ARGS+=    --with-berkeley-db=${PREFIX}/include/db${WITH_BDB_VER}:${PREFIX}/lib --with-dbm=db${WITH_BDB_VER}
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-db${WITH_BDB_VER}
+.else
+PKGNAMESUFFIX=  -db${WITH_BDB_VER}
 .endif
 
 pre-extract:
@@ -102,9 +126,9 @@ pre-extract:
 .if defined(APR_UTIL_WITHOUT_BERKELEY_DB)
 	@${ECHO_MSG} "Berkeley db4 support is disabled."
 .elif defined(APR_UTIL_WITH_BERKELEY_DB)
-	@${ECHO_MSG} "Berkeley db4 support forced."
-.elif exists(${LOCALBASE}/lib/libdb4.so.0)
-	@${ECHO_MSG} "Berkeley db4 support is enabled."
+	@${ECHO_MSG} "Berkeley db${WITH_BDB_VER} support forced."
+.elif defined(BDB_LIB_VER)
+	@${ECHO_MSG} "Berkeley db${WITH_BDB_VER} support is enabled."
 	@${ECHO_MSG} "You can disable Berkeley db4 support by defining APR_UTIL_WITHOUT_BERKELEY_DB."
 .else
 	@${ECHO_MSG} "Berkeley db4 was not found."