Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Nov 2013 20:25:57 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335053 - head/mail/spamilter
Message-ID:  <201311272025.rARKPvDN025396@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+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 <bsd.port.options.mk>
 
 .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 <bsd.port.post.mk>
+.include <bsd.port.mk>



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