- update to USE_BDB

PR:		89023
Submitted by:	Scot W. Hetzel

1 files changed, 19 insertions, 46 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 014ec02e15ce..1ac74a27ebd7 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -47,12 +47,9 @@ MILTER_SOVER?=	3
 # SENDMAIL_WITH_SASL=yes
 # SENDMAIL_WITH_SASL2=yes
 # SENDMAIL_WITH_LDAP=yes
-# SENDMAIL_WITH_BERKELEYDB_VER=2
-# SENDMAIL_WITH_BERKELEYDB_VER=3
-# SENDMAIL_WITH_BERKELEYDB_VER=4
-# SENDMAIL_WITH_BERKELEYDB_VER=41
-# SENDMAIL_WITH_BERKELEYDB_VER=42
-# SENDMAIL_WITH_BERKELEYDB_VER=43
+# SENDMAIL_WITH_BERKELEYDB=yes
+#   Set either WITH_BDB_VER or SENDMAIL_WITH_BDB_VER
+#   to the version of Berkeley DB to use.
 # SENDMAIL_WITH_SOCKETMAP=yes
 # SENDMAIL_WITH_CYRUSLOOKUP=yes
 # SENDMAIL_WITH_PICKY_HELO_CHECK=yes
@@ -68,43 +65,19 @@ AUTO_ENABLED_SOCKETMAP=yes
 .endif
 
 .if defined(SENDMAIL_WITH_BERKELEYDB_VER)
-.if ${SENDMAIL_WITH_BERKELEYDB_VER} == "2"
-BERKELEYDB_SUFFIX=	+db2
-BERKELEYDB_PORT?=	databases/db2
-BERKELEYDB_LIB?=		db2
-BERKELEYDB_INCLUDE?=	${LOCALBASE}/include/db2
-.endif
-.if ${SENDMAIL_WITH_BERKELEYDB_VER} == "3"
-BERKELEYDB_SUFFIX=	+db3
-BERKELEYDB_PORT?=	databases/db3
-BERKELEYDB_LIB?=		db3
-BERKELEYDB_INCLUDE?=	${LOCALBASE}/include/db3
-.endif
-.if ${SENDMAIL_WITH_BERKELEYDB_VER} == "4"
-BERKELEYDB_SUFFIX=	+db4
-BERKELEYDB_PORT?=	databases/db4
-BERKELEYDB_LIB?=		db4
-BERKELEYDB_INCLUDE?=	${LOCALBASE}/include/db4
-.endif
-.if ${SENDMAIL_WITH_BERKELEYDB_VER} == "41"
-BERKELEYDB_SUFFIX=	+db41
-BERKELEYDB_PORT?=	databases/db41
-BERKELEYDB_LIB?=		db41
-BERKELEYDB_INCLUDE?=	${LOCALBASE}/include/db41
-.endif
-.if ${SENDMAIL_WITH_BERKELEYDB_VER} == "42"
-BERKELEYDB_SUFFIX=	+db42
-BERKELEYDB_PORT?=	databases/db42
-BERKELEYDB_LIB?=		db-4.2
-BERKELEYDB_INCLUDE?=	${LOCALBASE}/include/db42
-.endif
-.if ${SENDMAIL_WITH_BERKELEYDB_VER} == "43"
-BERKELEYDB_SUFFIX=	+db43
-BERKELEYDB_PORT?=	databases/db43
-BERKELEYDB_LIB?=		db-4.3
-BERKELEYDB_INCLUDE?=	${LOCALBASE}/include/db43
-.endif
-LIB_DEPENDS+=		${BERKELEYDB_LIB}:${PORTSDIR}/${BERKELEYDB_PORT}
+SENDMAIL_WITH_BERKELEYDB=	yes
+OBSOLETE_BDB_VAR=	SENDMAIL_WITH_BERKELEYDB_VER BERKELEYDB_PORT \
+	BERKELEYDB_LIB BERKELEYDB_INCLUDE
+IGNORE= Use SENDMAIL_WITH_BERKELEYDB to select Berkeley DB.
+.endif
+
+.if defined(SENDMAIL_WITH_BDB_VER)
+SENDMAIL_WITH_BERKELEYDB=	yes
+.endif
+
+.if defined(SENDMAIL_WITH_BERKELEYDB)
+USE_BDB=	yes
+BERKELEYDB_SUFFIX=	+${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 CONFLICTS+=	sendmail+tls-8.* \
 		sendmail+tls+ldap-8.* \
 		sendmail+tls+sasl-8.* \
@@ -290,16 +263,16 @@ do-configure:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		${SITE} > ${WCONF}/site.config.m4
-.if defined(SENDMAIL_WITH_BERKELEYDB_VER)
+.if defined(SENDMAIL_WITH_BERKELEYDB)
 	${ECHO_CMD} \
-	 'APPENDDEF(`confENVDEF'\'', `-I${BERKELEYDB_INCLUDE}'\'')' \
+	 'APPENDDEF(`confENVDEF'\'', `-I${BDB_INCLUDE_DIR}'\'')' \
 		>> ${WCONF}/site.config.m4
 	${ECHO_CMD} \
 	 'APPENDDEF(`confLIBDIRS'\'', `-L${LOCALBASE}/lib'\'')' \
 		>> ${WCONF}/site.config.m4
 .for i in sendmail editmap makemap praliases vacation
 	${ECHO_CMD} \
-	 'APPENDDEF(`conf_${i}_LIBS'\'', `-l${BERKELEYDB_LIB}'\'')' \
+	 'APPENDDEF(`conf_${i}_LIBS'\'', `-l${BDB_LIB_NAME}'\'')' \
 		>> ${WCONF}/site.config.m4
 .endfor
 .endif