svn commit: r316300 - head/mail/postfix28

[Sahil Tandon]

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

Log:
  - Update to 2.8.14 and adjust CONFLICTS
  - 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
  Submitted by:	Yasuhiro KIMURA <yasu at utahime.org>

Modified:
  head/mail/postfix28/Makefile
  head/mail/postfix28/distinfo
  head/mail/postfix28/pkg-descr

Modified: head/mail/postfix28/Makefile
==============================================================================
--- head/mail/postfix28/Makefile	Tue Apr 23 01:56:06 2013	(r316299)
+++ head/mail/postfix28/Makefile	Tue Apr 23 01:56:20 2013	(r316300)
@@ -1,8 +1,8 @@
-# Created by: torstenb
+# Created by: Torsten Blum <torstenb at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	postfix
-PORTVERSION=	2.8.13
+PORTVERSION=	2.8.14
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -16,10 +16,16 @@ 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
+
 VDAVERSION=	2.8.13
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-79].* postfix-base-2.[0-79].* \
-		postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
-		sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
+		postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
+		postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
+		smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
 NO_LATEST_LINK=	yes
 
@@ -148,7 +154,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
 
@@ -159,7 +165,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
@@ -207,11 +213,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:MLSASL2}
-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/postfix28/distinfo
==============================================================================
--- head/mail/postfix28/distinfo	Tue Apr 23 01:56:06 2013	(r316299)
+++ head/mail/postfix28/distinfo	Tue Apr 23 01:56:20 2013	(r316300)
@@ -1,5 +1,5 @@
-SHA256 (postfix/postfix-2.8.13.tar.gz) = 66d278471b790eed663d6fe991403395e6340d45c92c8d0c445f7e9d77881502
-SIZE (postfix/postfix-2.8.13.tar.gz) = 3641782
+SHA256 (postfix/postfix-2.8.14.tar.gz) = 04e26548550d53c42c1bf35fe45943f9d7c589a3d4ef8af4c60f96a220473adf
+SIZE (postfix/postfix-2.8.14.tar.gz) = 3641913
 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.13.patch) = 87166c1f52840d5caf6e24a1f9e07fd7a2f5dfc7b4c340a212e387dace509c42

Modified: head/mail/postfix28/pkg-descr
==============================================================================
--- head/mail/postfix28/pkg-descr	Tue Apr 23 01:56:06 2013	(r316299)
+++ head/mail/postfix28/pkg-descr	Tue Apr 23 01:56:20 2013	(r316300)
@@ -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/