Convert from WITHOUT_NLS to PORT_OPTIONS:MNLS

While here do some conversion to new options framework

11 files changed, 86 insertions, 98 deletions

diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 04c193f84a40..7b345c859c21 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gnu dico
-# Date created:		27-12-2009
-# Whom:			Goran Tal
-#
+# Created by: Goran Tal
 # $FreeBSD$
-#
 
 PORTNAME=	dico
 PORTVERSION=	2.2
@@ -26,16 +22,13 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--localstatedir=/var
 
-OPTIONS=	PYTHON	"With PYTHON support" on \
-		GUILE	"With GUILE support" on \
-		PCRE	"With PCRE support" on \
-		GSASL	"With GSASL support" off \
-		PAM	"With PAM support" off \
-		LDAP	"With LDAP support" off
+OPTIONS_DEFINE=	PYTHON GUILE PCRE GSASL PAM LDAP
+OPTIONS_DEFAULT=	PYTHON GUILE PCRE
+GSASL_DESC=	GSASL support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""
 .else
@@ -43,7 +36,7 @@ CONFIGURE_ARGS+=--without-python
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if defined(WITH_GUILE)
+.if ${PORT_OPTIONS:MGUILE}
 LIB_DEPENDS+=	guile.21:${PORTSDIR}/lang/guile
 PLIST_SUB+=	GUILE=""
 .else
@@ -51,7 +44,7 @@ CONFIGURE_ARGS+=--without-guile
 PLIST_SUB+=	GUILE="@comment "
 .endif
 
-.if defined(WITH_PCRE)
+.if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 PLIST_SUB+=	PCRE=""
 .else
@@ -59,14 +52,14 @@ CONFIGURE_ARGS+=--without-pcre
 PLIST_SUB+=	PCRE="@comment "
 .endif
 
-.if defined(WITH_GSASL)
+.if ${PORT_OPTIONS:MGSASL}
 LIB_DEPENDS+=	gsasl.16:${PORTSDIR}/security/gsasl
 CONFIGURE_ARGS+=--with-gsasl
 .else
 CONFIGURE_ARGS+=--without-gsasl
 .endif
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 PLIST_SUB+=	PAM=""
 CONFIGURE_ARGS+=--enable-pam
 .else
@@ -74,7 +67,7 @@ PLIST_SUB+=	PAM="@comment "
 CONFIGURE_ARGS+=--disable-pam
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 PLIST_SUB+=	LDAP=""
 .else
@@ -82,7 +75,7 @@ CONFIGURE_ARGS+=--without-ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index c356e53a849e..4bff3acb95f1 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jwhois
-# Date created:		15 Jul 2000
-# Whom:			matusita@jp.FreeBSD.org
-#
+# Created by: matusita@jp.FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	jwhois
 PORTVERSION=	4.0
@@ -22,11 +18,14 @@ USE_GMAKE=	yes
 CPPFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/jwhois
-.if defined(WITHOUT_NLS)
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB=	NLS=""
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=	NLS="@comment "
-.else
-PLIST_SUB=	NLS=""
 .endif
 
 INSTALL_TARGET=	install-strip
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index ec73e3b72578..d14fe82556a3 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	miredo
-# Date created:				2006-08-12
-# Whom:					Andreas Kohn <andreas@syndrom23.de>
-#
+# Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#
 
 PORTNAME=		miredo
 PORTVERSION=	 	1.2.5
@@ -21,7 +17,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--localstatedir=/var --enable-examplesdir=$(EXAMPLESDIR)
 USE_LDCONFIG=		yes
 
-OPTIONS=		POLICYTABLE	"Install policy table to support teredo"	off
+OPTIONS_DEFINE=	POLICYTABLE NLS
+POLICYTABLE_DESC=	Install policy table to support teredo
 
 MAN1=			teredo-mire.1
 MAN5=			miredo-server.conf.5 miredo.conf.5
@@ -30,7 +27,9 @@ USE_RC_SUBR=		miredo_server miredo
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext iconv
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB=		NLS=""
@@ -39,10 +38,9 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=		NLS="@comment "
 .endif
 
-.include <bsd.port.options.mk>
 
 post-install:
-.if defined(WITH_POLICYTABLE)
+.if ${PORT_OPTIONS:MPOLICYTABLE}
 			$(INSTALL_DATA) $(FILESDIR)/ip6addrctl.conf /etc
 PLIST_SUB+=		POLICYTABLE=""
 .else
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index 427375c7750c..32a19c8e1b33 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   nc6
-# Date created:                30 May 2002
-# Whom:                        Filippo Natali <filippo@widestore.net>
-#
+# Created by: Filippo Natali <filippo@widestore.net>
 # $FreeBSD$
-#
 
 PORTNAME=	nc6
 PORTVERSION=	1.0
@@ -21,7 +17,9 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
diff --git a/net/net6/Makefile b/net/net6/Makefile
index f4010d49aee6..ed8141b54b65 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -20,14 +20,16 @@ USE_AUTOTOOLS=	libtool
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile
index 61da5d548506..046c97797cb0 100644
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	remmina-plugins
-# Date created:				24 June 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME?=	remmina-plugins
 PORTVERSION=	0.9.2
@@ -19,29 +15,31 @@ COMMENT?=	Remmina plugin system
 .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk"
 .else
 
-OPTIONS=	RDP	"Install RDP protocol plugin"	on \
-		VNC	"Install VNC protocol plugin"	on \
-		XDMCP	"Install XDMCP protocol plugin"	on \
-		TELEP	"Install Telepathy protocol plugin"	on
+OPTIONS_DEFINE=	RDP VNC XDMCP TELEP
+OPTIONS_DEFAULT=	RDP VNC XDMCP TELEP
+RDP_DESC=	RDP protocol plugin
+VNC_DESC=	VNC protocol plugin
+XDMCP_DESC=	XDMCP protocol plugin
+TELEP_DESC=	Telepathy protocol plugin
 
 NO_BUILD=	yes
 PATCHDIR=	# none
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_RDP)
+.if ${PORT_OPTIONS:MRDP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-rdp.so:${PORTSDIR}/net/remmina-plugin-rdp
 .endif
 
-.if !defined(WITHOUT_VNC)
+.if ${PORT_OPTIONS:MVNC}
 RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-vnc.so:${PORTSDIR}/net/remmina-plugin-vnc
 .endif
 
-.if !defined(WITHOUT_XDMCP)
+.if ${PORT_OPTIONS:MXDMCP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-xdmcp.so:${PORTSDIR}/net/remmina-plugin-xdmcp
 .endif
 
-.if !defined(WITHOUT_TELEP)
+.if ${PORT_OPTIONS:MTELEP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-telepathy.so:${PORTSDIR}/net/remmina-plugin-telepathy
 .endif
 
diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk
index 6aa1b7e77816..88cddb9915c9 100644
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@@ -31,12 +31,12 @@ CONFIGURE_ARGS+=--enable${PKGNAMESUFFIX}
 PLIST_SUB+=	PLUGIN="${PKGNAMESUFFIX:S,-,,}"
 PLIST=		${PKGDIR}/pkg-plist.plugin
 
-.if defined(WITH_TELEP)
+.if ${PORT_OPTIONS:MTELEP}
 PLIST_SUB+=	TELEP="" ICONS="@comment "
 .else
 PLIST_SUB+=	TELEP="@comment " ICONS=""
 .endif
-.if defined(WITH_SSH)
+.if ${PORT_OPTIONS:MTELEP}
 LIB_DEPENDS+=	ssh.4:${PORTSDIR}/security/libssh
 CONFIGURE_ARGS+=--enable-ssh
 PLIST_SUB+=	SSH="@comment "
@@ -47,7 +47,7 @@ LDFLAGS+=	-fstack-protector
 PLIST_SUB+=	SSH=""
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTONS:MNLS}
 RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n
 .endif
 
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 8e0a29654521..3ad1277b9ea0 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -10,11 +10,12 @@ MASTER_SITES=	SF/${PORTNAME}/0.9
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	The GTK+ Remote Desktop Client
 
-OPTIONS=	SSH	"Build with SSH tunneling support"	on \
-		GCRYPT	"Build with libgcrypt support for password encryption"	on \
-		TERM	"Build with terminal support"	on \
-		AVAHI	"Build with Avahi support"	on \
-		UNIQUE	"Build with Unique-App support"	on
+OPTIONS_DEFINE=	SSH GCRYPT TERM AVAHI UNIQUE NLS
+OPTIONS_DEFAULT=	SSH GCRYPT TERM AVAHI UNIQUE
+SSH_DESC=	SSH tunneling support
+GCRYPT_DESC=	libgcrypt support for password encryption
+TERM_DESC=	terminal support
+UNIQUE_DESC=	Unique-App support
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -29,15 +30,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_SSH)
+.if ${PORT_OPTIONS:MSSH}
 BUILD_DEPENDS+=	${LOCALBASE}/include/libssh/libssh.h:${PORTSDIR}/security/libssh
 RUN_DEPENDS+=	${LOCALBASE}/lib/libssh.so.4:${PORTSDIR}/security/libssh
 .if ${OSVERSION} >= 800040
@@ -47,25 +48,25 @@ LDFLAGS+=	-fstack-protector
 CONFIGURE_ARGS+=--disable-ssh
 .endif
 
-.if !defined(WITHOUT_GCRYPT)
+.if ${PORT_OPTIONS:MGCRYPT}
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 .else
 CONFIGURE_ARGS+=--disable-gcrypt
 .endif
 
-.if !defined(WITHOUT_TERM)
+.if ${PORT_OPTIONS:MTERM}
 USE_GNOME+=	vte
 .else
 CONFIGURE_ARGS+=--disable-vte
 .endif
 
-.if !defined(WITHOUT_AVAHI)
+.if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=	avahi-ui.0:${PORTSDIR}/net/avahi-gtk
 .else
 CONFIGURE_ARGS+=--disable-avahi
 .endif
 
-.if !defined(WITHOUT_UNIQUE)
+.if ${PORT_OPTIONS:MUNIQUE}
 LIB_DEPENDS+=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 .else
 CONFIGURE_ARGS+=--disable-unique
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index 61722f1f8809..ce1b9ac8611e 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	smb4k-kde4
-# Date created:				02 Jan 2011
-# Whom:					Josh Paetzel <jpaetzel@FreeBSD.org>
-#
+# Created by: Josh Paetzel <jpaetzel@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=		smb4k-kde4
 PORTVERSION=		0.10.9
@@ -30,19 +26,21 @@ USE_QT4=	corelib gui network opengl script svg webkit \
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/smb4k
 SUB_FILES=	pkg-message
 
-.if defined(WITHOUT_NLS)
-NLS=	"@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 NLS=	""
+.else
+NLS=	"@comment "
 .endif
 PLIST_SUB+=	NLS=${NLS}
 
 pre-configure:
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} -e 's|add_subdirectory( po )|#add_subdirectory( po )|'     \
 		${WRKSRC}/CMakeLists.txt
 .endif
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|add_subdirectory( doc )|#add_subdirectory( doc )|'   \
 		${WRKSRC}/CMakeLists.txt
 .endif
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index 605be9513d8d..502cb0f4aa79 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -16,7 +16,9 @@ MAN1=		tcpreen.1
 
 DOC_FILES=	AUTHORS NEWS README THANKS TODO
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
@@ -25,7 +27,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 1d4de7c79266..a0b7981d9ee4 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,5 +1,3 @@
-# ex:ts=8
-# Ports collection makefile for:	wol
 # Created by: ijliao
 # $FreeBSD$
 
@@ -17,19 +15,20 @@ USE_PERL5_BUILD=	yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB=	NLS="@comment "
-.else
-USES+=		gettext iconv
-PLIST_SUB=	NLS=""
-.endif
-
 MAN1=		wol.1
 INFO=		wol
 DOCS=		AUTHORS NEWS README TODO
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext iconv
+PLIST_SUB=	NLS=""
+.else
+CONFIGURE_ARGS=	--disable-nls
+PLIST_SUB=	NLS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}