Updated postfix to 2.0.3

- Postfix 2.0 broke relocated table lookup results with mail not
  rejected at the SMTP port, causing "User has moved to" text to be deleted.

- A widely used maildir filename generating algorithm was broken.
  This affects all Postfix versions with maildir support. Instead of
  TIME.PID_COUNT.HOST Postfix now uses TIME.DEVICE_INODE.HOST.

- Postfix 2.0 gave incorrect FILTER_README instructions for sites
  that wish to disable virtual alias mapping before the content filter.

3 files changed, 16 insertions, 20 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 32785efc65c..c887b01056b 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2003/01/23 06:50:21 martti Exp $
+# $NetBSD: Makefile,v 1.76 2003/01/25 07:22:19 martti Exp $
 
-DISTNAME=	postfix-2.0.2
+DISTNAME=	postfix-2.0.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
@@ -16,14 +16,6 @@ USE_BUILDLINK2=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"		\
-	|| defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"	\
-	|| defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"	\
-	|| defined(POSTFIX_USE_TLS) && ${POSTFIX_USE_TLS} == "YES"	\
-	|| defined(USE_SASL) && ${USE_SASL} == "YES"
-MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
-.endif
-
 #.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
 #PATCHFILES+=		tls+ipv6-1.12-pf-2.0.2.patch.gz
 #PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/
@@ -47,6 +39,8 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib		\
 		-Wl,-R${BUILDLINK_PREFIX.pcre}/lib	\
 		-lpcre
 BUILD_DEFS+=	POSTFIX_USE_PCRE
+.else
+CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
@@ -100,6 +94,7 @@ MESSAGE_SRC+=	${PKGDIR}/MESSAGE
 PLIST_SRC+=	${PKGDIR}/PLIST
 ALL_TARGET=	#empty
 MAKE_ENV=	CC="${CC}" OPT="${CFLAGS}"
+MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
 
 pre-configure:
 	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
@@ -125,8 +120,9 @@ pre-configure:
 	    > ${WRKSRC}/src/global/mail_params.h
 
 do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
-	'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}' )
+	(cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
+		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}')
 
 post-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 26e7c10bb92..398486d8b91 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.27 2003/01/15 17:15:04 martti Exp $
+$NetBSD: distinfo,v 1.28 2003/01/25 07:22:19 martti Exp $
 
-SHA1 (postfix/postfix-2.0.2.tar.gz) = 0274801a1a268735f615256f37a02c6e7ea69300
-Size (postfix/postfix-2.0.2.tar.gz) = 1339432 bytes
+SHA1 (postfix/postfix-2.0.3.tar.gz) = 6b0f06a64c3aeda1fe6a3f808fca886fd95fb1e2
+Size (postfix/postfix-2.0.3.tar.gz) = 1339919 bytes
 SHA1 (patch-aa) = 5bc8f2d888bea92cfa88ef154c852b63990ae03e
 SHA1 (patch-ab) = b414e4350e9004c3f45f591bc86663d9bf38464a
 SHA1 (patch-ad) = d4e536f5f0d482a759da0016ea79f78b0a87455c
 SHA1 (patch-ae) = daa160ef54d725ca156f29322d45efcf4af6c02a
-SHA1 (patch-af) = 411187319b3d4b652abe38452f57a47786412565
+SHA1 (patch-af) = 7d51fa19b577bd2a2bdfe61e9b69a09ebca97593
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 0b66fcae2bb..b37c0e5649c 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.13 2003/01/15 17:15:06 martti Exp $
+$NetBSD: patch-af,v 1.14 2003/01/25 07:22:20 martti Exp $
 
---- conf/main.cf.orig	Sun Jan  5 17:58:31 2003
-+++ conf/main.cf	Wed Jan 15 18:59:15 2003
+--- conf/main.cf.orig	Fri Jan 24 01:42:20 2003
++++ conf/main.cf	Sat Jan 25 08:04:54 2003
 @@ -31,13 +31,18 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.13 2003/01/15 17:15:06 martti Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -608,16 +613,16 @@
+@@ -610,16 +615,16 @@
  # commands.  This must be a group name with a numerical group ID that
  # is not shared with other accounts, not even with the Postfix account.
  #