- Upgrade to 2.2-20050227 [1]

- Add BD43 option [2]

PR:		ports/78205 [1], ports/76154 [2]
Submitted by:	maintainer, Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>

4 files changed, 22 insertions, 8 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 0a584d61870d..5ec9ddb72922 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSIONRAW=	2.2-20050218
+PORTVERSIONRAW=	2.2-20050227
 PORTVERSION=	${PORTVERSIONRAW:S/-/./}
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
@@ -110,7 +110,7 @@ pre-patch:
 	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
 		${WRKSRC}/man/man5/${f} ${WRKSRC}/html/${f}.html
 .endfor
-.for f in ${MAN8base}
+.for f in ${MAN8}
 	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
 		${WRKSRC}/man/man8/${f} ${WRKSRC}/html/${f}.html
 .endfor
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index fd7b70542a95..8af888dfafc7 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/postfix-2.2-20050218.tar.gz) = 5b41c917635ec61e29731bc9cea07a96
-SIZE (postfix/postfix-2.2-20050218.tar.gz) = 2401756
+MD5 (postfix/postfix-2.2-20050227.tar.gz) = 10b9b8d39464abae33e9fe480635af3a
+SIZE (postfix/postfix-2.2-20050227.tar.gz) = 2402536
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 39b5e5868ecc..3b5535d71f4c 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -81,6 +81,7 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
+%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 8f1ccc66803f..48d26320939f 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -29,6 +29,7 @@ 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" \
 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" \
@@ -110,7 +111,7 @@ while [ "$1" ]; do
 			;;
 		DB3)
 			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr
+				/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
@@ -122,7 +123,7 @@ while [ "$1" ]; do
 			;;
 		DB40)
 			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr
+				/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
@@ -134,7 +135,7 @@ while [ "$1" ]; do
 			;;
 		DB41)
 			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr
+				/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
@@ -146,7 +147,7 @@ while [ "$1" ]; do
 			;;
 		DB42)
 			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr
+				/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
@@ -156,6 +157,18 @@ while [ "$1" ]; do
 			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"
+			;;
 		MySQL)
 			echo "USE_MYSQL=YES"
 			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"