- update to postfix-3.0-20150129

- fix build on FreeBSD 11 [1]
- use OPENSSL=yes instead including Mk/bsd.openssl.mk

- enable TLS as default option.
  Postfix uses a secure default configuration if TLS is not configured.

	$ postconf -d | grep use_tls
	lmtp_use_tls = no
	postscreen_use_tls = $smtpd_use_tls
	smtp_use_tls = no
	smtpd_use_tls = no
	tlsproxy_use_tls = $smtpd_use_tls

Changes:
Many fixes, improvements and cleanups. The list is really to long,
please read the original Changelog on your favor postfix mirror.

[1] Noted by sbruno@

4 files changed, 28 insertions, 29 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 0c945aa..8e1b8e8 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	2.12-20141228
+DISTVERSION=	3.0-20150129
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -22,9 +22,10 @@ LICENSE_NAME=	IBM PUBLIC LICENSE VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-CONFLICTS_INSTALL=	courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2[789]-* \
-		postfix21?-* sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \
-		opensmtpd-[0-9]* postfix-tls-*
+CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* \
+		postfix-2.* postfix-base-2.* postfix2[789]-* \
+		postfix21?-* postfix-tls-* \
+		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.*
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
@@ -43,7 +44,7 @@ OPTIONS_DEFINE=	BDB CDB DOCS EAI INST_BASE LDAP_SASL LMDB MYSQL NIS \
 OPTIONS_RADIO=		RG1 RG2
 OPTIONS_RADIO_RG1=	DOVECOT DOVECOT2
 OPTIONS_RADIO_RG2=	SASLKRB5 SASLKMIT
-OPTIONS_DEFAULT=	PCRE
+OPTIONS_DEFAULT=	PCRE TLS
 
 PCRE_DESC=	Perl Compatible Regular Expressions
 EAI_DESC=	Email Address Internationalization (EAI, RFC 6531..6533)
@@ -183,10 +184,12 @@ POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -l
 .endif
 
 .if ${PORT_OPTIONS:MTLS}
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=		yes
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
-# XXX LDFLAGS possible distrubs dynamic building 
+# XXX LDFLAGS possible breaks dynamic building 
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
+.else
+POSTFIX_CCARGS+=	-DNO_TLS
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
@@ -198,9 +201,6 @@ PATCHFILES+=		postfix-2.8.0-libspf2-1.2.x-0.patch.gz
 PATCH_DIST_STRIP=	-p1
 POSTFIX_CCARGS+=	-DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lspf2
-PLIST_SUB+=		SPF=""
-.else
-PLIST_SUB+=		SPF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
@@ -263,9 +263,6 @@ BROKEN=		At the moment, VDA support is unavailable for ${PORTNAME}-${DISTVERSION
 .if ${PORT_OPTIONS:MTEST}
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
-PLIST_SUB+=	TEST=""
-.else
-PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLMDB}
@@ -335,7 +332,8 @@ do-configure:
 	${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \
 	shared=yes shlib_directory=${SHLIB_DIRECTORY} \
 	dynamicmaps=yes \
-	${POSTFIX_DYN_AUXLIBS} AUXLIBS="${POSTFIX_AUXLIBS}" && \
+	${POSTFIX_DYN_AUXLIBS} \
+	AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-install:
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index ea37cd0..c987069 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postfix/postfix-2.12-20141228.tar.gz) = e9a6fc4dc8aab6cdbfff15aff58c15bd1839ce294c53afb032f2d1c4b29ddddc
-SIZE (postfix/postfix-2.12-20141228.tar.gz) = 4236173
+SHA256 (postfix/postfix-3.0-20150129.tar.gz) = d8055245af463e286513ac143ccfbae6f09ceefb3f7c689f24bcc7413f269fe7
+SIZE (postfix/postfix-3.0-20150129.tar.gz) = 4239461
diff --git a/mail/postfix-current/files/patch-makedefs b/mail/postfix-current/files/patch-makedefs
index 9840edb..1f508a0 100644
--- a/mail/postfix-current/files/patch-makedefs
+++ b/mail/postfix-current/files/patch-makedefs
@@ -1,12 +1,17 @@
---- makedefs.orig	2014-01-20 23:24:30.000000000 +0000
-+++ makedefs	2014-01-20 23:25:24.000000000 +0000
-@@ -158,6 +158,10 @@
+--- makedefs.orig	2015-01-18 00:10:28 UTC
++++ makedefs
+@@ -235,6 +235,15 @@ case "$SYSTEM.$RELEASE" in
+ 		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ 		: ${PLUGIN_LD="${CC} -shared"}
  		;;
-   FreeBSD.9*)	SYSTYPE=FREEBSD9
- 		;;
-+  FreeBSD.10*)	SYSTYPE=FREEBSD10
-+		;;
 +  FreeBSD.11*)	SYSTYPE=FREEBSD11
++		: ${CC=cc}
++		: ${SHLIB_SUFFIX=.so}
++		: ${SHLIB_CFLAGS=-fPIC}
++		: ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
++		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
++		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
++		: ${PLUGIN_LD="${CC} -shared"}
 +		;;
   DragonFly.*)	SYSTYPE=DRAGONFLY
  		;;
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 941c8e5..46192e2 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -141,18 +141,14 @@ libexec/postfix/virtual
 sbin/postalias
 sbin/postcat
 sbin/postconf
+@(,maildrop,2755) sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
-@group maildrop
-@mode 2755
-sbin/postdrop
-sbin/postqueue
-@group
-@mode
+@(,maildrop,2755) sbin/postqueue
 sbin/postsuper
 sbin/posttls-finger
 sbin/sendmail