--- Makefile.modules.orig Wed Jan 24 11:22:16 2007 +++ Makefile.modules Wed Jan 24 13:03:55 2007 @@ -64,36 +64,11 @@ . 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 -. 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 . else -IGNORE= "Unknown Berkeley DB version" +USE_BDB= YES +CONFIGURE_ARGS+= --with-dbm=db${BDB_VER} \ + --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} +#IGNORE= "Unknown Berkeley DB version" . endif . else IGNORE= "Unknown DBM"