From owner-svn-ports-all@FreeBSD.ORG Fri Jul 4 13:00:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E10DDE99; Fri, 4 Jul 2014 13:00:41 +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 B49F8281D; Fri, 4 Jul 2014 13:00:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64D0fin046099; Fri, 4 Jul 2014 13:00:41 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64D0fcp046098; Fri, 4 Jul 2014 13:00:41 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201407041300.s64D0fcp046098@svn.freebsd.org> From: Vsevolod Stakhov Date: Fri, 4 Jul 2014 13:00:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360612 - 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-all@freebsd.org X-Mailman-Version: 2.1.18 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: Fri, 04 Jul 2014 13:00:42 -0000 Author: vsevolod Date: Fri Jul 4 13:00:41 2014 New Revision: 360612 URL: http://svnweb.freebsd.org/changeset/ports/360612 QAT: https://qat.redports.org/buildarchive/r360612/ Log: - Fix search path for optional dependencies (partially based on [1]) - Enable EXPERIMENTAL_REDIS knob if REDIS option is enabled - Bump portrevision Submitted by: pi [1] Modified: head/mail/exim/Makefile Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Fri Jul 4 12:51:51 2014 (r360611) +++ head/mail/exim/Makefile Fri Jul 4 13:00:41 2014 (r360612) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim @@ -202,7 +202,7 @@ SEDLIST+= -e 's,^\# (EXPERIMENTAL_OCSP=) .if ${PORT_OPTIONS:MDMARC} LIB_DEPENDS+= libopendmarc.so:${PORTSDIR}/mail/opendmarc -SEDLIST+= -e 's,XX_DMARC_LIBS_XX,-lopendmarc,' \ +SEDLIST+= -e 's,XX_DMARC_LIBS_XX,-L${LOCALBASE}/lib -lopendmarc,' \ -e 's,^\# (EXPERIMENTAL_DMARC=),\1,' .else SEDLIST+= -e 's,XX_DMARC_LIBS_XX,,' @@ -450,8 +450,9 @@ SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,,' \ .if ${PORT_OPTIONS:MREDIS} LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis -SEDLIST+= -e 's,XX_REDIS_LIBS_XX,-lhiredis,' \ - -e 's,^\# (LOOKUP_REDIS=),\1,' +SEDLIST+= -e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \ + -e 's,^\# (LOOKUP_REDIS=),\1,' \ + -e 's,^\# (EXPERIMENTAL_REDIS=),\1,' .else SEDLIST+= -e 's,XX_REDIS_LIBS_XX,,' .endif @@ -467,7 +468,7 @@ SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# .if ${PORT_OPTIONS:MSPF} LIB_DEPENDS+= libspf2.so:${PORTSDIR}/mail/libspf2 SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ - -e 's,XX_SPF_LIBS_XX,-lspf2 ${PTHREAD_LIBS:S/,/\\,/g},' \ + -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 ${PTHREAD_LIBS:S/,/\\,/g},' \ -e 's,^\# (EXPERIMENTAL_SPF=),\1,' .else SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ @@ -477,11 +478,11 @@ SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ .if ${PORT_OPTIONS:MSRS} LIB_DEPENDS+= libsrs2.so:${PORTSDIR}/mail/libsrs2 SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSRS,' \ - -e 's,XX_SRS_LIBS_XX,-lsrs2,' + -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,-lsrs_alt,' + -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,,'