Pullup ticket 47 to the pkgsrc-2004Q2 branch, requested by Martti Kuparinen.

Update postfix to 2.1.3.

	Module Name:    pkgsrc
	Committed By:   martti
	Date:           Mon Jun 21 16:13:24 UTC 2004

	Modified Files:
		pkgsrc/mail/postfix: Makefile PLIST PLIST.tls distinfo
		pkgsrc/mail/postfix/patches: patch-aa patch-ae patch-af patch-ag
		    patch-ai
	Removed Files:
		pkgsrc/mail/postfix/patches: patch-ad patch-ba patch-bb patch-bc
		    patch-bd

	Log Message:
	Updated postfix to 2.1.3

	This is the new 2.1.x series, please see www.postfix.org for
	complete list of changes since 2.0.20.

14 files changed, 99 insertions, 236 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index b844d8c25f7..51371afc646 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.131 2004/05/21 08:10:41 martti Exp $
+# $NetBSD: Makefile,v 1.131.2.1 2004/07/08 08:33:49 agc Exp $
 
-DISTNAME=	postfix-2.0.20
+DISTNAME=	postfix-2.1.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
+PATCHFILES+=		postfix-2.1.1-canonical_classes.diff
+PATCH_SITES+=		ftp://ftp.gw.com/pub/people/kim/patches/
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
@@ -50,7 +54,7 @@ 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.0.20.patch.gz
+PATCHFILES+=		tls+ipv6-1.24-pf-2.1.1.patch.gz
 PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.24/
 PATCH_DIST_STRIP=	-p1
 
@@ -96,17 +100,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
@@ -140,7 +144,7 @@ MAKE_ENV=	CC="${CC}" OPT="${CFLAGS}"
 MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
 
 POSTFIX_CONF_FILES=	conf/main.cf src/util/sys_defs.h postfix-install
-POSTFIX_CONF_FILES+=	conf/sample-misc.cf src/global/mail_params.h
+POSTFIX_CONF_FILES+=	src/global/mail_params.h
 
 FILES_SUBST+=	SHAREDIR=${SHAREDIR}
 MESSAGE_SUBST+=	SHAREDIR=${SHAREDIR}
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 37caf985045..84d79c431ca 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/05/01 14:07:57 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8.6.1 2004/07/08 08:33:49 agc Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/bounce
@@ -9,6 +9,7 @@ libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
 libexec/postfix/nqmgr
+libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/proxymap
@@ -19,6 +20,7 @@ libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
+libexec/postfix/verify
 libexec/postfix/virtual
 man/man1/mailq.1
 man/man1/newaliases.1
@@ -36,8 +38,15 @@ man/man1/postsuper.1
 man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
+man/man5/body_checks.5
 man/man5/canonical.5
+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/regexp_table.5
 man/man5/relocated.5
 man/man5/transport.5
@@ -50,7 +59,7 @@ man/man8/flush.8
 man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
-man/man8/nqmgr.8
+man/man8/oqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
 man/man8/proxymap.8
@@ -60,7 +69,9 @@ man/man8/showq.8
 man/man8/smtp.8
 man/man8/smtpd.8
 man/man8/spawn.8
+man/man8/trace.8
 man/man8/trivial-rewrite.8
+man/man8/verify.8
 man/man8/virtual.8
 sbin/postalias
 sbin/postcat
@@ -74,7 +85,15 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
+share/doc/postfix/AAAREADME
 share/doc/postfix/ADDRESS_CLASS_README
+share/doc/postfix/ADDRESS_REWRITING_README
+share/doc/postfix/ADDRESS_VERIFICATION_README
+share/doc/postfix/BACKSCATTER_README
+share/doc/postfix/BASIC_CONFIGURATION_README
+share/doc/postfix/BUILTIN_FILTER_README
+share/doc/postfix/CONTENT_INSPECTION_README
+share/doc/postfix/DATABASE_README
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
 share/doc/postfix/ETRN_README
@@ -84,53 +103,36 @@ share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README
 share/doc/postfix/LMTP_README
 share/doc/postfix/LOCAL_RECIPIENT_README
-share/doc/postfix/MACOSX_README
 share/doc/postfix/MAILDROP_README
 share/doc/postfix/MYSQL_README
 share/doc/postfix/NFS_README
+share/doc/postfix/OVERVIEW
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
+share/doc/postfix/PGSQL_README
 share/doc/postfix/QMQP_README
+share/doc/postfix/QSHAPE_README
 share/doc/postfix/RELEASE_NOTES
 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
+share/doc/postfix/STANDARD_CONFIGURATION_README
+share/doc/postfix/TUNING_README
 share/doc/postfix/ULTRIX_README
 share/doc/postfix/UUCP_README
 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/sample-aliases.cf
-share/examples/postfix/sample-auth.cf
-share/examples/postfix/sample-canonical.cf
-share/examples/postfix/sample-compatibility.cf
-share/examples/postfix/sample-debug.cf
-share/examples/postfix/sample-filter.cf
-share/examples/postfix/sample-flush.cf
-share/examples/postfix/sample-ldap.cf
-share/examples/postfix/sample-lmtp.cf
-share/examples/postfix/sample-local.cf
-share/examples/postfix/sample-mime.cf
-share/examples/postfix/sample-misc.cf
-share/examples/postfix/sample-pcre-access.cf
-share/examples/postfix/sample-pcre-body.cf
-share/examples/postfix/sample-pcre-header.cf
-share/examples/postfix/sample-qmqpd.cf
-share/examples/postfix/sample-rate.cf
-share/examples/postfix/sample-regexp-access.cf
-share/examples/postfix/sample-regexp-body.cf
-share/examples/postfix/sample-regexp-header.cf
-share/examples/postfix/sample-relocated.cf
-share/examples/postfix/sample-resource.cf
-share/examples/postfix/sample-rewrite.cf
-share/examples/postfix/sample-smtp.cf
-share/examples/postfix/sample-smtpd.cf
-share/examples/postfix/sample-transport.cf
-share/examples/postfix/sample-virtual.cf
 @dirrm share/examples/postfix
 @dirrm share/doc/postfix
 @dirrm libexec/postfix
diff --git a/mail/postfix/PLIST.tls b/mail/postfix/PLIST.tls
index c22da5dacad..28e13470311 100644
--- a/mail/postfix/PLIST.tls
+++ b/mail/postfix/PLIST.tls
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.tls,v 1.3 2003/05/21 09:24:01 martti Exp $
+@comment $NetBSD: PLIST.tls,v 1.3.6.1 2004/07/08 08:33:49 agc 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/distinfo b/mail/postfix/distinfo
index db4bfcb3c90..b19e4f581d0 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,21 +1,16 @@
-$NetBSD: distinfo,v 1.65 2004/06/06 01:12:52 grant Exp $
+$NetBSD: distinfo,v 1.65.2.1 2004/07/08 08:33:49 agc Exp $
 
-SHA1 (postfix/postfix-2.0.20.tar.gz) = ffedae380952a5afc2c3f6b5e610b099e10e3c91
-Size (postfix/postfix-2.0.20.tar.gz) = 1354414 bytes
-SHA1 (postfix/tls+ipv6-1.24-pf-2.0.20.patch.gz) = ff6d08bb950eb8b038fe518b7132705518270486
-Size (postfix/tls+ipv6-1.24-pf-2.0.20.patch.gz) = 258462 bytes
-SHA1 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 70a58f5bd6f8d833dd7cf3d90613f64eeae45f4b
-Size (postfix/postfix-pg.postfix-2.0.0.2.patch) = 27423 bytes
-SHA1 (patch-aa) = 39a89a28cec3fd264dbda97633e34695eaad01e9
+SHA1 (postfix/postfix-2.1.3.tar.gz) = 1c08947afa33a1cf1477954d906aa8d95922ea6f
+Size (postfix/postfix-2.1.3.tar.gz) = 1971632 bytes
+SHA1 (postfix/postfix-2.1.1-canonical_classes.diff) = f97f8879a7a047db062ba8f53f71c71b7d811667
+Size (postfix/postfix-2.1.1-canonical_classes.diff) = 9645 bytes
+SHA1 (postfix/tls+ipv6-1.24-pf-2.1.1.patch.gz) = cfb133eb1b67554fc228d6afb4c4659efd3d2c73
+Size (postfix/tls+ipv6-1.24-pf-2.1.1.patch.gz) = 256320 bytes
+SHA1 (patch-aa) = ca3d2739c35c89056b2f0c19a2cbcb9e018013c6
 SHA1 (patch-ab) = ac4c75fb7a36491edf03b54915c7a47461748b4d
 SHA1 (patch-ac) = b0d26742fe8496b2fd4729a41fecadc275e71cf2
-SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
-SHA1 (patch-ae) = 2a118fb905c469f8a2e947c3e91b5d4e82c5bb6e
-SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
-SHA1 (patch-ag) = 1753a7bfe9929fc3eabc02b07cdcb9fae4e351d2
+SHA1 (patch-ae) = 98ff7efe8338d4e6e05e311d070237d726161af2
+SHA1 (patch-af) = c5fc75f8f9499ed533bd30e162ec8784e446d288
+SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-SHA1 (patch-ai) = 475737812dd2025ae52ba9eab7569119d251eed6
-SHA1 (patch-ba) = e0ed2e41db1cfaf5d924578e536d809ff8623e2d
-SHA1 (patch-bb) = ba4cf4020ee26c3e43bd816f549ad6557a484110
-SHA1 (patch-bc) = 07ee685f6c607a5ee7ea723c4a36729a9c662ba1
-SHA1 (patch-bd) = 380f3947559667784584c05c0d38eb3ce61a13d5
+SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 12d3025fdbd..a6570a3e5ba 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2003/05/01 14:07:58 jmmv Exp $
+$NetBSD: patch-aa,v 1.13.6.1 2004/07/08 08:33:49 agc Exp $
 
---- postfix-install.orig	2003-03-21 20:04:53.000000000 +0100
-+++ postfix-install
-@@ -338,33 +338,13 @@ README files. Specify \"no\" if you do n
+--- 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.13 2003/05/01 14:07:58 jmmv Exp $
  
  # If a parameter is not set via the command line or environment,
  # try to use settings from installed configuration files.
-@@ -652,13 +632,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -715,10 +695,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
@@ -46,8 +46,5 @@ $NetBSD: patch-aa,v 1.13 2003/05/01 14:07:58 jmmv Exp $
 -# post-install processing now.
 -
 -test -n "$install_root" || {
--    export daemon_directory command_directory queue_directory sendmail_path \
--	newaliases_path mailq_path mail_owner setgid_group manpage_directory \
--	sample_directory readme_directory
--    ${SHELL} conf/post-install $post_install_options || exit 1
+-    bin/postfix post-install $post_install_options || exit 1
 -}
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
deleted file mode 100644
index 76ebd38529f..00000000000
--- a/mail/postfix/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2004/01/21 06:56:48 martti Exp $
-
---- conf/sample-misc.cf.orig	2003-08-12 19:20:19.000000000 +0300
-+++ conf/sample-misc.cf	2004-01-21 08:40:15.000000000 +0200
-@@ -360,7 +360,7 @@
- # The daemon_directory parameter specifies the location of Postfix
- # support programs and daemons. This directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = __PREFIX/libexec/postfix
- 
- # The queue_directory specifies the location of the Postfix queue.
- # This is also the root directory of Postfix daemons that run chrooted.
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
index 821ebcc8edd..3f102bc8546 100644
--- a/mail/postfix/patches/patch-ae
+++ b/mail/postfix/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2004/03/05 22:59:32 grant Exp $
+$NetBSD: patch-ae,v 1.7.4.1 2004/07/08 08:33:49 agc Exp $
 
---- src/global/mail_params.h.orig	2003-03-04 09:07:03.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,14 +11,8 @@ $NetBSD: patch-ae,v 1.7 2004/03/05 22:59:32 grant Exp $
  extern char *var_sgid_group;
  extern gid_t var_sgid_gid;
  
-@@ -187,18 +187,18 @@ extern char *var_queue_dir;
+@@ -202,13 +202,13 @@
    */
- #define VAR_PROGRAM_DIR		"program_directory"
- #ifndef DEF_PROGRAM_DIR
--#define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-+#define DEF_PROGRAM_DIR		"__PREFIX/libexec/postfix"
- #endif
- 
  #define VAR_DAEMON_DIR		"daemon_directory"
  #ifndef DEF_DAEMON_DIR
 -#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
@@ -33,14 +27,3 @@ $NetBSD: patch-ae,v 1.7 2004/03/05 22:59:32 grant Exp $
  #endif
  extern char *var_command_dir;
  
-@@ -324,6 +324,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_TRANSPORT_MAPS	"transport_maps"
- #define DEF_TRANSPORT_MAPS	""
- extern char *var_transport_maps;
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 81118455aac..9b6fa508840 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.18 2004/01/21 06:56:48 martti Exp $
+$NetBSD: patch-af,v 1.18.4.1 2004/07/08 08:33:49 agc Exp $
 
---- conf/main.cf.orig	2003-09-06 03:30:35.000000000 +0300
-+++ conf/main.cf	2004-01-21 08:40:42.000000000 +0200
-@@ -31,13 +31,18 @@
+--- 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.18 2004/01/21 06:56:48 martti Exp $
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -55,7 +60,7 @@
+@@ -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,19 +32,24 @@ $NetBSD: patch-af,v 1.18 2004/01/21 06:56:48 martti Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -621,16 +626,16 @@
+@@ -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.
  #
 -setgid_group =
 +setgid_group = maildrop
  
+ # html_directory: The location of the Postfix HTML documentation.
+ #
+@@ -619,13 +624,13 @@
+ 
  # manpage_directory: The location of the Postfix on-line manual pages.
  #
 -manpage_directory =
 +manpage_directory = __PREFIX/man
  
  # sample_directory: The location of the Postfix sample configuration files.
+ # This parameter is obsolete as of Postfix 2.1.
  #
 -sample_directory =
 +sample_directory = __PREFIX/share/examples/postfix
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 78d14bc76e9..11ee4d0e606 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.11 2004/05/04 19:59:06 minskim Exp $
+$NetBSD: patch-ag,v 1.11.2.1 2004/07/08 08:33:49 agc Exp $
 
---- src/util/sys_defs.h.orig	2003-11-05 14:17:37.000000000 -0600
-+++ src/util/sys_defs.h
-@@ -48,8 +48,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.11 2004/05/04 19:59:06 minskim 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/patches/patch-ai b/mail/postfix/patches/patch-ai
index 6bd03255b57..0bb13d01a43 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,17 +1,8 @@
-$NetBSD: patch-ai,v 1.10 2004/04/14 12:55:20 minskim Exp $
+$NetBSD: patch-ai,v 1.10.2.1 2004/07/08 08:33:49 agc Exp $
 
---- makedefs.orig	2003-11-05 13:50:15.000000000 -0600
-+++ makedefs
-@@ -94,7 +94,7 @@ case "$SYSTEM.$RELEASE" in
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
- 		;;
--   NetBSD.1*)	SYSTYPE=NETBSD1
-+   NetBSD.*)	SYSTYPE=NETBSD1
- 		;;
-    BSD/OS.2*)	SYSTYPE=BSDI2
- 		;;
-@@ -175,22 +175,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
@@ -34,7 +25,7 @@ $NetBSD: patch-ai,v 1.10 2004/04/14 12:55:20 minskim Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -201,7 +185,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/patches/patch-ba b/mail/postfix/patches/patch-ba
deleted file mode 100644
index 809415bf42e..00000000000
--- a/mail/postfix/patches/patch-ba
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ba,v 1.7 2004/03/05 22:59:32 grant Exp $
-
---- src/cleanup/cleanup.c.orig	2003-08-10 10:40:30.000000000 +1000
-+++ src/cleanup/cleanup.c
-@@ -333,6 +333,7 @@ int     main(int argc, char **argv)
-      * Pass control to the single-threaded service skeleton.
-      */
-     single_server_main(argc, argv, cleanup_service,
-+		       MAIL_SERVER_BOOL_TABLE, cleanup_bool_table,
- 		       MAIL_SERVER_INT_TABLE, cleanup_int_table,
- 		       MAIL_SERVER_STR_TABLE, cleanup_str_table,
- 		       MAIL_SERVER_TIME_TABLE, cleanup_time_table,
diff --git a/mail/postfix/patches/patch-bb b/mail/postfix/patches/patch-bb
deleted file mode 100644
index 9540af4e645..00000000000
--- a/mail/postfix/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2004/03/05 22:59:32 grant Exp $
-
---- src/cleanup/cleanup.h.orig	2002-12-04 01:58:11.000000000 +1100
-+++ src/cleanup/cleanup.h
-@@ -118,6 +118,7 @@ extern void cleanup_free(CLEANUP_STATE *
- extern void cleanup_all(void);
- extern void cleanup_pre_jail(char *, char **);
- extern void cleanup_post_jail(char *, char **);
-+extern CONFIG_BOOL_TABLE cleanup_bool_table[];
- extern CONFIG_INT_TABLE cleanup_int_table[];
- extern CONFIG_STR_TABLE cleanup_str_table[];
- extern CONFIG_TIME_TABLE cleanup_time_table[];
diff --git a/mail/postfix/patches/patch-bc b/mail/postfix/patches/patch-bc
deleted file mode 100644
index 43607190e12..00000000000
--- a/mail/postfix/patches/patch-bc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bc,v 1.4 2004/03/05 22:59:32 grant Exp $
-
---- src/cleanup/cleanup_envelope.c.orig	2003-05-23 07:03:20.000000000 +1000
-+++ src/cleanup/cleanup_envelope.c
-@@ -194,15 +194,19 @@ static void cleanup_envelope_process(CLE
- 	if (state->orig_rcpt == 0)
- 	    state->orig_rcpt = mystrdup(buf);
- 	cleanup_rewrite_internal(clean_addr, *buf ? buf : var_empty_addr);
--	if (cleanup_rcpt_canon_maps)
--	    cleanup_map11_internal(state, clean_addr, cleanup_rcpt_canon_maps,
--				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
--	if (cleanup_comm_canon_maps)
--	    cleanup_map11_internal(state, clean_addr, cleanup_comm_canon_maps,
--				cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
--	if (cleanup_masq_domains
--	    && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT))
--	    cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
-+	if (var_canon_env_rcpt) {
-+	    if (cleanup_rcpt_canon_maps)
-+		cleanup_map11_internal(state, clean_addr,
-+				    cleanup_rcpt_canon_maps,
-+				    cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+	    if (cleanup_comm_canon_maps)
-+		cleanup_map11_internal(state, clean_addr,
-+				    cleanup_comm_canon_maps,
-+				    cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+	    if (cleanup_masq_domains
-+		&& (cleanup_masq_flags & CLEANUP_MASQ_FLAG_ENV_RCPT))
-+		cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
-+	}
- 	cleanup_out_recipient(state, state->orig_rcpt, STR(clean_addr));
- 	if (state->recip == 0)
- 	    state->recip = mystrdup(STR(clean_addr));
diff --git a/mail/postfix/patches/patch-bd b/mail/postfix/patches/patch-bd
deleted file mode 100644
index 8df221accef..00000000000
--- a/mail/postfix/patches/patch-bd
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-bd,v 1.4 2004/03/05 22:59:32 grant Exp $
-
---- src/cleanup/cleanup_init.c.orig	2002-12-04 01:56:56.000000000 +1100
-+++ src/cleanup/cleanup_init.c
-@@ -6,6 +6,8 @@
- /* SYNOPSIS
- /*	#include "cleanup.h"
- /*
-+/*	CONFIG_BOOL_TABLE cleanup_bool_table[];
-+/*
- /*	CONFIG_INT_TABLE cleanup_int_table[];
- /*
- /*	CONFIG_STR_TABLE cleanup_str_table[];
-@@ -28,7 +30,7 @@
- /*	for one-time initializations that must be done before any message
- /*	processing can take place.
- /*
--/*	cleanup_{int,str,time}_table[] specify configuration
-+/*	cleanup_{bool,int,str,time}_table[] specify configuration
- /*	parameters that must be initialized before calling any functions
- /*	in this module. These tables satisfy the interface as specified in
- /*	single_service(3).
-@@ -109,6 +111,7 @@ char   *var_always_bcc;			/* big brother
- int     var_extra_rcpt_limit;		/* recipient extract limit */
- 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_body_check_len;		/* when to stop body scan */
- 
-@@ -145,6 +148,11 @@ CONFIG_STR_TABLE cleanup_str_table[] = {
-     0,
- };
- 
-+CONFIG_BOOL_TABLE cleanup_bool_table[] = {
-+    VAR_CANON_ENV_RCPT, DEF_CANON_ENV_RCPT, &var_canon_env_rcpt,
-+    0,
-+};
-+
-  /*
-   * Mappings.
-   */