From owner-svn-ports-all@FreeBSD.ORG Sat Jan 31 16:57:45 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D5FBF6E; Sat, 31 Jan 2015 16:57:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 897EF1A1; Sat, 31 Jan 2015 16:57:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0VGvjMY077263; Sat, 31 Jan 2015 16:57:45 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0VGvjh0077258; Sat, 31 Jan 2015 16:57:45 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201501311657.t0VGvjh0077258@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sat, 31 Jan 2015 16:57:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378221 - head/mail/postfix X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jan 2015 16:57:45 -0000 Author: ohauer Date: Sat Jan 31 16:57:44 2015 New Revision: 378221 URL: https://svnweb.freebsd.org/changeset/ports/378221 QAT: https://qat.redports.org/buildarchive/r378221/ Log: - update conflicts for new postfix-current - use OPTIONS_SUB - enable TLS as default [1] - use USE_OPENSSL instead including Mk/openssl.mk - use new install instruction - use new notation for @mode in pkg-plist - bump PORTREVISON [1] Users using packages should have the ability to use TLS from the default package, (this makes the the postfix-tls port obsolete) Approved by: sahil (implicit) MFH: 2015Q1 Modified: head/mail/postfix/Makefile head/mail/postfix/pkg-plist Modified: head/mail/postfix/Makefile ============================================================================== --- head/mail/postfix/Makefile Sat Jan 31 16:48:41 2015 (r378220) +++ head/mail/postfix/Makefile Sat Jan 31 16:57:44 2015 (r378221) @@ -3,7 +3,7 @@ PORTNAME= postfix PORTVERSION= 2.11.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -25,9 +25,10 @@ LICENSE_PERMS= dist-mirror dist-sell pkg PORTSCOUT= limit:^2\.11\. VDAVERSION= 2.10.0 -CONFLICTS_INSTALL?= courier-0.* postfix-1.* postfix2?-* postfix21?-* \ - postfix-current-2.* postfix-current-base-2.* postfix-tls-* \ - sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* +CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ + postfix2?-* postfix21?-* postfix-tls-* \ + postfix-current-[23].* postfix-current-base-[23].* \ + sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* USERS= postfix GROUPS= mail maildrop postfix @@ -39,13 +40,14 @@ USE_SUBMAKE= yes USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" +OPTIONS_SUB= yes OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP_SASL LMDB MYSQL NIS \ OPENLDAP PCRE PGSQL SASL2 SPF SQLITE TEST TLS VDA OPTIONS_RADIO= RG1 RG2 OPTIONS_RADIO_RG1= DOVECOT DOVECOT2 OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT -OPTIONS_DEFAULT= PCRE +OPTIONS_DEFAULT= PCRE TLS PCRE_DESC= Perl Compatible Regular Expressions SASL2_DESC= Cyrus SASLv2 (Simple Auth. and Sec. Layer) @@ -97,10 +99,10 @@ PKGNAMESUFFIX= -base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix -PLIST_SUB+= BASE="" BMAN="share/" +PLIST_SUB+= BMAN="share/" .else USE_RC_SUBR= postfix -PLIST_SUB+= BASE="@comment " BMAN="" +PLIST_SUB+= BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} @@ -114,7 +116,8 @@ READMEDIR= no DAEMONDIR= ${PREFIX}/libexec/postfix -SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}" +SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ + DAEMONDIR="${DAEMONDIR}" SUB_FILES+= pkg-install pkg-message POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ @@ -169,9 +172,11 @@ POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HO .endif .if ${PORT_OPTIONS:MTLS} -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +USE_OPENSSL= yes POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto +.else +POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MSPF} @@ -182,9 +187,6 @@ PATCHFILES+= postfix-2.8.0-libspf2-1.2. PATCH_DIST_STRIP= -p1 POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 -PLIST_SUB+= SPF="" -.else -PLIST_SUB+= SPF="@comment " .endif .if ${PORT_OPTIONS:MBDB} @@ -216,18 +218,18 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -ls .if ${PORT_OPTIONS:MOPENLDAP} USE_OPENLDAP= yes -.if defined(WITH_OPENLDAP_VER) +. if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif +. endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber _REQUIRE+= slapd -.if ${PORT_OPTIONS:MLDAP_SASL} -.if ! ${PORT_OPTIONS:MSASL2} +. if ${PORT_OPTIONS:MLDAP_SASL} +. if ! ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -.endif +. endif POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL -.endif +. endif .endif .if ${PORT_OPTIONS:MCDB} @@ -245,17 +247,11 @@ _REQUIRE+= ypserv PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda PATCHFILES+= postfix-vda-v13-${VDAVERSION}.patch:vda PATCH_DIST_STRIP= -p1 -PLIST_SUB+= VDA="" -.else -PLIST_SUB+= VDA="@comment " .endif .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 -PLIST_SUB+= TEST="" -.else -PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MLMDB} @@ -327,8 +323,9 @@ post-patch: >> ${WRKSRC}/conf/postfix-files do-configure: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ + (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ + ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ + AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-install: @@ -337,7 +334,8 @@ pre-install: .endif do-install: - @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=${WRKDIR} \ + @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ + install_root=${STAGEDIR} tempdir=${WRKDIR} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ Modified: head/mail/postfix/pkg-plist ============================================================================== --- head/mail/postfix/pkg-plist Sat Jan 31 16:48:41 2015 (r378220) +++ head/mail/postfix/pkg-plist Sat Jan 31 16:57:44 2015 (r378221) @@ -8,7 +8,7 @@ bin/qshape bin/rmail %%TEST%%bin/smtp-sink %%TEST%%bin/smtp-source -%%BASE%%@cwd / +%%INST_BASE%%@cwd / etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/bounce.cf.default @@ -128,21 +128,18 @@ libexec/postfix/virtual sbin/postalias sbin/postcat sbin/postconf +@(,maildrop,2755) sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti -@group maildrop -@mode 2755 -sbin/postdrop -sbin/postqueue -@group -@mode +@(,maildrop,2755) sbin/postqueue sbin/postsuper sbin/posttls-finger sbin/sendmail +@dir %%PFETC%% @dir /var/db/postfix @dir(postfix,,700) /var/spool/postfix/active @dir(postfix,,700) /var/spool/postfix/bounce @@ -159,6 +156,3 @@ sbin/sendmail @dir(postfix,,700) /var/spool/postfix/saved @dir(postfix,,700) /var/spool/postfix/trace @dir(,,755) /var/spool/postfix -%%BASE%%@cwd / -@dir etc/postfix -@cwd %%RESETPREFIX%%