Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Nov 2018 18:10:22 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r483696 - branches/2018Q4/mail/spamilter
Message-ID:  <201811011810.wA1IAMTj099590@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Nov  1 18:10:22 2018
New Revision: 483696
URL: https://svnweb.freebsd.org/changeset/ports/483696

Log:
  MFH: r482452
  
  - make ipfwmtad optional
  - fix build on FreeBSD-12

Modified:
  branches/2018Q4/mail/spamilter/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/mail/spamilter/Makefile
==============================================================================
--- branches/2018Q4/mail/spamilter/Makefile	Thu Nov  1 18:06:50 2018	(r483695)
+++ branches/2018Q4/mail/spamilter/Makefile	Thu Nov  1 18:10:22 2018	(r483696)
@@ -26,15 +26,15 @@ DOCSFILES=	Changelog INSTALL LICENSE docs/docs.html do
 		conf/db.rcpt conf/db.rdnsbl conf/db.sndr \
 		conf/policy.html conf/spamilter.rc
 
-PLIST_FILES+=	bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \
-		bin/spamilter \
+PLIST_FILES+=	bin/dnsblchk bin/dnsblupd bin/mxlookup bin/spamilter \
 		bin/spamilter-system-report bin/spamilter-user-report
 PORTDOCS=	Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \
 		db.rdnsbl db.sndr policy.html spamilter.rc
 
-OPTIONS_DEFINE=	SMTP_AFTER_POP3 PAM LIBSPF DOCS
+OPTIONS_DEFINE=	SMTP_AFTER_POP3 PAM LIBSPF IPFWMTAD DOCS
 SMTP_AFTER_POP3_DESC=	SMTP after POP3
 LIBSPF_DESC=	build with libspf
+IPFWMTAD_DESC=	build ipfwmtad (requires openssl)
 
 SMTP_AFTER_POP3_CONFIGURE_ON=	--with-popauth
 PAM_CONFIGURE_ON=	--with-pam
@@ -42,9 +42,15 @@ LIBSPF_BUILD_DEPENDS=	${LOCALBASE}/lib/libspf.a:mail/l
 LIBSPF_CONFIGURE_ON=	--with-libspf ${LOCALBASE}
 LIBSPF_CFLAGS=		-I${LOCALBASE}/include
 LIBSPF_LDFLAGS=		-L${LOCALBASE}/lib
+IPFWMTAD_PLIST_FILES=	bin/ipfwmtad
+IPFWMTAD_USES=	ssl
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MIPFWMTAD}
+BROKEN_FreeBSD_12=	option IPFWMTAD needs old openssl
+.endif
+
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 CONFIGURE_ARGS+=	--sendmail-dir "${MILTERBASE}"
@@ -60,6 +66,14 @@ pre-configure:
 	${REINPLACE_CMD} \
 		-e "s=/usr/local/=${PREFIX}/=" \
 		${WRKSRC}/Makefile.tmpl
+
+.if ! ${PORT_OPTIONS:MIPFWMTAD}
+post-configure:
+	${REINPLACE_CMD} \
+		-e 's| install-ipfwmtad $$| |' \
+		-e 's| ipfwmtad $$| |' \
+		${WRKSRC}/Makefile
+.endif
 
 post-install:
 .for i in ${BINFILES}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811011810.wA1IAMTj099590>