Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Jan 2014 01:17:52 +0000 (UTC)
From:      Sahil Tandon <sahil@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340539 - head/mail/postfix28
Message-ID:  <201401210117.s0L1Hquv090860@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sahil
Date: Tue Jan 21 01:17:51 2014
New Revision: 340539
URL: http://svnweb.freebsd.org/changeset/ports/340539
QAT: https://qat.redports.org/buildarchive/r340539/

Log:
  - Update to 2.8.17
  - Adopt new LIB_DEPENDS syntax [1]
  - Pet portlint(1) on PKGNAMESUFFIX placement [1]
  - Modify shell command to quiet warnings on 10+ [2]
  - Respect upstream Makefile's warning suppression [3]
  
  PR:		[1]: ports/185860
  		[2]: ports/185857
  
  Submitted by:	[1]: Yasuhiro KIMURA <yasu@utahime.org>
  		[2]: adamw
  		[3]: koobs (via email)

Modified:
  head/mail/postfix28/Makefile
  head/mail/postfix28/distinfo

Modified: head/mail/postfix28/Makefile
==============================================================================
--- head/mail/postfix28/Makefile	Tue Jan 21 01:17:43 2014	(r340538)
+++ head/mail/postfix28/Makefile	Tue Jan 21 01:17:51 2014	(r340539)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postfix
-PORTVERSION=	2.8.16
+PORTVERSION=	2.8.17
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -11,8 +11,8 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mi
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
-DIST_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	28
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail
@@ -23,8 +23,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 VDAVERSION=	2.8.14
-CONFLICTS=	courier-0.* postfix-1.* postfix2[79]-* \
-		postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix2[79]-* postfix21?-* \
+		postfix-2.* postfix-base-2.* postfix-current-2.* \
 		postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
 		smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
@@ -92,7 +92,7 @@ HTML1=	body_checks.5.html bounce.5.html 
 	scache.8.html tlsmgr.8.html
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING) && exists(/etc/mail/mailer.conf)
-OLD_MAILER!=	${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || true
+OLD_MAILER!=	${GREP} -m 1 '^purgestat' /etc/mail/mailer.conf || ${ECHO_CMD}
 .if !empty(OLD_MAILER)
 IS_INTERACTIVE=	yes
 .endif
@@ -108,7 +108,8 @@ MAKEFILEFLAGS+=	DEBUG=
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
+POSTFIX_CCARGS+=	\$$(WARN) \
+			-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -126,7 +127,7 @@ POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${
 _REQUIRE=		LOGIN cleanvar
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .else
@@ -134,7 +135,7 @@ POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
@@ -154,7 +155,7 @@ POSTFIX_AUXLIBS+=	-lkrb5 ${KRB5_EXTR} -l
 .endif
 
 .if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+=		krb5:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=		libkrb5.so:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
@@ -165,7 +166,7 @@ POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFL
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+=		spf2:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+=		libspf2.so:${PORTSDIR}/mail/libspf2
 PATCH_SITES+=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	mm
 PATCHFILES+=		postfix-2.8.0-libspf2-1.2.x-0.patch.gz
@@ -213,7 +214,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -ll
 _REQUIRE+=		slapd
 .if ${PORT_OPTIONS:MLDAP_SASL}
 .if ! ${PORT_OPTIONS:MSASL2}
-LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 .endif
 POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 .endif

Modified: head/mail/postfix28/distinfo
==============================================================================
--- head/mail/postfix28/distinfo	Tue Jan 21 01:17:43 2014	(r340538)
+++ head/mail/postfix28/distinfo	Tue Jan 21 01:17:51 2014	(r340539)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.8.16.tar.gz) = 1a8d98ada1aec92a6b4901b2e9e448fe02d55dab3ca50543cd1fb118fd339b49
-SIZE (postfix/postfix-2.8.16.tar.gz) = 3643279
+SHA256 (postfix/postfix-2.8.17.tar.gz) = 54342cabf6a731c931c8950ab8fefa189b4607e3bce517f294d5bdd3e6fd646a
+SIZE (postfix/postfix-2.8.17.tar.gz) = 3643766
 SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc
 SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191
 SHA256 (postfix/postfix-vda-v10-2.8.14.patch) = 04ee708e9532ae7d04460992927e47de7f1a7ea29b8d91ae5f87725653bfae43



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401210117.s0L1Hquv090860>