From owner-svn-ports-head@FreeBSD.ORG Tue Apr 23 01:49:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 10B22FE3; Tue, 23 Apr 2013 01:49:10 +0000 (UTC) (envelope-from sahil@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 029A711E6; Tue, 23 Apr 2013 01:49:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3N1n9u0095286; Tue, 23 Apr 2013 01:49:09 GMT (envelope-from sahil@svn.freebsd.org) Received: (from sahil@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3N1n8DP095272; Tue, 23 Apr 2013 01:49:08 GMT (envelope-from sahil@svn.freebsd.org) Message-Id: <201304230149.r3N1n8DP095272@svn.freebsd.org> From: Sahil Tandon Date: Tue, 23 Apr 2013 01:49:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316296 - in head: . mail mail/postfix mail/postfix29 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 01:49:10 -0000 Author: sahil Date: Tue Apr 23 01:49:08 2013 New Revision: 316296 URL: http://svnweb.freebsd.org/changeset/ports/316296 Log: Repo-copy mail/postfix -> mail/postfix29, and update both ports to the latest version and make a note in UPDATING. Also: - 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 Added: head/mail/postfix29/ - copied from r315123, head/mail/postfix/ Modified: head/UPDATING head/mail/Makefile head/mail/postfix/Makefile head/mail/postfix/distinfo head/mail/postfix/pkg-descr head/mail/postfix29/Makefile head/mail/postfix29/distinfo head/mail/postfix29/pkg-descr Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Apr 23 01:44:40 2013 (r316295) +++ head/UPDATING Tue Apr 23 01:49:08 2013 (r316296) @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130423: + AFFECTS: users of mail/postfix + AUTHOR: sahil@FreeBSD.org + + This is a significant update; so, please carefully review the + RELEASE_NOTES to identify which incompatible changes impact your + environment. + 20130408: AFFECTS: users of astro/libkgeomap, graphics/digikam-kde4, graphics/kipi-plugins-kde4 AUTHOR: makc@FreeBSD.org Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Tue Apr 23 01:44:40 2013 (r316295) +++ head/mail/Makefile Tue Apr 23 01:49:08 2013 (r316296) @@ -517,6 +517,7 @@ SUBDIR += postfix26 SUBDIR += postfix27 SUBDIR += postfix28 + SUBDIR += postfix29 SUBDIR += postfixadmin SUBDIR += postgrey SUBDIR += postpals Modified: head/mail/postfix/Makefile ============================================================================== --- head/mail/postfix/Makefile Tue Apr 23 01:44:40 2013 (r316295) +++ head/mail/postfix/Makefile Tue Apr 23 01:49:08 2013 (r316296) @@ -1,8 +1,8 @@ -# Created by: torstenb +# Created by: Torsten Blum # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 2.9.5 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -16,8 +16,13 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@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.9.5 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-8].* postfix-base-2.[0-8].* \ +CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-9].* postfix-base-2.[0-9].* \ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \ sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* @@ -146,7 +151,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 @@ -157,7 +162,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 @@ -205,11 +210,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/postfix/distinfo ============================================================================== --- head/mail/postfix/distinfo Tue Apr 23 01:44:40 2013 (r316295) +++ head/mail/postfix/distinfo Tue Apr 23 01:49:08 2013 (r316296) @@ -1,5 +1,5 @@ -SHA256 (postfix/postfix-2.9.5.tar.gz) = 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 -SIZE (postfix/postfix-2.9.5.tar.gz) = 3761272 +SHA256 (postfix/postfix-2.10.0.tar.gz) = 4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b +SIZE (postfix/postfix-2.10.0.tar.gz) = 3826655 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-v11-2.9.5.patch) = df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa Modified: head/mail/postfix/pkg-descr ============================================================================== --- head/mail/postfix/pkg-descr Tue Apr 23 01:44:40 2013 (r316295) +++ head/mail/postfix/pkg-descr Tue Apr 23 01:49:08 2013 (r316296) @@ -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/ Modified: head/mail/postfix29/Makefile ============================================================================== --- head/mail/postfix/Makefile Sun Mar 24 14:23:56 2013 (r315123) +++ head/mail/postfix29/Makefile Tue Apr 23 01:49:08 2013 (r316296) @@ -1,8 +1,8 @@ -# Created by: torstenb +# Created by: Torsten Blum # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 2.9.5 +PORTVERSION= 2.9.6 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -16,10 +16,18 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@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.9.5 CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-8].* postfix-base-2.[0-8].* \ - 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 USERS= postfix GROUPS= mail maildrop postfix @@ -146,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 @@ -157,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 @@ -205,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/postfix29/distinfo ============================================================================== --- head/mail/postfix/distinfo Sun Mar 24 14:23:56 2013 (r315123) +++ head/mail/postfix29/distinfo Tue Apr 23 01:49:08 2013 (r316296) @@ -1,5 +1,5 @@ -SHA256 (postfix/postfix-2.9.5.tar.gz) = 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 -SIZE (postfix/postfix-2.9.5.tar.gz) = 3761272 +SHA256 (postfix/postfix-2.9.6.tar.gz) = 790542a238f64d2620c26e787c98b07fb6e75a7620ce0584a7932b089dc5367c +SIZE (postfix/postfix-2.9.6.tar.gz) = 3767309 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-v11-2.9.5.patch) = df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa Modified: head/mail/postfix29/pkg-descr ============================================================================== --- head/mail/postfix/pkg-descr Sun Mar 24 14:23:56 2013 (r315123) +++ head/mail/postfix29/pkg-descr Tue Apr 23 01:49:08 2013 (r316296) @@ -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/