ports/133783: [PATCH] mail/milter-greylist: add OPTIONS and WITH_POSTFIX

[John Baldwin]

>Number:         133783
>Category:       ports
>Synopsis:       [PATCH] mail/milter-greylist: add OPTIONS and WITH_POSTFIX
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 16 17:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     John Baldwin
>Release:        
>Organization:
>Environment:
>Description:
This patch adds a new WITH option to the mail/milter-greylist port to support the '--enable-postfix' configure option for Postfix support.

It adds an OPTIONS line to convert the port over to using the OPTIONS framework.  This includes making NO_INSTALL_MANPAGES now be handled by an on-by-default WITH_MANPAGES option.
>How-To-Repeat:

>Fix:
Patch is attached and available at http://www.FreeBSD.org/~jhb/patches/greylist.patch.

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/mail/milter-greylist/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile	23 Jan 2009 15:42:54 -0000	1.30
+++ Makefile	16 Apr 2009 16:02:44 -0000
@@ -19,6 +19,14 @@
 CONFLICTS=	milter-greylist-devel-[1-9]*.*
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+OPTIONS=	MANPAGES "Install manpages" YES \
+		LIBSPF2 "Include SPF support" NO \
+		GEOIP "Include GeoIP support" NO \
+		CURL "Include curl support" NO \
+		POSTFIX "Use Postfix instead of Sendmail" NO
+
+.include <bsd.port.pre.mk>
+
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
@@ -30,7 +38,7 @@
 # installed port preference over it.
 ##
 
-.if !defined (NO_INSTALL_MANPAGES)
+.if defined (WITH_MANPAGES)
 MAN5=		greylist.conf.5
 MAN8=		milter-greylist.8
 .endif
@@ -50,6 +58,9 @@
 BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 .endif
+.if defined(WITH_POSTFIX)
+CONFIGURE_ARGS+=	--enable-postfix
+.endif
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 CFLAGS+=	${PTHREAD_CFLAGS}
@@ -67,8 +78,10 @@
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/mail
+.if defined (WITH_MANPAGES)
 	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
 	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
+.endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec
 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf \
 			${PREFIX}/etc/mail/greylist.conf.sample
@@ -100,8 +113,6 @@
 	) || ${TRUE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 .include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: