- update to version 3.0.1

- rename OPTIONS to match default name of most ports
  - SASL2 -> SASL
  - OPENLDAP -> LDAP
- install main.cf and master.cf with the @sample macro
- rework pkg-install
- fix wrong permission for /var/db/postfix [1]
- sets WANT_OPENLDAP_SASL option for openldap port when
  postfix LDAP_SASL option is set [2]
- make usage of new ${opt}_DEPENDS notation

Release 3.0.1 or 3.0.2 is now a strong candidate to become the new
default mail/postfix port (missing components are VDA and SPF).

Changelog:
20150211
	Cleanup: strncasecmp_utf8() streamlining. Files: util/stringops.h,
	util/allascii.c, util/strcasecmp_utf8.c.

20150214
	Bugfix (introduced: Postfix 3.0): missing #ifdef USE_TLS
	inside #ifdef USE_SASL_AUTH.  Viktor Dukhovni. File:
	smtpd/smtpd.c.

20150217
	Cleanup: missing <string.h> include. File: util/allascii.c.

20150221
	Bugfix (introduced: Postfix 3.0): don't append '.' to the
	DNS resource record value, when converting TXT records to
	the string form that is used used by xxx_dns_reply_filter.
	File: dns/dns_strrecord.c.

20150313
	Documentation: incorrect Postfix version number for
	postscreen_dnsbl_timeout. Quanah Gibson-Mount. File:
	postscreen/postscreen.c.

20150324
	Bugfix (introduced: Postfix 2.6): sender_dependent_relayhost_maps
	ignored the relayhost setting in the case of a DUNNO lookup
	result.  It would use the recipient domain instead.  Viktor
	Dukhovni. Wietse took the pieces of code that enforce the
	precedence of a sender-dependent relayhost, the global
	relayhost, and the recipient domain, and put that code
	together in once place so that it is easier to maintain.
	File: trivial-rewrite/resolve.c.

20150328
	Bugfix (introduced: Postfix 1.1.0): post-install expanded
	macros in parameter values when trying to detect parameter
	overrides, causing unnecessary main.cf updates during Postfix
	start-up. Julian Reich, Viktor Dukhovni, and Wietse.  File:
	conf/post-install.

20150330
	Bitrot: prepare for future changes in OpenSSL API. Viktor
	Dukhovni. File: tls_dane.c.

PR:	198215 [1]
PR:	198857 [2]

1 files changed, 21 insertions, 9 deletions

diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 895a7f5ef008..a2dadd25aca6 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -1,5 +1,3 @@
-@unexec if cmp -s %D/libexec/postfix/main.cf.proto %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi
-@unexec if cmp -s %D/libexec/postfix/master.cf.proto %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi
 bin/mailq
 bin/newaliases
 %%TEST%%bin/qmqp-sink
@@ -8,19 +6,19 @@ bin/qshape
 bin/rmail
 %%TEST%%bin/smtp-sink
 %%TEST%%bin/smtp-source
-%%INST_BASE%%@cwd /
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-@cwd %%RESETPREFIX%%
+%%PFETC%%/LICENSE
+%%PFETC%%/TLS_LICENSE
+%%PFETC%%/bounce.cf.default
+%%PFETC%%/main.cf.default
+@sample %%PFETC%%/main.cf.sample
+@sample %%PFETC%%/master.cf.sample
 lib/postfix/libpostfix-dns.so
 lib/postfix/libpostfix-global.so
 lib/postfix/libpostfix-master.so
 lib/postfix/libpostfix-tls.so
 lib/postfix/libpostfix-util.so
 %%CDB%%lib/postfix/postfix-cdb.so
-%%OPENLDAP%%lib/postfix/postfix-ldap.so
+%%LDAP%%lib/postfix/postfix-ldap.so
 %%LMDB%%lib/postfix/postfix-lmdb.so
 %%MYSQL%%lib/postfix/postfix-mysql.so
 %%PCRE%%lib/postfix/postfix-pcre.so
@@ -32,6 +30,13 @@ libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/dnsblog
 libexec/postfix/dynamicmaps.cf
+%%CDB%%libexec/postfix/dynamicmaps.cf.d/cdb.cf
+%%LDAP%%libexec/postfix/dynamicmaps.cf.d/ldap.cf
+%%LMDB%%libexec/postfix/dynamicmaps.cf.d/lmdb.cf
+%%MYSQL%%libexec/postfix/dynamicmaps.cf.d/mysql.cf
+%%PCRE%%libexec/postfix/dynamicmaps.cf.d/pcre.cf
+%%PGSQL%%libexec/postfix/dynamicmaps.cf.d/pgsql.cf
+%%SQLITE%%libexec/postfix/dynamicmaps.cf.d/sqlite.cf
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
@@ -46,6 +51,13 @@ libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
+%%CDB%%libexec/postfix/postfix-files.d/cdb-files
+%%LDAP%%libexec/postfix/postfix-files.d/ldap-files
+%%LMDB%%libexec/postfix/postfix-files.d/lmdb-files
+%%MYSQL%%libexec/postfix/postfix-files.d/mysql-files
+%%PCRE%%libexec/postfix/postfix-files.d/pcre-files
+%%PGSQL%%libexec/postfix/postfix-files.d/pgsql-files
+%%SQLITE%%libexec/postfix/postfix-files.d/sqlite-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script