- fix 2013Q3 build

  some previous bulk commits are missing, fix the manually

PR:		212657
Reported by:	fredrik.eriksson_at_loopia.se
Approved by:	portmgr (implicit)

6 files changed, 36 insertions, 13 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 8df9f1fba77a..dcee966ed461 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-PORTVERSION=	3.1.1
+PORTVERSION=	3.1.2
 PORTEPOCH=	1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
 		http://de.postfix.org/ftpmirror/ \
@@ -48,7 +48,7 @@ OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
 OPTIONS_DEFAULT=	PCRE TLS
 
-BDB_USE=		BDB=yes
+BDB_USES=		bdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
@@ -58,7 +58,7 @@ PGSQL_USES=		pgsql
 SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SQLITE_USES=		sqlite
-TLS_USE=		OPENSSL=yes
+TLS_USES=		ssl
 
 CDB_DESC=	CDB maps lookups
 INST_BASE_DESC=	Install into /usr and /etc/postfix
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index bbb0a3882626..961f149eec26 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463345893
-SHA256 (postfix/postfix-3.1.1.tar.gz) = 3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982
-SIZE (postfix/postfix-3.1.1.tar.gz) = 4337295
+TIMESTAMP = 1472342160
+SHA256 (postfix/postfix-3.1.2.tar.gz) = 1ab9b4ee6bf9eb37d2467a63244132aab22ac23b91a72f327334e236b0d30f6b
+SIZE (postfix/postfix-3.1.2.tar.gz) = 4337569
diff --git a/mail/postfix/files/patch-makedefs b/mail/postfix/files/patch-makedefs
index 1f508a00ba74..5abe3f061e08 100644
--- a/mail/postfix/files/patch-makedefs
+++ b/mail/postfix/files/patch-makedefs
@@ -1,6 +1,6 @@
---- makedefs.orig	2015-01-18 00:10:28 UTC
+--- makedefs.orig	2016-05-15 16:39:11 UTC
 +++ makedefs
-@@ -235,6 +235,15 @@ case "$SYSTEM.$RELEASE" in
+@@ -272,6 +272,24 @@ case "$SYSTEM.$RELEASE" in
  		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
  		: ${PLUGIN_LD="${CC} -shared"}
  		;;
@@ -13,6 +13,15 @@
 +		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
 +		: ${PLUGIN_LD="${CC} -shared"}
 +		;;
++  FreeBSD.12*)	SYSTYPE=FREEBSD12
++		: ${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
  		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
diff --git a/mail/postfix/files/patch-src__util__sys_defs.h b/mail/postfix/files/patch-src__util__sys_defs.h
index d977481d19a1..41fbafc106ea 100644
--- a/mail/postfix/files/patch-src__util__sys_defs.h
+++ b/mail/postfix/files/patch-src__util__sys_defs.h
@@ -1,10 +1,10 @@
---- src/util/sys_defs.h.orig	2015-04-19 10:22:40 UTC
+--- src/util/sys_defs.h.orig	2016-05-15 16:39:11 UTC
 +++ src/util/sys_defs.h
 @@ -26,6 +26,7 @@
  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
      || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
      || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
-+    || defined(FREEBSD11) \
++    || defined(FREEBSD11) || defined(FREEBSD12) \
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
-     || defined(OPENBSD5) \
+     || defined(OPENBSD5) || defined(OPENBSD6) \
diff --git a/mail/postfix/files/patch-src_tls_tls.h b/mail/postfix/files/patch-src_tls_tls.h
new file mode 100644
index 000000000000..2bf7bdd5d082
--- /dev/null
+++ b/mail/postfix/files/patch-src_tls_tls.h
@@ -0,0 +1,14 @@
+# fix build against LibreSSL
+# Obtained from: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/mail/postfix/stable/patches/
+# 
+--- src/tls/tls.h.orig	2016-02-06 20:09:41 UTC
++++ src/tls/tls.h
+@@ -89,7 +89,7 @@ extern const char *str_tls_level(int);
+ #endif
+ 
+  /* Backwards compatibility with OpenSSL < 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define OpenSSL_version_num SSLeay
+ #define OpenSSL_version SSLeay_version
+ #define OPENSSL_VERSION SSLEAY_VERSION
diff --git a/mail/postfix/files/patch-src_tls_tls__dane.c b/mail/postfix/files/patch-src_tls_tls__dane.c
index 00c4a060be5f..494c3598053d 100644
--- a/mail/postfix/files/patch-src_tls_tls__dane.c
+++ b/mail/postfix/files/patch-src_tls_tls__dane.c
@@ -5,7 +5,7 @@
      tls_check_version();
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESS_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
      SSL_load_error_strings();
      SSL_library_init();
  #endif