12 files changed, 137 insertions, 77 deletions

diff --git a/mail/postfix1/files/patch-bd b/mail/postfix1/files/patch-bd
deleted file mode 100644
index ce79695f1341..000000000000
--- a/mail/postfix1/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./html/local.8.html.orig	Thu Feb  3 21:15:02 2000
---- ./html/local.8.html	Thu Jun  1 22:22:30 2000
-***************
-*** 99,101 ****
-         The default per-user mailbox is a file in  the  UNIX  mail
-!        spool  directory (<b>/var/mail/</b><i>user</i> or <b>/var/spool/mail/</b><i>user</i>);
-         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
---- 99,101 ----
-         The default per-user mailbox is a file in  the  UNIX  mail
-!        spool  directory (<b>/var/mail/</b><i>user</i>);
-         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
diff --git a/mail/postfix1/files/patch-ck b/mail/postfix1/files/patch-ck
deleted file mode 100644
index 6e1ddce3c8f9..000000000000
--- a/mail/postfix1/files/patch-ck
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./man/man8/local.8.orig	Thu Feb  3 21:14:53 2000
---- ./man/man8/local.8	Thu Jun  1 22:42:43 2000
-***************
-*** 96,98 ****
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
---- 96,98 ----
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
diff --git a/mail/postfix1/files/patch-ea b/mail/postfix1/files/patch-ea
new file mode 100644
index 000000000000..6c3f98d2af4f
--- /dev/null
+++ b/mail/postfix1/files/patch-ea
@@ -0,0 +1,13 @@
+*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
+***************
+*** 118,121 ****
+  /* FILES
+! /*	/etc/postfix/canonical*, canonical mapping table
+! /*	/etc/postfix/virtual*, virtual mapping table
+  /* LICENSE
+--- 118,121 ----
+  /* FILES
+! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
+! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
+  /* LICENSE
diff --git a/mail/postfix1/files/patch-eb b/mail/postfix1/files/patch-eb
new file mode 100644
index 000000000000..e67680963d2d
--- /dev/null
+++ b/mail/postfix1/files/patch-eb
@@ -0,0 +1,11 @@
+*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
+--- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
+***************
+*** 53,55 ****
+  /* FILES
+! /*	/etc/postfix: default Postfix configuration directory.
+  /* ENVIRONMENT
+--- 53,55 ----
+  /* FILES
+! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
+  /* ENVIRONMENT
diff --git a/mail/postfix1/files/patch-ee b/mail/postfix1/files/patch-ee
new file mode 100644
index 000000000000..ef44eac24b73
--- /dev/null
+++ b/mail/postfix1/files/patch-ee
@@ -0,0 +1,13 @@
+*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
+--- ./src/master/master.c	Thu Jun  1 22:43:50 2000
+***************
+*** 104,107 ****
+  /* FILES
+! /*	/etc/postfix/main.cf: global configuration file.
+! /*	/etc/postfix/master.cf: master process configuration file.
+  /*	/var/spool/postfix/pid/master.pid: master lock file.
+--- 104,107 ----
+  /* FILES
+! /*	!!PREFIX!!/etc/postfix/main.cf: global configuration file.
+! /*	!!PREFIX!!/etc/postfix/master.cf: master process configuration file.
+  /*	/var/spool/postfix/pid/master.pid: master lock file.
diff --git a/mail/postfix1/files/patch-ef b/mail/postfix1/files/patch-ef
new file mode 100644
index 000000000000..586b304a103d
--- /dev/null
+++ b/mail/postfix1/files/patch-ef
@@ -0,0 +1,11 @@
+*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
+***************
+*** 39,41 ****
+  /*	/var/spool/postfix, mail queue
+! /*	/etc/postfix, configuration files
+  /* CONFIGURATION PARAMETERS
+--- 39,41 ----
+  /*	/var/spool/postfix, mail queue
+! /*	!!PREFIX!!/etc/postfix, configuration files
+  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-eg b/mail/postfix1/files/patch-eg
new file mode 100644
index 000000000000..2983bbfd86ea
--- /dev/null
+++ b/mail/postfix1/files/patch-eg
@@ -0,0 +1,20 @@
+*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
+***************
+*** 57,59 ****
+  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /*	files are kept in \fB/etc/postfix\fR.
+  /* .IP "\fB-F \fIfull_name\fR
+--- 57,59 ----
+  /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
+! /*	files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+  /* .IP "\fB-F \fIfull_name\fR
+***************
+*** 159,161 ****
+  /*	/var/spool/postfix, mail queue
+! /*	/etc/postfix, configuration files
+  /* CONFIGURATION PARAMETERS
+--- 159,161 ----
+  /*	/var/spool/postfix, mail queue
+! /*	!!PREFIX!!/etc/postfix, configuration files
+  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-eh b/mail/postfix1/files/patch-eh
new file mode 100644
index 000000000000..c104c3680d21
--- /dev/null
+++ b/mail/postfix1/files/patch-eh
@@ -0,0 +1,11 @@
+*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
+***************
+*** 32,34 ****
+  /* FILES
+! /*	/etc/postfix/transport*
+  /* CONFIGURATION PARAMETERS
+--- 32,34 ----
+  /* FILES
+! /*	!!PREFIX!!/etc/postfix/transport*
+  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-ei b/mail/postfix1/files/patch-ei
deleted file mode 100644
index 8f03b69ccc52..000000000000
--- a/mail/postfix1/files/patch-ei
+++ /dev/null
@@ -1,21 +0,0 @@
-*** ./src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
---- ./src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
-***************
-*** 12,19 ****
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl.h>
-! #include <saslutil.h>
-  #endif
-  
-   /*
---- 12,19 ----
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl1/sasl.h>
-! #include <sasl1/saslutil.h>
-  #endif
-  
-   /*
diff --git a/mail/postfix1/files/patch-ej b/mail/postfix1/files/patch-ej
deleted file mode 100644
index 329d7bb1cf96..000000000000
--- a/mail/postfix1/files/patch-ej
+++ /dev/null
@@ -1,21 +0,0 @@
-*** ./src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
---- ./src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
-***************
-*** 12,19 ****
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl.h>
-! #include <saslutil.h>
-  #endif
-  
-   /*
---- 12,19 ----
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl1/sasl.h>
-! #include <sasl1/saslutil.h>
-  #endif
-  
-   /*
diff --git a/mail/postfix1/files/patch-lmtp.h b/mail/postfix1/files/patch-lmtp.h
deleted file mode 100644
index 86d5975b2b4d..000000000000
--- a/mail/postfix1/files/patch-lmtp.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001
-+++ ./src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001
-@@ -12,8 +12,8 @@
-   * SASL library.
-   */
- #ifdef USE_SASL_AUTH
--#include <sasl.h>
--#include <saslutil.h>
-+#include <sasl1/sasl.h>
-+#include <sasl1/saslutil.h>
- #endif
- 
-  /*
diff --git a/mail/postfix1/files/patch-main.cf b/mail/postfix1/files/patch-main.cf
new file mode 100644
index 000000000000..95fb2feaca0a
--- /dev/null
+++ b/mail/postfix1/files/patch-main.cf
@@ -0,0 +1,58 @@
+--- ./conf/main.cf	Wed Jan  8 22:11:52 2003
++++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
+@@ -31,13 +31,13 @@
+ # The command_directory parameter specifies the location of all
+ # postXXX commands.
+ #
+-command_directory = /usr/sbin
++command_directory = /usr/local/sbin
+ 
+ # The daemon_directory parameter specifies the location of all Postfix
+ # daemon programs (i.e. programs listed in the master.cf file). This
+ # directory must be owned by root.
+ #
+-daemon_directory = /usr/libexec/postfix
++daemon_directory = /usr/local/libexec/postfix
+ 
+ # QUEUE AND PROCESS OWNERSHIP
+ #
+@@ -590,32 +590,32 @@
+ # sendmail_path: The full pathname of the Postfix sendmail command.
+ # This is the Sendmail-compatible mail posting interface.
+ # 
+-sendmail_path =
++sendmail_path = /usr/local/sbin/sendmail
+ 
+ # newaliases_path: The full pathname of the Postfix newaliases command.
+ # This is the Sendmail-compatible command to build alias databases.
+ #
+-newaliases_path =
++newaliases_path = /usr/local/bin/newaliases
+ 
+ # mailq_path: The full pathname of the Postfix mailq command.  This
+ # is the Sendmail-compatible mail queue listing command.
+ # 
+-mailq_path =
++mailq_path = /usr/local/bin/mailq
+ 
+ # setgid_group: The group for mail submission and queue management
+ # 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 = /usr/local/man
+ 
+ # sample_directory: The location of the Postfix sample configuration files.
+ #
+-sample_directory =
++sample_directory = /usr/local/etc/postfix
+ 
+ # readme_directory: The location of the Postfix README files.
+ #
+-readme_directory =
++readme_directory = no