svn commit: r316301 - head/mail/postfix-current

[Sahil Tandon]

Author: sahil
Date: Tue Apr 23 01:56:36 2013
New Revision: 316301
URL: http://svnweb.freebsd.org/changeset/ports/316301

Log:
  - Update to Postfix 2.11 Snapshot 20130405
  - Add LICENSE information
  - Canonicalize 'Created by:' Makefile header
  - Remove shlib version from LIB_DEPENDS assignment
  - Correct LDAP_SASL logic
  - Replace tab with a single space after 'WWW:' in pkg-descr
  
  PR:		ports/177127 (inspired by)
  Submitted by:	Yasuhiro KIMURA <yasu at utahime.org>

Modified:
  head/mail/postfix-current/Makefile
  head/mail/postfix-current/distinfo
  head/mail/postfix-current/pkg-descr

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Tue Apr 23 01:56:20 2013	(r316300)
+++ head/mail/postfix-current/Makefile	Tue Apr 23 01:56:36 2013	(r316301)
@@ -1,8 +1,8 @@
-# Created by: torstenb
+# Created by: Torsten Blum <torstenb at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	postfix
-DISTVERSION=	2.10-20130113
+DISTVERSION=	2.11-20130405
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -17,6 +17,11 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sahil at FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail
 
+LICENSE=	IPL10
+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=	courier-0.* postfix-1.* postfix-2.* postfix-base-2.* \
 		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
@@ -144,7 +149,7 @@ POSTFIX_AUXLIBS+=	-lkrb5 ${KRB5_EXTR} -l
 .endif
 
 .if ${PORT_OPTIONS:MSASLKMIT}
-LIB_DEPENDS+=		krb5.3:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=		krb5:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
@@ -155,7 +160,7 @@ POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFL
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
-LIB_DEPENDS+=		spf2.3:${PORTSDIR}/mail/libspf2
+LIB_DEPENDS+=		spf2:${PORTSDIR}/mail/libspf2
 PATCH_SITES+=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	mm
 PATCHFILES+=		postfix-2.8.0-libspf2-1.2.x-0.patch.gz
@@ -203,11 +208,9 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -ll
 _REQUIRE+=		slapd
 .if ${PORT_OPTIONS:MLDAP_SASL}
 .if ! ${PORT_OPTIONS:MSASL2}
-PORT_OPTIONS+=SASL2
-.endif
-.if ${PORT_OPTIONS:MSASL2}
-POSTFIX_CCARGS+=	-DUSE_LDAP_SASL
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
+POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
 .endif
 .endif
 

Modified: head/mail/postfix-current/distinfo
==============================================================================
--- head/mail/postfix-current/distinfo	Tue Apr 23 01:56:20 2013	(r316300)
+++ head/mail/postfix-current/distinfo	Tue Apr 23 01:56:36 2013	(r316301)
@@ -1,4 +1,4 @@
-SHA256 (postfix/postfix-2.10-20130113.tar.gz) = 3fde4d4a0296c26a24b69d63fe376b4e01fd01d65ef36ab12c56ac57a450bca3
-SIZE (postfix/postfix-2.10-20130113.tar.gz) = 3823921
+SHA256 (postfix/postfix-2.11-20130405.tar.gz) = 81ad2d8c94484d4e1fe9afb6b85d9c08dfac1086d9c721d0b30050574126aa0b
+SIZE (postfix/postfix-2.11-20130405.tar.gz) = 3860386
 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

Modified: head/mail/postfix-current/pkg-descr
==============================================================================
--- head/mail/postfix-current/pkg-descr	Tue Apr 23 01:56:20 2013	(r316300)
+++ head/mail/postfix-current/pkg-descr	Tue Apr 23 01:56:36 2013	(r316301)
@@ -12,4 +12,4 @@ queue, external after queue), Berkeley D
 database, PostgreSQL database, Maildir and mailbox format, Virtual domains,
 VERP envelope return addresses and others.
 
-WWW:	http://www.postfix.org/
+WWW: http://www.postfix.org/