4 files changed, 17 insertions, 31 deletions

diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 552b4df43d0f..075d6d51784d 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -6,7 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	postfix-19990601
+DISTNAME=	postfix-19990906-pl02
+PKGNAME=	postfix-19990906.02
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
 		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -53,7 +54,7 @@ do-install:
 	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
 		${PREFIX}/etc/postfix/postfix-script
 	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error fsstone local master pickup pipe qmgr \
+	@for f in bounce cleanup error local master pickup pipe qmgr \
 		 showq smtp smtpd trivial-rewrite ; do \
 		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/libexec/$$f \
 			${PREFIX}/libexec/postfix/$$f ;\
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index 2e79546a5262..2ab8b5c4dbd1 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1 +1 @@
-MD5 (postfix-19990601.tar.gz) = adf54dfceb7950587b3e1a0966e84026
+MD5 (postfix-19990906-pl02.tar.gz) = 7d712bc007bcb05728347cb6a3fbd2be
diff --git a/mail/postfix20/files/patch-ab b/mail/postfix20/files/patch-ab
index 2f113e55a1ee..1e48d8aacfe7 100644
--- a/mail/postfix20/files/patch-ab
+++ b/mail/postfix20/files/patch-ab
@@ -1,5 +1,5 @@
-*** conf/main.cf.orig	Mon Mar 29 22:10:14 1999
---- conf/main.cf	Mon Mar 29 22:13:09 1999
+*** conf/main.cf.orig	Mon Sep  6 22:20:55 1999
+--- conf/main.cf	Fri Sep 10 21:49:50 1999
 ***************
 *** 18,36 ****
   # Postfix support programs and daemons. This setting can be overruled
@@ -10,14 +10,14 @@
   # The command_directory parameter specifies the location of all
   # postXXX commands.  The default value is $program_directory.
   #
-! #command_directory = /usr/sbin
+! command_directory = /usr/sbin
   
   # The daemon_directory parameter specifies the location of all Postfix
   # daemon programs (i.e. programs listed in the master.cf file). The
   # default value is $program_directory. This directory must be owned
   # by root.
   #
-! #daemon_directory = /usr/libexec/postfix
+! daemon_directory = /usr/libexec/postfix
   
   # QUEUE AND PROCESS OWNERSHIP
   #
@@ -42,14 +42,7 @@
   # QUEUE AND PROCESS OWNERSHIP
   #
 ***************
-*** 40,53 ****
-  # OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In particular,
-  # don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
-  #
-! #mail_owner = postfix
-  
-  # The default_privs parameter specifies the default rights used by
-  # the local delivery agent for delivery to external file or command.
+*** 47,53 ****
   # These rights are used in the absence of a recipient user context.
   # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
   #
@@ -57,14 +50,7 @@
   
   # INTERNET HOST AND DOMAIN NAMES
   # 
---- 40,53 ----
-  # OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In particular,
-  # don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
-  #
-! mail_owner = postfix
-  
-  # The default_privs parameter specifies the default rights used by
-  # the local delivery agent for delivery to external file or command.
+--- 47,53 ----
   # These rights are used in the absence of a recipient user context.
   # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
   #
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
index d03bf1373f1c..8fa639631947 100644
--- a/mail/postfix20/pkg-plist
+++ b/mail/postfix20/pkg-plist
@@ -1,13 +1,15 @@
-etc/postfix/main.cf
 etc/postfix/LICENSE
+etc/postfix/main.cf
+etc/postfix/master.cf
+etc/postfix/postfix-script
 etc/postfix/sample-access
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
 etc/postfix/sample-aliases.cf
 etc/postfix/sample-canonical.cf
 etc/postfix/sample-debug.cf
 etc/postfix/sample-ldap.cf
 etc/postfix/sample-local.cf
+etc/postfix/sample-main.cf
+etc/postfix/sample-master.cf
 etc/postfix/sample-misc.cf
 etc/postfix/sample-pcre.cf
 etc/postfix/sample-rate.cf
@@ -18,12 +20,9 @@ etc/postfix/sample-smtp.cf
 etc/postfix/sample-smtpd.cf
 etc/postfix/sample-transport.cf
 etc/postfix/sample-virtual.cf
-etc/postfix/postfix-script
-etc/postfix/master.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
-libexec/postfix/fsstone
 libexec/postfix/local
 libexec/postfix/master
 libexec/postfix/pickup
@@ -33,17 +32,17 @@ libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/trivial-rewrite
-sbin/sendmail
 sbin/postalias
 sbin/postcat
 sbin/postconf
+sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postsuper
-sbin/postdrop
+sbin/sendmail
 sbin/smtp-sink
 sbin/smtp-source
 @exec mkdir -p -m 0755 /var/spool/postfix