svn commit: r362210 - head/mail/exim

[Vsevolod Stakhov]

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