Update some of my ports to new options framework

Submitted by:	Baptiste Daroussin <bapt@FreeBSD.org>

1 files changed, 26 insertions, 34 deletions

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index f2a830a9fae6..f61d1b7248df 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	jabberd
-# Date created:				29 December 2003
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	jabberd
 PORTVERSION=	2.2.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://cloud.github.com/downloads/Jabberd2/jabberd2/
 DIST_SUBDIR=	jabber
@@ -22,18 +18,14 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	MYSQL "Support MySQL (storage/auth/reg)" on \
-		POSTGRESQL "Support PostgreSQL (storage/auth/reg)" off \
-		LDAP "Support OpenLDAP (storage/auth/reg)" off \
-		BDB "Support BerkeleyDB (storage/auth/reg)" off \
-		SQLITE "Support SQLite3 (storage/auth/reg)" off \
-		PAM "Enable PAM (auth/reg)" off \
-		PIPE "Enable pipe (auth/reg)" off \
-		ANON "Enable anonymous (auth/reg)" off \
-		FS "Filesystem storage (only for testing)" off \
-		DEBUG "Compile with debug messages" on \
-		REQUIRES "Add backend requires to startup script" off \
-		CYRUS "Use Cyrus SASL backend (not supported)" off
+OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE FAM PIPE ANON FS DEBUG REQUIRES \
+		CYRUS DOCS
+OPTIONS_DEFAULT=	MYSQL DEBUG
+PIPE_DESC=	Enable pipe (auth/reg)
+ANON_DESC=	Enable anonymous (auth/reg)
+FS_DESC=	Filesystem storage (only for testing)
+REQUIRES_DESC=	Add backend requires to startup script
+CYRUS_DESC=	Use Cyrus SASL backend (not supported)
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -73,16 +65,16 @@ DOCFILES=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
 
 _REQUIRE=	LOGIN
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ELP+=	${OPENSSLLIB}
 EIP+=	${OPENSSLINC}
 
-.if !defined(WITHOUT_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--enable-pgsql
 PLIST_SUB+=	SUB_PGSQL=""
@@ -92,7 +84,7 @@ CONFIGURE_ARGS+=--disable-pgsql
 PLIST_SUB+=	SUB_PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=--enable-sqlite
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 CFLAGS+=	${PTHREAD_CFLAGS}
@@ -102,7 +94,7 @@ CONFIGURE_ARGS+=--disable-sqlite
 PLIST_SUB+=	SUB_SQLITE="@comment "
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--enable-mysql
 EIP+=:${LOCALBASE}/include/mysql
@@ -114,7 +106,7 @@ CONFIGURE_ARGS+=--disable-mysql
 PLIST_SUB+=	SUB_MYSQL="@comment "
 .endif
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 USE_BDB=	41+
 CONFIGURE_ARGS+=--enable-db
 CONFIGURE_ARGS+=--oldincludedir=/nonexistant
@@ -126,7 +118,7 @@ CONFIGURE_ARGS+=--disable-db
 PLIST_SUB+=	SUB_BDB="@comment "
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--enable-ldap
 PLIST_SUB+=	SUB_LDAP=""
@@ -136,7 +128,7 @@ CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	SUB_LDAP="@comment "
 .endif
 
-.if defined(WITH_FS)
+.if ${PORT_OPTIONS:MFS}
 CONFIGURE_ARGS+=--enable-fs
 PLIST_SUB+=	SUB_FS=""
 .else
@@ -144,7 +136,7 @@ CONFIGURE_ARGS+=--disable-fs
 PLIST_SUB+=	SUB_FS="@comment "
 .endif
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=--enable-pam
 PLIST_SUB+=	SUB_PAM=""
 .else
@@ -152,27 +144,27 @@ CONFIGURE_ARGS+=--disable-pam
 PLIST_SUB+=	SUB_PAM="@comment "
 .endif
 
-.if defined(WITH_PIPE)
+.if ${PORT_OPTIONS:MPIPE}
 CONFIGURE_ARGS+=--enable-pipe
 PLIST_SUB+=	SUB_PIPE=""
 .else
 PLIST_SUB+=	SUB_PIPE="@comment "
 .endif
 
-.if defined(WITH_ANON)
+.if ${PORT_OPTIONS:MANON}
 CONFIGURE_ARGS+=--enable-anon
 PLIST_SUB+=	SUB_ANON=""
 .else
 PLIST_SUB+=	SUB_ANON="@comment "
 .endif
 
-.if defined(WITH_REQUIRES)
+.if ${PORT_OPTIONS:MREQUIRES}
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 .else
 SUB_LIST+=	REQUIRE="LOGIN"
 .endif
 
-.if defined(WITH_CYRUS)
+.if ${PORT_OPTIONS:MCYRUS}
 CONFIGURE_ARGS+=	--with-sasl=cyrus
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .else
@@ -187,7 +179,7 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
 		${WRKSRC}/tools/jabberd.in
-.if defined(WITH_CYRUS)
+.if ${PORT_OPTIONS:MCYRUS}
 	@${REINPLACE_CMD} -e '/^#error /d' \
 		${WRKSRC}/sx/sasl_cyrus.c
 .endif
@@ -197,7 +189,7 @@ post-install:
 	@${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd
 	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
 	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
@@ -207,4 +199,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>