3 files changed, 20 insertions, 9 deletions

diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index aa888b3e6fd8..72b8347f323a 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.16
+PORTVERSION=	2.0.18
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -27,6 +27,7 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
+
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 
@@ -81,7 +82,6 @@ POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .endif
 
-
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index a3eb62fc1bca..3b49b405ff4b 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f
+MD5 (postfix/postfix-2.0.18.tar.gz) = 3e5baf2cc497a5fb1aaa6ba11aa6491e
 MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160
 MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1
-MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7
+MD5 (postfix/ipv6-1.21-pf-2.0.18.patch.gz) = f30495d44b140239df02a0599d280d68
+MD5 (postfix/tls+ipv6-1.21-pf-2.0.18.patch.gz) = 8d273f922352a0ff32c57c29bec26b46
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
index c83a3f125171..90b81f8894ea 100644
--- a/mail/postfix20/scripts/configure.postfix
+++ b/mail/postfix20/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.42 2004-01-30 19:28:45 eik Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,8 @@ 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" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL v7.3 map lookups" "$status_PgSQL" \
+PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
+PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
 PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
 OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
 OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
@@ -164,6 +165,16 @@ while [ "$1" ]; do
 			echo "PATCH_DIST_STRIP= -p1"
 			echo "PGSQL_SUFFIX=	+pgsql"
 			;;
+		PgSQL73)
+			echo "POSTGRESQL_PORT?=	databases/postgresql73"
+			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
+			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
+			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
+			echo "PATCH_SITES+=	http://mat.cc/postfix/"
+			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
+			echo "PATCH_DIST_STRIP= -p1"
+			echo "PGSQL_SUFFIX=	+pgsql"
+			;;
 		PgSQL72)
 			echo "POSTGRESQL_PORT?=	databases/postgresql72"
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
@@ -203,7 +214,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.18a-pf-2.0.16.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.21-pf-2.0.18.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -221,7 +232,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.18a-pf-2.0.16.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.21-pf-2.0.18.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""