Updated postfix-current to 2.2-20040628

* Sync with pkgsrc/mail/postfix
* Get rid of canonical_classes patch
* No IPv6 patch

19 files changed, 92 insertions, 225 deletions

diff --git a/mail/postfix-current/INSTALL b/mail/postfix-current/INSTALL
index abec8e6d155..145927c517f 100644
--- a/mail/postfix-current/INSTALL
+++ b/mail/postfix-current/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+# $NetBSD: INSTALL,v 1.2 2004/07/02 08:03:04 martti Exp $
 #
 
 SHAREDIR=@SHAREDIR@
@@ -6,6 +6,6 @@ SHAREDIR=@SHAREDIR@
 case $STAGE in
 POST-INSTALL)
 	echo "===> Running postfix's post-install script"
-	@SHAREDIR@/post-install command_directory="@PREFIX@/sbin" first-install
+	@SHAREDIR@/post-install command_directory=@PREFIX@/sbin first-install
 	;;
 esac
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index da093643cef..366ac0a4874 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/06/06 13:50:41 taca Exp $
+# $NetBSD: Makefile,v 1.33 2004/07/02 08:03:04 martti Exp $
 
-DISTNAME=	postfix-2.2-20040504
-PKGNAME=	postfix-20040504
+DISTNAME=	postfix-2.2-20040628
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		http://public.planetmirror.com.au/pub/postfix/experimental/
@@ -40,10 +39,9 @@ RCD_SCRIPTS=	postfix
 .endif
 
 FIX_RPATH+=	AUXLIBS
-REPLACE_PERL+=	examples/smtpd-policy/greylist.pl examples/smtpd-policy/spf.pl
 
 BUILD_DEFS+=	POSTFIX_USE_INET6
-#BUILD_DEFS+=	POSTFIX_USE_TLS
+BUILD_DEFS+=	POSTFIX_USE_TLS
 BUILD_DEFS+=	POSTFIX_USE_PCRE
 BUILD_DEFS+=	POSTFIX_USE_MYSQL
 BUILD_DEFS+=	POSTFIX_USE_PGSQL
@@ -51,20 +49,20 @@ BUILD_DEFS+=	USE_OPENLDAP
 BUILD_DEFS+=	USE_SASL
 BUILD_DEFS+=	USE_SASL2
 
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-.  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=		tls+ipv6-1.24-pf-2.2-20040504.patch.gz
-PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.24/
-PATCH_DIST_STRIP=	-p1
-
-CCARGS+=	-DHAS_SSL
-AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
-		-lssl -lcrypto
-
-PLIST_SRC+=	${PKGDIR}/PLIST.tls
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
-.endif
+# .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
+# .  include "../../security/openssl/buildlink3.mk"
+# PATCHFILES+=		tls+ipv6-1.25-pf-2.2-20040616.patch.gz
+# PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
+# PATCH_DIST_STRIP=	-p1
+# 
+# CCARGS+=	-DHAS_SSL
+# AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
+# 		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
+# 		-lssl -lcrypto
+# 
+# PLIST_SRC+=	${PKGDIR}/PLIST.tls
+# MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
+# .endif
 
 .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
 .  include "../../devel/pcre/buildlink3.mk"
@@ -82,6 +80,13 @@ CCARGS+=	-DHAS_LDAP
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib			\
 		-Wl,${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                    \
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib     \
+		-ldb4
+.  endif
 .endif
 
 .if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
@@ -92,17 +97,17 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
 		-lmysqlclient -lz -lm
 .endif
 
-.if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
-.  include "../../databases/postgresql-lib/buildlink3.mk"
-.  include "../../security/openssl/buildlink3.mk"
-PATCHFILES+=		postfix-pg.postfix-2.0.0.2.patch
-PATCH_SITES+=		http://www.mat.cc/postfix/
-PATCH_DIST_STRIP=	-p1
-
-CCARGS+=	-DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
-AUXLIBS+=	-L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
-		-L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
-.endif
+## .if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
+## .  include "../../databases/postgresql-lib/buildlink3.mk"
+## .  include "../../security/openssl/buildlink3.mk"
+## PATCHFILES+=		postfix-pg.postfix-2.0.0.2.patch
+## PATCH_SITES+=		http://www.mat.cc/postfix/
+## PATCH_DIST_STRIP=	-p1
+##
+## CCARGS+=	-DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+## AUXLIBS+=	-L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
+##		-L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
+## .endif
 
 .if defined(USE_SASL2) && ${USE_SASL2} == "YES"
 USING_SASL=	YES
@@ -112,7 +117,7 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
 		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
 		-lsasl2
 .elif defined(USE_SASL) && ${USE_SASL} == "YES"
-USING_SASL=	YES
+USING_SASL=YES
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
@@ -212,15 +217,6 @@ pre-install:
 do-install:
 	cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}"	\
 		${SH} postfix-install -non-interactive
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-	${INSTALL_DATA} ${WRKSRC}/conf/sample-ipv6.cf ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/sample-tls.cf ${SHAREDIR}
-.endif
-	${INSTALL_DATA_DIR} ${SHAREDIR}/smtpd-policy
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/smtpd-policy/greylist.pl \
-		${SHAREDIR}/smtpd-policy
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/smtpd-policy/spf.pl \
-		${SHAREDIR}/smtpd-policy
 
 .if ${OPSYS} == "Linux"
 .  include "../../databases/db/buildlink3.mk"
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index 9ca711f1cea..0adf7c1657f 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/06 13:50:41 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/07/02 08:03:04 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -45,9 +45,9 @@ man/man5/cidr_table.5
 man/man5/header_checks.5
 man/man5/ldap_table.5
 man/man5/mysql_table.5
+man/man5/pcre_table.5
 man/man5/pgsql_table.5
 man/man5/postconf.5
-man/man5/pcre_table.5
 man/man5/regexp_table.5
 man/man5/relocated.5
 man/man5/tcp_table.5
@@ -113,12 +113,12 @@ share/doc/postfix/OVERVIEW
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
 share/doc/postfix/PGSQL_README
-share/doc/postfix/QSHAPE_README
 share/doc/postfix/QMQP_README
+share/doc/postfix/QSHAPE_README
 share/doc/postfix/RELEASE_NOTES
-share/doc/postfix/SCHEDULER_README
 share/doc/postfix/RESTRICTION_CLASS_README
 share/doc/postfix/SASL_README
+share/doc/postfix/SCHEDULER_README
 share/doc/postfix/SMTPD_ACCESS_README
 share/doc/postfix/SMTPD_POLICY_README
 share/doc/postfix/SMTPD_PROXY_README
@@ -130,15 +130,13 @@ share/doc/postfix/VERP_README
 share/doc/postfix/VIRTUAL_README
 share/doc/postfix/XCLIENT_README
 share/doc/postfix/XFORWARD_README
-share/examples/postfix/mailer.conf
-share/examples/postfix/main.cf
-share/examples/postfix/master.cf
-share/examples/postfix/post-install
-share/examples/postfix/postfix-files
-share/examples/postfix/postfix-script
-share/examples/postfix/smtpd-policy/greylist.pl
-share/examples/postfix/smtpd-policy/spf.pl
-@dirrm share/examples/postfix/smtpd-policy
-@dirrm share/examples/postfix
+share/examples/postfix-2.2/mailer.conf
+share/examples/postfix-2.2/main.cf
+share/examples/postfix-2.2/master.cf
+share/examples/postfix-2.2/post-install
+share/examples/postfix-2.2/postfix-files
+share/examples/postfix-2.2/postfix-script
+@dirrm share/examples/postfix-2.2
 @dirrm share/doc/postfix
+@dirrm libexec/postfix-2.2
 @dirrm libexec/postfix
diff --git a/mail/postfix-current/PLIST.tls b/mail/postfix-current/PLIST.tls
index e2c66eb863c..7aa3af17056 100644
--- a/mail/postfix-current/PLIST.tls
+++ b/mail/postfix-current/PLIST.tls
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.tls,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
+@comment $NetBSD: PLIST.tls,v 1.2 2004/07/02 08:03:04 martti Exp $
 libexec/postfix/tlsmgr
 man/man8/tlsmgr.8
 share/doc/postfix/IPV6_README
-share/examples/postfix/sample-ipv6.cf
-share/examples/postfix/sample-tls.cf
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index e03255fed00..99b05da1f76 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,20 +1,12 @@
-$NetBSD: distinfo,v 1.6 2004/06/06 13:50:41 taca Exp $
+$NetBSD: distinfo,v 1.7 2004/07/02 08:03:04 martti Exp $
 
-SHA1 (postfix/postfix-2.2-20040504.tar.gz) = c0b2493c8f407396117e453b011633ea72f21e93
-Size (postfix/postfix-2.2-20040504.tar.gz) = 1989111 bytes
-SHA1 (postfix/tls+ipv6-1.24-pf-2.2-20040504.patch.gz) = 6bfe5abbe051fc412280fae1f7d13a7c2b8e5d13
-Size (postfix/tls+ipv6-1.24-pf-2.2-20040504.patch.gz) = 256490 bytes
-SHA1 (patch-aa) = 2c29fa353a07d651b2c32a6ee2e5e80f31e1c08f
+SHA1 (postfix/postfix-2.2-20040628.tar.gz) = f5fb9278cbcb86fd2d90ceea62e806894561a333
+Size (postfix/postfix-2.2-20040628.tar.gz) = 2014579 bytes
+SHA1 (patch-aa) = ca3d2739c35c89056b2f0c19a2cbcb9e018013c6
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
-SHA1 (patch-ae) = 9ea314db37541a1a9c7765e000687c0fdef90d8e
-SHA1 (patch-af) = db5b23950e18d6914718d785396873bcdabed941
-SHA1 (patch-ag) = e3b1bb58d193f487e0eb3844a72969dc8d9d4f61
+SHA1 (patch-ae) = 98ff7efe8338d4e6e05e311d070237d726161af2
+SHA1 (patch-af) = c5fc75f8f9499ed533bd30e162ec8784e446d288
+SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-SHA1 (patch-ai) = 1e9954ff10db17870f27671e8b72ea8f816802bc
-SHA1 (patch-bd) = 652b96357164208e39d322e84ee9a2ad2bd4ccc4
-SHA1 (patch-be) = dd00235af79a8d5e46a7d393e18840241bb685a8
-SHA1 (patch-bg) = d09d7fce17e27b1e91c0914b4e7b1b3f418f5356
-SHA1 (patch-bk) = aa3516374629a525c75caca4ed89c2225c47506f
-SHA1 (patch-bs) = 2dfa789f4fb2ef6fbf4ba85387c8c29bafe224c0
-SHA1 (patch-bt) = 912cc7811743ce1ff8b556085dbc2ffc73808333
+SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index 403a584ed98..c4aff913353 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-aa,v 1.13 2004/07/02 08:03:04 martti Exp $
 
---- postfix-install.orig	2004-04-15 00:45:23.000000000 +0900
-+++ postfix-install
-@@ -354,33 +354,13 @@ HTML files. Specify \"no\" if you do not
+--- postfix-install.orig	2004-04-14 11:45:23.000000000 -0400
++++ postfix-install	2004-05-23 22:32:31.000000000 -0400
+@@ -354,33 +354,13 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $
  
  # If a parameter is not set via the command line or environment,
  # try to use settings from installed configuration files.
-@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -715,10 +695,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
index 34c044ab034..6c535a114ab 100644
--- a/mail/postfix-current/patches/patch-ab
+++ b/mail/postfix-current/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ab,v 1.6 2004/07/02 08:03:04 martti Exp $
 
 --- src/lmtp/lmtp.h.orig	2003-09-10 02:48:03.000000000 +0200
 +++ src/lmtp/lmtp.h	2004-01-20 20:30:12.000000000 +0100
diff --git a/mail/postfix-current/patches/patch-ac b/mail/postfix-current/patches/patch-ac
index 7536289c357..26261cb6ccc 100644
--- a/mail/postfix-current/patches/patch-ac
+++ b/mail/postfix-current/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ac,v 1.4 2004/07/02 08:03:04 martti Exp $
 
 --- src/smtp/smtp.h.orig	2002-05-23 21:18:02.000000000 +0200
 +++ src/smtp/smtp.h	2004-01-20 20:29:21.000000000 +0100
diff --git a/mail/postfix-current/patches/patch-ae b/mail/postfix-current/patches/patch-ae
index 5a9480f2e7c..6298f3b891b 100644
--- a/mail/postfix-current/patches/patch-ae
+++ b/mail/postfix-current/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ae,v 1.4 2004/07/02 08:03:04 martti Exp $
 
---- src/global/mail_params.h.orig	2004-01-18 02:04:00.000000000 +1100
-+++ src/global/mail_params.h
-@@ -64,7 +64,7 @@ extern uid_t var_owner_uid;
+--- src/global/mail_params.h.orig	2004-04-21 14:56:04.000000000 -0400
++++ src/global/mail_params.h	2004-05-23 22:44:13.000000000 -0400
+@@ -64,7 +64,7 @@
  extern gid_t var_owner_gid;
  
  #define VAR_SGID_GROUP		"setgid_group"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
  extern char *var_sgid_group;
  extern gid_t var_sgid_gid;
  
-@@ -202,13 +202,13 @@ extern char *var_queue_dir;
+@@ -202,13 +202,13 @@
    */
  #define VAR_DAEMON_DIR		"daemon_directory"
  #ifndef DEF_DAEMON_DIR
@@ -27,14 +27,3 @@ $NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
  #endif
  extern char *var_command_dir;
  
-@@ -334,6 +334,10 @@ extern char *var_send_canon_maps;
- #define DEF_RCPT_CANON_MAPS	""
- extern char *var_rcpt_canon_maps;
- 
-+#define VAR_CANON_ENV_RCPT	"canonicalize_envelope_recipient"
-+#define DEF_CANON_ENV_RCPT	1
-+extern bool var_canon_env_rcpt;
-+
- #define VAR_SEND_BCC_MAPS	"sender_bcc_maps"
- #define DEF_SEND_BCC_MAPS	""
- extern char *var_send_bcc_maps;
diff --git a/mail/postfix-current/patches/patch-af b/mail/postfix-current/patches/patch-af
index e96ec88897b..ee35fcfcb3d 100644
--- a/mail/postfix-current/patches/patch-af
+++ b/mail/postfix-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-af,v 1.10 2004/07/02 08:03:04 martti Exp $
 
---- conf/main.cf.orig	2004-04-15 22:27:21.000000000 +0900
-+++ conf/main.cf
-@@ -32,13 +32,18 @@ queue_directory = /var/spool/postfix
+--- conf/main.cf.orig	2004-04-15 09:27:21.000000000 -0400
++++ conf/main.cf	2004-05-23 22:51:16.000000000 -0400
+@@ -32,13 +32,18 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.
  #
@@ -23,7 +23,7 @@ $NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -56,7 +61,7 @@ mail_owner = postfix
+@@ -56,7 +61,7 @@
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -611,7 +616,7 @@ mailq_path =
+@@ -611,7 +616,7 @@
  # 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.
  #
@@ -41,7 +41,7 @@ $NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
  
  # html_directory: The location of the Postfix HTML documentation.
  #
-@@ -619,13 +624,13 @@ html_directory =
+@@ -619,13 +624,13 @@
  
  # manpage_directory: The location of the Postfix on-line manual pages.
  #
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index aa593d661d1..d49a39f69a1 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.4 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-ag,v 1.5 2004/07/02 08:03:04 martti Exp $
 
---- src/util/sys_defs.h.orig	2004-04-15 04:49:40.000000000 +0900
-+++ src/util/sys_defs.h
-@@ -50,8 +50,13 @@
- #endif
- #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
+--- src/util/sys_defs.h.orig	2004-06-14 21:13:40.000000000 +0300
++++ src/util/sys_defs.h	2004-06-20 11:40:54.000000000 +0300
+@@ -127,8 +127,13 @@
+ #define ALIAS_DB_MAP	"hash:/etc/aliases"
+ #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
 +#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
 +#define USE_STATVFS
@@ -14,5 +14,5 @@ $NetBSD: patch-ag,v 1.4 2004/06/06 13:50:41 taca Exp $
  #define STATFS_IN_SYS_MOUNT_H
 +#endif
  #define HAS_POSIX_REGEXP
- #define HAS_ST_GEN	/* struct stat contains inode generation number */
- #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NORETURN	void
+ #define PRINTFLIKE(x,y)
diff --git a/mail/postfix-current/patches/patch-ah b/mail/postfix-current/patches/patch-ah
index a936e20ba7c..d83dbe02eb5 100644
--- a/mail/postfix-current/patches/patch-ah
+++ b/mail/postfix-current/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ah,v 1.4 2004/07/02 08:03:04 martti Exp $
 
 --- src/smtpd/smtpd.h.orig	2003-10-02 06:48:30.000000000 -0400
 +++ src/smtpd/smtpd.h	2003-10-02 06:48:31.000000000 -0400
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 1d33174f62f..e3ec76951c7 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-ai,v 1.7 2004/07/02 08:03:04 martti Exp $
 
---- makedefs.orig	2004-04-15 04:18:06.000000000 +0900
-+++ makedefs
-@@ -182,22 +182,6 @@ case "$SYSTEM.$RELEASE" in
+--- makedefs.orig	2004-04-14 14:59:43.000000000 -0400
++++ makedefs	2004-05-23 22:53:06.000000000 -0400
+@@ -182,22 +182,6 @@
  		SYSLIBS="-ldb"
  		;;
      Linux.2*)	SYSTYPE=LINUX2
@@ -25,7 +25,7 @@ $NetBSD: patch-ai,v 1.6 2004/06/06 13:50:41 taca Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -208,7 +192,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -208,7 +192,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
diff --git a/mail/postfix-current/patches/patch-bd b/mail/postfix-current/patches/patch-bd
deleted file mode 100644
index deaf11fa350..00000000000
--- a/mail/postfix-current/patches/patch-bd
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2004/03/06 15:08:32 grant Exp $
-
---- src/cleanup/cleanup_init.c.orig	2004-01-06 11:27:08.000000000 +1100
-+++ src/cleanup/cleanup_init.c
-@@ -112,6 +112,7 @@ char   *var_prop_extension;		/* propagat
- char   *var_always_bcc;			/* big brother */
- char   *var_rcpt_witheld;		/* recipients not disclosed */
- char   *var_masq_classes;		/* what to masquerade */
-+bool    var_canon_env_rcpt;		/* canonicalize envelope recipient */
- int     var_qattr_count_limit;		/* named attribute limit */
- int     var_virt_recur_limit;		/* maximum virtual alias recursion */
- int     var_virt_expan_limit;		/* maximum virtual alias expansion */
diff --git a/mail/postfix-current/patches/patch-be b/mail/postfix-current/patches/patch-be
deleted file mode 100644
index 4dc1c4cc711..00000000000
--- a/mail/postfix-current/patches/patch-be
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-be,v 1.3 2004/03/06 15:08:32 grant Exp $
-
---- src/cleanup/cleanup_message.c.orig	2004-01-21 12:25:27.000000000 +1100
-+++ src/cleanup/cleanup_message.c
-@@ -177,15 +177,17 @@ static void cleanup_rewrite_sender(CLEAN
-     for (tpp = addr_list; *tpp; tpp++) {
- 	cleanup_rewrite_tree(*tpp);
- 	if (state->flags & CLEANUP_FLAG_MAP_OK) {
--	    if (cleanup_send_canon_maps)
--		cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps,
--				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
--	    if (cleanup_comm_canon_maps)
--		cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps,
--				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
--	    if (cleanup_masq_domains
--		&& (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM))
-+	    if (var_canon_env_rcpt) {
-+		if (cleanup_send_canon_maps)
-+		    cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps,
-+			cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+		if (cleanup_comm_canon_maps)
-+		    cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps,
-+			cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+		if (cleanup_masq_domains
-+		    && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM))
- 		cleanup_masquerade_tree(*tpp, cleanup_masq_domains);
-+	    }
- 	}
- 	if (hdr_opts->type == HDR_FROM && state->from == 0)
- 	    state->from = cleanup_extract_internal(header_buf, *tpp);
diff --git a/mail/postfix-current/patches/patch-bg b/mail/postfix-current/patches/patch-bg
deleted file mode 100644
index 8f76730275c..00000000000
--- a/mail/postfix-current/patches/patch-bg
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bg,v 1.3 2004/06/06 13:50:41 taca Exp $
-
---- src/local/file.c.orig	2002-11-17 08:44:57.000000000 +0900
-+++ src/local/file.c
-@@ -181,7 +181,11 @@ int     deliver_file(LOCAL_STATE state, 
-     if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
- 	deliver_status = DEL_STAT_DEFER;
-     } else if (mail_copy_status != 0) {
--	deliver_status = (errno == EAGAIN || errno == ENOSPC || errno == ESTALE ?
-+	deliver_status = (errno == EAGAIN || errno == ENOSPC || 
-+#ifdef EDQUOT
-+			errno == EDQUOT ||
-+#endif
-+			errno == ESTALE ?
- 			  defer_append : bounce_append)
- 	    (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr),
- 	     "cannot append message to destination file %s: %s",
diff --git a/mail/postfix-current/patches/patch-bk b/mail/postfix-current/patches/patch-bk
deleted file mode 100644
index 1358a028aeb..00000000000
--- a/mail/postfix-current/patches/patch-bk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2004/06/06 13:50:41 taca Exp $
-
---- src/util/sys_defs.h.orig	2004-06-06 01:38:41.000000000 +0900
-+++ src/util/sys_defs.h
-@@ -951,6 +951,8 @@ extern int h_errno;
- #endif
- #endif
- 
-+#define RECEIVED_ENVELOPE_FROM
-+
- #define CAST_CHAR_PTR_TO_INT(cptr)	((int) (long) (cptr))
- #define CAST_INT_TO_CHAR_PTR(ival)	((char *) (long) (ival))
- 
diff --git a/mail/postfix-current/patches/patch-bs b/mail/postfix-current/patches/patch-bs
deleted file mode 100644
index 9b3dd71f057..00000000000
--- a/mail/postfix-current/patches/patch-bs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bs,v 1.1 2004/06/06 13:50:41 taca Exp $
-
---- src/local/mailbox.c.orig	2002-11-17 08:44:57.000000000 +0900
-+++ src/local/mailbox.c
-@@ -213,7 +213,11 @@ static int deliver_mailbox_file(LOCAL_ST
-     if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
- 	deliver_status = DEL_STAT_DEFER;
-     } else if (mail_copy_status != 0) {
--	deliver_status = (errno == EAGAIN || errno == ENOSPC || errno == ESTALE ?
-+	deliver_status = (errno == EAGAIN || errno == ENOSPC ||
-+#ifdef EDQUOT
-+			errno == EDQUOT ||
-+#endif
-+			errno == ESTALE ?
- 			  defer_append : bounce_append)
- 	    (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr),
- 	     "cannot access mailbox %s for user %s. %s",
diff --git a/mail/postfix-current/patches/patch-bt b/mail/postfix-current/patches/patch-bt
deleted file mode 100644
index 485fe37a21b..00000000000
--- a/mail/postfix-current/patches/patch-bt
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bt,v 1.1 2004/06/06 13:50:41 taca Exp $
-
---- src/local/maildir.c.orig	2003-04-17 00:03:02.000000000 +0900
-+++ src/local/maildir.c
-@@ -212,7 +212,11 @@ int     deliver_maildir(LOCAL_STATE stat
-     if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
- 	deliver_status = DEL_STAT_DEFER;
-     } else if (mail_copy_status != 0) {
--	deliver_status = (errno == ENOSPC || errno == ESTALE ?
-+	deliver_status = (errno == ENOSPC ||
-+#ifdef EDQUOT
-+			errno == EDQUOT ||
-+#endif
-+			errno == ESTALE ?
- 			  defer_append : bounce_append)
- 	    (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr),
- 	     "maildir delivery failed: %s", vstring_str(why));