ports/179276: [PATCH] mail/dovecot: convert to optionsNG

[Matthias Andree]

>Number:         179276
>Category:       ports
>Synopsis:       [PATCH] mail/dovecot: convert to optionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 03 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:
Request portmgr approval if maintainer non-responsive.

- Convert to optionsNG
- Improve some descriptions
- Remove KQUEUE from options and enforce it:
  the configure script would pick it anyways even if missing

- While here, cook Makefile header.

Port maintainer (yds at CoolRat.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- dovecot-1.2.17.patch begins here ---
diff -ruN /usr/ports//mail/dovecot/Makefile ./Makefile
--- /usr/ports//mail/dovecot/Makefile	2013-04-27 13:59:28.000000000 +0200
+++ ./Makefile	2013-06-03 23:32:31.000000000 +0200
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dovecot
-# Date created:				12/08/2002
-# Whom:			Dominic Marks <dominic.marks at btinternet.com>
-#
-# $FreeBSD: mail/dovecot/Makefile 316662 2013-04-27 11:59:28Z mva $
-#
+# Created by: Dominic Marks <dominic.marks at btinternet.com>
+# $FreeBSD$
 
 PORTNAME=	dovecot
 PORTVERSION=	1.2.17
@@ -11,6 +7,8 @@
 MASTER_SITES=	http://www.dovecot.org/releases/${DOVECOTVERSION}/ \
 		http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
 
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	yds at CoolRat.org
 COMMENT=	Secure and compact IMAP and POP3 servers
 
@@ -45,7 +43,19 @@
 		${PREFIX}/lib/dovecot/pop3 \
 		${PREFIX}/lib/dovecot/lda
 
-.if defined(NOPORTDOCS)
+NO_OPTIONS_SORT=	yes
+OPTIONS_DEFINE=	SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE
+# KQUEUE removed because dovecot picks it anyways
+OPTIONS_DEFAULT=SSL MANAGESIEVE KQUEUE
+
+MANAGESIEVE_DESC=	ManageSieve filter management support
+VPOPMAIL_DESC=		VPopMail password lookup support
+SSL_DESC=		SSL/TLS support through OpenSSL
+GSSAPI_DESC=		GSSAPI mechanism support
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--without-docs
 .else
 DOCS=		AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README
@@ -57,17 +69,6 @@
 
 PROTOCOLS=	imap pop3
 
-OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
-		SSL		"SSL support"		on  \
-		MANAGESIEVE	"ManageSieve support"	on  \
-		GSSAPI		"GSSAPI support"	off \
-		VPOPMAIL	"VPopMail support"	off \
-		BDB		"BerkleyDB support"	off \
-		LDAP		"OpenLDAP support"	off \
-		PGSQL		"PostgreSQL support"	off \
-		MYSQL		"MySQL support"		off \
-		SQLITE		"SQLite support"	off
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
@@ -86,15 +87,13 @@
 		s![[:<:]]doc/(dovecot-[^-]+)-example.conf[[:>:]]!${EXAMPLESDIR}/\1.conf!g;\
 		s!\#sendmail_path = /usr/.*!sendmail_path = /usr/sbin/sendmail!g;
 
-## kqueue(2) support
+## kqueue(2) support - no longer optional, dovecots picks it anyways
 #
-.if !defined(WITHOUT_KQUEUE)
 CONFIGURE_ARGS+=	--with-ioloop=kqueue
-.endif
 
 ## SSL support
 #
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 PROTOCOLS+=		imaps pop3s
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -102,18 +101,17 @@
 
 ## ManageSieve support
 #
-.if defined(WITH_MANAGESIEVE)
+.if ${PORT_OPTIONS:MMANAGESIEVE}
 MANAGESIEVEVERSION!=	${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V PORTVERSION
 PATCH_SITES!=		${MAKE} -C ${.CURDIR}/../dovecot-managesieve -V MASTER_SITES
 PATCHFILES+=		dovecot-${PORTVERSION}-managesieve-${MANAGESIEVEVERSION}.diff.gz
-PATCH_DIST_STRIP=	-p1
 PROTOCOLS+=		managesieve
 DOCS+=			README.managesieve
 .endif
 
 ## GSSAPI support
 #
-.if defined(WITH_GSSAPI)
+.if ${PORT_OPTIONS:MGSSAPI}
 CONFIGURE_ARGS+=	--with-gssapi
 .else
 CONFIGURE_ARGS+=	--without-gssapi
@@ -121,7 +119,7 @@
 
 ## VPopMail Support
 #
-.if defined(WITH_VPOPMAIL)
+.if ${PORT_OPTIONS:MVPOPMAIL}
 VPOPMAIL=		${LOCALBASE}/vpopmail/bin/vchkpw
 BUILD_DEPENDS+=		${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
 CONFIGURE_ARGS+=	--with-vpopmail
@@ -131,7 +129,7 @@
 
 ## BDB Support
 #
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--with-db
 CFLAGS+=		-I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}
@@ -143,7 +141,7 @@
 
 ## OpenLDAP Support
 #
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 PLIST_SUB+=		LDAP=""
@@ -155,7 +153,7 @@
 
 ## PostgreSQL Support
 #
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST_SUB+=		SQL=""
@@ -167,7 +165,7 @@
 
 ## MySQL Support
 #
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		SQL=""
@@ -179,7 +177,7 @@
 
 ## SQLite Support
 #
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		3
 CONFIGURE_ARGS+=	--with-sqlite
 PLIST_SUB+=		SQL=""
@@ -219,7 +217,7 @@
 		| ${SED} -e 's:^@exec ::; s:%D:${PREFIX}:g;' \
 		> ${WRKDIR}/.PLIST.exec \
 		&& ${SH} ${WRKDIR}/.PLIST.exec
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
--- dovecot-1.2.17.patch ends here ---

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