15 files changed, 148 insertions, 875 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 1dca2be8dd36..7387594dd86e 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	20000531
+PORTVERSION=	20001030
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.merit.edu/postfix/experimental/ \
 		ftp://ftp.tux.org/pub/net/postfix/experimental/ \
@@ -16,21 +16,19 @@ MASTER_SITES=	ftp://ftp.merit.edu/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
+DISTNAME=	snapshot-${PORTVERSION}
 
-MAINTAINER=	missnglnk@sneakerz.org
+MAINTAINER=	dwcjr@inethouston.net
 
 .if !defined(DEBUG)
 MAKEFILEFLAGS+= DEBUG=
 .endif
 
 .if defined(CC)
-MAKEFILEFLAGS+= CC=$(CC)
+MAKEFILEFLAGS+= CC="${CC}"
 .endif
 
-.if defined(OPT)
-MAKEFILEFLAGS+= OPT=$(OPT)
-.endif
+MAKEFILEFLAGS+= OPT="${CFLAGS}"
 
 .if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
@@ -39,21 +37,35 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
 
 .if defined(WITH_LDAP)
+CONF2+=			sample-ldap.cf
 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
+PLIST_SUB+=		WITH_LDAP=""
+.else
+PLIST_SUB+=		WITH_LDAP="@comment "
 .endif
 
 .if defined(WITH_PCRE)
+CONF1+=			pcre_table
+CONF2+=			sample-pcre.cf
+MAN5+=			pcre_table.5
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libpcre.a
+PLIST_SUB+=		WITH_PCRE=""
+.else
+PLIST_SUB+=		WITH_PCRE="@comment "
 .endif
 
 .if defined(WITH_SASL)
+CONF2+=			sample-auth.cf
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libsasl.a:${PORTSDIR}/security/cyrus-sasl
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libsasl.a -lpam -lcrypt
+PLIST_SUB+=		WITH_SASL=""
+.else
+PLIST_SUB+=		WITH_SASL="@comment "
 .endif
 
 MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
@@ -63,103 +75,94 @@ MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
 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 \
+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
 
+CONF1=	access aliases canonical main.cf master.cf \
+	regexp_table relocated transport virtual
+
+CONF2=	sample-aliases.cf sample-canonical.cf sample-debug.cf \
+	sample-filter.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
+
+BIN1=	bounce cleanup error lmtp local master nqmgr pickup \
+	pipe qmgr showq smtp smtpd trivial-rewrite
+
+BIN2=	postalias postcat postconf postdrop postfix \
+	postkick postlog postmap postsuper sendmail
+
 post-patch:
 	(cd ${WRKSRC} && make -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-install:
-	@/bin/sh ${PKGINSTALL} Postfix PRE-INSTALL
+	${SH} ${PKGINSTALL} 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 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
-
-.if defined(WITH_PCRE)
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/pcre_table \
-		${PREFIX}/etc/postfix/sample-pcre_table
+	@${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \
+		${PREFIX}/etc/postfix \
+		${PREFIX}/libexec/postfix \
+		/var/spool/postfix
+	@${INSTALL_DATA} ${WRKSRC}/conf/LICENSE ${PREFIX}/etc/postfix
+
+.for file in ${CONF1}
+	@${INSTALL_DATA} \
+		${WRKSRC}/conf/${file} \
+		${PREFIX}/etc/postfix/sample-${file}
+.endfor
+
+.for file in ${CONF2}
+	@${INSTALL_DATA} \
+		${WRKSRC}/conf/${file} \
+		${PREFIX}/etc/postfix
+.endfor
+
+	@${INSTALL_SCRIPT} \
+		${WRKSRC}/conf/postfix-script-sgid \
+		${PREFIX}/etc/postfix/postfix-script
+
+.for file in ${BIN1}
+	@${INSTALL_PROGRAM} \
+		${WRKSRC}/libexec/${file} \
+		${PREFIX}/libexec/postfix
+.endfor
+
+.for file in ${BIN2}
+	@${INSTALL_PROGRAM} \
+		${WRKSRC}/src/${file}/${file} \
+		${PREFIX}/sbin
+.endfor
+
+.for file in ${MAN1}
+	@${INSTALL_MAN} \
+		${WRKSRC}/man/man1/${file} \
+		${PREFIX}/man/man1
+.endfor
+
+.for file in ${MAN5}
+	@${INSTALL_MAN} \
+		${WRKSRC}/man/man5/${file} \
+		${PREFIX}/man/man5
+.endfor
+
+.for file in ${MAN8}
+	@${INSTALL_MAN} \
+		${WRKSRC}/man/man8/${file} \
+		${PREFIX}/man/man8
+.endfor
+
+.if !defined(NOPORTDOCS)
+	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR}
+	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \
+		${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}"
 .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 ; \
-	done
-
-.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 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 \
-		${WRKSRC}/postdrop/postdrop ${PREFIX}/sbin/postdrop
-
-	@for f in ${MAN1} ; do \
-		${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 0644 \
-		${WRKSRC}/man/man5/$$f ${PREFIX}/man/man5/$$f ; \
-	done
-
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 \
-		${WRKSRC}/man/man8/$$f ${PREFIX}/man/man8/$$f ; \
-	done
-
 	@${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 ${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\"                          -"
@@ -169,12 +172,16 @@ do-install:
 
 replace:
 .if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
+	@${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} "#" > /etc/mail/mailer.conf
+	${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
+	${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
+	${ECHO} "#" >> /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 \
@@ -206,4 +213,5 @@ replace:
 		${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 49e46670cae5..13782956a2cd 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1 +1 @@
-MD5 (snapshot-20000531.tar.gz) = 5b25b37dc40e9982ec443cae1bda8c10
+MD5 (snapshot-20001030.tar.gz) = c53af2a2dd52a2ddb92958bb91c14de1
diff --git a/mail/postfix-current/files/patch-be b/mail/postfix-current/files/patch-be
index 1f6e41cb4b58..bef6a3bfaf73 100644
--- a/mail/postfix-current/files/patch-be
+++ b/mail/postfix-current/files/patch-be
@@ -1,715 +1,10 @@
-*** ./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
+--- ./html/faq.html.orig	Sat Oct 28 23:34:51 2000
++++ ./html/faq.html	Sat Oct 28 23:36:04 2000
+@@ -2572,7 +2572,7 @@
+ 
+ Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building
+ Postfix with some incompatible third-party file, typically
+-<b>/usr/local/include/ndbm.h</b>.
++<b>!!PREFIX!!/include/ndbm.h</b>.
+ 
+ <p>
diff --git a/mail/postfix-current/files/patch-ea b/mail/postfix-current/files/patch-ea
index 80647e0b2ba0..6c3f98d2af4f 100644
--- a/mail/postfix-current/files/patch-ea
+++ b/mail/postfix-current/files/patch-ea
@@ -1,5 +1,5 @@
-*** ./cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
+*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
+--- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
 ***************
 *** 118,121 ****
   /* FILES
diff --git a/mail/postfix-current/files/patch-eb b/mail/postfix-current/files/patch-eb
index d576de434580..e67680963d2d 100644
--- a/mail/postfix-current/files/patch-eb
+++ b/mail/postfix-current/files/patch-eb
@@ -1,5 +1,5 @@
-*** ./global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./global/mail_conf.c	Thu Jun  1 22:16:29 2000
+*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
+--- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
 ***************
 *** 53,55 ****
   /* FILES
diff --git a/mail/postfix-current/files/patch-ec b/mail/postfix-current/files/patch-ec
index 74edda76007b..6d12d1ce4c17 100644
--- a/mail/postfix-current/files/patch-ec
+++ b/mail/postfix-current/files/patch-ec
@@ -1,5 +1,5 @@
-*** ./global/mail_params.h.orig	Wed May 31 19:18:31 2000
---- ./global/mail_params.h	Thu Jun  1 22:17:10 2000
+*** ./src/global/mail_params.h.orig	Wed May 31 19:18:31 2000
+--- ./src/global/mail_params.h	Thu Jun  1 22:17:10 2000
 ***************
 *** 155,157 ****
   #ifndef DEF_PROGRAM_DIR
diff --git a/mail/postfix-current/files/patch-ed b/mail/postfix-current/files/patch-ed
index b573748b45e1..f971b62720d8 100644
--- a/mail/postfix-current/files/patch-ed
+++ b/mail/postfix-current/files/patch-ed
@@ -1,5 +1,5 @@
-*** ./local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./local/mailbox.c	Thu Jun  1 22:37:48 2000
+*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
+--- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
 ***************
 *** 15,17 ****
   /*	suppression. The default is direct mailbox delivery to
diff --git a/mail/postfix-current/files/patch-ee b/mail/postfix-current/files/patch-ee
index d79219b1ba62..ef44eac24b73 100644
--- a/mail/postfix-current/files/patch-ee
+++ b/mail/postfix-current/files/patch-ee
@@ -1,5 +1,5 @@
-*** ./master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./master/master.c	Thu Jun  1 22:43:50 2000
+*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
+--- ./src/master/master.c	Thu Jun  1 22:43:50 2000
 ***************
 *** 104,107 ****
   /* FILES
diff --git a/mail/postfix-current/files/patch-ef b/mail/postfix-current/files/patch-ef
index 44816a063b95..586b304a103d 100644
--- a/mail/postfix-current/files/patch-ef
+++ b/mail/postfix-current/files/patch-ef
@@ -1,5 +1,5 @@
-*** ./postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
+*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
+--- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
 ***************
 *** 39,41 ****
   /*	/var/spool/postfix, mail queue
diff --git a/mail/postfix-current/files/patch-eg b/mail/postfix-current/files/patch-eg
index cdf9e3097053..2983bbfd86ea 100644
--- a/mail/postfix-current/files/patch-eg
+++ b/mail/postfix-current/files/patch-eg
@@ -1,5 +1,5 @@
-*** ./sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
+*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
+--- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
 ***************
 *** 57,59 ****
   /*	The path name of the \fBsendmail.cf\fR file. Postfix configuration
diff --git a/mail/postfix-current/files/patch-eh b/mail/postfix-current/files/patch-eh
index f95b51423128..c104c3680d21 100644
--- a/mail/postfix-current/files/patch-eh
+++ b/mail/postfix-current/files/patch-eh
@@ -1,5 +1,5 @@
-*** ./trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
+*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
+--- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
 ***************
 *** 32,34 ****
   /* FILES
diff --git a/mail/postfix-current/files/patch-ei b/mail/postfix-current/files/patch-ei
index f3a0cc82333e..3029372b746e 100644
--- a/mail/postfix-current/files/patch-ei
+++ b/mail/postfix-current/files/patch-ei
@@ -1,5 +1,5 @@
-*** ./smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
---- ./smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
+*** ./src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
+--- ./src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
 ***************
 *** 12,19 ****
     * SASL library.
diff --git a/mail/postfix-current/files/patch-ej b/mail/postfix-current/files/patch-ej
index a118090e5548..6c5cf2e23758 100644
--- a/mail/postfix-current/files/patch-ej
+++ b/mail/postfix-current/files/patch-ej
@@ -1,5 +1,5 @@
-*** ./smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
---- ./smtp/smtp.h	Thu Sep 14 13:04:53 2000
+*** ./src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
+--- ./src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
 ***************
 *** 12,19 ****
     * SASL library.
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index dcc7c370d885..7f5976b37897 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/pkg-install
@@ -85,6 +85,7 @@ if [ x"$2" = xPOST-INSTALL ]; then
         cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
 	    ${PKG_PREFIX}/etc/postfix/master.cf
     fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
+    /usr/sbin/chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
+    /bin/chmod 2555 ${PKG_PREFIX}/sbin/postdrop
+    ${PKG_PREFIX}/sbin/postfix check
 fi
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 6c4d91bb1bb1..0dbe369140bc 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -1,28 +1,32 @@
 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
+%%WITH_SASL%%etc/postfix/sample-auth.cf
+etc/postfix/sample-canonical
 etc/postfix/sample-canonical.cf
 etc/postfix/sample-debug.cf
 etc/postfix/sample-filter.cf
-etc/postfix/sample-ldap.cf
+%%WITH_LDAP%%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
+%%WITH_PCRE%%etc/postfix/sample-pcre.cf
+%%WITH_PCRE%%etc/postfix/sample-pcre_table
 etc/postfix/sample-rate.cf
 etc/postfix/sample-regexp.cf
+etc/postfix/sample-regexp_table
+etc/postfix/sample-relocated
 etc/postfix/sample-relocated.cf
 etc/postfix/sample-resource.cf
 etc/postfix/sample-rewrite.cf
 etc/postfix/sample-smtp.cf
 etc/postfix/sample-smtpd.cf
+etc/postfix/sample-transport
 etc/postfix/sample-transport.cf
+etc/postfix/sample-virtual
 etc/postfix/sample-virtual.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
@@ -38,40 +42,6 @@ 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
@@ -84,4 +54,3 @@ sbin/postdrop
 sbin/sendmail
 @dirrm etc/postfix
 @dirrm libexec/postfix
-@dirrm /var/spool/postfix