3 files changed, 11 insertions, 77 deletions
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=" 	
+ "