1 files changed, 115 insertions, 77 deletions
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index 2524f0f03f95..84154a9969fd 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -1,38 +1,48 @@
 @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
 @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
+bin/rmail
 etc/postfix/LICENSE
-etc/postfix/install.cf
+etc/postfix/access
+etc/postfix/aliases
+etc/postfix/canonical
+etc/postfix/main.cf
+etc/postfix/main.cf.default
+etc/postfix/master.cf
+etc/postfix/pcre_table
+etc/postfix/post-install
+etc/postfix/postfix-files
 etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
+etc/postfix/regexp_table
+etc/postfix/relocated
 etc/postfix/sample-aliases.cf
-%%SUB_SASL%%etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical
+etc/postfix/sample-auth.cf
 etc/postfix/sample-canonical.cf
+etc/postfix/sample-compatibility.cf
 etc/postfix/sample-debug.cf
 etc/postfix/sample-filter.cf
 etc/postfix/sample-flush.cf
-%%SUB_LDAP%%etc/postfix/sample-ldap.cf
+etc/postfix/sample-ldap.cf
+etc/postfix/sample-lmtp.cf
 etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
 etc/postfix/sample-misc.cf
-%%SUB_PCRE%%etc/postfix/sample-pcre.cf
-%%SUB_PCRE%%etc/postfix/sample-pcre_table
+etc/postfix/sample-pcre-access.cf
+etc/postfix/sample-pcre-body.cf
+etc/postfix/sample-pcre-header.cf
+etc/postfix/sample-qmqpd.cf
 etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp.cf
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
+etc/postfix/sample-regexp-access.cf
+etc/postfix/sample-regexp-body.cf
+etc/postfix/sample-regexp-header.cf
 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
 etc/postfix/sample-virtual.cf
+etc/postfix/transport
+etc/postfix/virtual
+%%SUB_TLS%%etc/postfix/sample-tls.cf
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
@@ -40,15 +50,18 @@ libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
+libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/qmgr
+libexec/postfix/qmqpd
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
-%%SUB_TLS%%libexec/postfix/tlsmgr
 libexec/postfix/trivial-rewrite
+libexec/postfix/virtual
+%%SUB_TLS%%libexec/postfix/tlsmgr
 sbin/postalias
 sbin/postcat
 sbin/postconf
@@ -58,68 +71,93 @@ sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
+sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 %%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
+%%PORTDOCS%%share/doc/postfix/DB_README
+%%PORTDOCS%%share/doc/postfix/DEBUG_README
+%%PORTDOCS%%share/doc/postfix/ETRN_README
+%%PORTDOCS%%share/doc/postfix/FILTER_README
+%%PORTDOCS%%share/doc/postfix/INSTALL
+%%PORTDOCS%%share/doc/postfix/LDAP_README
+%%PORTDOCS%%share/doc/postfix/LINUX_README
+%%PORTDOCS%%share/doc/postfix/LMTP_README
+%%PORTDOCS%%share/doc/postfix/MACOSX_README
+%%PORTDOCS%%share/doc/postfix/MYSQL_README
+%%PORTDOCS%%share/doc/postfix/NFS_README
+%%PORTDOCS%%share/doc/postfix/PACKAGE_README
+%%PORTDOCS%%share/doc/postfix/PCRE_README
+%%PORTDOCS%%share/doc/postfix/QMQP_README
+%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
+%%PORTDOCS%%share/doc/postfix/SASL_README
+%%PORTDOCS%%share/doc/postfix/ULTRIX_README
+%%PORTDOCS%%share/doc/postfix/UUCP_README
+%%PORTDOCS%%share/doc/postfix/VERP_README
+%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
+%%PORTDOCS%%share/doc/postfix/access.5.html
+%%PORTDOCS%%share/doc/postfix/aliases.5.html
+%%PORTDOCS%%share/doc/postfix/architecture.html
+%%PORTDOCS%%share/doc/postfix/backstage.html
+%%PORTDOCS%%share/doc/postfix/basic.html
+%%PORTDOCS%%share/doc/postfix/big-picture.gif
+%%PORTDOCS%%share/doc/postfix/big-picture.html
+%%PORTDOCS%%share/doc/postfix/bounce.8.html
+%%PORTDOCS%%share/doc/postfix/canonical.5.html
+%%PORTDOCS%%share/doc/postfix/cleanup.8.html
+%%PORTDOCS%%share/doc/postfix/commands.html
+%%PORTDOCS%%share/doc/postfix/defer.8.html
+%%PORTDOCS%%share/doc/postfix/delivering.html
+%%PORTDOCS%%share/doc/postfix/error.8.html
+%%PORTDOCS%%share/doc/postfix/faq.html
+%%PORTDOCS%%share/doc/postfix/flush.8.html
+%%PORTDOCS%%share/doc/postfix/goals.html
+%%PORTDOCS%%share/doc/postfix/inbound.gif
+%%PORTDOCS%%share/doc/postfix/index.html
+%%PORTDOCS%%share/doc/postfix/lmtp.8.html
+%%PORTDOCS%%share/doc/postfix/local.8.html
+%%PORTDOCS%%share/doc/postfix/mailq.1.html
+%%PORTDOCS%%share/doc/postfix/master.8.html
+%%PORTDOCS%%share/doc/postfix/motivation.html
+%%PORTDOCS%%share/doc/postfix/newaliases.1.html
+%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
+%%PORTDOCS%%share/doc/postfix/outbound.gif
+%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
+%%PORTDOCS%%share/doc/postfix/pickup.8.html
+%%PORTDOCS%%share/doc/postfix/pipe.8.html
+%%PORTDOCS%%share/doc/postfix/postalias.1.html
+%%PORTDOCS%%share/doc/postfix/postcat.1.html
+%%PORTDOCS%%share/doc/postfix/postconf.1.html
+%%PORTDOCS%%share/doc/postfix/postdrop.1.html
+%%PORTDOCS%%share/doc/postfix/postfix.1.html
+%%PORTDOCS%%share/doc/postfix/postkick.1.html
+%%PORTDOCS%%share/doc/postfix/postlock.1.html
+%%PORTDOCS%%share/doc/postfix/postlog.1.html
+%%PORTDOCS%%share/doc/postfix/postmap.1.html
+%%PORTDOCS%%share/doc/postfix/postqueue.1.html
+%%PORTDOCS%%share/doc/postfix/postsuper.1.html
+%%PORTDOCS%%share/doc/postfix/qmgr.8.html
+%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
+%%PORTDOCS%%share/doc/postfix/queuing.html
+%%PORTDOCS%%share/doc/postfix/rate.html
+%%PORTDOCS%%share/doc/postfix/receiving.html
+%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
+%%PORTDOCS%%share/doc/postfix/relocated.5.html
+%%PORTDOCS%%share/doc/postfix/resource.html
+%%PORTDOCS%%share/doc/postfix/rewrite.html
+%%PORTDOCS%%share/doc/postfix/security.html
+%%PORTDOCS%%share/doc/postfix/sendmail.1.html
+%%PORTDOCS%%share/doc/postfix/showq.8.html
+%%PORTDOCS%%share/doc/postfix/small-picture.gif
+%%PORTDOCS%%share/doc/postfix/smtp.8.html
+%%PORTDOCS%%share/doc/postfix/smtpd.8.html
+%%PORTDOCS%%share/doc/postfix/spawn.8.html
+%%PORTDOCS%%share/doc/postfix/transport.5.html
+%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
+%%PORTDOCS%%share/doc/postfix/uce.html
+%%PORTDOCS%%share/doc/postfix/virtual.5.html
+%%PORTDOCS%%share/doc/postfix/virtual.8.html
+%%PORTDOCS%%@dirrm share/doc/postfix
 @dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@unexec rmdir %D/etc/postfix  2>/dev/null || true