From 68517d8ee096a6d1e71465c0d6c839b996a45ed0 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 19 Mar 2015 19:38:48 +0000 Subject: [PATCH] five milter ports: Add or improve support on systems missing sendmail In some cases no-sendmail support was in place but missing CFLAGS or LDFLAGS, but in others it needed to be added. Problems found as a result of DragonFly removing sendmail from base. Approved by: just fix it. --- mail/milter-bogom/Makefile | 7 ++++++- mail/milter-skem/Makefile | 5 +++++ mail/opendmarc/Makefile | 5 +++++ mail/py-milter/Makefile | 1 + security/clamav/Makefile | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile index 442f0c6e763b..f391e23a5a1d 100644 --- a/mail/milter-bogom/Makefile +++ b/mail/milter-bogom/Makefile @@ -14,8 +14,13 @@ COMMENT= Simple sendmail milter to interface bogofilter RUN_DEPENDS= bogofilter:${PORTSDIR}/mail/bogofilter +.if !exists(/usr/lib/libmilter.so) +LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/sendmail +LDFLAGS+= -I${LOCALBASE}/include +.endif + MAKE_ARGS= CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS}" \ - LIBS="-lmilter ${PTHREAD_LIBS}" + LIBS="-lmilter ${PTHREAD_LIBS}" LDFLAGS="${LDFLAGS}" USE_RC_SUBR= milter-bogom SUB_FILES= pkg-message diff --git a/mail/milter-skem/Makefile b/mail/milter-skem/Makefile index 2b57198d7736..53e3e5c04549 100644 --- a/mail/milter-skem/Makefile +++ b/mail/milter-skem/Makefile @@ -9,6 +9,11 @@ MASTER_SITES= http://virtual-estates.net/skem/ MAINTAINER= mi@aldan.algebra.com COMMENT= Cache earlier sendmail's verdicts for the relays +.if !exists( /usr/include/libmilter/mfapi.h ) +BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail +CFLAGS+= -I${LOCALBASE}/include +.endif + USES= tar:bzip2 uidfix PLIST_FILES= sbin/skem \ diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile index bcad8d03c911..28c6ee753a23 100644 --- a/mail/opendmarc/Makefile +++ b/mail/opendmarc/Makefile @@ -19,6 +19,11 @@ LICENSE_GROUPS_SENDMAIL= FSF OSI LICENSE_NAME_SENDMAIL= Sendmail Open Source License LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +.if !exists( /usr/include/libmilter/mfapi.h ) +BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail +CFLAGS+= -I${LOCALBASE}/include +.endif + USES= libtool shebangfix SHEBANG_FILES= reports/opendmarc-expire.in \ reports/opendmarc-import.in \ diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile index 6dce26b42112..d572b687b533 100644 --- a/mail/py-milter/Makefile +++ b/mail/py-milter/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING .if !exists(/usr/lib/libmilter.so) LIB_DEPENDS= libmilter.so:${PORTSDIR}/mail/sendmail +CFLAGS+= -I${LOCALBASE}/include .endif PYPORTNAME= ${PKGNAMEPREFIX:C/[0-9]+-//}${PORTNAME} diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 03d6cd529d94..604443ee352a 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -150,6 +150,7 @@ LDFLAGS+= -lldap . if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a) BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail CONFIGURE_ARGS+=--with-sendmail=${LOCALBASE}/sbin/sendmail +LDFLAGS+= -L${LOCALBASE}/lib . else CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail . endif