diff options
| author | vsevolod <vsevolod@FreeBSD.org> | 2014-07-04 21:00:41 +0800 |
|---|---|---|
| committer | vsevolod <vsevolod@FreeBSD.org> | 2014-07-04 21:00:41 +0800 |
| commit | 00dde7a95d7071261bce871ad33e2aa05a47fb3c (patch) | |
| tree | 11fbe0cccc891d7b7255414cbd71e81aaab7561d /mail/exim | |
| parent | 570b8af77da333b1c1856c510f213e9957c564a8 (diff) | |
| download | freebsd-ports-gnome-00dde7a95d7071261bce871ad33e2aa05a47fb3c.tar.gz freebsd-ports-gnome-00dde7a95d7071261bce871ad33e2aa05a47fb3c.tar.zst freebsd-ports-gnome-00dde7a95d7071261bce871ad33e2aa05a47fb3c.zip | |
- 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]
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 720be7843599..d6e7644735af 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -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=),\1,' .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=),\# \1,' .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,,' |