From owner-svn-ports-all@freebsd.org Thu Nov 1 18:10:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 768E510FA681; Thu, 1 Nov 2018 18:10:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C0A683975; Thu, 1 Nov 2018 18:10:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CF211F3FC; Thu, 1 Nov 2018 18:10:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1IAM9X099591; Thu, 1 Nov 2018 18:10:22 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1IAMTj099590; Thu, 1 Nov 2018 18:10:22 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811011810.wA1IAMTj099590@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 1 Nov 2018 18:10:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483696 - branches/2018Q4/mail/spamilter X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2018Q4/mail/spamilter X-SVN-Commit-Revision: 483696 X-SVN-Commit-Repository: ports 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.29 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: Thu, 01 Nov 2018 18:10:23 -0000 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 +.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}