1 files changed, 24 insertions, 25 deletions

diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index cfbfc8dc25d2..48d85628d386 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -21,13 +21,15 @@ LIB_DEPENDS=	xine.2:${PORTSDIR}/multimedia/libxine \
 		tag.1:${PORTSDIR}/audio/taglib	\
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-OPTIONS=	DBUS "Add DBUS support" on \
-		CURL "Add Curl support" on \
-		NLS "Add support for nls" on \
-		NEWREMOTE "Use new remote player" on \
-		FOX16 "Use stable branch of  FOX" on \
-		FOX17 "Use development branch of FOX" off \
-		GCRYPT "Use libgcrypt for md5 calculation" off
+OPTIONS_DEFINE=	DBUS CURL NLS NEWREMOTE GCRYPT DOCS
+OPTIONS_SINGLE=	FOX
+OPTIONS_SINGLE_FOX=	FOX16 FOX17
+OPTIONS_DEFAULT=	DBUS CURL NEWREMOTE FOX16
+
+FOX16_DESC=	Use stable branch of FOX
+FOX17_DESC=	Use development branch of FOX
+NEWREMOTE_DESC=	Use new remote player
+GCRYPT_DESC=	Use libgcrypt for md5 calculation
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --prefix=${PREFIX}
@@ -40,46 +42,43 @@ MAN1=		gogglesmm.1
 PORTDOCS=	README AUTHORS
 
 .include <bsd.port.options.mk>
-.if (defined(WITHOUT_FOX16) && defined(WITHOUT_FOX17)) || (defined(WITH_FOX16) && defined(WITH_FOX17))
-IGNORE=	you should choose between FOX16 and FOX17
-.endif
 
-.if defined(WITH_FOX16)
+.if ${PORT_OPTIONS:MFOX16}
 LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
 .endif
 
-.if defined(WITH_FOX17)
+.if ${PORT_OPTIONS:MFOX17}
 LIB_DEPENDS+=	FOX-1.7:${PORTSDIR}/x11-toolkits/fox17
 .endif
 
-.if defined(WITH_GCRYPT)
+.if ${PORT_OPTIONS:MGCRYPT}
 LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--with-md5=gcrypt
 .else
 CONFIGURE_ARGS+=	--with-md5=internal
 .endif
 
-.if defined(WITHOUT_DBUS)
-CONFIGURE_ARGS+=	--without-dbus
-.else
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
+.else
+CONFIGURE_ARGS+=	--without-dbus
 .endif
 
-.if defined(WITHOUT_CURL)
-CONFIGURE_ARGS+=	--without-curl
-.else
+.if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--without-curl
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB=	NLS=""
 USE_GETTEXT=	yes
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_NEWREMOTE)
+.if empty(PORT_OPTIONS:MNEWREMOTE)
 CONFIGURE_ARGS+=--without-new-remote
 .endif
 
@@ -90,7 +89,7 @@ pre-install:
 	@${MKDIR} ${PREFIX}/share/applications
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 . for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}