diff options
| author | eik <eik@FreeBSD.org> | 2004-08-19 17:52:22 +0800 |
|---|---|---|
| committer | eik <eik@FreeBSD.org> | 2004-08-19 17:52:22 +0800 |
| commit | 4a9a9c89683f5c3d142a345d768e13f5f082394a (patch) | |
| tree | bc8809ba9e1bd204f28049309ee175bb52af6aae /mail/exim | |
| parent | 5f4eaaf109510424286eebeaf816287e0aee124d (diff) | |
| download | freebsd-ports-gnome-4a9a9c89683f5c3d142a345d768e13f5f082394a.tar.gz freebsd-ports-gnome-4a9a9c89683f5c3d142a345d768e13f5f082394a.tar.zst freebsd-ports-gnome-4a9a9c89683f5c3d142a345d768e13f5f082394a.zip | |
make a little more robust against CFLAGS that are accidentially overwritten by make.conf(5)
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 14 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::EDITME | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 324162c3a0c0..24cb8e72e041 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -422,18 +422,20 @@ SEDLIST+= -e 's,^ALT_CONFIG_PREFIX=,\# ALT_CONFIG_PREFIX=,' .if defined(WITH_SPF) && !defined(WITHOUT_EXISCAN) LIB_DEPENDS+= spf2.1:${PORTSDIR}/mail/libspf2 -CFLAGS+= -DSPF -SEDLIST+= -e 's,XX_SPF_LIBS_XX,-lspf2,' +SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ + -e 's,XX_SPF_LIBS_XX,-lspf2,' .else -SEDLIST+= -e 's,XX_SPF_LIBS_XX,,' +SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ + -e 's,XX_SPF_LIBS_XX,,' .endif .if defined(WITH_SRS) && !defined(WITHOUT_EXISCAN) LIB_DEPENDS+= srs2.0:${PORTSDIR}/mail/libsrs2 -CFLAGS+= -DSRS -SEDLIST+= -e 's,XX_SRS_LIBS_XX,-lsrs2,' +SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSRS,' \ + -e 's,XX_SRS_LIBS_XX,-lsrs2,' .else -SEDLIST+= -e 's,XX_SRS_LIBS_XX,,' +SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ + -e 's,XX_SRS_LIBS_XX,,' .endif .include <bsd.port.pre.mk> diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME index e220d65009c9..762daaa7c6f4 100644 --- a/mail/exim/files/patch-src::EDITME +++ b/mail/exim/files/patch-src::EDITME @@ -113,9 +113,10 @@ @@ -690,12 +694,20 @@ # # USE_TCP_WRAPPERS=yes - # CFLAGS=-O -I/usr/local/include +-# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap -# ++CFLAGS+=XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX +EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX + # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM |