1 files changed, 73 insertions, 60 deletions
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
index 5f8572883b4c..97167cb8ed15 100644
--- a/mail/postfix24/pkg-plist
+++ b/mail/postfix24/pkg-plist
@@ -5,24 +5,29 @@ etc/postfix/postfix-script
 etc/postfix/sample-access
 etc/postfix/sample-aliases
 etc/postfix/sample-aliases.cf
+%%SUB_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
-%%WITH_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-flush.cf
+%%SUB_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
+%%SUB_PCRE%%etc/postfix/sample-pcre.cf
+%%SUB_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
+%%SUB_TLS%%etc/postfix/sample-tls.cf
 etc/postfix/sample-transport
 etc/postfix/sample-transport.cf
 etc/postfix/sample-virtual
@@ -30,6 +35,8 @@ etc/postfix/sample-virtual.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
+libexec/postfix/flush
+libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
 libexec/postfix/pickup
@@ -38,6 +45,8 @@ libexec/postfix/qmgr
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
+libexec/postfix/spawn
+%%SUB_TLS%%libexec/postfix/tlsmgr
 libexec/postfix/trivial-rewrite
 sbin/postalias
 sbin/postcat
@@ -50,62 +59,66 @@ sbin/postlog
 sbin/postmap
 sbin/postsuper
 sbin/sendmail
-share/doc/postfix/LDAP_README
-share/doc/postfix/MYSQL_README
-share/doc/postfix/html/access.5.html
-share/doc/postfix/html/aliases.5.html
-share/doc/postfix/html/architecture.html
-share/doc/postfix/html/backstage.html
-share/doc/postfix/html/basic.html
-share/doc/postfix/html/big-picture.gif
-share/doc/postfix/html/big-picture.html
-share/doc/postfix/html/bounce.8.html
-share/doc/postfix/html/canonical.5.html
-share/doc/postfix/html/cleanup.8.html
-share/doc/postfix/html/commands.html
-share/doc/postfix/html/defer.8.html
-share/doc/postfix/html/delivering.html
-share/doc/postfix/html/error.8.html
-share/doc/postfix/html/faq.html
-share/doc/postfix/html/goals.html
-share/doc/postfix/html/inbound.gif
-share/doc/postfix/html/index.html
-share/doc/postfix/html/local.8.html
-share/doc/postfix/html/mailq.1.html
-share/doc/postfix/html/master.8.html
-share/doc/postfix/html/motivation.html
-share/doc/postfix/html/newaliases.1.html
-share/doc/postfix/html/outbound.gif
-share/doc/postfix/html/pickup.8.html
-share/doc/postfix/html/pipe.8.html
-share/doc/postfix/html/postalias.1.html
-share/doc/postfix/html/postcat.1.html
-share/doc/postfix/html/postconf.1.html
-share/doc/postfix/html/postdrop.1.html
-share/doc/postfix/html/postfix.1.html
-share/doc/postfix/html/postkick.1.html
-share/doc/postfix/html/postlock.1.html
-share/doc/postfix/html/postlog.1.html
-share/doc/postfix/html/postmap.1.html
-share/doc/postfix/html/postsuper.1.html
-share/doc/postfix/html/qmgr.8.html
-share/doc/postfix/html/queuing.html
-share/doc/postfix/html/rate.html
-share/doc/postfix/html/receiving.html
-share/doc/postfix/html/relocated.5.html
-share/doc/postfix/html/resource.html
-share/doc/postfix/html/rewrite.html
-share/doc/postfix/html/security.html
-share/doc/postfix/html/sendmail.1.html
-share/doc/postfix/html/showq.8.html
-share/doc/postfix/html/small-picture.gif
-share/doc/postfix/html/smtp.8.html
-share/doc/postfix/html/smtpd.8.html
-share/doc/postfix/html/transport.5.html
-share/doc/postfix/html/trivial-rewrite.8.html
-share/doc/postfix/html/uce.html
-share/doc/postfix/html/virtual.5.html
-@dirrm etc/postfix
+%%SUB_TEST%%sbin/smtp-sink
+%%SUB_TEST%%sbin/smtp-source
+%%SUB_DOCS%%share/doc/postfix/access.5.html
+%%SUB_DOCS%%share/doc/postfix/aliases.5.html
+%%SUB_DOCS%%share/doc/postfix/architecture.html
+%%SUB_DOCS%%share/doc/postfix/backstage.html
+%%SUB_DOCS%%share/doc/postfix/basic.html
+%%SUB_DOCS%%share/doc/postfix/big-picture.gif
+%%SUB_DOCS%%share/doc/postfix/big-picture.html
+%%SUB_DOCS%%share/doc/postfix/bounce.8.html
+%%SUB_DOCS%%share/doc/postfix/canonical.5.html
+%%SUB_DOCS%%share/doc/postfix/cleanup.8.html
+%%SUB_DOCS%%share/doc/postfix/commands.html
+%%SUB_DOCS%%share/doc/postfix/defer.8.html
+%%SUB_DOCS%%share/doc/postfix/delivering.html
+%%SUB_DOCS%%share/doc/postfix/error.8.html
+%%SUB_DOCS%%share/doc/postfix/faq.html
+%%SUB_DOCS%%share/doc/postfix/flush.8.html
+%%SUB_DOCS%%share/doc/postfix/goals.html
+%%SUB_DOCS%%share/doc/postfix/inbound.gif
+%%SUB_DOCS%%share/doc/postfix/index.html
+%%SUB_DOCS%%share/doc/postfix/lmtp.8.html
+%%SUB_DOCS%%share/doc/postfix/local.8.html
+%%SUB_DOCS%%share/doc/postfix/mailq.1.html
+%%SUB_DOCS%%share/doc/postfix/master.8.html
+%%SUB_DOCS%%share/doc/postfix/motivation.html
+%%SUB_DOCS%%share/doc/postfix/newaliases.1.html
+%%SUB_DOCS%%share/doc/postfix/outbound.gif
+%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html
+%%SUB_DOCS%%share/doc/postfix/pickup.8.html
+%%SUB_DOCS%%share/doc/postfix/pipe.8.html
+%%SUB_DOCS%%share/doc/postfix/postalias.1.html
+%%SUB_DOCS%%share/doc/postfix/postcat.1.html
+%%SUB_DOCS%%share/doc/postfix/postconf.1.html
+%%SUB_DOCS%%share/doc/postfix/postdrop.1.html
+%%SUB_DOCS%%share/doc/postfix/postfix.1.html
+%%SUB_DOCS%%share/doc/postfix/postkick.1.html
+%%SUB_DOCS%%share/doc/postfix/postlock.1.html
+%%SUB_DOCS%%share/doc/postfix/postlog.1.html
+%%SUB_DOCS%%share/doc/postfix/postmap.1.html
+%%SUB_DOCS%%share/doc/postfix/postsuper.1.html
+%%SUB_DOCS%%share/doc/postfix/qmgr.8.html
+%%SUB_DOCS%%share/doc/postfix/queuing.html
+%%SUB_DOCS%%share/doc/postfix/rate.html
+%%SUB_DOCS%%share/doc/postfix/receiving.html
+%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html
+%%SUB_DOCS%%share/doc/postfix/relocated.5.html
+%%SUB_DOCS%%share/doc/postfix/resource.html
+%%SUB_DOCS%%share/doc/postfix/rewrite.html
+%%SUB_DOCS%%share/doc/postfix/security.html
+%%SUB_DOCS%%share/doc/postfix/sendmail.1.html
+%%SUB_DOCS%%share/doc/postfix/showq.8.html
+%%SUB_DOCS%%share/doc/postfix/small-picture.gif
+%%SUB_DOCS%%share/doc/postfix/smtp.8.html
+%%SUB_DOCS%%share/doc/postfix/smtpd.8.html
+%%SUB_DOCS%%share/doc/postfix/spawn.8.html
+%%SUB_DOCS%%share/doc/postfix/transport.5.html
+%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%SUB_DOCS%%share/doc/postfix/uce.html
+%%SUB_DOCS%%share/doc/postfix/virtual.5.html
+%%SUB_DOCS%%@dirrm share/doc/postfix
 @dirrm libexec/postfix
-@dirrm share/doc/postfix/html
-@dirrm share/doc/postfix
+@dirrm etc/postfix