From 871e7c99e3fec1697f3786f3583b9d3f8ed6f247 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 30 Nov 2004 20:54:38 +0000 Subject: Use bdb.buildlink3.mk to get the DB library to use for the "hash" map type. All platforms now support the "hash" map type as a result. Remove the explicit dependencies on db4 and db2 on non-Linux and Linux, respectively. Bump the PKGREVISION. --- mail/postfix/options.mk | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'mail/postfix/options.mk') diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index e9c7ec3c2df..4125944258d 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,11 +1,24 @@ -# $NetBSD: options.mk,v 1.11 2004/11/17 19:34:31 xtraeme Exp $ +# $NetBSD: options.mk,v 1.12 2004/11/30 20:54:38 jlam Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.postfix -PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls +PKG_SUPPORTED_OPTIONS= bdb inet6 ldap mysql mysql4 pcre pgsql sasl tls .include "../../mk/bsd.options.mk" +### +### Support "hash" (Berkeley DB) map type. +### +.if empty(PKG_OPTIONS:Mbdb) +PKG_OPTIONS+= bdb # "hash" map type is mandatory +.endif +.if !empty(PKG_OPTIONS:Mbdb) +USE_DB185= no +. include "../../mk/bdb.buildlink3.mk" +CCARGS+= -DHAS_DB +AUXLIBS+= ${BUILDLINK_LDFLAGS.${BDB_TYPE}} ${BDB_LIBS} +.endif + ### ### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/) ### @@ -69,13 +82,6 @@ CCARGS+= -DHAS_LDAP AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \ -lldap -llber -. if ${OPSYS} != "Linux" -. include "../../databases/db4/buildlink3.mk" -CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4 -AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \ - -ldb4 -. endif .endif ### @@ -142,11 +148,3 @@ MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} .endif - -.if ${OPSYS} == "Linux" -. include "../../databases/db/buildlink3.mk" -CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2 -AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \ - -ldb2 -.endif -- cgit v1.2.3