From owner-svn-ports-head@FreeBSD.ORG Fri Jul 18 14:37:03 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 717A4BE1; Fri, 18 Jul 2014 14:37:03 +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 428992B12; Fri, 18 Jul 2014 14:37:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6IEb3l0001700; Fri, 18 Jul 2014 14:37:03 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6IEb2oN001698; Fri, 18 Jul 2014 14:37:02 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201407181437.s6IEb2oN001698@svn.freebsd.org> From: Vsevolod Stakhov Date: Fri, 18 Jul 2014 14:37:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362210 - head/mail/exim 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.18 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: Fri, 18 Jul 2014 14:37:03 -0000 Author: vsevolod Date: Fri Jul 18 14:37:02 2014 New Revision: 362210 URL: http://svnweb.freebsd.org/changeset/ports/362210 QAT: https://qat.redports.org/buildarchive/r362210/ Log: Restore srs_alt support. PR: 191950 Submitted by: pi Modified: head/mail/exim/Makefile head/mail/exim/options Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Fri Jul 18 14:28:34 2014 (r362209) +++ head/mail/exim/Makefile Fri Jul 18 14:37:02 2014 (r362210) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim @@ -427,6 +427,10 @@ SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ LIB_DEPENDS+= libsrs2.so:${PORTSDIR}/mail/libsrs2 SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSRS,' \ -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs2,' +.elif ${PORT_OPTIONS:MSRS_ALT} +LIB_DEPENDS+= libsrs_alt.so:${PORTSDIR}/mail/libsrs_alt +SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \ + -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,' .else SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ -e 's,XX_SRS_LIBS_XX,,' Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Fri Jul 18 14:28:34 2014 (r362209) +++ head/mail/exim/options Fri Jul 18 14:37:02 2014 (r362210) @@ -18,6 +18,7 @@ OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \ READLINE \ SPF \ SRS \ + SRS_ALT \ SUID \ TCP_WRAPPERS \ WISHLIST \ @@ -104,6 +105,7 @@ SO_1024_DESC= Build with Spamooborona-1 SPF_DESC= Enable Sender Policy Framework checking SQLITE_DESC= Enable SQLite lookups SRS_DESC= Enable Sender Rewriting Scheme +SRS_ALT_DESC= Enable alternative Sender Rewriting Scheme SUID_DESC= Install the exim binary suid root TCP_WRAPPERS_DESC= Enable /etc/hosts.allow access control GNUTLS_DESC= Use GnuTLS instead of OpenSSL for TLS