Date: Wed, 19 Apr 2006 11:32:35 -0400 (EDT) From: Vivek Khera <vivek@khera.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96048: update mail/postfix to use USE_BDB flag Message-ID: <20060419153235.CFC7511637@lorax.kcilink.com> Resent-Message-ID: <200604191540.k3JFeFOR065193@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96048
>Category: ports
>Synopsis: update mail/postfix to use USE_BDB flag
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 19 15:40:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Vivek Khera
>Release: FreeBSD 6.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD lorax.kcilink.com 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #0: Thu Jan 26 17:37:40 EST 2006 vivek@lorax.kcilink.com:/u/lorax1/usr6/obj.i386/n/lorax1/usr6/src/sys/LORAX i386
>Description:
updates the configuration of mail/postfix port to take advantage of the USE_BDB
and WITH_BDB_VER variables from bsd.database.mk.
>How-To-Repeat:
>Fix:
diff -Pru postfix.old/Makefile postfix/Makefile
--- postfix.old/Makefile Tue Apr 18 09:24:12 2006
+++ postfix/Makefile Wed Apr 19 11:31:48 2006
@@ -7,7 +7,7 @@
# To pre-select options in batch mode, run make like this:
#
-# make -DBATCH POSTFIX_OPTIONS="DB43 TLS"
+# make -DBATCH POSTFIX_OPTIONS="BDB TLS"
#
# the options are the same names as in the scripts/configure.postfix file.
# POSTFIX_OPTIONS can be set in /etc/make.conf also.
diff -Pru postfix.old/scripts/configure.postfix postfix/scripts/configure.postfix
--- postfix.old/scripts/configure.postfix Tue Apr 18 09:24:14 2006
+++ postfix/scripts/configure.postfix Wed Apr 19 10:46:32 2006
@@ -27,11 +27,7 @@
SASLKRB5MIT "If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
SPF "SPF support" "$status_SPF" \
TLS "SSL and TLS" "$status_TLS" \
-DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
+BDB "Berkeley DB (select version using WITH_BDB_VER variable)" "$status_BDB" \
MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
@@ -124,65 +120,11 @@
echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
echo "TLS_SUFFIX= +tls"
;;
- DB3)
- if [ "X$BDB_SELECTED" != "X" ]; then
- /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
- echo "DB_SUFFIX= +db3"
- BDB_SELECTED="3"
- ;;
- DB40)
- if [ "X$BDB_SELECTED" != "X" ]; then
- /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4"
- echo "DB_SUFFIX= +db40"
- BDB_SELECTED="40"
- ;;
- DB41)
- if [ "X$BDB_SELECTED" != "X" ]; then
- /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41"
- echo "DB_SUFFIX= +db41"
- BDB_SELECTED="41"
- ;;
- DB42)
- if [ "X$BDB_SELECTED" != "X" ]; then
- /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"
- echo "DB_SUFFIX= +db42"
- BDB_SELECTED="42"
- ;;
- DB43)
- if [ "X$BDB_SELECTED" != "X" ]; then
- /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
- rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- exit 1
- fi
- echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb"
- echo "DB_SUFFIX= +db43"
- BDB_SELECTED="43"
+ BDB)
+ echo "USE_BDB=YES"
+ echo "POSTFIX_CCARGS+= -I\${BDB_INCLUDE_DIR}"
+ echo "POSTFIX_AUXLIBS+= -L\${BDB_LIB_DIR} -l\${BDB_LIB_NAME}"
+ echo "DB_SUFFIX= +${BDB_LIB_NAME}"
;;
MySQL)
echo "USE_MYSQL=YES"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060419153235.CFC7511637>