Convert my ports to optionsNG

4 files changed, 42 insertions, 33 deletions

diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 1e94e4db4234..374efbf0184e 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -25,16 +25,6 @@ USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	ASPELL		"Enable spell checking support"	on \
-		GPG		"Enable gpg plugin"		off \
-		GSM		"Enable gsm audio plugin"	off \
-		GTK2		"Enable gtk plugin"		off \
-		PERL		"Enable perl plugin"		off \
-		PYTHON		"Enable python plugin"		off \
-		SQLITE		"Enable sqlite plugin"		off \
-		UNICODE		"Enable unicode (experimental)" off \
-		XOSD		"Enable xosd plugin"		off
-
 CONFIGURE_ARGS+=	--enable-shared \
 			--disable-static \
 			--enable-dynamic \
@@ -50,9 +40,23 @@ CONFIGURE_ARGS+=	--enable-shared \
 LDFLAGS+=		-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
 CFLAGS+=		-I${LOCALBASE}/include
 
+OPTIONS_DEFINE=	ASPELL GPG GSM GTK2 PERL PYTHON SQLITE UNICODE XOSD
+
+ASPELL_DESC=	Enable spell checking support
+GPG_DESC=	Enable gpg plugin
+GSM_DESC=	Enable gsm audio plugin
+GTK2_DESC=	Enable gtk plugin
+PERL_DESC=	Enable perl plugin
+PYTHON_DESC=	Enable python plugin
+SQLITE_DESC=	Enable sqlite plugin
+UNICODE_DESC=	Enable unicode (experimental)
+XOSD_DESC=	Enable xosd plugin
+
+OPTIONS_DEFAULT=ASPELL
+
 .include <bsd.port.options.mk>
 
-.if defined(WITH_ASPELL)
+.if ${PORT_OPTIONS:MASPELL}
 LIB_DEPENDS+=		aspell:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS+=		${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell
 CONFIGURE_ARGS+=	--with-aspell
@@ -60,7 +64,7 @@ CONFIGURE_ARGS+=	--with-aspell
 CONFIGURE_ARGS+=	--without-aspell
 .endif
 
-.if defined(WITH_GPG)
+.if ${PORT_OPTIONS:MGPG}
 LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme \
 			gpg-error:${PORTSDIR}/security/libgpg-error
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
@@ -71,7 +75,7 @@ CONFIGURE_ARGS+=	--without-gpg
 PLIST_SUB+=		GPG_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_GSM)
+.if ${PORT_OPTIONS:MGSM}
 LIB_DEPENDS+=		gsm:${PORTSDIR}/audio/gsm
 CONFIGURE_ARGS+=	--with-libgsm
 PLIST_SUB+=		GSM_PLUGIN=""
@@ -80,7 +84,7 @@ CONFIGURE_ARGS+=	--without-libgsm
 PLIST_SUB+=		GSM_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=		gtk20
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SUB+=		GTK2_PLUGIN=""
@@ -89,16 +93,16 @@ CONFIGURE_ARGS+=	--without-gtk
 PLIST_SUB+=		GTK2_PLUGIN="@comment "
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=		yes
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=		PERL_PLUGIN=""
@@ -107,7 +111,7 @@ CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		PERL_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=		yes
 CONFIGURE_ARGS+=	--with-python
 PLIST_SUB+=		PYTHON_PLUGIN=""
@@ -116,7 +120,7 @@ CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=		PYTHON_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3
 PLIST_SUB+=		SQLITE_PLUGIN=""
@@ -125,11 +129,11 @@ CONFIGURE_ARGS+=	--without-sqlite3
 PLIST_SUB+=		SQLITE_PLUGIN="@comment "
 .endif
 
-.if defined(WITH_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
 CONFIGURE_ARGS+=	--enable-unicode
 .endif
 
-.if defined(WITH_XOSD)
+.if ${PORT_OPTIONS:MXOSD}
 LIB_DEPENDS+=		xosd:${PORTSDIR}/misc/xosd
 CONFIGURE_ARGS+=	--with-libxosd
 PLIST_SUB+=		XOSD_PLUGIN=""
@@ -139,12 +143,12 @@ PLIST_SUB+=		XOSD_PLUGIN="@comment "
 .endif
 
 post-patch:
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
 		${WRKSRC}/contrib/python/notify-bubble.py
 .endif
 
-.if defined(WITH_UNICODE)
+.if ${PORT_OPTIONS:MUNICODE}
 	@${REINPLACE_CMD} -e 's|ncursesw/||' ${WRKSRC}/configure \
 		${WRKSRC}/plugins/ncurses/ecurses.h
 .endif
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 8888a4d2f09c..98e674d981c7 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -52,11 +52,12 @@ USE_QT4=	dbus gui network script scripttools webkit xml phonon \
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 
-OPTIONS=	GG_EMOTS	"Install GG-compatible emoticons"	off
+OPTIONS_DEFINE=	GG_EMOTS
+GG_EMOTS_DESC=	Install GG-compatible emoticons
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GG_EMOTS)
+.if ${PORT_OPTIONS:MGG_EMOTS}
 PLIST_SUB+=	GG_EMOTS=""
 DISTFILES+=	${GG6_EMOTS_DISTFILE}:additions \
 		${GG7_EMOTS_DISTFILE}:additions
@@ -72,7 +73,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -exec ${GREP} -q "#!/bin/bash" {} \; \
 		-exec ${REINPLACE_CMD} -e 's|#!/bin/bash|#!/usr/bin/env bash|g' {} \;
 
-.if defined(WITH_GG_EMOTS)
+.if ${PORT_OPTIONS:MGG_EMOTS}
 	@cd ${WRKSRC}/varia/themes/emoticons && \
 	${TAR} -zxf ${_DISTDIR}/${GG6_EMOTS_DISTFILE} && \
 	${MV} kompatybilne_z_GG6 gg6_compatible && \
diff --git a/polish/libgadu/Makefile b/polish/libgadu/Makefile
index e77a71469932..dfc8d8952c44 100644
--- a/polish/libgadu/Makefile
+++ b/polish/libgadu/Makefile
@@ -25,17 +25,19 @@ CONFIGURE_ARGS=	--enable-shared --disable-static --with-pthread \
 
 USE_LDCONFIG=	yes
 
-OPTIONS=	OPENSSL "Build with OpenSSL support" on
-
 PLIST_FILES=	include/libgadu.h \
 		lib/libgadu.la \
 		lib/libgadu.so \
 		lib/libgadu.so.3 \
 		libdata/pkgconfig/libgadu.pc
 
+OPTIONS_DEFINE=	OPENSSL
+OPENSSL_DESC=	Build with OpenSSL support
+OPTIONS_DEFAULT=OPENSSL
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .else
 CONFIGURE_ARGS+=	--without-openssl
@@ -46,7 +48,7 @@ post-patch:
 
 pre-install:
 # OpenSSL from base system lacks .pc file for pkgconfig
-.if defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 	@${REINPLACE_CMD} -e 's|openssl| |g' ${WRKSRC}/pkgconfig/libgadu.pc
 .endif
 
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 7701eaa2e942..2c4ef4c5cc2d 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -29,6 +29,8 @@ MANCOMPRESSED=	yes
 PORTDOCS=	ChangeLog changelog.gz README README.pl LICENSE \
 		LICENSE.pl COPYRIGHT
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
 		doc/qnapi.desktop doc/qnapi-download.desktop
@@ -39,7 +41,7 @@ pre-build:
 	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}