From owner-svn-ports-head@FreeBSD.ORG Wed Nov 27 20:25:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D8DA40D; Wed, 27 Nov 2013 20:25:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 32CCA2640; Wed, 27 Nov 2013 20:25:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARKPvRs025397; Wed, 27 Nov 2013 20:25:57 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARKPvDN025396; Wed, 27 Nov 2013 20:25:57 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201311272025.rARKPvDN025396@svn.freebsd.org> From: Dirk Meyer Date: Wed, 27 Nov 2013 20:25:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335053 - head/mail/spamilter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Nov 2013 20:25:57 -0000 Author: dinoex Date: Wed Nov 27 20:25:56 2013 New Revision: 335053 URL: http://svnweb.freebsd.org/changeset/ports/335053 Log: - use OPTIONS_DEFINE Modified: head/mail/spamilter/Makefile Modified: head/mail/spamilter/Makefile ============================================================================== --- head/mail/spamilter/Makefile Wed Nov 27 20:23:37 2013 (r335052) +++ head/mail/spamilter/Makefile Wed Nov 27 20:25:56 2013 (r335053) @@ -29,7 +29,17 @@ DOCSFILES= Changelog INSTALL LICENSE doc conf/db.rcpt conf/db.rdnsbl conf/db.sndr \ conf/policy.html conf/spamilter.rc -.include +PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/ipfwmtad 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 +SMTP_AFTER_POP3_DESC= SMTP after POP3 +LIBSPF_DESC= build with libspf + +.include .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" @@ -39,29 +49,23 @@ CONFIGURE_ARGS+= --sendmail-dir "${LOCAL CONFIGURE_ARGS+= --sendmail-dir "/usr" .endif -.if defined(SMTP_AFTER_POP3) +.if ${PORT_OPTIONS:MSMTP_AFTER_POP3} CONFIGURE_ARGS+= --with-popauth .endif -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --with-pam .endif -.if defined(WITH_LIBSPF) +.if ${PORT_OPTIONS:MLIBSPF} BUILD_DEPENDS+= ${LOCALBASE}/lib/libspf.a:${PORTSDIR}/mail/libspf CONFIGURE_ARGS+= --with-libspf ${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif -PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/ipfwmtad 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 - post-extract: - @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + ${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} pre-configure: ${REINPLACE_CMD} \ @@ -81,11 +85,9 @@ post-install: .for i in ${BINFILES} ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/ .endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${DOCSFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ -.endfor +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCSFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include