Update to 20020115

Give originator maintainership

Submitted by:	khera@kcilink.com

9 files changed, 253 insertions, 392 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 4d1d50123bcc..747b9c35f3e6 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	20020107
+PORTVERSION=	20020115
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	snapshot-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	dwcjr@FreeBSD.org
+MAINTAINER=	khera@kciLink.com
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
@@ -31,39 +31,8 @@ MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
 	master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
 	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
 
-CONF1=	access aliases canonical main.cf master.cf \
-	regexp_table relocated transport virtual
-
-CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
-	sample-filter.cf sample-flush.cf sample-local.cf sample-misc.cf \
-	sample-qmqpd.cf \
-	sample-rate.cf sample-regexp-access.cf sample-regexp-body.cf \
-	sample-regexp-header.cf sample-relocated.cf \
-	sample-resource.cf sample-rewrite.cf sample-smtp.cf \
-	sample-smtpd.cf sample-transport.cf sample-virtual.cf install.cf
-
-BIN1=	bounce cleanup error flush lmtp local master nqmgr pickup \
-	pipe qmgr qmqpd showq smtp smtpd spawn trivial-rewrite virtual
-
-BIN2=	postalias postcat postconf postdrop postfix \
-	postkick postlock postlog postmap postqueue postsuper sendmail
-
-DOC1=	0README COMPATIBILITY HISTORY INSTALL LICENSE \
-	PORTING RELEASE_NOTES TODO
-
-DOC2=	DB_README DEBUG_README ETRN_README FILTER_README LDAP_README \
-	LINUX_README LMTP_README MACOSX_README MYSQL_README NFS_README \
-	PCRE_README QMQP_README SASL_README ULTRIX_README UUCP_README \
-	VERP_README VIRTUAL_README
-
 NO_LATEST_LINK=	yes
 
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	SUB_DOCS="@comment "
-.else
-PLIST_SUB+=	SUB_DOCS=""
-.endif
-
 .if !defined(DEBUG)
 MAKEFILEFLAGS+=	DEBUG=
 .endif
@@ -81,148 +50,61 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-post-extract:
-	@${CP} ${FILESDIR}/install.cf ${WRKSRC}/conf
-
 post-patch:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO_CMD} "all: default" >> Makefile)
+	${ECHO} "all: default" >> Makefile)
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-do-install:
-	@${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \
-		${PREFIX}/etc/postfix \
-		${PREFIX}/libexec/postfix \
-		/var/spool/postfix
-	@${INSTALL_DATA} ${WRKSRC}/conf/LICENSE ${PREFIX}/etc/postfix
-
-.for file in ${CONF1}
-	@${INSTALL_DATA} \
-		${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
+.if defined(NOPORTDOCS)
+READMEDIR=no
+.else
+READMEDIR=${PREFIX}/share/doc/postfix
+.endif
 
-.for file in ${CONF2}
-	@${INSTALL_DATA} \
-		${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix
-.endfor
+do-install:
+	cd ${WRKSRC}; sh postfix-install -non-interactive install_root=/ tempdir=/tmp \
+	 config_directory=${PREFIX}/etc/postfix \
+	 daemon_directory=${PREFIX}/libexec/postfix \
+	 command_directory=${PREFIX}/sbin \
+	 queue_directory=/var/spool/postfix \
+	 sendmail_path=${PREFIX}/sbin/sendmail \
+	 newaliases_path=${PREFIX}/bin/newaliases \
+	 mailq_path=${PREFIX}/bin/mailq \
+	 mail_owner=postfix \
+	 setgid_group=maildrop \
+	 manpage_directory=${PREFIX}/man \
+	 sample_directory=${PREFIX}/etc/postfix \
+	 readme_directory=${READMEDIR}
 
 	@${INSTALL_SCRIPT} \
-		${WRKSRC}/conf/postfix-script \
-		${PREFIX}/etc/postfix
-	@${INSTALL_SCRIPT} \
 		${WRKSRC}/auxiliary/rmail/rmail \
 		${PREFIX}/bin/rmail
 
+# optional TEST binaries
 .for file in ${BIN1}
 	@${INSTALL_PROGRAM} \
-		${WRKSRC}/libexec/${file} \
-		${PREFIX}/libexec/postfix
-.endfor
-
-.for file in ${BIN2}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/${file}/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.for file in ${BIN3}
-	@${INSTALL_PROGRAM} \
 		${WRKSRC}/src/smtpstone/${file} \
 		${PREFIX}/sbin
 .endfor
 
-.for file in ${MAN1}
-	@${INSTALL_MAN} \
-		${WRKSRC}/man/man1/${file} \
-		${PREFIX}/man/man1
-.endfor
-
-.for file in ${MAN5}
-	@${INSTALL_MAN} \
-		${WRKSRC}/man/man5/${file} \
-		${PREFIX}/man/man5
-.endfor
-
-.for file in ${MAN8}
-	@${INSTALL_MAN} \
-		${WRKSRC}/man/man8/${file} \
-		${PREFIX}/man/man8
-.endfor
-
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
 	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
 		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-	@cd ${WRKSRC} && for i in ${DOC1} ; do \
-		${INSTALL_DATA} $$i ${DOCSDIR} ; done && \
-		${ECHO_MSG} "Installed text documentation in ${DOCSDIR}"
-	@cd ${WRKSRC}/README_FILES && for i in ${DOC2} ; do \
-		${INSTALL_DATA} $$i ${DOCSDIR} ; done && \
-		${ECHO_MSG} "Installed readme in ${DOCSDIR}"
 .endif
 
-	@${ECHO_MSG} '--------------------------------------------------'
-	@${ECHO_MSG} '- To replace your existing sendmail with postfix -'
-	@${ECHO_MSG} '- type "make replace"                            -'
-	@${ECHO_MSG} '--------------------------------------------------'
-	@${ECHO_MSG} '******You may need to update your master.cf*******'
-	@${ECHO_MSG} '**************due to recent changes***************'
-
 post-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
+# man pages, since the ports software compresses them after this step, and
+# if we run etc/postfix/post-install again during package installation,
+# it will complain about missing files.
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===>  Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO_CMD} "#" > /etc/mail/mailer.conf
-	${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
-	${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
-	${ECHO_CMD} "#" >> /etc/mail/mailer.conf
-	${ECHO_CMD} "sendmail	${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
-	${ECHO_CMD} "send-mail	${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
-	${ECHO_CMD} "mailq		${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
-	${ECHO_CMD} "newaliases	${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 781e7f1819f4..492954dc787b 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-MD5 (postfix/snapshot-20020107.tar.gz) = 1a1ace7950289a78490d8dce93a47786
-MD5 (postfix/pfixtls-0.7.14-snap20020107-0.9.6c.tar.gz) = aa00167f2359ff854efcd39fc02bdcce
+MD5 (postfix/snapshot-20020115.tar.gz) = d1f53c0767e09ab48fd0a9a7307674f8
+MD5 (postfix/pfixtls-0.7.15-1.1.0-0.9.6c.tar.gz) = f45fe15a623ffa22a17cbf2f977a5c62
diff --git a/mail/postfix-current/files/install.cf b/mail/postfix-current/files/install.cf
deleted file mode 100644
index d90da341bd53..000000000000
--- a/mail/postfix-current/files/install.cf
+++ /dev/null
@@ -1,5 +0,0 @@
-sendmail_path=/usr/sbin/sendmail
-newaliases_path=/usr/bin/newaliases
-mailq_path=/usr/bin/mailq
-setgid=maildrop
-manpages=!!PREFIX!!/man
diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa
index ab210efce359..51b40396bd5e 100644
--- a/mail/postfix-current/files/patch-aa
+++ b/mail/postfix-current/files/patch-aa
@@ -32,40 +32,6 @@
   # QUEUE AND PROCESS OWNERSHIP
   #
 ***************
-*** 56,62 ****
-  # These rights are used in the absence of a recipient user context.
-  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
-  #
-! #default_privs = nobody
-  
-  # INTERNET HOST AND DOMAIN NAMES
-  # 
---- 56,62 ----
-  # These rights are used in the absence of a recipient user context.
-  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
-  #
-! default_privs = nobody
-  
-  # INTERNET HOST AND DOMAIN NAMES
-  # 
-***************
-*** 306,312 ****
-  # tables that are not necessarily all under control by Postfix.
-  #
-  #alias_database = dbm:/etc/aliases
-! #alias_database = dbm:/etc/mail/aliases
-  #alias_database = hash:/etc/aliases
-  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-  
---- 306,312 ----
-  # tables that are not necessarily all under control by Postfix.
-  #
-  #alias_database = dbm:/etc/aliases
-! #alias_database = dbm:/etc/aliases
-  #alias_database = hash:/etc/aliases
-  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-  
-***************
 *** 325,332 ****
   #
   # The home_mailbox parameter specifies the optional pathname of a
@@ -85,23 +51,6 @@
   #home_mailbox = Mailbox
   #home_mailbox = Maildir/
 ***************
-*** 335,341 ****
-  # UNIX-style mailboxes are kept. The default setting depends on the
-  # system type.
-  #
-! #mail_spool_directory = /var/mail
-  #mail_spool_directory = /var/spool/mail
-  
-  # The mailbox_command parameter specifies the optional external
---- 335,341 ----
-  # UNIX-style mailboxes are kept. The default setting depends on the
-  # system type.
-  #
-! mail_spool_directory = /var/mail
-  #mail_spool_directory = /var/spool/mail
-  
-  # The mailbox_command parameter specifies the optional external
-***************
 *** 424,430 ****
   #
   # See also the body_checks example in the sample-filter.cf file.
@@ -119,27 +68,6 @@
   # FAST ETRN SERVICE
   #
 ***************
-*** 498,506 ****
-  # the process marches on. If you use an X-based debugger, be sure to
-  # set up your XAUTHORITY environment variable before starting Postfix.
-  #
-! debugger_command =
-! 	 PATH=/usr/bin:/usr/X11R6/bin
-! 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
-  
-  # INSTALL-TIME CONFIGURATION INFORMATION
-  #
---- 498,506 ----
-  # the process marches on. If you use an X-based debugger, be sure to
-  # set up your XAUTHORITY environment variable before starting Postfix.
-  #
-! #debugger_command =
-! #	 PATH=/usr/bin:/usr/X11R6/bin
-! #	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
-  
-  # INSTALL-TIME CONFIGURATION INFORMATION
-  #
-***************
 *** 525,531 ****
   # 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.
diff --git a/mail/postfix-current/files/patch-post-install b/mail/postfix-current/files/patch-post-install
new file mode 100644
index 000000000000..92b2d4c2c6eb
--- /dev/null
+++ b/mail/postfix-current/files/patch-post-install
@@ -0,0 +1,11 @@
+--- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
++++ ./conf/post-install	Fri Jan 18 12:32:54 2002
+@@ -183,7 +183,7 @@
+ 
+ umask 022
+ 
+-PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
++PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
+ SHELL=/bin/sh
+ IFS=" 	
+ "
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index 03d6d352e37d..b2b0e42a0332 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/pkg-install
@@ -5,10 +5,6 @@
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
-user=postfix
-group=postfix
-group2=maildrop
-
 ask() {
     local question default answer
 
@@ -24,74 +20,126 @@ ask() {
 }
 
 yesno() {
-    local dflt question answer
+    local question default answer
 
     question=$1
-    dflt=$2
+    default=$2
     while :; do
-        answer=$(ask "${question}" "${dflt}")
+        answer=$(ask "${question}" "${default}")
         case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
+        [Yy]*)	return 0;;
+        [Nn]*)	return 1;;
         esac
         echo "Please answer yes or no."
     done
 }
 
 if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
+    USER=postfix
+    GROUP=postfix
+    GROUP2=maildrop
+
+    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
+        echo "You already have a group \"${GROUP}\", so I will use it."
     else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
+        if /usr/sbin/pw groupadd ${GROUP} -h -
+	then
+	    echo "Added group \"${GROUP}\"."
+	else
+	    echo "Adding group \"${GROUP}\" failed..."
             echo "Please create it, and try again."
             exit 1
         fi
     fi
 
-    if /usr/sbin/pw groupshow "${group2}" 2>/dev/null; then
-        echo "You already have a group \"${group2}\", so I will use it."
+    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
+        echo "You already have a group \"${GROUP2}\", so I will use it."
     else
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
+        if /usr/sbin/pw groupadd ${GROUP2} -h -
+	then
+	    echo "Added group \"${GROUP2}\"."
+	else
+	    echo "Adding group \"${GROUP2}\" failed..."
             echo "Please create it, and try again."
             exit 1
         fi
     fi
 
-    if /usr/sbin/pw user show "${user}" 2>/dev/null; then
-        echo "You already have a user \"${user}\", so I will use it."
+    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
+        echo "You already have a user \"${USER}\", so I will use it."
     else
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
+        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
+           -d /var/spool/postfix \
+           -s /sbin/nologin \
+           -c "Postfix Mail System"
+	then
+	    echo "Added user \"${USER}\"."
+	else
+	    echo "Adding user \"${USER}\" failed..."
             echo "Please create it, and try again."
             exit 1
         fi
     fi
-
 fi
 
 if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
+	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
+	 config_directory=${PKG_PREFIX}/etc/postfix \
+	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
+	 command_directory=${PKG_PREFIX}/sbin \
+	 queue_directory=/var/spool/postfix \
+	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
+	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
+	 mailq_path=${PKG_PREFIX}/bin/mailq \
+	 mail_owner=postfix \
+	 setgid_group=maildrop \
+	 manpage_directory=${PKG_PREFIX}/man \
+	 sample_directory=${PKG_PREFIX}/etc/postfix \
+	 readme_directory=no \
+	 upgrade-package
+# readme_directory is "no" above since the package will have correct perms
+# already, and we don't know if they had PORTDOCS.
+fi
+
+replace() {
+    local orig repl
+    
+    orig=$1
+    repl=$2
+    if [ -e ${orig} ]; then
+        mv -f ${orig} ${orig}.OFF
+        chmod 0 ${orig}.OFF
     fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
+    if [ -e ${repl} ]; then
+        ln -s ${repl} ${orig}
+    fi
+}
+
+if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
+    if [ -x /sbin/sysctl ]; then
+        OSVERSION=`/sbin/sysctl -n kern.osreldate`
+    else
+        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
+    fi
+    if [ ${OSVERSION} -ge 400014 ]; then
+        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
+            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
+            echo "#"						>  /etc/mail/mailer.conf
+            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
+            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
+            echo "#"						>> /etc/mail/mailer.conf
+            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
+            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
+            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
+            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
+            echo "Done."
+        fi
+    else
+        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
+            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
+            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
+            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
+            echo "Done."
+        fi
     fi
-    /usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    /bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
-    /bin/mkdir -p /var/spool/postfix
-    ${PKG_PREFIX}/sbin/postfix check
 fi
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 6d0a94ad171d..a6e41994c5c5 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -2,43 +2,47 @@
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
 bin/rmail
 etc/postfix/LICENSE
-etc/postfix/install.cf
+etc/postfix/access
+etc/postfix/aliases
+etc/postfix/canonical
+etc/postfix/main.cf
+etc/postfix/main.cf.default
+etc/postfix/master.cf
+etc/postfix/pcre_table
+etc/postfix/post-install
+etc/postfix/postfix-files
 etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
+etc/postfix/regexp_table
+etc/postfix/relocated
 etc/postfix/sample-aliases.cf
-%%SUB_SASL%%etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical
+etc/postfix/sample-auth.cf
 etc/postfix/sample-canonical.cf
+etc/postfix/sample-compatibility.cf
 etc/postfix/sample-debug.cf
 etc/postfix/sample-filter.cf
 etc/postfix/sample-flush.cf
-%%SUB_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-ldap.cf
+etc/postfix/sample-lmtp.cf
 etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
 etc/postfix/sample-misc.cf
-%%SUB_PCRE%%etc/postfix/sample-pcre-access.cf
-%%SUB_PCRE%%etc/postfix/sample-pcre-body.cf
-%%SUB_PCRE%%etc/postfix/sample-pcre-header.cf
-%%SUB_PCRE%%etc/postfix/sample-pcre_table
+etc/postfix/sample-pcre-access.cf
+etc/postfix/sample-pcre-body.cf
+etc/postfix/sample-pcre-header.cf
 etc/postfix/sample-qmqpd.cf
 etc/postfix/sample-rate.cf
 etc/postfix/sample-regexp-access.cf
 etc/postfix/sample-regexp-body.cf
 etc/postfix/sample-regexp-header.cf
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
 etc/postfix/sample-relocated.cf
 etc/postfix/sample-resource.cf
 etc/postfix/sample-rewrite.cf
 etc/postfix/sample-smtp.cf
 etc/postfix/sample-smtpd.cf
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-etc/postfix/sample-transport
 etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual
 etc/postfix/sample-virtual.cf
+etc/postfix/transport
+etc/postfix/virtual
+%%SUB_TLS%%etc/postfix/sample-tls.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
@@ -55,9 +59,9 @@ libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
-%%SUB_TLS%%libexec/postfix/tlsmgr
 libexec/postfix/trivial-rewrite
 libexec/postfix/virtual
+%%SUB_TLS%%libexec/postfix/tlsmgr
 sbin/postalias
 sbin/postcat
 sbin/postconf
@@ -72,93 +76,87 @@ sbin/postsuper
 sbin/sendmail
 %%SUB_TEST%%sbin/smtp-sink
 %%SUB_TEST%%sbin/smtp-source
-%%SUB_DOCS%%share/doc/postfix/0README
-%%SUB_DOCS%%share/doc/postfix/COMPATIBILITY
-%%SUB_DOCS%%share/doc/postfix/DB_README
-%%SUB_DOCS%%share/doc/postfix/DEBUG_README
-%%SUB_DOCS%%share/doc/postfix/ETRN_README
-%%SUB_DOCS%%share/doc/postfix/FILTER_README
-%%SUB_DOCS%%share/doc/postfix/HISTORY
-%%SUB_DOCS%%share/doc/postfix/INSTALL
-%%SUB_DOCS%%share/doc/postfix/LDAP_README
-%%SUB_DOCS%%share/doc/postfix/LICENSE
-%%SUB_DOCS%%share/doc/postfix/LINUX_README
-%%SUB_DOCS%%share/doc/postfix/LMTP_README
-%%SUB_DOCS%%share/doc/postfix/MACOSX_README
-%%SUB_DOCS%%share/doc/postfix/MYSQL_README
-%%SUB_DOCS%%share/doc/postfix/NFS_README
-%%SUB_DOCS%%share/doc/postfix/PCRE_README
-%%SUB_DOCS%%share/doc/postfix/PORTING
-%%SUB_DOCS%%share/doc/postfix/QMQP_README
-%%SUB_DOCS%%share/doc/postfix/RELEASE_NOTES
-%%SUB_DOCS%%share/doc/postfix/SASL_README
-%%SUB_DOCS%%share/doc/postfix/TODO
-%%SUB_DOCS%%share/doc/postfix/ULTRIX_README
-%%SUB_DOCS%%share/doc/postfix/UUCP_README
-%%SUB_DOCS%%share/doc/postfix/VERP_README
-%%SUB_DOCS%%share/doc/postfix/VIRTUAL_README
-%%SUB_DOCS%%share/doc/postfix/access.5.html
-%%SUB_DOCS%%share/doc/postfix/aliases.5.html
-%%SUB_DOCS%%share/doc/postfix/architecture.html
-%%SUB_DOCS%%share/doc/postfix/backstage.html
-%%SUB_DOCS%%share/doc/postfix/basic.html
-%%SUB_DOCS%%share/doc/postfix/big-picture.gif
-%%SUB_DOCS%%share/doc/postfix/big-picture.html
-%%SUB_DOCS%%share/doc/postfix/bounce.8.html
-%%SUB_DOCS%%share/doc/postfix/canonical.5.html
-%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
-%%SUB_DOCS%%share/doc/postfix/commands.html
-%%SUB_DOCS%%share/doc/postfix/defer.8.html
-%%SUB_DOCS%%share/doc/postfix/delivering.html
-%%SUB_DOCS%%share/doc/postfix/error.8.html
-%%SUB_DOCS%%share/doc/postfix/faq.html
-%%SUB_DOCS%%share/doc/postfix/flush.8.html
-%%SUB_DOCS%%share/doc/postfix/goals.html
-%%SUB_DOCS%%share/doc/postfix/inbound.gif
-%%SUB_DOCS%%share/doc/postfix/index.html
-%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
-%%SUB_DOCS%%share/doc/postfix/local.8.html
-%%SUB_DOCS%%share/doc/postfix/mailq.1.html
-%%SUB_DOCS%%share/doc/postfix/master.8.html
-%%SUB_DOCS%%share/doc/postfix/motivation.html
-%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
-%%SUB_DOCS%%share/doc/postfix/nqmgr.8.html
-%%SUB_DOCS%%share/doc/postfix/outbound.gif
-%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
-%%SUB_DOCS%%share/doc/postfix/pickup.8.html
-%%SUB_DOCS%%share/doc/postfix/pipe.8.html
-%%SUB_DOCS%%share/doc/postfix/postalias.1.html
-%%SUB_DOCS%%share/doc/postfix/postcat.1.html
-%%SUB_DOCS%%share/doc/postfix/postconf.1.html
-%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
-%%SUB_DOCS%%share/doc/postfix/postfix.1.html
-%%SUB_DOCS%%share/doc/postfix/postkick.1.html
-%%SUB_DOCS%%share/doc/postfix/postlock.1.html
-%%SUB_DOCS%%share/doc/postfix/postlog.1.html
-%%SUB_DOCS%%share/doc/postfix/postmap.1.html
-%%SUB_DOCS%%share/doc/postfix/postqueue.1.html
-%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
-%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
-%%SUB_DOCS%%share/doc/postfix/qmqpd.8.html
-%%SUB_DOCS%%share/doc/postfix/queuing.html
-%%SUB_DOCS%%share/doc/postfix/rate.html
-%%SUB_DOCS%%share/doc/postfix/receiving.html
-%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
-%%SUB_DOCS%%share/doc/postfix/relocated.5.html
-%%SUB_DOCS%%share/doc/postfix/resource.html
-%%SUB_DOCS%%share/doc/postfix/rewrite.html
-%%SUB_DOCS%%share/doc/postfix/security.html
-%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
-%%SUB_DOCS%%share/doc/postfix/showq.8.html
-%%SUB_DOCS%%share/doc/postfix/small-picture.gif
-%%SUB_DOCS%%share/doc/postfix/smtp.8.html
-%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
-%%SUB_DOCS%%share/doc/postfix/spawn.8.html
-%%SUB_DOCS%%share/doc/postfix/transport.5.html
-%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%SUB_DOCS%%share/doc/postfix/uce.html
-%%SUB_DOCS%%share/doc/postfix/virtual.5.html
-%%SUB_DOCS%%share/doc/postfix/virtual.8.html
-%%SUB_DOCS%%@dirrm share/doc/postfix
+%%PORTDOCS%%share/doc/postfix/DB_README
+%%PORTDOCS%%share/doc/postfix/DEBUG_README
+%%PORTDOCS%%share/doc/postfix/ETRN_README
+%%PORTDOCS%%share/doc/postfix/FILTER_README
+%%PORTDOCS%%share/doc/postfix/LDAP_README
+%%PORTDOCS%%share/doc/postfix/LINUX_README
+%%PORTDOCS%%share/doc/postfix/LMTP_README
+%%PORTDOCS%%share/doc/postfix/MACOSX_README
+%%PORTDOCS%%share/doc/postfix/MYSQL_README
+%%PORTDOCS%%share/doc/postfix/NFS_README
+%%PORTDOCS%%share/doc/postfix/PACKAGE_README
+%%PORTDOCS%%share/doc/postfix/PCRE_README
+%%PORTDOCS%%share/doc/postfix/QMQP_README
+%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
+%%PORTDOCS%%share/doc/postfix/SASL_README
+%%PORTDOCS%%share/doc/postfix/ULTRIX_README
+%%PORTDOCS%%share/doc/postfix/UUCP_README
+%%PORTDOCS%%share/doc/postfix/VERP_README
+%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
+%%PORTDOCS%%share/doc/postfix/access.5.html
+%%PORTDOCS%%share/doc/postfix/aliases.5.html
+%%PORTDOCS%%share/doc/postfix/architecture.html
+%%PORTDOCS%%share/doc/postfix/backstage.html
+%%PORTDOCS%%share/doc/postfix/basic.html
+%%PORTDOCS%%share/doc/postfix/big-picture.gif
+%%PORTDOCS%%share/doc/postfix/big-picture.html
+%%PORTDOCS%%share/doc/postfix/bounce.8.html
+%%PORTDOCS%%share/doc/postfix/canonical.5.html
+%%PORTDOCS%%share/doc/postfix/cleanup.8.html
+%%PORTDOCS%%share/doc/postfix/commands.html
+%%PORTDOCS%%share/doc/postfix/defer.8.html
+%%PORTDOCS%%share/doc/postfix/delivering.html
+%%PORTDOCS%%share/doc/postfix/error.8.html
+%%PORTDOCS%%share/doc/postfix/faq.html
+%%PORTDOCS%%share/doc/postfix/flush.8.html
+%%PORTDOCS%%share/doc/postfix/goals.html
+%%PORTDOCS%%share/doc/postfix/inbound.gif
+%%PORTDOCS%%share/doc/postfix/index.html
+%%PORTDOCS%%share/doc/postfix/lmtp.8.html
+%%PORTDOCS%%share/doc/postfix/local.8.html
+%%PORTDOCS%%share/doc/postfix/mailq.1.html
+%%PORTDOCS%%share/doc/postfix/master.8.html
+%%PORTDOCS%%share/doc/postfix/motivation.html
+%%PORTDOCS%%share/doc/postfix/newaliases.1.html
+%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
+%%PORTDOCS%%share/doc/postfix/outbound.gif
+%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
+%%PORTDOCS%%share/doc/postfix/pickup.8.html
+%%PORTDOCS%%share/doc/postfix/pipe.8.html
+%%PORTDOCS%%share/doc/postfix/postalias.1.html
+%%PORTDOCS%%share/doc/postfix/postcat.1.html
+%%PORTDOCS%%share/doc/postfix/postconf.1.html
+%%PORTDOCS%%share/doc/postfix/postdrop.1.html
+%%PORTDOCS%%share/doc/postfix/postfix.1.html
+%%PORTDOCS%%share/doc/postfix/postkick.1.html
+%%PORTDOCS%%share/doc/postfix/postlock.1.html
+%%PORTDOCS%%share/doc/postfix/postlog.1.html
+%%PORTDOCS%%share/doc/postfix/postmap.1.html
+%%PORTDOCS%%share/doc/postfix/postqueue.1.html
+%%PORTDOCS%%share/doc/postfix/postsuper.1.html
+%%PORTDOCS%%share/doc/postfix/qmgr.8.html
+%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
+%%PORTDOCS%%share/doc/postfix/queuing.html
+%%PORTDOCS%%share/doc/postfix/rate.html
+%%PORTDOCS%%share/doc/postfix/receiving.html
+%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
+%%PORTDOCS%%share/doc/postfix/relocated.5.html
+%%PORTDOCS%%share/doc/postfix/resource.html
+%%PORTDOCS%%share/doc/postfix/rewrite.html
+%%PORTDOCS%%share/doc/postfix/security.html
+%%PORTDOCS%%share/doc/postfix/sendmail.1.html
+%%PORTDOCS%%share/doc/postfix/showq.8.html
+%%PORTDOCS%%share/doc/postfix/small-picture.gif
+%%PORTDOCS%%share/doc/postfix/smtp.8.html
+%%PORTDOCS%%share/doc/postfix/smtpd.8.html
+%%PORTDOCS%%share/doc/postfix/spawn.8.html
+%%PORTDOCS%%share/doc/postfix/transport.5.html
+%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%PORTDOCS%%share/doc/postfix/uce.html
+%%PORTDOCS%%share/doc/postfix/virtual.5.html
+%%PORTDOCS%%share/doc/postfix/virtual.8.html
+%%PORTDOCS%%@dirrm share/doc/postfix
 @dirrm libexec/postfix
 @unexec rmdir %D/etc/postfix  2>/dev/null || true
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index da5218cca38c..1024264c9872 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -20,7 +20,7 @@ MySQL		"MySQL map lookups" OFF \
 OpenLDAP	"OpenLDAP map lookups" OFF \
 Test		"SMTP/LMTP test server and generator" OFF \
 TLS		"Secure Sockets Layer and Transport Layer Security" OFF \
-IPv6		"IPv6 support" OFF \
+IPv6		"IPv6 support (CURRENTLY BROKEN)" OFF \
 2> $tempfile
 
 	retval=$?
@@ -46,25 +46,18 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 echo "PREFIX=	${PREFIX}"
 
-SUB_PCRE="@comment "
-SUB_SASL="@comment "
 SUB_TLS="@comment "
-SUB_LDAP="@comment "
 SUB_TEST="@comment "
 
 while [ "$1" ]; do
 	case $1 in
 		\"PCRE\")
-			echo "CONF1+=		pcre_table"
-			echo "CONF2+=		sample-pcre-access.cf sample-pcre-body.cf sample-pcre-header.cf"
-			echo "MAN5+=		pcre_table.5"
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre"
 			echo "POSTFIX_CCARGS+=	-DHAS_PCRE -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libpcre.a"
 			SUB_PCRE=""
 			;;
 		\"SASL\")
-			echo "CONF2+=		sample-auth.cf"
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl"
 			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libsasl.a -lpam -lcrypt"
@@ -83,12 +76,11 @@ while [ "$1" ]; do
 			SUB_SASL=""
 			;;
 		\"TLS\")
-			echo "CONF2+=		sample-tls.cf"
-			echo "BIN1+=		tlsmgr"
+			echo "MAN8+=		tlsmgr.8"
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
 			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.14-snap20020107-0.9.6c.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.14-snap20020107-0.9.6c/pfixtls.diff"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.7.15-1.1.0-0.9.6c.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.7.15-1.1.0-0.9.6c/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			SUB_TLS=""
 			;;
@@ -103,14 +95,12 @@ while [ "$1" ]; do
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			;;
 		\"OpenLDAP\")
-			echo "CONF2+=		sample-ldap.cf"
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			SUB_LDAP=""
 			;;
 		\"Test\")
-			echo "BIN3=		smtp-sink smtp-source"
+			echo "BIN1=		smtp-sink smtp-source"
 			SUB_TEST=""
 			;;
 		\"IPv6\")
@@ -142,8 +132,5 @@ while [ "$1" ]; do
 	shift
 done
 
-echo "PLIST_SUB+=	SUB_PCRE=\"${SUB_PCRE}\""
-echo "PLIST_SUB+=	SUB_SASL=\"${SUB_SASL}\""
 echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_LDAP=\"${SUB_LDAP}\""
 echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
diff --git a/mail/postfix-current/scripts/fix-files-list b/mail/postfix-current/scripts/fix-files-list
new file mode 100644
index 000000000000..cc4a1083a814
--- /dev/null
+++ b/mail/postfix-current/scripts/fix-files-list
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
+# man pages, since the ports software compresses them later, and if we
+# run post-install it will complain about missing files
+# (script from Simon J. Mudd)
+
+ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
+%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
+w
+q
+EOF