Updated postfix to 1.1.4

Major changes with release-20010228
===================================

Postfix produces DSN formatted bounced/delayed mail notifications.
The human-readable text still exists, so that users will not have
to be unnecessarily confused by all the ugliness of RFC 1894.  Full
DSN support will be later.

This release introduces full content filtering through an external
process. This involves an incompatible change in queue file format.
Mail is delivered to content filtering software via an existing
mail delivery agent, and is re-injected into Postfix via an existing
mail submission agent.  See examples in the FILTER_README file.
Depending on how the filter is implemented, you can expect to lose
a factor of 2 to 4 in delivery performance of SMTP transit mail,
more if the content filtering software needs lots of CPU or memory.

Specify "body_checks = regexp:/etc/postfix/body_checks" for a quick
and dirty emergency content filter that looks at non-header lines
one line at a time (including MIME headers inside the message body).
Details in conf/sample-filter.cf.

The header_checks and body_checks features can be used to strip
out unwanted data. Specify IGNORE on the right-hand side and the
data will disappear from the mail.

Support for SASL (RFC 2554) authentication in the SMTP server and
in the SMTP and LMTP clients. See the SASL_README file for more
details. This file still needs better examples.

Postfix now ships with an LMTP delivery agent that can deliver over
local/remote TCP sockets and over local UNIX-domain sockets.  The
LMTP_README file gives example, but still needs to be revised.

Fast "ETRN" and "sendmail -qR".  Postfix maintains per-destination
logfiles with information about what mail is queued for selected
destinations.  See the file ETRN_README for details.

The mailbox locking style is now fully configurable at runtime.
The new configuration parameter is called "mailbox_delivery_lock".
Depending on the operating system type, mailboxes can be locked
with one or more of "flock", "fcntl" or "dotlock".  The command
"postconf -l" shows the available locking styles.  The default
mailbox locking style is system dependent.  This change affects
all mailbox and all "/file/name" deliveries by the Postfix local
delivery agent.

7 files changed, 202 insertions, 335 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 0a4cef305d5..560afa288aa 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.53 2002/01/31 21:20:34 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2002/03/06 15:07:54 martti Exp $
 
-DISTNAME=	postfix-20010228-pl08
-PKGNAME=	postfix-20010228pl8
+DISTNAME=	postfix-1.1.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
-PATCHFILES=	postfix-20010228release-ercpt.diff
-PATCH_SITES=	ftp://ftp.gw.com/pub/people/kim/patches/
-PATCH_DIST_STRIP+=	-p1
-
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
@@ -19,11 +14,13 @@ POSTFIX_SPOOL=	/var/spool/postfix
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-PATCHFILES+=	postfix-20010228pl04-v6-20010809a.diff.gz
-PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
-BUILD_DEFS+=	POSTFIX_USE_INET6
-.endif
+# XXX No IPv6 patch available yet!
+#
+# .if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
+# PATCHFILES+=	postfix-20010228pl04-v6-20010809a.diff.gz
+# PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
+# BUILD_DEFS+=	POSTFIX_USE_INET6
+# .endif
 
 .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES" \
 	|| defined(USE_SASL) && ${USE_SASL} == "YES"
@@ -54,17 +51,17 @@ ALL_TARGET=	#empty
 
 pre-configure:
 	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
-	${CP} ${WRKSRC}/src/util/sys_defs.h ${WRKSRC}/src/util/sys_defs.h.dist
-	${CP} ${WRKSRC}/INSTALL.sh ${WRKSRC}/INSTALL.sh.dist
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/conf/main.cf.dist \
 	    > ${WRKSRC}/conf/main.cf
+	${CP} ${WRKSRC}/src/util/sys_defs.h ${WRKSRC}/src/util/sys_defs.h.dist
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/src/util/sys_defs.h.dist \
 	    > ${WRKSRC}/src/util/sys_defs.h
+	${CP} ${WRKSRC}/postfix-install ${WRKSRC}/postfix-install.dist
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
-	    < ${WRKSRC}/INSTALL.sh.dist \
-	    > ${WRKSRC}/INSTALL.sh
+	    < ${WRKSRC}/postfix-install.dist \
+	    > ${WRKSRC}/postfix-install
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} makefiles)
@@ -76,7 +73,8 @@ post-build:
 pre-install:
 	${INSTALL_DATA_DIR} /etc/postfix ${PREFIX}/share/postfix \
 	    ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/postfix \
+	    ${PREFIX}/libexec/postfix
 	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
 	-${RM} -f ${WRKSRC}/conf/*.orig
 .if defined(USE_SASL) && ${USE_SASL} == "YES"
@@ -84,9 +82,23 @@ pre-install:
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${PREFIX}/lib/sasl
 	echo lib/sasl/smtpd.conf > ${WRKDIR}/PLIST.sasl
 .endif
+	${TEST} -f /etc/postfix/postfix-files || \
+		${INSTALL_DATA} ${WRKSRC}/conf/postfix-files /etc/postfix
+	${TEST} -f /etc/postfix/postfix-script || \
+		${INSTALL_DATA} ${WRKSRC}/conf/postfix-script /etc/postfix
+
+do-install:
+	(cd ${WRKSRC} && ${SH} postfix-install -non-interactive)
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${PREFIX}/share/postfix
+	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${PREFIX}/share/postfix
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${PREFIX}/share/postfix
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${PREFIX}/share/postfix
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${PREFIX}/share/postfix
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
+	${LN} -sf ${PREFIX}/share/postfix/post-install /etc/postfix
+	${LN} -sf ${PREFIX}/share/postfix/postfix-files /etc/postfix
 	${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix
 	${INSTALL_DATA_DIR} ${POSTFIX_SPOOL}
 	${CHMOD} 755 ${POSTFIX_SPOOL}
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index b7ca4aa2587..e04928832b2 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:48 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/06 15:07:54 martti Exp $
+bin/mailq
+bin/newaliases
 etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
@@ -7,63 +9,17 @@ libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
+libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/qmgr
-libexec/postfix/sendmail
+libexec/postfix/qmqpd
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-share/postfix/LICENSE
-share/postfix/access
-share/postfix/aliases
-share/postfix/canonical
-share/postfix/main.cf
-share/postfix/main.cf.default
-share/postfix/main.cf.dist
-share/postfix/master.cf
-share/postfix/pcre_table
-share/postfix/postfix-script
-share/postfix/postfix-script-diff
-share/postfix/postfix-script-nosgid
-share/postfix/postfix-script-sgid
-share/postfix/regexp_table
-share/postfix/relocated
-share/postfix/sample-aliases.cf
-share/postfix/sample-auth.cf
-share/postfix/sample-canonical.cf
-share/postfix/sample-compatibility.cf
-share/postfix/sample-debug.cf
-share/postfix/sample-filter.cf
-share/postfix/sample-flush.cf
-share/postfix/sample-ldap.cf
-share/postfix/sample-lmtp.cf
-share/postfix/sample-local.cf
-share/postfix/sample-misc.cf
-share/postfix/sample-pcre.cf
-share/postfix/sample-rate.cf
-share/postfix/sample-regexp.cf
-share/postfix/sample-relocated.cf
-share/postfix/sample-resource.cf
-share/postfix/sample-rewrite.cf
-share/postfix/sample-smtp.cf
-share/postfix/sample-smtpd.cf
-share/postfix/sample-transport.cf
-share/postfix/sample-virtual.cf
-share/postfix/transport
-share/postfix/virtual
+libexec/postfix/virtual
 man/man1/mailq.1
 man/man1/newaliases.1
 man/man1/postalias.1
@@ -75,6 +31,7 @@ man/man1/postkick.1
 man/man1/postlock.1
 man/man1/postlog.1
 man/man1/postmap.1
+man/man1/postqueue.1
 man/man1/postsuper.1
 man/man1/sendmail.1
 man/man5/access.5
@@ -93,20 +50,90 @@ man/man8/flush.8
 man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
+man/man8/nqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
 man/man8/qmgr.8
+man/man8/qmqpd.8
 man/man8/showq.8
 man/man8/smtp.8
 man/man8/smtpd.8
 man/man8/spawn.8
 man/man8/trivial-rewrite.8
-@dirrm share/postfix
-@dirrm share/doc/postfix
-@dirrm libexec/postfix
+man/man8/virtual.8
+sbin/postalias
+sbin/postcat
+sbin/postconf
+sbin/postdrop
+sbin/postfix
+sbin/postkick
+sbin/postlock
+sbin/postlog
+sbin/postmap
+sbin/postqueue
+sbin/postsuper
+sbin/sendmail
+share/doc/postfix/DB_README
+share/doc/postfix/DEBUG_README
+share/doc/postfix/ETRN_README
+share/doc/postfix/FILTER_README
+share/doc/postfix/INSTALL
+share/doc/postfix/LDAP_README
+share/doc/postfix/LINUX_README
+share/doc/postfix/LMTP_README
+share/doc/postfix/MACOSX_README
+share/doc/postfix/MYSQL_README
+share/doc/postfix/NFS_README
+share/doc/postfix/PACKAGE_README
+share/doc/postfix/PCRE_README
+share/doc/postfix/QMQP_README
+share/doc/postfix/RESTRICTION_CLASS_README
+share/doc/postfix/SASL_README
+share/doc/postfix/ULTRIX_README
+share/doc/postfix/UUCP_README
+share/doc/postfix/VERP_README
+share/doc/postfix/VIRTUAL_README
+share/postfix/main.cf
+share/postfix/master.cf
+share/postfix/post-install
+share/postfix/postfix-files
+share/postfix/postfix-script
+share/postfix/sample-aliases.cf
+share/postfix/sample-auth.cf
+share/postfix/sample-canonical.cf
+share/postfix/sample-compatibility.cf
+share/postfix/sample-debug.cf
+share/postfix/sample-filter.cf
+share/postfix/sample-flush.cf
+share/postfix/sample-ldap.cf
+share/postfix/sample-lmtp.cf
+share/postfix/sample-local.cf
+share/postfix/sample-misc.cf
+share/postfix/sample-pcre-access.cf
+share/postfix/sample-pcre-body.cf
+share/postfix/sample-pcre-header.cf
+share/postfix/sample-qmqpd.cf
+share/postfix/sample-rate.cf
+share/postfix/sample-regexp-access.cf
+share/postfix/sample-regexp-body.cf
+share/postfix/sample-regexp-header.cf
+share/postfix/sample-relocated.cf
+share/postfix/sample-resource.cf
+share/postfix/sample-rewrite.cf
+share/postfix/sample-smtp.cf
+share/postfix/sample-smtpd.cf
+share/postfix/sample-transport.cf
+share/postfix/sample-virtual.cf
 @exec ${MKDIR} -p /etc/postfix
 @exec if [ ! -f /etc/postfix/main.cf ]; then cp %D/share/postfix/main.cf /etc/postfix ; fi
 @exec if [ ! -f /etc/postfix/master.cf ]; then cp %D/share/postfix/master.cf /etc/postfix ; fi
 @exec if [ ! -d /var/spool/postfix ]; then ${MKDIR} /var/spool/postfix; ${CHMOD} 755 /var/spool/postfix ; fi
+@exec ln -sf %D/share/postfix/post-install /etc/postfix
+@unexec ${RM} -f /etc/postfix/post-install
+@exec ln -sf %D/share/postfix/postfix-files /etc/postfix
+@unexec ${RM} -f /etc/postfix/postfix-files
 @exec ln -sf %D/share/postfix/postfix-script /etc/postfix
 @unexec ${RM} -f /etc/postfix/postfix-script
+@dirrm libexec/postfix
+@dirrm share/doc/postfix
+@dirrm share/postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 1693d7ba459..b0f491fc7e7 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.11 2001/12/01 12:40:52 martti Exp $
+$NetBSD: distinfo,v 1.12 2002/03/06 15:07:54 martti Exp $
 
-SHA1 (postfix/postfix-20010228-pl08.tar.gz) = d171867ba89c3766f2346575acdab8423ebf7077
-Size (postfix/postfix-20010228-pl08.tar.gz) = 989129 bytes
-SHA1 (postfix/postfix-20010228release-ercpt.diff) = c6abc5d57ca1a36de85dadee878b266d707ad3cd
-Size (postfix/postfix-20010228release-ercpt.diff) = 4484 bytes
-SHA1 (postfix/postfix-20010228pl04-v6-20010809a.diff.gz) = 9399d7134063870969d65ddca0084c2cc31c80a3
-Size (postfix/postfix-20010228pl04-v6-20010809a.diff.gz) = 22731 bytes
-SHA1 (patch-aa) = a2cbec9609c9abaf87a8e11220ddf2546802648d
-SHA1 (patch-af) = 1f96a9b36cc65b079839542cc4e7a3230318013c
+SHA1 (postfix/postfix-1.1.4.tar.gz) = c4840f0558f0c253cc863a315ea38a2ced8bf688
+Size (postfix/postfix-1.1.4.tar.gz) = 1183534 bytes
+SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
+SHA1 (patch-ab) = d4e50ffc31d71ff64067101f6d733655fcf76713
+SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4
+SHA1 (patch-af) = d25b58b4da462a719bcd0fafaf45b9b5d8f2c877
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index ad55a2847bd..e4ae0f21668 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,265 +1,39 @@
-$NetBSD: patch-aa,v 1.9 2001/06/07 09:23:20 itojun Exp $
+$NetBSD: patch-aa,v 1.10 2002/03/06 15:07:54 martti Exp $
 
---- INSTALL.sh.orig	Tue May  1 23:21:22 2001
-+++ INSTALL.sh	Thu Jun  7 17:50:31 2001
-@@ -7,39 +7,39 @@
- umask 022
- 
- test -t 0 &&
--cat <<EOF
--
--Warning: this script replaces existing sendmail or Postfix programs.
--Make backups if you want to be able to recover.
--
--In addition to doing a fresh install, this script can change an
--existing installation from using a world-writable maildrop to a
--group-writable one. It cannot be used to change Postfix queue
--file/directory ownership.
--
--Before installing files, this script prompts you for some definitions.
--Most definitions will be remembered, so you have to specify them
--only once. All definitions have a reasonable default value.
--
--    install_root - prefix for installed file names (for package building)
--
--    tempdir - where to write scratch files
--
--    config_directory - directory with Postfix configuration files.
--    daemon_directory - directory with Postfix daemon programs.
--    command_directory - directory with Postfix administrative commands.
--    queue_directory - directory with Postfix queues.
--
--    sendmail_path - full pathname of the Postfix sendmail command.
--    newaliases_path - full pathname of the Postfix newaliases command.
--    mailq_path - full pathname of the Postfix mailq command.
--
--    mail_owner - owner of Postfix queue files.
--
--    setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12.
--    manpages - "no" or path to man tree. Example: /usr/local/man.
--
--EOF
-+#cat <<EOF
-+#
-+#Warning: this script replaces existing sendmail or Postfix programs.
-+#Make backups if you want to be able to recover.
-+#
-+#In addition to doing a fresh install, this script can change an
-+#existing installation from using a world-writable maildrop to a
-+#group-writable one. It cannot be used to change Postfix queue
-+#file/directory ownership.
-+#
-+#Before installing files, this script prompts you for some definitions.
-+#Most definitions will be remembered, so you have to specify them
-+#only once. All definitions have a reasonable default value.
-+#
-+#    install_root - prefix for installed file names (for package building)
-+#
-+#    tempdir - where to write scratch files
-+#
-+#    config_directory - directory with Postfix configuration files.
-+#    daemon_directory - directory with Postfix daemon programs.
-+#    command_directory - directory with Postfix administrative commands.
-+#    queue_directory - directory with Postfix queues.
-+#
-+#    sendmail_path - full pathname of the Postfix sendmail command.
-+#    newaliases_path - full pathname of the Postfix newaliases command.
-+#    mailq_path - full pathname of the Postfix mailq command.
-+#
-+#    mail_owner - owner of Postfix queue files.
-+#
-+#    setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12.
-+#    manpages - "no" or path to man tree. Example: /usr/local/man.
-+#
-+#EOF
- 
- # By now, shells must have functions. Ultrix users must use sh5 or lose.
- # The following shell functions replace files/symlinks while minimizing
-@@ -109,35 +109,32 @@
- 
- : ${install_root=/}
+--- postfix-install.orig	Sat Feb 23 14:32:12 2002
++++ postfix-install	Tue Mar  5 13:44:11 2002
+@@ -348,33 +348,13 @@
  : ${tempdir=`pwd`}
--: ${config_directory=/etc/postfix}
--: ${daemon_directory=/usr/libexec/postfix}
--: ${command_directory=/usr/sbin}
-+: ${config_directory=__PREFIX/share/postfix}
-+: ${daemon_directory=__PREFIX/libexec/postfix}
-+: ${command_directory=__PREFIX/sbin}
- : ${queue_directory=/var/spool/postfix}
--if [ -f /usr/lib/sendmail ]
--    then : ${sendmail_path=/usr/lib/sendmail}
--    else : ${sendmail_path=/usr/sbin/sendmail}
--fi
--: ${newaliases_path=/usr/bin/newaliases}
--: ${mailq_path=/usr/bin/mailq}
-+: ${sendmail_path=__PREFIX/libexec/postfix/sendmail}
-+#: ${newaliases_path=/usr/bin/newaliases}
-+#: ${mailq_path=/usr/bin/mailq}
- : ${mail_owner=postfix}
--: ${setgid=no}
--: ${manpages=/usr/local/man}
-+: ${setgid=maildrop}
-+: ${manpages=__PREFIX/man}
- 
- # Find out the location of configuration files.
- 
--test -t 0 &&
--for name in install_root tempdir config_directory
--do
--    while :
--    do
--	eval echo \$n "$name: [\$$name]\  \$c"
--	read ans
--	case $ans in
--	"") break;;
--	 *) eval $name=\$ans; break;;
--	esac
--    done
--done
-+#test -t 0 &&
-+#for name in install_root tempdir config_directory
-+#do
-+#    while :
-+#    do
-+#	eval echo \$n "$name: [\$$name]\  \$c"
-+#	read ans
-+#	case $ans in
-+#	"") break;;
-+#	 *) eval $name=\$ans; break;;
-+#	esac
-+#    done
-+#done
+ : ${config_directory=`bin/postconf -h -d config_directory`}
  
- # Sanity checks
- 
-@@ -159,42 +156,42 @@
- 
- CONFIG_DIRECTORY=$install_root$config_directory
- 
--test -f $CONFIG_DIRECTORY/main.cf && {
--    for name in daemon_directory command_directory queue_directory mail_owner 
--    do
--	eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$
--    done
--}
+-# Find out the location of installed configuration files.
 -
--if [ -f $CONFIG_DIRECTORY/install.cf ]
--then
--    . $CONFIG_DIRECTORY/install.cf
--elif [ ! -t 0 -a -z "$install_root" ]
--then
--    echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2
--    echo file from a previous Postfix installation. 1>&2
--    echo 1>&2
--    echo Use interactive installation instead. 1>&2
--    exit 1
--fi
-+#test -f $CONFIG_DIRECTORY/main.cf && {
-+#    for name in daemon_directory command_directory queue_directory mail_owner 
-+#    do
-+#	eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$
-+#    done
-+#}
-+
-+#if [ -f $CONFIG_DIRECTORY/install.cf ]
-+#then
-+#    . $CONFIG_DIRECTORY/install.cf
-+#elif [ ! -t 0 -a -z "$install_root" ]
-+#then
-+#    echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2
-+#    echo file from a previous Postfix installation. 1>&2
-+#    echo 1>&2
-+#    echo Use interactive installation instead. 1>&2
-+#    exit 1
-+#fi
- 
- # Override default settings.
- 
--test -t 0 &&
--for name in daemon_directory command_directory \
--    queue_directory sendmail_path newaliases_path mailq_path mail_owner\
--    setgid manpages
+-test -z "$non_interactive" && for name in install_root tempdir config_directory
 -do
 -    while :
 -    do
+-	echo
+-	eval echo Please specify \$${name}_prompt | ${FMT}
 -	eval echo \$n "$name: [\$$name]\  \$c"
 -	read ans
 -	case $ans in
 -	"") break;;
--	 *) eval $name=\$ans; break;;
+-	 *) case $ans in
+-	    /*) eval $name=$ans; break;;
+-	     *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;;
+-	    esac;;
 -	esac
 -    done
 -done
-+#test -t 0 &&
-+#for name in daemon_directory command_directory \
-+#    queue_directory sendmail_path newaliases_path mailq_path mail_owner\
-+#    setgid manpages
-+#do
-+#    while :
-+#    do
-+#	eval echo \$n "$name: [\$$name]\  \$c"
-+#	read ans
-+#	case $ans in
-+#	"") break;;
-+#	 *) eval $name=\$ans; break;;
-+#	esac
-+#    done
-+#done
- 
- # Sanity checks
- 
-@@ -242,10 +239,10 @@
- 
- DAEMON_DIRECTORY=$install_root$daemon_directory
- COMMAND_DIRECTORY=$install_root$command_directory
--QUEUE_DIRECTORY=$install_root$queue_directory
-+QUEUE_DIRECTORY=$queue_directory
- SENDMAIL_PATH=$install_root$sendmail_path
--NEWALIASES_PATH=$install_root$newaliases_path
--MAILQ_PATH=$install_root$mailq_path
-+#NEWALIASES_PATH=$install_root$newaliases_path
-+#MAILQ_PATH=$install_root$mailq_path
- MANPAGES=$install_root$manpages
- 
- # Create any missing directories.
-@@ -254,7 +251,7 @@
- test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
- test -d $COMMAND_DIRECTORY || mkdir -p $COMMAND_DIRECTORY || exit 1
- test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1
--for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH
-+for path in $SENDMAIL_PATH
- do
-     dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'`
-     test -d $dir || mkdir -p $dir || exit 1
-@@ -274,8 +271,8 @@
- 
- test -f bin/sendmail && {
-     compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1
--    compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
--    compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
-+#    compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH
-+#    compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH
- }
- 
- if [ -f $CONFIG_DIRECTORY/main.cf ]
-@@ -300,13 +297,13 @@
-     "mail_owner = $mail_owner" \
- || exit 1
+-
+ # In case some systems special-case pathnames beginning with //.
  
--(echo "# This file was generated by $0"
--for name in sendmail_path newaliases_path mailq_path setgid manpages
--do
--    eval echo $name=\$$name
--done) >$tempdir/junk || exit 1
--compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1
--rm -f $tempdir/junk
-+#(echo "# This file was generated by $0"
-+#for name in sendmail_path newaliases_path mailq_path setgid manpages
-+#do
-+#    eval echo $name=\$$name
-+#done) >$tempdir/junk || exit 1
-+#compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1
-+#rm -f $tempdir/junk
+ case $install_root in
+ /) install_root=
+ esac
  
- # Use set-gid privileges instead of writable maildrop (optional).
+-CONFIG_DIRECTORY=$install_root$config_directory
++CONFIG_DIRECTORY=conf
  
+ # If a parameter is not set via the command line or environment,
+ # try to use settings from installed configuration files.
diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
new file mode 100644
index 00000000000..53d75e28fd8
--- /dev/null
+++ b/mail/postfix/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.4 2002/03/06 15:07:54 martti Exp $
+
+--- src/util/sys_defs.h.orig	Tue Feb 12 13:46:16 2002
++++ src/util/sys_defs.h	Tue Feb 12 13:47:13 2002
+@@ -52,11 +52,11 @@
+ #define STATFS_IN_SYS_MOUNT_H
+ #define HAS_POSIX_REGEXP
+ #define HAS_ST_GEN	/* struct stat contains inode generation number */
+-#define DEF_SENDMAIL_PATH "/usr/sbin/sendmail"
+-#define DEF_MAILQ_PATH	"/usr/bin/mailq"
+-#define DEF_NEWALIAS_PATH "/usr/bin/newaliases"
+-#define DEF_COMMAND_DIR	"/usr/sbin"
+-#define DEF_DAEMON_DIR	"/usr/libexec/postfix"
++#define DEF_SENDMAIL_PATH "__PREFIX/sbin/sendmail"
++#define DEF_MAILQ_PATH	"__PREFIX/bin/mailq"
++#define DEF_NEWALIAS_PATH "__PREFIX/bin/newaliases"
++#define DEF_COMMAND_DIR	"__PREFIX/sbin"
++#define DEF_DAEMON_DIR	"__PREFIX/libexec/postfix"
+ #endif
+ 
+ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4)
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
new file mode 100644
index 00000000000..8a499c52224
--- /dev/null
+++ b/mail/postfix/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 2002/03/06 15:07:54 martti Exp $
+
+--- src/virtual/Makefile.in.orig	Wed Mar  6 15:52:14 2002
++++ src/virtual/Makefile.in	Wed Mar  6 15:52:19 2002
+@@ -11,7 +11,7 @@
+ PROG	= virtual
+ TESTPROG= 
+ INC_DIR	= ../../include
+-LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a $(AUXLIBS)
++LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
+ 
+ .c.o:;	$(CC) $(CFLAGS) -c $*.c
+ 
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
index 042ae0170ae..a26dc6927fc 100644
--- a/mail/postfix/patches/patch-af
+++ b/mail/postfix/patches/patch-af
@@ -1,14 +1,14 @@
-$NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $
+$NetBSD: patch-af,v 1.8 2002/03/06 15:07:54 martti Exp $
 
---- conf/main.cf.orig	Fri Dec 15 07:44:19 2000
-+++ conf/main.cf	Sat Jan 13 16:39:28 2001
+--- conf/main.cf.orig	Fri Feb  1 03:12:04 2002
++++ conf/main.cf	Tue Mar  5 13:54:58 2002
 @@ -1,3 +1,5 @@
-+#	$NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $
++#	$NetBSD: patch-af,v 1.8 2002/03/06 15:07:54 martti Exp $
 +#
  # Global Postfix configuration file. This file lists only a subset
  # of all 100+ parameters. See the sample-xxx.cf files for a full list.
  # 
-@@ -28,14 +30,19 @@
+@@ -31,14 +33,19 @@
  # The command_directory parameter specifies the location of all
  # postXXX commands.  The default value is $program_directory.
  #
@@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  
  # QUEUE AND PROCESS OWNERSHIP
  #
-@@ -52,7 +59,7 @@
+@@ -56,7 +63,7 @@
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -39,7 +39,7 @@ $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -440,8 +447,7 @@
+@@ -495,9 +502,8 @@
  # the process marches on. If you use an X-based debugger, be sure to
  # set up your XAUTHORITY environment variable before starting Postfix.
  #
@@ -49,4 +49,26 @@ $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $
 +debugger_command = PATH=/usr/bin:/usr/X11R6/bin; \
 +	xxgdb $daemon_directory/$process_name $process_id & sleep 5
  
- # Other configurable parameters.
+ # INSTALL-TIME CONFIGURATION INFORMATION
+ #
+@@ -522,16 +528,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.
+ #
+-setgid_group =
++setgid_group = maildrop
+ 
+ # 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.
+ #
+-sample_directory =
++sample_directory = __PREFIX/share/postfix
+ 
+ # readme_directory: The location of the Postfix README files.
+ #
+-readme_directory =
++readme_directory = __PREFIX/share/doc/postfix