Update to postfix 19991231-pl10. Install LDAP_README and MYSQL_README along

with documentation.  Fix manpage generation.  Consistently use INSTALL_*
macros (from postfix-current).  Modify packaging list using WITH_PCRE and
WITH_LDAP PLIST_SUBs (as per postfix-current).  Add knob to enable PCRE (again
from postfix-current).  Use better package description (postfix-current).
Fix PLIST.  Conditionally remove main.cf and master.cf when they are
unmodified from default (postfix-current).  Fully institute new maintainer
as a real one.  :-)

PR:		17777, 19185, 20565, 21819, 22613 (also postfix-current)
Submitted by:	maintainer (THANKS!)

1 files changed, 69 insertions, 60 deletions

diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
index 943a376..5f85728 100644
--- a/mail/postfix23/pkg-plist
+++ b/mail/postfix23/pkg-plist
@@ -1,22 +1,31 @@
+@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
 etc/postfix/LICENSE
 etc/postfix/postfix-script
 etc/postfix/sample-access
+etc/postfix/sample-aliases
 etc/postfix/sample-aliases.cf
+etc/postfix/sample-canonical
 etc/postfix/sample-canonical.cf
 etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
+etc/postfix/sample-filter.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
-etc/postfix/sample-pcre.cf
+%%WITH_PCRE%%etc/postfix/sample-pcre.cf
 etc/postfix/sample-rate.cf
+etc/postfix/sample-regexp.cf
+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
@@ -41,62 +50,62 @@ sbin/postlog
 sbin/postmap
 sbin/postsuper
 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
+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
 @dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrm share/doc/postfix/html
+@dirrm share/doc/postfix