44 files changed, 552 insertions, 233 deletions

diff --git a/mail/postfix25/files/patch-ab b/mail/postfix25/files/patch-ab
index d705b8a7f594..7c81d3dc12c9 100644
--- a/mail/postfix25/files/patch-ab
+++ b/mail/postfix25/files/patch-ab
@@ -1,11 +1,11 @@
---- conf/canonical.orig	Sun Sep  5 23:47:01 1999
-+++ conf/canonical	Tue Nov  7 22:24:42 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- #	format of Postfix canonical table
- # SYNOPSIS
--#	\fBpostmap /etc/postfix/canonical\fR
-+#	\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- # DESCRIPTION
- #	The optional \fBcanonical\fR file specifies an address mapping for
- #	local and non-local addresses. The mapping is used by the
+*** ./conf/canonical.orig	Tue Mar  7 10:42:58 2000
+--- ./conf/canonical	Thu Jun  1 21:53:23 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        postmap /etc/postfix/canonical
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        postmap !!PREFIX!!/etc/postfix/canonical
+  # 
diff --git a/mail/postfix25/files/patch-ac b/mail/postfix25/files/patch-ac
index 264335cb70fa..0fb2192cdd84 100644
--- a/mail/postfix25/files/patch-ac
+++ b/mail/postfix25/files/patch-ac
@@ -1,11 +1,11 @@
---- conf/access.orig	Fri Dec 11 19:55:48 1998
-+++ conf/access	Tue Nov  7 22:25:54 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- #	format of Postfix access table
- # SYNOPSIS
--#	\fBpostmap /etc/postfix/access\fR
-+#	\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- # DESCRIPTION
- #	The optional \fBaccess\fR table directs the Postfix SMTP server
- #	to selectively reject or accept mail from or to specific hosts,
+*** ./conf/access.orig	Tue Mar  7 10:42:58 2000
+--- ./conf/access	Thu Jun  1 21:53:36 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        postmap /etc/postfix/access
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        postmap !!PREFIX!!/etc/postfix/access
+  # 
diff --git a/mail/postfix25/files/patch-ad b/mail/postfix25/files/patch-ad
new file mode 100644
index 000000000000..c1b102574165
--- /dev/null
+++ b/mail/postfix25/files/patch-ad
@@ -0,0 +1,11 @@
+*** ./conf/pcre_table.orig	Thu Mar  9 20:36:19 2000
+--- ./conf/pcre_table	Thu Jun  1 22:02:08 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        pcre:/etc/postfix/filename
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        pcre:!!PREFIX!!/etc/postfix/filename
+  # 
diff --git a/mail/postfix25/files/patch-ae b/mail/postfix25/files/patch-ae
new file mode 100644
index 000000000000..e396dd8626db
--- /dev/null
+++ b/mail/postfix25/files/patch-ae
@@ -0,0 +1,11 @@
+*** ./conf/regexp_table.orig	Thu Mar  9 20:36:19 2000
+--- ./conf/regexp_table	Thu Jun  1 22:03:27 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        regexp:/etc/postfix/filename
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        regexp:!!PREFIX!!/etc/postfix/filename
+  # 
diff --git a/mail/postfix25/files/patch-af b/mail/postfix25/files/patch-af
index ec92981276c6..8fca6b208941 100644
--- a/mail/postfix25/files/patch-af
+++ b/mail/postfix25/files/patch-af
@@ -1,11 +1,11 @@
---- conf/relocated.orig	Sun Sep  5 23:47:01 1999
-+++ conf/relocated	Tue Nov  7 22:28:27 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- #	format of Postfix relocated table
- # SYNOPSIS
--#	\fBpostmap /etc/postfix/relocated\fR
-+#	\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- # DESCRIPTION
- #	The optional \fBrelocated\fR file provides the information that is
- #	used in "user has moved to \fInew_location\fR" bounce messages.
+*** ./conf/relocated.orig	Tue Mar  7 10:42:58 2000
+--- ./conf/relocated	Thu Jun  1 22:03:59 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        postmap /etc/postfix/relocated
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        postmap !!PREFIX!!/etc/postfix/relocated
+  # 
diff --git a/mail/postfix25/files/patch-ag b/mail/postfix25/files/patch-ag
new file mode 100644
index 000000000000..54c0fa918d3b
--- /dev/null
+++ b/mail/postfix25/files/patch-ag
@@ -0,0 +1,15 @@
+*** ./conf/sample-auth.cf.orig	Sun May 28 17:55:19 2000
+--- ./conf/sample-auth.cf	Thu Jun  1 22:05:32 2000
+***************
+*** 91,95 ****
+  # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in /etc/postfix.
+  #
+! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
+  
+--- 91,95 ----
+  # The Postfix SMTP client opens the lookup table before going to
+! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
+  #
+! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass
+  
diff --git a/mail/postfix25/files/patch-ao b/mail/postfix25/files/patch-ao
index 206c152728da..fd854e181601 100644
--- a/mail/postfix25/files/patch-ao
+++ b/mail/postfix25/files/patch-ao
@@ -1,11 +1,11 @@
---- conf/transport.orig	Fri Dec 31 20:54:11 1999
-+++ conf/transport	Tue Nov  7 22:46:59 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- #	format of Postfix transport table
- # SYNOPSIS
--#	\fBpostmap /etc/postfix/transport\fR
-+#	\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- # DESCRIPTION
- #	The optional \fBtransport\fR file specifies a mapping from domain
- #	hierarchies to message delivery transports and/or relay hosts. The
+*** ./conf/transport.orig	Tue Mar  7 10:42:58 2000
+--- ./conf/transport	Thu Jun  1 22:13:41 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        postmap /etc/postfix/transport
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        postmap !!PREFIX!!/etc/postfix/transport
+  # 
diff --git a/mail/postfix25/files/patch-ap b/mail/postfix25/files/patch-ap
index b412ce386f8d..4598192cd5c1 100644
--- a/mail/postfix25/files/patch-ap
+++ b/mail/postfix25/files/patch-ap
@@ -1,11 +1,11 @@
---- conf/virtual.orig	Tue Dec 21 03:00:13 1999
-+++ conf/virtual	Tue Nov  7 22:48:18 2000
-@@ -4,7 +4,7 @@
- # SUMMARY
- #	format of Postfix virtual table
- # SYNOPSIS
--#	\fBpostmap /etc/postfix/virtual\fR
-+#	\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- # DESCRIPTION
- #	The optional \fBvirtual\fR table specifies redirections for local
- #	and non-local recipients or domains. The redirections are used by
+*** ./conf/virtual.orig	Tue Mar  7 10:42:59 2000
+--- ./conf/virtual	Thu Jun  1 22:13:54 2000
+***************
+*** 7,9 ****
+  # SYNOPSIS
+! #        postmap /etc/postfix/virtual
+  # 
+--- 7,9 ----
+  # SYNOPSIS
+! #        postmap !!PREFIX!!/etc/postfix/virtual
+  # 
diff --git a/mail/postfix25/files/patch-bb b/mail/postfix25/files/patch-bb
index 6444bc0d1f75..ea744664dfa7 100644
--- a/mail/postfix25/files/patch-bb
+++ b/mail/postfix25/files/patch-bb
@@ -1,11 +1,20 @@
---- html/access.5.html.orig	Fri Dec 11 19:55:49 1998
-+++ html/access.5.html	Tue Nov  7 22:48:47 2000
+--- ./html/access.5.html.orig   Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html        Tue Nov 21 21:24:34 2000
 @@ -9,7 +9,7 @@
         access - format of Postfix access table
- 
+
  <b>SYNOPSIS</b>
 -       <b>postmap</b> <b>/etc/postfix/access</b>
 +       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
- 
+
  <b>DESCRIPTION</b>
         The  optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b>  <b>/etc/postfix/access</b>  in  order  to  rebuild   the
++       <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/access</b>  in  order  to  rebuild   the
+        indexed file after changing the access table.
+
+        When  the  table  is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bc b/mail/postfix25/files/patch-bc
index 4d24077b9527..e407a9650585 100644
--- a/mail/postfix25/files/patch-bc
+++ b/mail/postfix25/files/patch-bc
@@ -1,11 +1,20 @@
---- html/canonical.5.html.orig	Mon Sep  6 05:13:54 1999
-+++ html/canonical.5.html	Tue Nov  7 22:51:05 2000
+--- ./html/canonical.5.html.orig        Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html     Tue Nov 21 21:33:21 2000
 @@ -9,7 +9,7 @@
         canonical - format of Postfix canonical table
- 
+
  <b>SYNOPSIS</b>
 -       <b>postmap</b> <b>/etc/postfix/canonical</b>
 +       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
- 
+
  <b>DESCRIPTION</b>
-        The  optional  <b>canonical</b> file specifies an address mapping
+        The  optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b> <b>/etc/postfix/canonical</b> in  order  to  rebuild  the
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in  order  to  rebuild  the
+        indexed file after changing the text file.
+
+        When  the  table  is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bl b/mail/postfix25/files/patch-bl
new file mode 100644
index 000000000000..176c7d1b64de
--- /dev/null
+++ b/mail/postfix25/files/patch-bl
@@ -0,0 +1,11 @@
+*** ./html/regexp_table.5.html.orig	Sat Apr 22 20:28:38 2000
+--- ./html/regexp_table.5.html	Thu Jun  1 22:32:44 2000
+***************
+*** 11,13 ****
+  <b>SYNOPSIS</b>
+!        regexp:/etc/postfix/filename
+  
+--- 11,13 ----
+  <b>SYNOPSIS</b>
+!        regexp:!!PREFIX!!/etc/postfix/filename
+  
diff --git a/mail/postfix25/files/patch-bm b/mail/postfix25/files/patch-bm
index bc9479bea2fe..e5ccc2c50b94 100644
--- a/mail/postfix25/files/patch-bm
+++ b/mail/postfix25/files/patch-bm
@@ -1,11 +1,20 @@
---- html/relocated.5.html.orig	Mon Sep  6 05:13:55 1999
-+++ html/relocated.5.html	Tue Nov  7 22:52:46 2000
+--- ./html/relocated.5.html.orig        Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html     Tue Nov 21 21:38:08 2000
 @@ -9,7 +9,7 @@
         relocated - format of Postfix relocated table
- 
+
  <b>SYNOPSIS</b>
 -       <b>postmap</b> <b>/etc/postfix/relocated</b>
 +       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
- 
+
  <b>DESCRIPTION</b>
-        The  optional <b>relocated</b> file provides the information that
+        The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+        that serves as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a>  command.   The
+        result,  an  indexed file in <b>dbm</b> or <b>db</b> format, is used for
+        fast searching by the mail  system.  Execute  the  command
+-       <b>postmap</b>  <b>/etc/postfix/relocated</b>  in  order  to rebuild the
++       <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/relocated</b>  in  order  to rebuild the
+        indexed file after changing the relocated table.
+
+        When the table is provided via other means  such  as  NIS,
diff --git a/mail/postfix25/files/patch-bo b/mail/postfix25/files/patch-bo
index 41cbc4ca6d65..b45270be8151 100644
--- a/mail/postfix25/files/patch-bo
+++ b/mail/postfix25/files/patch-bo
@@ -1,11 +1,20 @@
---- html/transport.5.html.orig	Fri Dec 31 20:54:56 1999
-+++ html/transport.5.html	Tue Nov  7 22:53:50 2000
+--- ./html/transport.5.html.orig        Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html     Tue Nov 21 21:43:20 2000
 @@ -9,7 +9,7 @@
         transport - format of Postfix transport table
- 
+
  <b>SYNOPSIS</b>
 -       <b>postmap</b> <b>/etc/postfix/transport</b>
 +       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
- 
+
  <b>DESCRIPTION</b>
-        The  optional  <b>transport</b>  file  specifies  a  mapping from
+        The  optional  <b>transport</b>  table  specifies  a mapping from
+@@ -21,7 +21,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b> <b>/etc/postfix/transport</b> in  order  to  rebuild  the
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in  order  to  rebuild  the
+        indexed file after changing the transport table.
+
+        When  the  table  is provided via other means such as NIS,
diff --git a/mail/postfix25/files/patch-bp b/mail/postfix25/files/patch-bp
index bb65bd98a7b8..5206bfd4bfd0 100644
--- a/mail/postfix25/files/patch-bp
+++ b/mail/postfix25/files/patch-bp
@@ -1,11 +1,43 @@
---- html/virtual.5.html.orig	Tue Dec 21 03:00:58 1999
-+++ html/virtual.5.html	Tue Nov  7 22:55:04 2000
+--- ./html/virtual.5.html.orig  Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html       Tue Nov 21 21:47:17 2000
 @@ -9,7 +9,7 @@
         virtual - format of Postfix virtual table
- 
+
  <b>SYNOPSIS</b>
 -       <b>postmap</b> <b>/etc/postfix/virtual</b>
 +       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
- 
+
  <b>DESCRIPTION</b>
-        The  optional  <b>virtual</b>  table  specifies  redirections for
+        The  optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b>  <b>/etc/postfix/virtual</b>  in  order  to  rebuild  the
++       <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/virtual</b>  in  order  to  rebuild  the
+        indexed file after changing the text file.
+
+        When  the  table  is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+        Support for a Postfix-style virtual domain looks like:
+
+-       /etc/postfix/virtual:
++       !!PREFIX!!/etc/postfix/virtual:
+            <i>virtual.domain</i>       <i>anything</i> (right-hand content does not matter)
+            <i>postmaster@virtual.domain</i>    <i>postmaster</i>
+            <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+        Support for a Sendmail-style virtual domain looks like:
+
+-       /etc/postfix/main.cf:
++       !!PREFIX!!/etc/postfix/main.cf:
+            mydestination = $myhostname localhost.$mydomain $mydomain
+                <i>virtual.domain</i>
+
+-       /etc/postfix/virtual:
++       !!PREFIX!!/etc/postfix/virtual:
+            <i>user1@virtual.domain</i> <i>address1</i>
+            <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+
diff --git a/mail/postfix25/files/patch-cb b/mail/postfix25/files/patch-cb
index ef73429287d2..58559c7273d1 100644
--- a/mail/postfix25/files/patch-cb
+++ b/mail/postfix25/files/patch-cb
@@ -1,25 +1,20 @@
---- man/man1/sendmail.1.orig	Thu Mar 30 17:46:10 2000
-+++ man/man1/sendmail.1	Wed Dec 20 18:37:45 2000
-@@ -61,10 +61,12 @@
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-+.IP "\fB-G\fR (ignored)"
-+Gateway (relay) submission, as opposed to initial user submission.
- .IP \fB-I\fR
- Initialize alias database. See the \fBnewaliases\fR
- command above.
-@@ -171,7 +173,7 @@
- .na
- .nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+!!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+*** ./man/man1/sendmail.1.orig	Thu Mar 30 14:05:28 2000
+--- ./man/man1/sendmail.1	Thu Jun  1 22:39:16 2000
+***************
+*** 63,65 ****
+  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
+--- 63,65 ----
+  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
+***************
+*** 173,175 ****
+  /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+  .SH CONFIGURATION PARAMETERS
+--- 173,175 ----
+  /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+  .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix25/files/patch-cc b/mail/postfix25/files/patch-cc
new file mode 100644
index 000000000000..cd6946003217
--- /dev/null
+++ b/mail/postfix25/files/patch-cc
@@ -0,0 +1,11 @@
+*** ./man/man5/pcre_table.5.orig	Thu Mar 30 14:05:28 2000
+--- ./man/man5/pcre_table.5	Thu Jun  1 22:39:34 2000
+***************
+*** 10,12 ****
+  .nf
+! pcre:/etc/postfix/filename
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! pcre:!!PREFIX!!/etc/postfix/filename
+  .SH DESCRIPTION
diff --git a/mail/postfix25/files/patch-cd b/mail/postfix25/files/patch-cd
index 36461a39bb49..b51de44d0bee 100644
--- a/mail/postfix25/files/patch-cd
+++ b/mail/postfix25/files/patch-cd
@@ -1,11 +1,20 @@
---- man/man5/access.5.orig	Fri Dec 11 19:55:52 1998
-+++ man/man5/access.5	Tue Nov  7 22:56:25 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/access\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/access.5.orig	Sat Apr 22 20:28:30 2000
+--- ./man/man5/access.5	Thu Jun  1 22:39:55 2000
+***************
+*** 10,12 ****
+  .nf
+! \fBpostmap /etc/postfix/access\fR
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
+  .SH DESCRIPTION
+***************
+*** 21,23 ****
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+  file after changing the access table.
+--- 21,23 ----
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+  file after changing the access table.
diff --git a/mail/postfix25/files/patch-ce b/mail/postfix25/files/patch-ce
index 0e0bd4aa1ae5..f77053f8b3aa 100644
--- a/mail/postfix25/files/patch-ce
+++ b/mail/postfix25/files/patch-ce
@@ -1,11 +1,20 @@
---- man/man5/canonical.5.orig	Mon Sep  6 05:13:32 1999
-+++ man/man5/canonical.5	Tue Nov  7 22:57:40 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/canonical\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/canonical.5.orig	Sat Apr 22 20:28:30 2000
+--- ./man/man5/canonical.5	Thu Jun  1 22:40:18 2000
+***************
+*** 10,12 ****
+  .nf
+! \fBpostmap /etc/postfix/canonical\fR
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+  .SH DESCRIPTION
+***************
+*** 21,23 ****
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+  file after changing the canonical table.
+--- 21,23 ----
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+  file after changing the canonical table.
diff --git a/mail/postfix25/files/patch-cf b/mail/postfix25/files/patch-cf
new file mode 100644
index 000000000000..28fb053b94a7
--- /dev/null
+++ b/mail/postfix25/files/patch-cf
@@ -0,0 +1,11 @@
+*** ./man/man5/regexp_table.5.orig	Thu Mar 30 14:05:28 2000
+--- ./man/man5/regexp_table.5	Thu Jun  1 22:40:43 2000
+***************
+*** 10,12 ****
+  .nf
+! regexp:/etc/postfix/filename
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! regexp:!!PREFIX!!/etc/postfix/filename
+  .SH DESCRIPTION
diff --git a/mail/postfix25/files/patch-cg b/mail/postfix25/files/patch-cg
index cdce4aaddaf3..0ae82cc57669 100644
--- a/mail/postfix25/files/patch-cg
+++ b/mail/postfix25/files/patch-cg
@@ -1,11 +1,20 @@
---- man/man5/relocated.5.orig	Mon Sep  6 05:13:33 1999
-+++ man/man5/relocated.5	Tue Nov  7 22:59:11 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/relocated\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/relocated.5.orig	Sat Apr 22 20:28:31 2000
+--- ./man/man5/relocated.5	Thu Jun  1 22:41:05 2000
+***************
+*** 10,12 ****
+  .nf
+! \fBpostmap /etc/postfix/relocated\fR
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+  .SH DESCRIPTION
+***************
+*** 20,22 ****
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+  file after changing the relocated table.
+--- 20,22 ----
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+  file after changing the relocated table.
diff --git a/mail/postfix25/files/patch-ch b/mail/postfix25/files/patch-ch
index 80df028f9255..3ed047ea474c 100644
--- a/mail/postfix25/files/patch-ch
+++ b/mail/postfix25/files/patch-ch
@@ -1,11 +1,20 @@
---- man/man5/transport.5.orig	Fri Dec 31 20:54:51 1999
-+++ man/man5/transport.5	Tue Nov  7 22:59:57 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/transport\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/transport.5.orig	Sat Apr 22 20:28:31 2000
+--- ./man/man5/transport.5	Thu Jun  1 22:41:26 2000
+***************
+*** 10,12 ****
+  .nf
+! \fBpostmap /etc/postfix/transport\fR
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+  .SH DESCRIPTION
+***************
+*** 21,23 ****
+  for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+  file after changing the transport table.
+--- 21,23 ----
+  for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+  file after changing the transport table.
diff --git a/mail/postfix25/files/patch-ci b/mail/postfix25/files/patch-ci
index 889eed3f4d89..1a7cf4abbac7 100644
--- a/mail/postfix25/files/patch-ci
+++ b/mail/postfix25/files/patch-ci
@@ -1,11 +1,20 @@
---- man/man5/virtual.5.orig	Tue Dec 21 03:00:51 1999
-+++ man/man5/virtual.5	Tue Nov  7 23:00:32 2000
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- .na
- .nf
--\fBpostmap /etc/postfix/virtual\fR
-+\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+*** ./man/man5/virtual.5.orig	Sat Apr 22 20:28:31 2000
+--- ./man/man5/virtual.5	Thu Jun  1 22:41:51 2000
+***************
+*** 10,12 ****
+  .nf
+! \fBpostmap /etc/postfix/virtual\fR
+  .SH DESCRIPTION
+--- 10,12 ----
+  .nf
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+  .SH DESCRIPTION
+***************
+*** 26,28 ****
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+  file after changing the virtual table.
+--- 26,28 ----
+  is used for fast searching by the mail system. Execute the command
+! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+  file after changing the virtual table.
diff --git a/mail/postfix25/files/patch-da b/mail/postfix25/files/patch-da
new file mode 100644
index 000000000000..e57e31750d18
--- /dev/null
+++ b/mail/postfix25/files/patch-da
@@ -0,0 +1,11 @@
+*** ./proto/regexp_table.orig	Wed Mar  8 19:18:20 2000
+--- ./proto/regexp_table	Thu Jun  1 22:44:43 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	regexp:/etc/postfix/filename
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	regexp:!!PREFIX!!/etc/postfix/filename
+  # DESCRIPTION
diff --git a/mail/postfix25/files/patch-db b/mail/postfix25/files/patch-db
new file mode 100644
index 000000000000..7f89fb770783
--- /dev/null
+++ b/mail/postfix25/files/patch-db
@@ -0,0 +1,20 @@
+*** ./proto/access.orig	Sun Apr  9 16:44:45 2000
+--- ./proto/access	Thu Jun  1 22:45:05 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	\fBpostmap /etc/postfix/access\fR
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	\fBpostmap !!PREFIX!!/etc/postfix/access\fR
+  # DESCRIPTION
+***************
+*** 15,17 ****
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
+  #	file after changing the access table.
+--- 15,17 ----
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
+  #	file after changing the access table.
diff --git a/mail/postfix25/files/patch-dc b/mail/postfix25/files/patch-dc
new file mode 100644
index 000000000000..786f2da45c32
--- /dev/null
+++ b/mail/postfix25/files/patch-dc
@@ -0,0 +1,20 @@
+*** ./proto/canonical.orig	Sun Apr  9 16:43:37 2000
+--- ./proto/canonical	Thu Jun  1 22:45:28 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	\fBpostmap /etc/postfix/canonical\fR
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+  # DESCRIPTION
+***************
+*** 15,17 ****
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+  #	file after changing the canonical table.
+--- 15,17 ----
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
+  #	file after changing the canonical table.
diff --git a/mail/postfix25/files/patch-dd b/mail/postfix25/files/patch-dd
new file mode 100644
index 000000000000..b65a57ff7d57
--- /dev/null
+++ b/mail/postfix25/files/patch-dd
@@ -0,0 +1,11 @@
+*** ./proto/pcre_table.orig	Wed Mar  8 19:18:11 2000
+--- ./proto/pcre_table	Thu Jun  1 22:45:41 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	pcre:/etc/postfix/filename
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	pcre:!!PREFIX!!/etc/postfix/filename
+  # DESCRIPTION
diff --git a/mail/postfix25/files/patch-de b/mail/postfix25/files/patch-de
new file mode 100644
index 000000000000..73bb2af2261d
--- /dev/null
+++ b/mail/postfix25/files/patch-de
@@ -0,0 +1,20 @@
+*** ./proto/relocated.orig	Sun Apr  9 16:47:31 2000
+--- ./proto/relocated	Thu Jun  1 22:46:02 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	\fBpostmap /etc/postfix/relocated\fR
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+  # DESCRIPTION
+***************
+*** 14,16 ****
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+  #	file after changing the relocated table.
+--- 14,16 ----
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
+  #	file after changing the relocated table.
diff --git a/mail/postfix25/files/patch-df b/mail/postfix25/files/patch-df
new file mode 100644
index 000000000000..8d3fba96a224
--- /dev/null
+++ b/mail/postfix25/files/patch-df
@@ -0,0 +1,20 @@
+*** ./proto/transport.orig	Sun Apr  9 17:05:45 2000
+--- ./proto/transport	Thu Jun  1 22:46:23 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	\fBpostmap /etc/postfix/transport\fR
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	\fBpostmap !!PREFIX!!/etc/postfix/transport\fR
+  # DESCRIPTION
+***************
+*** 15,17 ****
+  #	for fast searching by the mail system. Execute the command
+! #	\fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+  #	file after changing the transport table.
+--- 15,17 ----
+  #	for fast searching by the mail system. Execute the command
+! #	\fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
+  #	file after changing the transport table.
diff --git a/mail/postfix25/files/patch-dg b/mail/postfix25/files/patch-dg
new file mode 100644
index 000000000000..bff20a2cff3e
--- /dev/null
+++ b/mail/postfix25/files/patch-dg
@@ -0,0 +1,20 @@
+*** ./proto/virtual.orig	Sun Apr  9 17:14:14 2000
+--- ./proto/virtual	Thu Jun  1 22:46:40 2000
+***************
+*** 6,8 ****
+  # SYNOPSIS
+! #	\fBpostmap /etc/postfix/virtual\fR
+  # DESCRIPTION
+--- 6,8 ----
+  # SYNOPSIS
+! #	\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+  # DESCRIPTION
+***************
+*** 20,22 ****
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+  #	file after changing the virtual table.
+--- 20,22 ----
+  #	is used for fast searching by the mail system. Execute the command
+! #	\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
+  #	file after changing the virtual table.
diff --git a/mail/postfix25/files/patch-ea b/mail/postfix25/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix25/files/patch-ea
+++ b/mail/postfix25/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
+*** ./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
diff --git a/mail/postfix25/files/patch-eb b/mail/postfix25/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix25/files/patch-eb
+++ b/mail/postfix25/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./global/mail_conf.c	Thu Jun  1 22:16:29 2000
+*** ./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
diff --git a/mail/postfix25/files/patch-ec b/mail/postfix25/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix25/files/patch-ec
+++ b/mail/postfix25/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig	Wed May 31 19:18:31 2000
---- ./global/mail_params.h	Thu Jun  1 22:17:10 2000
+*** ./src/global/mail_params.h.orig	Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h	Thu Jun  1 22:17:10 2000
 ***************
 *** 155,157 ****
   #ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix25/files/patch-ed b/mail/postfix25/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix25/files/patch-ed
+++ b/mail/postfix25/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c	Thu Jun  1 22:37:48 2000
+*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
 ***************
 *** 15,17 ****
   /*	suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix25/files/patch-ee b/mail/postfix25/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix25/files/patch-ee
+++ b/mail/postfix25/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./master/master.c	Thu Jun  1 22:43:50 2000
+*** ./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
diff --git a/mail/postfix25/files/patch-ef b/mail/postfix25/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix25/files/patch-ef
+++ b/mail/postfix25/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
+*** ./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
diff --git a/mail/postfix25/files/patch-eg b/mail/postfix25/files/patch-eg
index 28950509870c..2983bbfd86ea 100644
--- a/mail/postfix25/files/patch-eg
+++ b/mail/postfix25/files/patch-eg
@@ -1,34 +1,20 @@
---- sendmail/sendmail.c.orig	Sun Mar 26 22:51:33 2000
-+++ sendmail/sendmail.c	Wed Dec 20 18:17:31 2000
-@@ -55,10 +55,12 @@
- /*	\fBjust-send-eight\fR.
- /* .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
--/*	files are kept in \fB/etc/postfix\fR.
-+/*	files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- /* .IP "\fB-F \fIfull_name\fR
- /*	Set the sender full name. This is used only with messages that
- /*	have no \fBFrom:\fR message header.
-+/* .IP "\fB-G \fR (ignored)"
-+/*	Gateway (relay) submission, as opposed to initial user submission.
- /* .IP \fB-I\fR
- /*	Initialize alias database. See the \fBnewaliases\fR
- /*	command above.
-@@ -157,7 +159,7 @@
- /*	\fBdebugger_command\fR configuration parameter.
- /* FILES
- /*	/var/spool/postfix, mail queue
--/*	/etc/postfix, configuration files
-+/*	!!PREFIX!!/etc/postfix, configuration files
- /* CONFIGURATION PARAMETERS
- /* .ad
- /* .fi
-@@ -710,6 +712,8 @@
- 	    break;
- 	case 'F':				/* full name */
- 	    full_name = optarg;
-+	    break;
-+	case 'G':				/* gateway submission */
- 	    break;
- 	case 'I':				/* newaliases */
- 	    mode = SM_MODE_NEWALIAS;
+*** ./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/postfix25/files/patch-eh b/mail/postfix25/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix25/files/patch-eh
+++ b/mail/postfix25/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
+*** ./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
diff --git a/mail/postfix25/files/patch-ei b/mail/postfix25/files/patch-ei
new file mode 100644
index 000000000000..3029372b746e
--- /dev/null
+++ b/mail/postfix25/files/patch-ei
@@ -0,0 +1,21 @@
+*** ./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 <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+  #endif
+  
+   /*
diff --git a/mail/postfix25/files/patch-ej b/mail/postfix25/files/patch-ej
new file mode 100644
index 000000000000..6c5cf2e23758
--- /dev/null
+++ b/mail/postfix25/files/patch-ej
@@ -0,0 +1,21 @@
+*** ./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 <sasl/sasl.h>
+! #include <sasl/saslutil.h>
+  #endif
+  
+   /*
diff --git a/mail/postfix25/files/patch-fa b/mail/postfix25/files/patch-fa
deleted file mode 100644
index bc1c2dc388c2..000000000000
--- a/mail/postfix25/files/patch-fa
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
- 
diff --git a/mail/postfix25/files/patch-fb b/mail/postfix25/files/patch-fb
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix25/files/patch-fb
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix25/files/patch-ga b/mail/postfix25/files/patch-ga
index 3ad7120b8322..60a6dd578564 100644
--- a/mail/postfix25/files/patch-ga
+++ b/mail/postfix25/files/patch-ga
@@ -3,8 +3,8 @@
 ***************
 *** 1,3 ****
 --- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_MYSQL" option at compile time ("make -DWITH_MYSQL").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
 + 
   [Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
   
diff --git a/mail/postfix25/files/patch-gb b/mail/postfix25/files/patch-gb
index 312c8c60f9e5..98816d155122 100644
--- a/mail/postfix25/files/patch-gb
+++ b/mail/postfix25/files/patch-gb
@@ -3,8 +3,8 @@
 ***************
 *** 1,3 ****
 --- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled with the
-+ *** "-DWITH_LDAP" option at compile time ("make -DWITH_LDAP").
++ *** Note for FreeBSD users: this feature must be specifically enabled
++ *** at compile time.
 + 
   BUILDING WITH LDAP SUPPORT
   ==========================
diff --git a/mail/postfix25/files/patch-lmtp.h b/mail/postfix25/files/patch-lmtp.h
new file mode 100644
index 000000000000..3d941c034198
--- /dev/null
+++ b/mail/postfix25/files/patch-lmtp.h
@@ -0,0 +1,13 @@
+--- ./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 <sasl/sasl.h>
++#include <sasl/saslutil.h>
+ #endif
+ 
+  /*