Update to the latest snapshot, plus add hooks for all the very spiffy

plugins that postfix can use.

Submitted by:   Omanchu Oogali <missnglnk@sneakerz.org> (new MAINTAINER)

65 files changed, 1958 insertions, 431 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 3378bbf..0f4a56d 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,152 +1,209 @@
 # New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
+# Date created: 	18 Mar 1999
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
-PORTVERSION= 	19991231.08
+PORTVERSION=	20000531
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
+MASTER_SITES=	ftp://ftp.merit.edu/postfix/experimental/ \
+		ftp://ftp.tux.org/pub/net/postfix/experimental/ \
+		ftp://ftp.utoronto.ca/mirror/packages/postfix/experimental/ \
+		ftp://ftp.samurai.com/pub/postfix/experimental/ \
+		ftp://ftp.nl.uu.net/pub/unix/mail/postfix/experimental/ \
+		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/experimental/ \
+		ftp://ftp.mira.net/pub/unix/mail/postfix/experimental/ \
+		ftp://coda.nctu.edu.tw/network/mail/postfix/experimental/
+DISTNAME=	snapshot-20000531
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	missnglnk@sneakerz.org
 
-BROKEN=		"pending update after a repository copy"
+.if !defined(DEBUG)
+MAKEFILEFLAGS+= DEBUG=
+.endif
+
+.if defined(CC)
+MAKEFILEFLAGS+= CC=$(CC)
+.endif
+
+.if defined(OPT)
+MAKEFILEFLAGS+= OPT=$(OPT)
+.endif
 
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
 .if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
 
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
 .if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
 .endif
 
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
+.if defined(WITH_PCRE)
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
+POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libpcre.a
+.endif
 
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
+.if defined(WITH_SASL)
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libsasl.a:${PORTSDIR}/security/cyrus-sasl
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I${LOCALBASE}/include
+POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libsasl.a
+.endif
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
 	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
 
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
+MAN5=	access.5 aliases.5 canonical.5 regexp_table.5 relocated.5 \
+	transport.5 virtual.5
+
+.ifdef(WITH_PCRE)
+MAN5+=	pcre_table.5
+.endif
+
+MAN8=	bounce.8 cleanup.8 defer.8 error.8 lmtp.8 local.8 master.8 \
+	pickup.8 pipe.8 qmgr.8 showq.8 smtp.8 smtpd.8 trivial-rewrite.8
+
+post-patch:
+	(cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
+	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
+	${ECHO} "all: default" >> Makefile)
+
+pre-install:
+	@${PKGDIR}/INSTALL Postfix PRE-INSTALL
 
 do-install:
 	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
 	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
 	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
 		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
+
+	@for f in access aliases canonical main.cf master.cf \
+		regexp_table relocated transport virtual ; do \
+			${INSTALL} -C -o root -g wheel -m 0644 \
+			${WRKSRC}/conf/$$f ${PREFIX}/etc/postfix/sample-$$f ; \
 	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
+
+.if defined(WITH_PCRE)
+	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/pcre_table \
+		${PREFIX}/etc/postfix/sample-pcre_table
+.endif
+
+	@for f in sample-aliases.cf sample-canonical.cf \
+		sample-debug.cf sample-filter.cf sample-ldap.cf \
+		sample-local.cf sample-misc.cf sample-rate.cf \
+		sample-regexp.cf sample-relocated.cf sample-resource.cf \
 		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
 		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
+			${INSTALL} -C -o root -g wheel -m 0644 \
+			${WRKSRC}/conf/$$f ${PREFIX}/etc/postfix/$$f ; \
 	done
-	@${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 local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
+
+.if defined(WITH_PCRE)
+	@${INSTALL} -C -o root -g wheel -m 0644 \
+		${WRKSRC}/conf/sample-pcre.cf \
+		${PREFIX}/etc/postfix/sample-pcre.cf
+.endif
+
+.if defined(WITH_SASL)
+	@${INSTALL} -C -o root -g wheel -m 0644 \
+		${WRKSRC}/conf/sample-auth.cf \
+		${PREFIX}/etc/postfix/sample-auth.cf
+.endif
+
+	@${MKDIR} -m 755 ${PREFIX}/libexec/postfix
+	@${CHOWN} root:wheel ${PREFIX}/libexec/postfix
+
+	@for f in bounce cleanup error lmtp local master nqmgr pickup \
+		pipe qmgr showq smtp smtpd trivial-rewrite ; do \
+		${INSTALL} -C -o root -g wheel -m 0755 \
+			${WRKSRC}/libexec/$$f \
+			${PREFIX}/libexec/postfix/$$f ; \
 	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
+
+	@for f in postalias postcat postconf postfix postkick postlog \
+		postmap postsuper sendmail ; do \
+		${INSTALL} -C -o root -g wheel -m 0755 \
+			${WRKSRC}/$$f/$$f ${PREFIX}/sbin/$$f ; \
 	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
+
+	@${INSTALL} -C -o root -g maildrop -m 2755 \
+		${WRKSRC}/postdrop/postdrop ${PREFIX}/sbin/postdrop
+
 	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
+		${INSTALL} -C -o root -g wheel -m 0644 \
+		${WRKSRC}/man/man1/$$f ${PREFIX}/man/man1/$$f ; \
 	done
+
 	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
+		${INSTALL} -C -o root -g wheel -m 0644 \
+		${WRKSRC}/man/man5/$$f ${PREFIX}/man/man5/$$f ; \
 	done
+
 	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
+		${INSTALL} -C -o root -g wheel -m 0644 \
+		${WRKSRC}/man/man8/$$f ${PREFIX}/man/man8/$$f ; \
 	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
+
+	@${MKDIR} -m 755 /var/spool/postfix
+	@${CHOWN} root:wheel /var/spool/postfix
+
+	@${MKDIR} -m 755 ${PREFIX}/share/doc/postfix
+	@${INSTALL} -d -m 555 -o root -g wheel ${PREFIX}/share/doc/postfix
 	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
+		html/*.html html/*.gif ${PREFIX}/share/doc && \
+		${ECHO_MSG} "Installed HTML documentation in ${PREFIX}/share/doc"
+
 	@${ECHO_MSG} "--------------------------------------------------"
 	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
 	@${ECHO_MSG} "- type \"make replace\"                          -"
 	@${ECHO_MSG} "--------------------------------------------------"
 
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
 .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} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
+	${ECHO} 'sendmail       ${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
+	${ECHO} 'send-mail      ${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
+	${ECHO} 'mailq          ${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
+	${ECHO} '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>
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index c8a018d..49e4667 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1 +1 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
+MD5 (snapshot-20000531.tar.gz) = 5b25b37dc40e9982ec443cae1bda8c10
diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa
index 3af6375..a5f9ee7 100644
--- a/mail/postfix-current/files/patch-aa
+++ b/mail/postfix-current/files/patch-aa
@@ -1,36 +1,69 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
+*** ./conf/main.cf.orig	Fri Jan 28 09:44:47 2000
+--- ./conf/main.cf	Thu Jun  1 22:01:21 2000
 ***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
+*** 19,21 ****
+  #
+! command_directory = /usr/sbin
+  
+--- 19,21 ----
+  #
+! command_directory = !!PREFIX!!/sbin
+  
+***************
+*** 26,28 ****
+  #
+! daemon_directory = /usr/libexec/postfix
+  
+--- 26,28 ----
+  #
+! daemon_directory = !!PREFIX!!/libexec/postfix
+  
+***************
+*** 43,45 ****
+  #
+! #default_privs = nobody
+  
+--- 43,45 ----
+  #
+! default_privs = nobody
+  
+***************
+*** 180,182 ****
+  #alias_database = dbm:/etc/aliases
+! #alias_database = dbm:/etc/mail/aliases
+  #alias_database = hash:/etc/aliases
+--- 180,182 ----
+  #alias_database = dbm:/etc/aliases
+! #alias_database = dbm:/etc/aliases
+  #alias_database = hash:/etc/aliases
 ***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
+*** 199,202 ****
+  # mailbox file relative to a user's home directory. The default
+! # mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
+! # "Maildir/" for qmail-style delivery (the / is required).
+  #
+--- 199,202 ----
+  # mailbox file relative to a user's home directory. The default
+! # mailbox file is /var/mail/user.  Specify "Maildir/" for 
+! # qmail-style delivery (the / is required).
+  #
+***************
+*** 209,211 ****
+  #
+! # mail_spool_directory = /var/mail
+  # mail_spool_directory = /var/spool/mail
+--- 209,211 ----
+  #
+! mail_spool_directory = /var/mail
+  # mail_spool_directory = /var/spool/mail
+***************
+*** 274,277 ****
+  #
+! #header_checks = regexp:/etc/postfix/filename
+! #header_checks = pcre:/etc/postfix/filename
+  
+--- 274,277 ----
+  #
+! #header_checks = regexp:!!PREFIX!!/etc/postfix/filename
+! #header_checks = pcre:!!PREFIX!!/etc/postfix/filename
   
diff --git a/mail/postfix-current/files/patch-ab b/mail/postfix-current/files/patch-ab
index 32a96b2..7c81d3d 100644
--- a/mail/postfix-current/files/patch-ab
+++ b/mail/postfix-current/files/patch-ab
@@ -1,28 +1,11 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/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 = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # 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
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
+*** ./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/postfix-current/files/patch-ac b/mail/postfix-current/files/patch-ac
new file mode 100644
index 0000000..0fb2192
--- /dev/null
+++ b/mail/postfix-current/files/patch-ac
@@ -0,0 +1,11 @@
+*** ./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/postfix-current/files/patch-ad b/mail/postfix-current/files/patch-ad
new file mode 100644
index 0000000..c1b1025
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-ae b/mail/postfix-current/files/patch-ae
new file mode 100644
index 0000000..e396dd8
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-af b/mail/postfix-current/files/patch-af
new file mode 100644
index 0000000..8fca6b2
--- /dev/null
+++ b/mail/postfix-current/files/patch-af
@@ -0,0 +1,11 @@
+*** ./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/postfix-current/files/patch-ag b/mail/postfix-current/files/patch-ag
new file mode 100644
index 0000000..54c0fa9
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-ah b/mail/postfix-current/files/patch-ah
new file mode 100644
index 0000000..c8c769e
--- /dev/null
+++ b/mail/postfix-current/files/patch-ah
@@ -0,0 +1,44 @@
+*** ./conf/sample-canonical.cf.orig	Thu Sep 23 14:10:38 1999
+--- ./conf/sample-canonical.cf	Thu Jun  1 22:07:23 2000
+***************
+*** 14,16 ****
+  #
+! # If you use this feature, run "postmap /etc/postfix/canonical" to
+  # build the necessary DBM or DB file after every change. The changes
+--- 14,16 ----
+  #
+! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to
+  # build the necessary DBM or DB file after every change. The changes
+***************
+*** 19,24 ****
+  #
+! # canonical_maps = dbm:/etc/postfix/canonical
+! # canonical_maps = hash:/etc/postfix/canonical
+! # canonical_maps = hash:/etc/postfix/canonical, nis:canonical
+! # canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical
+  canonical_maps = 
+--- 19,24 ----
+  #
+! # canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical
+! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical
+! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical
+! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical
+  canonical_maps = 
+***************
+*** 32,34 ****
+  #
+! # recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
+  recipient_canonical_maps = 
+--- 32,34 ----
+  #
+! # recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical
+  recipient_canonical_maps = 
+***************
+*** 46,48 ****
+  #
+! # sender_canonical_maps = hash:/etc/postfix/sender_canonical
+  sender_canonical_maps = 
+--- 46,48 ----
+  #
+! # sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical
+  sender_canonical_maps = 
diff --git a/mail/postfix-current/files/patch-ai b/mail/postfix-current/files/patch-ai
new file mode 100644
index 0000000..f7aa2fd
--- /dev/null
+++ b/mail/postfix-current/files/patch-ai
@@ -0,0 +1,18 @@
+*** ./conf/sample-filter.cf.orig	Mon May 29 11:30:44 2000
+--- ./conf/sample-filter.cf	Thu Jun  1 22:07:58 2000
+***************
+*** 15,17 ****
+  #
+! header_checks = regexp:/etc/postfix/header_checks
+  
+--- 15,17 ----
+  #
+! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks
+  
+***************
+*** 26,27 ****
+  #
+! body_checks = regexp:/etc/postfix/body_checks
+--- 26,27 ----
+  #
+! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks
diff --git a/mail/postfix-current/files/patch-aj b/mail/postfix-current/files/patch-aj
new file mode 100644
index 0000000..fa3cc64
--- /dev/null
+++ b/mail/postfix-current/files/patch-aj
@@ -0,0 +1,24 @@
+*** ./conf/sample-misc.cf.orig	Thu Sep 23 14:10:52 1999
+--- ./conf/sample-misc.cf	Thu Jun  1 22:09:39 2000
+***************
+*** 220,222 ****
+  #
+! program_directory = /usr/libexec/postfix
+  
+--- 220,222 ----
+  #
+! program_directory = !!PREFIX!!/usr/libexec/postfix
+  
+***************
+*** 263,267 ****
+  # Specify the types and names of databases to use.  After change,
+! # run "postmap /etc/postfix/relocated", then "postfix reload".
+  #
+! # relocated_maps = hash:/etc/postfix/relocated
+  relocated_maps =
+--- 263,267 ----
+  # Specify the types and names of databases to use.  After change,
+! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload".
+  #
+! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
+  relocated_maps =
diff --git a/mail/postfix-current/files/patch-ak b/mail/postfix-current/files/patch-ak
new file mode 100644
index 0000000..249a427
--- /dev/null
+++ b/mail/postfix-current/files/patch-ak
@@ -0,0 +1,26 @@
+*** ./conf/sample-relocated.cf.orig	Thu Sep 23 14:11:17 1999
+--- ./conf/sample-relocated.cf	Thu Jun  1 22:10:43 2000
+***************
+*** 12,14 ****
+  #
+! # If you use this feature, run "postmap /etc/postfix/relocated" to 
+  # build the necessary DBM or DB file after change, then "postfix
+--- 12,14 ----
+  #
+! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to 
+  # build the necessary DBM or DB file after change, then "postfix
+***************
+*** 16,21 ****
+  #
+! # relocated_maps = dbm:/etc/postfix/relocated
+! # relocated_maps = hash:/etc/postfix/relocated
+! # relocated_maps = hash:/etc/postfix/relocated, nis:virtual
+! # relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated
+  relocated_maps = 
+--- 16,21 ----
+  #
+! # relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated
+! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
+! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual
+! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated
+  relocated_maps = 
diff --git a/mail/postfix-current/files/patch-al b/mail/postfix-current/files/patch-al
new file mode 100644
index 0000000..d363aba
--- /dev/null
+++ b/mail/postfix-current/files/patch-al
@@ -0,0 +1,11 @@
+*** ./conf/sample-smtpd.cf.orig	Mon Dec 27 19:41:37 1999
+--- ./conf/sample-smtpd.cf	Thu Jun  1 22:11:22 2000
+***************
+*** 183,185 ****
+  # smtpd_sender_restrictions = reject_unknown_sender_domain
+! # smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access
+  smtpd_sender_restrictions = 
+--- 183,185 ----
+  # smtpd_sender_restrictions = reject_unknown_sender_domain
+! # smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access
+  smtpd_sender_restrictions = 
diff --git a/mail/postfix-current/files/patch-am b/mail/postfix-current/files/patch-am
new file mode 100644
index 0000000..3328cc4
--- /dev/null
+++ b/mail/postfix-current/files/patch-am
@@ -0,0 +1,23 @@
+*** ./conf/sample-transport.cf.orig	Thu Dec 23 10:50:00 1999
+--- ./conf/sample-transport.cf	Thu Jun  1 22:13:09 2000
+***************
+*** 10,18 ****
+  # By default, this feature is disabled. Specify the types of databases
+! # to use.  If you use this feature, run "postmap /etc/postfix/transport"
+  # after change, then "postfix reload".
+  # 
+! # transport_maps = dbm:/etc/postfix/transport
+! # transport_maps = hash:/etc/postfix/transport
+! # transport_maps = hash:/etc/postfix/transport, nis:transport
+! # transport_maps = hash:/etc/postfix/transport, netinfo:/transport
+  transport_maps = 
+--- 10,18 ----
+  # By default, this feature is disabled. Specify the types of databases
+! # to use.  If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport"
+  # after change, then "postfix reload".
+  # 
+! # transport_maps = dbm:!!PREFIX!!/etc/postfix/transport
+! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport
+! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport
+  transport_maps = 
diff --git a/mail/postfix-current/files/patch-an b/mail/postfix-current/files/patch-an
new file mode 100644
index 0000000..4da6a09
--- /dev/null
+++ b/mail/postfix-current/files/patch-an
@@ -0,0 +1,26 @@
+*** ./conf/sample-virtual.cf.orig	Mon Dec 20 21:00:42 1999
+--- ./conf/sample-virtual.cf	Thu Jun  1 22:13:32 2000
+***************
+*** 12,14 ****
+  #
+! # If you use this feature, run "postmap /etc/postfix/virtual" to 
+  # build the necessary DBM or DB file after change.
+--- 12,14 ----
+  #
+! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to 
+  # build the necessary DBM or DB file after change.
+***************
+*** 18,23 ****
+  #
+! # virtual_maps = dbm:/etc/postfix/virtual
+! # virtual_maps = hash:/etc/postfix/virtual
+! # virtual_maps = hash:/etc/postfix/virtual, nis:virtual
+! # virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual
+  virtual_maps = 
+--- 18,23 ----
+  #
+! # virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual
+! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
+! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual
+! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual
+  virtual_maps = 
diff --git a/mail/postfix-current/files/patch-ao b/mail/postfix-current/files/patch-ao
new file mode 100644
index 0000000..fd854e1
--- /dev/null
+++ b/mail/postfix-current/files/patch-ao
@@ -0,0 +1,11 @@
+*** ./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/postfix-current/files/patch-ap b/mail/postfix-current/files/patch-ap
new file mode 100644
index 0000000..4598192
--- /dev/null
+++ b/mail/postfix-current/files/patch-ap
@@ -0,0 +1,11 @@
+*** ./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/postfix-current/files/patch-ba b/mail/postfix-current/files/patch-ba
index 73feeef..ccb54ec 100644
--- a/mail/postfix-current/files/patch-ba
+++ b/mail/postfix-current/files/patch-ba
@@ -1,19 +1,20 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
+*** ./html/mailq.1.html.orig	Sat Apr 22 20:28:36 2000
+--- ./html/mailq.1.html	Thu Jun  1 22:19:24 2000
 ***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
+*** 83,85 ****
+                The path name of the <b>sendmail.cf</b> file. Postfix con-
+!               figuration files are kept in <b>/etc/postfix</b>.
+  
+--- 83,85 ----
+                The path name of the <b>sendmail.cf</b> file. Postfix con-
+!               figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>.
+  
+***************
+*** 231,233 ****
+         /var/spool/postfix, mail queue
+!        /etc/postfix, configuration files
+  
+--- 231,233 ----
+         /var/spool/postfix, mail queue
+!        !!PREFIX!!/etc/postfix, configuration files
+  
diff --git a/mail/postfix-current/files/patch-bb b/mail/postfix-current/files/patch-bb
index af024b2..0fb75ce 100644
--- a/mail/postfix-current/files/patch-bb
+++ b/mail/postfix-current/files/patch-bb
@@ -1,36 +1,20 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
+*** ./html/access.5.html.orig	Sat Apr 22 20:28:36 2000
+--- ./html/access.5.html	Thu Jun  1 22:21:32 2000
 ***************
-*** 60,66 ****
-  \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.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \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!!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.
+*** 11,13 ****
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>/etc/postfix/access</b>
+  
+--- 11,13 ----
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
+  
 ***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
+*** 22,24 ****
+         used for fast searching by the mail  system.  Execute  the
+!        command  <b>postmap</b>  <b>/etc/postfix/access</b>  in order to rebuild
+         the indexed file after changing the access table.
+--- 22,24 ----
+         used for fast searching by the mail  system.  Execute  the
+!        command  <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild
+         the indexed file after changing the access table.
diff --git a/mail/postfix-current/files/patch-bc b/mail/postfix-current/files/patch-bc
index 12a3696..652e13c 100644
--- a/mail/postfix-current/files/patch-bc
+++ b/mail/postfix-current/files/patch-bc
@@ -1,19 +1,20 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
+*** ./html/canonical.5.html.orig	Sat Apr 22 20:28:37 2000
+--- ./html/canonical.5.html	Thu Jun  1 22:21:57 2000
 ***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
+*** 11,13 ****
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>/etc/postfix/canonical</b>
+  
+--- 11,13 ----
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
+  
+***************
+*** 21,23 ****
+         used for fast searching by the mail  system.  Execute  the
+!        command <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild
+         the indexed file after changing the canonical table.
+--- 21,23 ----
+         used for fast searching by the mail  system.  Execute  the
+!        command <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild
+         the indexed file after changing the canonical table.
diff --git a/mail/postfix-current/files/patch-bd b/mail/postfix-current/files/patch-bd
index 2b2f30f..ce79695 100644
--- a/mail/postfix-current/files/patch-bd
+++ b/mail/postfix-current/files/patch-bd
@@ -1,19 +1,11 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
+*** ./html/local.8.html.orig	Thu Feb  3 21:15:02 2000
+--- ./html/local.8.html	Thu Jun  1 22:22:30 2000
 ***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
+*** 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/postfix-current/files/patch-be b/mail/postfix-current/files/patch-be
index 354737c..1f6e41c 100644
--- a/mail/postfix-current/files/patch-be
+++ b/mail/postfix-current/files/patch-be
@@ -1,19 +1,715 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
+*** ./html/faq.html.orig	Mon May  8 10:11:21 2000
+--- ./html/faq.html	Thu Jun  1 22:28:20 2000
+***************
+*** 273,275 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          myorigin = $mydomain
+--- 273,275 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          myorigin = $mydomain
+***************
+*** 281,283 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          myorigin = $mydomain
+--- 281,283 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          myorigin = $mydomain
+***************
+*** 326,328 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          myorigin = $mydomain
+--- 326,328 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          myorigin = $mydomain
+***************
+*** 330,332 ****
+  
+!     /etc/postfix/master.cf:
+          Comment out the SMTP server entry
+--- 330,332 ----
+  
+!     !!PREFIX!!/etc/postfix/master.cf:
+          Comment out the SMTP server entry
+***************
+*** 357,359 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          myorigin = $mydomain
+--- 357,359 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          myorigin = $mydomain
+***************
+*** 369,371 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          relayhost = $mydomain
+--- 369,371 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          relayhost = $mydomain
+***************
+*** 386,388 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          relayhost = host.my.domain
+--- 386,388 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          relayhost = host.my.domain
+***************
+*** 398,400 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          disable_dns_lookups = yes
+--- 398,400 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          disable_dns_lookups = yes
+***************
+*** 417,419 ****
+  <pre>
+!     /etc/postfix/transport:
+          my.domain               smtp:
+--- 417,419 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/transport:
+          my.domain               smtp:
+***************
+*** 423,426 ****
+  
+!     /etc/postfix/main.cf:
+!         transport_maps = hash:/etc/postfix/transport
+  </pre>
+--- 423,426 ----
+  
+!     !!PREFIX!!/etc/postfix/main.cf:
+!         transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+  </pre>
+***************
+*** 434,436 ****
+  
+! Specify <b>dbm:/etc/postfix/transport</b> if your system uses
+  <b>dbm</b> files instead of <b>db</b>. To find out what map types
+--- 434,436 ----
+  
+! Specify <b>dbm:!!PREFIX!!/etc/postfix/transport</b> if your system uses
+  <b>dbm</b> files instead of <b>db</b>. To find out what map types
+***************
+*** 440,442 ****
+  
+! Execute the command <b>postmap /etc/postfix/transport</b> whenever
+  you edit the transport table.
+--- 440,442 ----
+  
+! Execute the command <b>postmap !!PREFIX!!/etc/postfix/transport</b> whenever
+  you edit the transport table.
+***************
+*** 478,485 ****
+  <pre>
+! /etc/postfix/main.cf:
+      mydestination = $myhostname, my.domain, localhost.my.domain
+      relay_domains =
+!     transport_maps = hash:/etc/postfix/transport
+  
+! /etc/postfix/transport:
+      my.domain   smtp:inside-gateway.my.domain   (forwards user@domain)
+--- 478,485 ----
+  <pre>
+! !!PREFIX!!/etc/postfix/main.cf:
+      mydestination = $myhostname, my.domain, localhost.my.domain
+      relay_domains =
+!     transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+  
+! !!PREFIX!!/etc/postfix/transport:
+      my.domain   smtp:inside-gateway.my.domain   (forwards user@domain)
+***************
+*** 487,489 ****
+  
+! /etc/postfix/master.cf:
+      Comment out the local delivery agent
+--- 487,489 ----
+  
+! !!PREFIX!!/etc/postfix/master.cf:
+      Comment out the local delivery agent
+***************
+*** 493,495 ****
+  
+! Specify <b>dbm:/etc/postfix/transport</b> if your system uses
+  <b>dbm</b> files instead of <b>db</b>. To find out what map types
+--- 493,495 ----
+  
+! Specify <b>dbm:!!PREFIX!!/etc/postfix/transport</b> if your system uses
+  <b>dbm</b> files instead of <b>db</b>. To find out what map types
+***************
+*** 499,501 ****
+  
+! <li>Execute the command <b>postmap /etc/postfix/transport</b>
+  whenever you change the transport table.
+--- 499,501 ----
+  
+! <li>Execute the command <b>postmap !!PREFIX!!/etc/postfix/transport</b>
+  whenever you change the transport table.
+***************
+*** 539,541 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          relayhost = smtprelay.someprovider.com
+--- 539,541 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          relayhost = smtprelay.someprovider.com
+***************
+*** 559,561 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          defer_transports = smtp (Only for systems that use on-demand dialup IP)
+--- 559,561 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          defer_transports = smtp (Only for systems that use on-demand dialup IP)
+***************
+*** 578,580 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          disable_dns_lookups = yes (Only for delivery across LANs that are disconnected most of the time)
+--- 578,580 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          disable_dns_lookups = yes (Only for delivery across LANs that are disconnected most of the time)
+***************
+*** 685,687 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          delay_warning_time = 4
+--- 685,687 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          delay_warning_time = 4
+***************
+*** 959,966 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions = 
+!             regexp:/etc/postfix/regexp_access
+              ...other restrictions...
+  
+!     /etc/postfix/regexp_access:
+          /[%!@].*[%!@]/ 550 Sender specified routing is not supported here.
+--- 959,966 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions = 
+!             regexp:!!PREFIX!!/etc/postfix/regexp_access
+              ...other restrictions...
+  
+!     !!PREFIX!!/etc/postfix/regexp_access:
+          /[%!@].*[%!@]/ 550 Sender specified routing is not supported here.
+***************
+*** 1002,1010 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+              permit_mynetworks
+!             check_client_access hash:/etc/postfix/client_access
+              check_relay_domains
+  
+!     /etc/postfix/client_access:
+          4.3.2.1         OK
+--- 1002,1010 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+              permit_mynetworks
+!             check_client_access hash:!!PREFIX!!/etc/postfix/client_access
+              check_relay_domains
+  
+!     !!PREFIX!!/etc/postfix/client_access:
+          4.3.2.1         OK
+***************
+*** 1046,1055 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+              permit_mynetworks
+!             check_client_access hash:/etc/postfix/client_access
+!             check_sender_access hash:/etc/postfix/sender_access
+              check_relay_domains
+  
+!     /etc/postfix/client_access:
+          11.22.33                OK
+--- 1046,1055 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+              permit_mynetworks
+!             check_client_access hash:!!PREFIX!!/etc/postfix/client_access
+!             check_sender_access hash:!!PREFIX!!/etc/postfix/sender_access
+              check_relay_domains
+  
+!     !!PREFIX!!/etc/postfix/client_access:
+          11.22.33                OK
+***************
+*** 1057,1059 ****
+  
+!     /etc/postfix/sender_access:
+          joe@my.domain           OK
+--- 1057,1059 ----
+  
+!     !!PREFIX!!/etc/postfix/sender_access:
+          joe@my.domain           OK
+***************
+*** 1108,1112 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+!             hash:/etc/postfix/restricted_senders
+              ...other stuff...
+--- 1108,1112 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+!             hash:!!PREFIX!!/etc/postfix/restricted_senders
+              ...other stuff...
+***************
+*** 1114,1118 ****
+          smtpd_restriction_classes = local_only
+!         local_only = check_sender_access hash:/etc/postfix/local_domains, reject
+  
+!     /etc/postfix/restricted_senders:
+          foo@domain      local_only
+--- 1114,1118 ----
+          smtpd_restriction_classes = local_only
+!         local_only = check_sender_access hash:!!PREFIX!!/etc/postfix/local_domains, reject
+  
+!     !!PREFIX!!/etc/postfix/restricted_senders:
+          foo@domain      local_only
+***************
+*** 1120,1122 ****
+  
+!     /etc/postfix/local_domains:
+          this.domain     OK      (matches this.domain and subdomains)
+--- 1120,1122 ----
+  
+!     !!PREFIX!!/etc/postfix/local_domains:
+          this.domain     OK      (matches this.domain and subdomains)
+***************
+*** 1134,1136 ****
+  The <b>smtpd_restriction_classes</b> verbiage exists so that Postfix can
+! open <b>/etc/postfix/local_domains.db</b> before entering a chroot
+  jail, so it is only an artefact of implementation.
+--- 1134,1136 ----
+  The <b>smtpd_restriction_classes</b> verbiage exists so that Postfix can
+! open <b>!!PREFIX!!/etc/postfix/local_domains.db</b> before entering a chroot
+  jail, so it is only an artefact of implementation.
+***************
+*** 1168,1170 ****
+  
+!     /etc/postfix/main.cf:
+          relay_domains = the.backed-up.domain.name
+--- 1168,1170 ----
+  
+!     !!PREFIX!!/etc/postfix/main.cf:
+          relay_domains = the.backed-up.domain.name
+***************
+*** 1179,1184 ****
+  <pre>
+!     /etc/postfix/main.cf:
+!         transport_maps = hash:/etc/postfix/transport
+  
+!     /etc/postfix/transport:
+          the.backed-up.domain.name       smtp:[their.mail.host.name]
+--- 1179,1184 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+!         transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+  
+!     !!PREFIX!!/etc/postfix/transport:
+          the.backed-up.domain.name       smtp:[their.mail.host.name]
+***************
+*** 1309,1311 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtp_skip_4xx_greeting = yes
+--- 1309,1311 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtp_skip_4xx_greeting = yes
+***************
+*** 1399,1401 ****
+  For example, if you use the default Postfix local delivery agent
+! in <b>/etc/postfix/master.cf</b>, specify:
+  
+--- 1399,1401 ----
+  For example, if you use the default Postfix local delivery agent
+! in <b>!!PREFIX!!/etc/postfix/master.cf</b>, specify:
+  
+***************
+*** 1404,1406 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          local_recipient_maps = $alias_maps, unix:passwd.byname
+--- 1404,1406 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          local_recipient_maps = $alias_maps, unix:passwd.byname
+***************
+*** 1434,1436 ****
+  <pre>
+! /etc/postfix/main.cf:
+      myorigin = domain.name
+--- 1434,1436 ----
+  <pre>
+! !!PREFIX!!/etc/postfix/main.cf:
+      myorigin = domain.name
+***************
+*** 1447,1452 ****
+  <pre>
+! /etc/postfix/main.cf:
+!     virtual_maps = hash:/etc/postfix/virtual
+  
+! /etc/postfix/virtual:
+      root        root@localhost
+--- 1447,1452 ----
+  <pre>
+! !!PREFIX!!/etc/postfix/main.cf:
+!     virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
+  
+! !!PREFIX!!/etc/postfix/virtual:
+      root        root@localhost
+***************
+*** 1463,1465 ****
+  
+! <li>Execute the command <b>postmap /etc/postfix/virtual</b> whenever
+  you edit the the <b>virtual</b> table.
+--- 1463,1465 ----
+  
+! <li>Execute the command <b>postmap !!PREFIX!!/etc/postfix/virtual</b> whenever
+  you edit the the <b>virtual</b> table.
+***************
+*** 1485,1487 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          home_mailbox = Maildir/
+--- 1485,1487 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          home_mailbox = Maildir/
+***************
+*** 1519,1524 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          mailbox_command = /path/to/procmail
+  
+!     /etc/postfix/main.cf:
+          mailbox_command = /path/to/procmail -a $EXTENSION
+--- 1519,1524 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          mailbox_command = /path/to/procmail
+  
+!     !!PREFIX!!/etc/postfix/main.cf:
+          mailbox_command = /path/to/procmail -a $EXTENSION
+***************
+*** 1612,1620 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions = 
+!             ... regexp:/etc/postfix/access_regexp ...
+          smtpd_recipient_restrictions = 
+!             ... pcre:/etc/postfix/access_regexp ...
+  
+!     /etc/postfix/access_regexp:
+          /^(.*)-outgoing@(.*)/   554 Use $1@$2 instead
+--- 1612,1620 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions = 
+!             ... regexp:!!PREFIX!!/etc/postfix/access_regexp ...
+          smtpd_recipient_restrictions = 
+!             ... pcre:!!PREFIX!!/etc/postfix/access_regexp ...
+  
+!     !!PREFIX!!/etc/postfix/access_regexp:
+          /^(.*)-outgoing@(.*)/   554 Use $1@$2 instead
+***************
+*** 1699,1706 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_sender_restrictions =
+!             regexp:/etc/postfix/envelope-regexp
+              reject_unknown_sender_domain
+          smtpd_recipient_restrictions =
+!             regexp:/etc/postfix/envelope-regexp
+              permit_mynetworks
+--- 1699,1706 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_sender_restrictions =
+!             regexp:!!PREFIX!!/etc/postfix/envelope-regexp
+              reject_unknown_sender_domain
+          smtpd_recipient_restrictions =
+!             regexp:!!PREFIX!!/etc/postfix/envelope-regexp
+              permit_mynetworks
+***************
+*** 1708,1710 ****
+  
+!     /etc/postfix/envelope-regexp:
+          /[/|]/  REJECT
+--- 1708,1710 ----
+  
+!     !!PREFIX!!/etc/postfix/envelope-regexp:
+          /[/|]/  REJECT
+***************
+*** 1746,1753 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+!             hash:/etc/postfix/access
+              ..the usual stuff...
+  
+!     /etc/postfix/access:
+          all     permit_mynetworks,reject
+--- 1746,1753 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+!             hash:!!PREFIX!!/etc/postfix/access
+              ..the usual stuff...
+  
+!     !!PREFIX!!/etc/postfix/access:
+          all     permit_mynetworks,reject
+***************
+*** 1783,1787 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+!             hash:/etc/postfix/protected_destinations
+              ..the usual stuff...
+--- 1783,1787 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          smtpd_recipient_restrictions =
+!             hash:!!PREFIX!!/etc/postfix/protected_destinations
+              ..the usual stuff...
+***************
+*** 1789,1793 ****
+          smtpd_restriction_classes = insiders_only
+!         insiders_only = check_sender_access hash:/etc/postfix/insiders, reject
+  
+!     /etc/postfix/protected_destinations:
+          all@my.domain   insiders_only
+--- 1789,1793 ----
+          smtpd_restriction_classes = insiders_only
+!         insiders_only = check_sender_access hash:!!PREFIX!!/etc/postfix/insiders, reject
+  
+!     !!PREFIX!!/etc/postfix/protected_destinations:
+          all@my.domain   insiders_only
+***************
+*** 1795,1797 ****
+  
+!     /etc/postfix/insiders:
+          my.domain       OK
+--- 1795,1797 ----
+  
+!     !!PREFIX!!/etc/postfix/insiders:
+          my.domain       OK
+***************
+*** 1852,1854 ****
+  <pre>
+!     /etc/postfix/virtual:
+          virtual.domain whatever
+--- 1852,1854 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/virtual:
+          virtual.domain whatever
+***************
+*** 1924,1926 ****
+  <pre>
+!     /etc/postfix/virtual:
+          virtual.domain          whatever
+--- 1924,1926 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/virtual:
+          virtual.domain          whatever
+***************
+*** 1931,1933 ****
+  
+! <li>Execute the command <b>postmap /etc/postfix/virtual</b> whenever
+  you edit the virtual database.
+--- 1931,1933 ----
+  
+! <li>Execute the command <b>postmap !!PREFIX!!/etc/postfix/virtual</b> whenever
+  you edit the virtual database.
+***************
+*** 1977,1979 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          recipient_delimiter = +
+--- 1977,1979 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          recipient_delimiter = +
+***************
+*** 1981,1985 ****
+              ...non-regexp virtual maps...
+!             regexp:/etc/postfix/virtual_regexp
+  
+!     /etc/postfix/virtual_regexp:
+          /^virtual\.domain$/             whatever
+--- 1981,1985 ----
+              ...non-regexp virtual maps...
+!             regexp:!!PREFIX!!/etc/postfix/virtual_regexp
+  
+!     !!PREFIX!!/etc/postfix/virtual_regexp:
+          /^virtual\.domain$/             whatever
+***************
+*** 2029,2031 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          masquerade_domains = $mydomain
+--- 2029,2031 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          masquerade_domains = $mydomain
+***************
+*** 2056,2058 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          masquerade_exceptions = root
+--- 2056,2058 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          masquerade_exceptions = root
+***************
+*** 2068,2070 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          masquerade_domains = somehost.my.domain otherhost.my.domain $mydomain
+--- 2068,2070 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          masquerade_domains = somehost.my.domain otherhost.my.domain $mydomain
+***************
+*** 2114,2116 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          mailbox_command = /some/program ...
+--- 2114,2116 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          mailbox_command = /some/program ...
+***************
+*** 2129,2131 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          mailbox_transport = foo
+--- 2129,2131 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          mailbox_transport = foo
+***************
+*** 2136,2138 ****
+  This example delegates local mailbox delivery to the transport
+! <i>foo</i> as configured in <b>/etc/postfix/master.cf</b>. If you
+  follow this route you will build something around the pipe mailer.
+--- 2136,2138 ----
+  This example delegates local mailbox delivery to the transport
+! <i>foo</i> as configured in <b>!!PREFIX!!/etc/postfix/master.cf</b>. If you
+  follow this route you will build something around the pipe mailer.
+***************
+*** 2168,2170 ****
+  <pre>
+!     /etc/postfix/transport:
+          some.domain     uucp:uucp-host
+--- 2168,2170 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/transport:
+          some.domain     uucp:uucp-host
+***************
+*** 2180,2182 ****
+  
+! <li>Execute the command <b>postmap /etc/postfix/transport</b> whenever
+  you change the <b>transport</b> file.
+--- 2180,2182 ----
+  
+! <li>Execute the command <b>postmap !!PREFIX!!/etc/postfix/transport</b> whenever
+  you change the <b>transport</b> file.
+***************
+*** 2190,2193 ****
+  <pre>
+!     /etc/postfix/main.cf:
+!         transport_maps = hash:/etc/postfix/transport
+  </pre>
+--- 2190,2193 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+!         transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+  </pre>
+***************
+*** 2205,2207 ****
+  <pre>
+!     /etc/postfix/master.cf:
+          uucp      unix  -       n       n       -       -       pipe
+--- 2205,2207 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/master.cf:
+          uucp      unix  -       n       n       -       -       pipe
+***************
+*** 2225,2227 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          relay_domains = some.domain $mydestination ...
+--- 2225,2227 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          relay_domains = some.domain $mydestination ...
+***************
+*** 2263,2265 ****
+  <pre>
+!     /etc/postfix/main.cf:
+          relayhost = uucp-gateway
+--- 2263,2265 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/main.cf:
+          relayhost = uucp-gateway
+***************
+*** 2275,2277 ****
+  <pre>
+!     /etc/postfix/master.cf:
+          uucp      unix  -       n       n       -       -       pipe
+--- 2275,2277 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/master.cf:
+          uucp      unix  -       n       n       -       -       pipe
+***************
+*** 2308,2310 ****
+  <pre>
+!     /etc/postfix/master.cf:
+          fax       unix  -       n       n       -       -       pipe
+--- 2308,2310 ----
+  <pre>
+!     !!PREFIX!!/etc/postfix/master.cf:
+          fax       unix  -       n       n       -       -       pipe
+***************
+*** 2312,2318 ****
+  
+!     /etc/postfix/transport:
+          fax.your.domain   fax:localhost
+  
+!     /etc/postfix/main.cf:
+!         transport_maps = hash:/etc/postfix/transport
+  	fax_destination_recipient_limit = 1
+--- 2312,2318 ----
+  
+!     !!PREFIX!!/etc/postfix/transport:
+          fax.your.domain   fax:localhost
+  
+!     !!PREFIX!!/etc/postfix/main.cf:
+!         transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+  	fax_destination_recipient_limit = 1
diff --git a/mail/postfix-current/files/patch-bf b/mail/postfix-current/files/patch-bf
index 4de8178..d652e1e 100644
--- a/mail/postfix-current/files/patch-bf
+++ b/mail/postfix-current/files/patch-bf
@@ -1,19 +1,13 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
+*** ./html/cleanup.8.html.orig	Sun May 28 21:58:41 2000
+--- ./html/cleanup.8.html	Thu Jun  1 22:29:04 2000
 ***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
+*** 174,177 ****
+  <b>FILES</b>
+!        /etc/postfix/canonical*, canonical mapping table
+!        /etc/postfix/virtual*, virtual mapping table
+  
+--- 174,177 ----
+  <b>FILES</b>
+!        !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
+!        !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
+  
diff --git a/mail/postfix-current/files/patch-bg b/mail/postfix-current/files/patch-bg
index fb2b093..ce2454e 100644
--- a/mail/postfix-current/files/patch-bg
+++ b/mail/postfix-current/files/patch-bg
@@ -1,19 +1,13 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
+*** ./html/master.8.html.orig	Tue Mar  7 10:48:56 2000
+--- ./html/master.8.html	Thu Jun  1 22:29:24 2000
 ***************
-*** 75,81 ****
-  .ad
-  .fi
-  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
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  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
-  configuration parameter.
-  
+*** 148,151 ****
+  <b>FILES</b>
+!        /etc/postfix/main.cf: global configuration file.
+!        /etc/postfix/master.cf: master process configuration file.
+         /var/spool/postfix/pid/master.pid: master lock file.
+--- 148,151 ----
+  <b>FILES</b>
+!        !!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/postfix-current/files/patch-bh b/mail/postfix-current/files/patch-bh
index 42b7373..a20232e 100644
--- a/mail/postfix-current/files/patch-bh
+++ b/mail/postfix-current/files/patch-bh
@@ -1,21 +1,11 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
+*** ./html/goals.html.orig	Sun May  9 15:44:18 1999
+--- ./html/goals.html	Thu Jun  1 22:30:14 2000
 ***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
+*** 45,47 ****
+  <li>Compatibility. Postfix is designed to be sendmail-compatible
+! to make migration easy.  Postfix supports <b>/var[/spool]/mail</b>,
+  <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files.
+--- 45,47 ----
+  <li>Compatibility. Postfix is designed to be sendmail-compatible
+! to make migration easy.  Postfix supports <b>/var/mail</b>,
+  <b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files.
diff --git a/mail/postfix-current/files/patch-bi b/mail/postfix-current/files/patch-bi
index 2b57467..7e4acdb 100644
--- a/mail/postfix-current/files/patch-bi
+++ b/mail/postfix-current/files/patch-bi
@@ -1,21 +1,11 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
+*** ./html/postdrop.1.html.orig	Mon May  3 15:05:12 1999
+--- ./html/postdrop.1.html	Thu Jun  1 22:30:47 2000
 ***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!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.
-  .SH SEE ALSO
-  .na
+*** 48,50 ****
+         /var/spool/postfix, mail queue
+!        /etc/postfix, configuration files
+  
+--- 48,50 ----
+         /var/spool/postfix, mail queue
+!        !!PREFIX!!/etc/postfix, configuration files
+  
diff --git a/mail/postfix-current/files/patch-bj b/mail/postfix-current/files/patch-bj
index 99c5213..00e78d0 100644
--- a/mail/postfix-current/files/patch-bj
+++ b/mail/postfix-current/files/patch-bj
@@ -1,20 +1,42 @@
---- 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
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
+*** ./html/uce.html.orig	Fri Dec 31 15:06:07 1999
+--- ./html/uce.html	Thu Jun  1 22:31:37 2000
+***************
+*** 126,130 ****
+  
+! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b>
+  
+! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b>
+  
+--- 126,130 ----
+  
+! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b>
+  
+! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b>
+  
+***************
+*** 169,171 ****
+  
+! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access,
+  reject_maps_rbl</b>
+--- 169,171 ----
+  
+! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access,
+  reject_maps_rbl</b>
+***************
+*** 474,476 ****
+  
+! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access,
+  reject_unknown_sender_domain</b>
+--- 474,476 ----
+  
+! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access,
+  reject_unknown_sender_domain</b>
+***************
+*** 856,858 ****
+  <dd> <b>smtpd_etrn_restrictions = permit_mynetworks,
+! hash:/etc/postfix/etrn_access, reject</b>
+  
+--- 856,858 ----
+  <dd> <b>smtpd_etrn_restrictions = permit_mynetworks,
+! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b>
+  
diff --git a/mail/postfix-current/files/patch-bk b/mail/postfix-current/files/patch-bk
index 3350e88..62a0573 100644
--- a/mail/postfix-current/files/patch-bk
+++ b/mail/postfix-current/files/patch-bk
@@ -1,10 +1,29 @@
---- 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
+*** ./html/rate.html.orig	Wed Mar 17 17:55:22 1999
+--- ./html/rate.html	Thu Jun  1 22:32:19 2000
+***************
+*** 224,226 ****
+  
+! <dt>/etc/postfix/main.cf:
+  
+--- 224,226 ----
+  
+! <dt>!!PREFIX!!/etc/postfix/main.cf:
+  
+***************
+*** 237,239 ****
+  
+! <dt>/etc/postfix/<a href="transport.5.html">transport</a>:
+  
+--- 237,239 ----
+  
+! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>:
+  
+***************
+*** 253,255 ****
+  
+! <dt>/etc/postfix/master.cf:
+  
+--- 253,255 ----
+  
+! <dt>!!PREFIX!!/etc/postfix/master.cf:
+  
diff --git a/mail/postfix-current/files/patch-bl b/mail/postfix-current/files/patch-bl
new file mode 100644
index 0000000..176c7d1
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-bm b/mail/postfix-current/files/patch-bm
new file mode 100644
index 0000000..5b779eb
--- /dev/null
+++ b/mail/postfix-current/files/patch-bm
@@ -0,0 +1,20 @@
+*** ./html/relocated.5.html.orig	Sat Apr 22 20:28:37 2000
+--- ./html/relocated.5.html	Thu Jun  1 22:33:09 2000
+***************
+*** 11,13 ****
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>/etc/postfix/relocated</b>
+  
+--- 11,13 ----
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
+  
+***************
+*** 21,23 ****
+         used  for  fast  searching by the mail system. Execute the
+!        command <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild
+         the indexed file after changing the relocated table.
+--- 21,23 ----
+         used  for  fast  searching by the mail system. Execute the
+!        command <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild
+         the indexed file after changing the relocated table.
diff --git a/mail/postfix-current/files/patch-bn b/mail/postfix-current/files/patch-bn
new file mode 100644
index 0000000..21e69dc
--- /dev/null
+++ b/mail/postfix-current/files/patch-bn
@@ -0,0 +1,56 @@
+*** ./html/rewrite.html.orig	Sat May  8 17:51:41 1999
+--- ./html/rewrite.html	Thu Jun  1 22:34:21 2000
+***************
+*** 194,196 ****
+  
+! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b>
+  
+--- 194,196 ----
+  
+! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b>
+  
+***************
+*** 207,209 ****
+  
+! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b>
+  
+--- 207,209 ----
+  
+! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b>
+  
+***************
+*** 211,213 ****
+  
+! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b>
+  
+--- 211,213 ----
+  
+! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b>
+  
+***************
+*** 295,297 ****
+  
+! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b>
+  
+--- 295,297 ----
+  
+! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b>
+  
+***************
+*** 323,325 ****
+  
+! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b>
+  
+--- 323,325 ----
+  
+! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b>
+  
+***************
+*** 348,350 ****
+  
+! <dd><b>transport_maps = hash:/etc/postfix/transport</b>
+  
+--- 348,350 ----
+  
+! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b>
+  
diff --git a/mail/postfix-current/files/patch-bo b/mail/postfix-current/files/patch-bo
new file mode 100644
index 0000000..d36eda1
--- /dev/null
+++ b/mail/postfix-current/files/patch-bo
@@ -0,0 +1,20 @@
+*** ./html/transport.5.html.orig	Sat Apr 22 20:28:37 2000
+--- ./html/transport.5.html	Thu Jun  1 22:35:04 2000
+***************
+*** 11,13 ****
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>/etc/postfix/transport</b>
+  
+--- 11,13 ----
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
+  
+***************
+*** 22,24 ****
+         used for fast searching by the mail  system.  Execute  the
+!        command <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild
+         the indexed file after changing the transport table.
+--- 22,24 ----
+         used for fast searching by the mail  system.  Execute  the
+!        command <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild
+         the indexed file after changing the transport table.
diff --git a/mail/postfix-current/files/patch-bp b/mail/postfix-current/files/patch-bp
new file mode 100644
index 0000000..6d7f1bb
--- /dev/null
+++ b/mail/postfix-current/files/patch-bp
@@ -0,0 +1,20 @@
+*** ./html/virtual.5.html.orig	Sat Apr 22 20:28:38 2000
+--- ./html/virtual.5.html	Thu Jun  1 22:35:20 2000
+***************
+*** 11,13 ****
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>/etc/postfix/virtual</b>
+  
+--- 11,13 ----
+  <b>SYNOPSIS</b>
+!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
+  
+***************
+*** 28,30 ****
+         used for fast searching by the mail  system.  Execute  the
+!        command  <b>postmap</b>  <b>/etc/postfix/virtual</b> in order to rebuild
+         the indexed file after changing the virtual table.
+--- 28,30 ----
+         used for fast searching by the mail  system.  Execute  the
+!        command  <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild
+         the indexed file after changing the virtual table.
diff --git a/mail/postfix-current/files/patch-ca b/mail/postfix-current/files/patch-ca
new file mode 100644
index 0000000..86d56f8
--- /dev/null
+++ b/mail/postfix-current/files/patch-ca
@@ -0,0 +1,11 @@
+*** ./man/man1/postdrop.1.orig	Mon May  3 15:03:29 1999
+--- ./man/man1/postdrop.1	Thu Jun  1 22:38:54 2000
+***************
+*** 53,55 ****
+  /var/spool/postfix, mail queue
+! /etc/postfix, configuration files
+  .SH CONFIGURATION PARAMETERS
+--- 53,55 ----
+  /var/spool/postfix, mail queue
+! !!PREFIX!!/etc/postfix, configuration files
+  .SH CONFIGURATION PARAMETERS
diff --git a/mail/postfix-current/files/patch-cb b/mail/postfix-current/files/patch-cb
new file mode 100644
index 0000000..58559c7
--- /dev/null
+++ b/mail/postfix-current/files/patch-cb
@@ -0,0 +1,20 @@
+*** ./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/postfix-current/files/patch-cc b/mail/postfix-current/files/patch-cc
new file mode 100644
index 0000000..cd69460
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-cd b/mail/postfix-current/files/patch-cd
new file mode 100644
index 0000000..b51de44
--- /dev/null
+++ b/mail/postfix-current/files/patch-cd
@@ -0,0 +1,20 @@
+*** ./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/postfix-current/files/patch-ce b/mail/postfix-current/files/patch-ce
new file mode 100644
index 0000000..f77053f
--- /dev/null
+++ b/mail/postfix-current/files/patch-ce
@@ -0,0 +1,20 @@
+*** ./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/postfix-current/files/patch-cf b/mail/postfix-current/files/patch-cf
new file mode 100644
index 0000000..28fb053
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-cg b/mail/postfix-current/files/patch-cg
new file mode 100644
index 0000000..0ae82cc
--- /dev/null
+++ b/mail/postfix-current/files/patch-cg
@@ -0,0 +1,20 @@
+*** ./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/postfix-current/files/patch-ch b/mail/postfix-current/files/patch-ch
new file mode 100644
index 0000000..3ed047e
--- /dev/null
+++ b/mail/postfix-current/files/patch-ch
@@ -0,0 +1,20 @@
+*** ./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/postfix-current/files/patch-ci b/mail/postfix-current/files/patch-ci
new file mode 100644
index 0000000..1a7cf4a
--- /dev/null
+++ b/mail/postfix-current/files/patch-ci
@@ -0,0 +1,20 @@
+*** ./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/postfix-current/files/patch-cj b/mail/postfix-current/files/patch-cj
new file mode 100644
index 0000000..50448f2
--- /dev/null
+++ b/mail/postfix-current/files/patch-cj
@@ -0,0 +1,13 @@
+*** ./man/man8/cleanup.8.orig	Sun May 28 21:58:32 2000
+--- ./man/man8/cleanup.8	Thu Jun  1 22:42:21 2000
+***************
+*** 136,139 ****
+  .nf
+! /etc/postfix/canonical*, canonical mapping table
+! /etc/postfix/virtual*, virtual mapping table
+  .SH LICENSE
+--- 136,139 ----
+  .nf
+! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
+! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
+  .SH LICENSE
diff --git a/mail/postfix-current/files/patch-ck b/mail/postfix-current/files/patch-ck
new file mode 100644
index 0000000..6e1ddce
--- /dev/null
+++ b/mail/postfix-current/files/patch-ck
@@ -0,0 +1,11 @@
+*** ./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/postfix-current/files/patch-cl b/mail/postfix-current/files/patch-cl
new file mode 100644
index 0000000..44c8a3a
--- /dev/null
+++ b/mail/postfix-current/files/patch-cl
@@ -0,0 +1,13 @@
+*** ./man/man8/master.8.orig	Tue Mar  7 10:48:19 2000
+--- ./man/man8/master.8	Thu Jun  1 22:43:02 2000
+***************
+*** 120,123 ****
+  .nf
+! /etc/postfix/main.cf: global configuration file.
+! /etc/postfix/master.cf: master process configuration file.
+  /var/spool/postfix/pid/master.pid: master lock file.
+--- 120,123 ----
+  .nf
+! !!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/postfix-current/files/patch-da b/mail/postfix-current/files/patch-da
new file mode 100644
index 0000000..e57e317
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-db b/mail/postfix-current/files/patch-db
new file mode 100644
index 0000000..7f89fb7
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-dc b/mail/postfix-current/files/patch-dc
new file mode 100644
index 0000000..786f2da
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-dd b/mail/postfix-current/files/patch-dd
new file mode 100644
index 0000000..b65a57f
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-de b/mail/postfix-current/files/patch-de
new file mode 100644
index 0000000..73bb2af
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-df b/mail/postfix-current/files/patch-df
new file mode 100644
index 0000000..8d3fba9
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-dg b/mail/postfix-current/files/patch-dg
new file mode 100644
index 0000000..bff20a2
--- /dev/null
+++ b/mail/postfix-current/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/postfix-current/files/patch-ea b/mail/postfix-current/files/patch-ea
new file mode 100644
index 0000000..80647e0
--- /dev/null
+++ b/mail/postfix-current/files/patch-ea
@@ -0,0 +1,13 @@
+*** ./cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
+--- ./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/postfix-current/files/patch-eb b/mail/postfix-current/files/patch-eb
new file mode 100644
index 0000000..d576de4
--- /dev/null
+++ b/mail/postfix-current/files/patch-eb
@@ -0,0 +1,11 @@
+*** ./global/mail_conf.c.orig	Sun May  7 18:51:16 2000
+--- ./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/postfix-current/files/patch-ec b/mail/postfix-current/files/patch-ec
new file mode 100644
index 0000000..74edda7
--- /dev/null
+++ b/mail/postfix-current/files/patch-ec
@@ -0,0 +1,20 @@
+*** ./global/mail_params.h.orig	Wed May 31 19:18:31 2000
+--- ./global/mail_params.h	Thu Jun  1 22:17:10 2000
+***************
+*** 155,157 ****
+  #ifndef DEF_PROGRAM_DIR
+! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
+  #endif
+--- 155,157 ----
+  #ifndef DEF_PROGRAM_DIR
+! #define DEF_PROGRAM_DIR		"!!PREFIX!!/usr/libexec/postfix"
+  #endif
+***************
+*** 189,191 ****
+  #ifndef DEF_CONFIG_DIR
+! #define DEF_CONFIG_DIR		"/etc/postfix"
+  #endif
+--- 189,191 ----
+  #ifndef DEF_CONFIG_DIR
+! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
+  #endif
diff --git a/mail/postfix-current/files/patch-ed b/mail/postfix-current/files/patch-ed
new file mode 100644
index 0000000..b573748
--- /dev/null
+++ b/mail/postfix-current/files/patch-ed
@@ -0,0 +1,11 @@
+*** ./local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
+--- ./local/mailbox.c	Thu Jun  1 22:37:48 2000
+***************
+*** 15,17 ****
+  /*	suppression. The default is direct mailbox delivery to
+! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
+  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
+--- 15,17 ----
+  /*	suppression. The default is direct mailbox delivery to
+! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
+  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix-current/files/patch-ee b/mail/postfix-current/files/patch-ee
new file mode 100644
index 0000000..d79219b
--- /dev/null
+++ b/mail/postfix-current/files/patch-ee
@@ -0,0 +1,13 @@
+*** ./master/master.c.orig	Tue Mar  7 10:25:07 2000
+--- ./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/postfix-current/files/patch-ef b/mail/postfix-current/files/patch-ef
new file mode 100644
index 0000000..44816a0
--- /dev/null
+++ b/mail/postfix-current/files/patch-ef
@@ -0,0 +1,11 @@
+*** ./postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
+--- ./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/postfix-current/files/patch-eg b/mail/postfix-current/files/patch-eg
new file mode 100644
index 0000000..cdf9e30
--- /dev/null
+++ b/mail/postfix-current/files/patch-eg
@@ -0,0 +1,20 @@
+*** ./sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
+--- ./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/postfix-current/files/patch-eh b/mail/postfix-current/files/patch-eh
new file mode 100644
index 0000000..f95b514
--- /dev/null
+++ b/mail/postfix-current/files/patch-eh
@@ -0,0 +1,11 @@
+*** ./trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
+--- ./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/postfix-current/pkg-comment b/mail/postfix-current/pkg-comment
index 2afe8fa..f2bec12 100644
--- a/mail/postfix-current/pkg-comment
+++ b/mail/postfix-current/pkg-comment
@@ -1 +1 @@
-Good alternative to sendmail
+An alternative to widely-used Sendmail
diff --git a/mail/postfix-current/pkg-descr b/mail/postfix-current/pkg-descr
index f5136ef..e1c9889 100644
--- a/mail/postfix-current/pkg-descr
+++ b/mail/postfix-current/pkg-descr
@@ -1,6 +1,8 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
+Postfix attempts to be fast, easy to administer, and secure, while at
+the same time being sendmail-compatible enough to not upset existing
+users.
 
 WWW: http://www.postfix.org/
+
+- Omachonu Ogali
+oogali@intranova.net
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 943a376..6c4d91b 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -1,16 +1,22 @@
 etc/postfix/LICENSE
-etc/postfix/postfix-script
 etc/postfix/sample-access
+etc/postfix/sample-aliases
+etc/postfix/sample-canonical
+etc/postfix/sample-main.cf
+etc/postfix/sample-master.cf
+etc/postfix/sample-regexp_table
+etc/postfix/sample-relocated
+etc/postfix/sample-transport
+etc/postfix/sample-virtual
 etc/postfix/sample-aliases.cf
 etc/postfix/sample-canonical.cf
 etc/postfix/sample-debug.cf
+etc/postfix/sample-filter.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
+etc/postfix/sample-regexp.cf
 etc/postfix/sample-relocated.cf
 etc/postfix/sample-resource.cf
 etc/postfix/sample-rewrite.cf
@@ -21,8 +27,10 @@ etc/postfix/sample-virtual.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
+libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
+libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/qmgr
@@ -30,73 +38,50 @@ libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/trivial-rewrite
+man/man1/mailq.1.gz
+man/man1/postalias.1.gz
+man/man1/postcat.1.gz
+man/man1/postconf.1.gz
+man/man1/postdrop.1.gz
+man/man1/postfix.1.gz
+man/man1/postlock.1.gz
+man/man1/postlog.1.gz
+man/man1/postmap.1.gz
+man/man1/postsuper.1.gz
+man/man1/sendmail.1.gz
+man/man1/newaliases.1.gz
+man/man1/postkick.1.gz
+man/man5/access.5.gz
+man/man5/canonical.5.gz
+man/man5/regexp_table.5.gz
+man/man5/relocated.5.gz
+man/man5/transport.5.gz
+man/man5/virtual.5.gz
+man/man5/aliases.5.gz
+man/man8/bounce.8.gz
+man/man8/defer.8.gz
+man/man8/error.8.gz
+man/man8/lmtp.8.gz
+man/man8/local.8.gz
+man/man8/master.8.gz
+man/man8/pickup.8.gz
+man/man8/pipe.8.gz
+man/man8/qmgr.8.gz
+man/man8/smtp.8.gz
+man/man8/smtpd.8.gz
+man/man8/cleanup.8.gz
+man/man8/showq.8.gz
+man/man8/trivial-rewrite.8.gz
 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
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
+@dirrm etc/postfix
 @dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrm /var/spool/postfix
diff --git a/mail/postfix-current/scripts/configure b/mail/postfix-current/scripts/configure
index a46faa9..5efeadd 100644
--- a/mail/postfix-current/scripts/configure
+++ b/mail/postfix-current/scripts/configure
@@ -2,25 +2,7 @@
 #
 # $FreeBSD$
 
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
+for f in `grep -r "\!\!PREFIX\!\!" ${WRKSRC} | cut -f 1 -d ':' | uniq` ; do \
+	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
+		rm $f.orig
 done