From 65927632bbc188e090248e0ca24f7bb4dea3be2e Mon Sep 17 00:00:00 2001
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sat, 14 Feb 2015 17:45:02 +0000
Subject: [PATCH] - update to postfix 3.0.0 release [1] - cleanup MASTER_SITES
 - enable new pie parameter (build with -fPIC)

[1] keep the port as postfix-current until we are sure
    the new distributed layout will not change
    (location of libs, dynamicmaps.cf.d, postfix-files.d ...)

Release announcement:
 http://www.postfix.org/announcements/postfix-3.0.0.html

Release Notes:
 ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.0.RELEASE_NOTES

Approved by:	sahil (implicit)
---
 mail/postfix-current/Makefile  | 21 ++++++++++++---------
 mail/postfix-current/distinfo  |  4 ++--
 mail/postfix-current/pkg-plist |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 8e1b8e80dec5..3283f43a80d1 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -2,16 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	3.0-20150129
+DISTVERSION=	3.0-20150208
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
-		ftp://postfix.mirrors.pair.com/experimental/ \
-		ftp://ftp.tux.org/pub/net/postfix/experimental/ \
-		http://mirrors.rootservices.net/postfix/experimental/ \
-		ftp://ftp.samurai.com/pub/postfix/experimental/ \
-		http://ftp.unicamp.br/pub/postfix/experimental/
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/ \
+		http://de.postfix.org/ftpmirror/ \
+		http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \
+		http://www.artfiles.org/postfix.org/postfix-release/ \
+		http://mirror.lhsolutions.nl/postfix-release/ \
+		ftp://postfix.mirrors.pair.com/
+#MASTER_SITES:=	${MASTER_SITES:S|$|experimental/|}
+MASTER_SITES:=	${MASTER_SITES:S|$|official/|}
 PKGNAMESUFFIX=	-current
+DISTNAME=	${PORTNAME}-3.0.0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@FreeBSD.org
@@ -90,7 +93,7 @@ IS_INTERACTIVE=	yes
 MAKEFILEFLAGS+=	DEBUG=
 .endif
 
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
+MAKEFILEFLAGS+=	pie=yes CC="${CC}" OPT="${CFLAGS}"
 
 .if ${PORT_OPTIONS:MINST_BASE}
 PKGNAMESUFFIX=	-base
@@ -186,7 +189,7 @@ POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -l
 .if ${PORT_OPTIONS:MTLS}
 USE_OPENSSL=		yes
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
-# XXX LDFLAGS possible breaks dynamic building 
+# XXX LDFLAGS possible breaks dynamic building
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .else
 POSTFIX_CCARGS+=	-DNO_TLS
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index c987069b8d44..c9cbb1f71449 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postfix/postfix-3.0-20150129.tar.gz) = d8055245af463e286513ac143ccfbae6f09ceefb3f7c689f24bcc7413f269fe7
-SIZE (postfix/postfix-3.0-20150129.tar.gz) = 4239461
+SHA256 (postfix/postfix-3.0.0.tar.gz) = c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955
+SIZE (postfix/postfix-3.0.0.tar.gz) = 4239248
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 46192e25de5d..895a7f5ef008 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -155,7 +155,7 @@ sbin/sendmail
 @dir libexec/postfix/dynamicmaps.cf.d
 @dir libexec/postfix/postfix-files.d
 @dir %%PFETC%%
-@dir /var/db/postfix
+@dir(postfix,,700) /var/db/postfix
 @dir(postfix,,700) /var/spool/postfix/active
 @dir(postfix,,700) /var/spool/postfix/bounce
 @dir(postfix,,700) /var/spool/postfix/corrupt