- Convert to OPTIONS and add more of them

PR:		129757
Submitted by:	Silver Salonen <silver at ultrasoft dot ee> (maintainer)

2 files changed, 109 insertions, 74 deletions

diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index 3de268a39e63..dd01e2b2602f 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -3,17 +3,10 @@
 # Whom:					Stefan Walter <stefan@FreeBSD.org>
 #
 # $FreeBSD$
-#
-# This port's behaviour can be adjusted by defining the following variables:
-#
-# WITHOUT_MUSEEQ        - build without museeq, the Qt frontend
-# WITHOUT_QSA           - build museeq without scripting support
-# WITH_DEBUG            - build with debugging messages
-# WITH_OPTIMIZED_CFLAGS - build with optimizations and exclude debug symbols
 
 PORTNAME=	museekplus
 PORTVERSION=	0.1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
@@ -22,58 +15,97 @@ DISTNAME=	museek+-${PORTVERSION}
 MAINTAINER=	silver@ultrasoft.ee
 COMMENT=	SoulSeek client with separate terminal and Qt based interface
 
-LIB_DEPENDS=	xml\\+\\+:${PORTSDIR}/textproc/libxml++26 \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	xml\\+\\+:${PORTSDIR}/textproc/libxml++26
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
 USE_BZIP2=	yes
-USE_PYTHON=	yes
 USE_SCONS=	yes
 USE_FAM=	yes
 
 SCONS_ARGS=	QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
 DATADIR=	share/museek
+MAN1=		musetup.1 mulog.1 museekcontrol.1 muscan.1 muscand.1 museekd.1
 
-MAN1=		mucous.1 mulog.1 murmur.1 muscan.1 muscand.1 museekcontrol.1 \
-		museekd.1 musetup-gtk.1 musetup.1
+OPTIONS= \
+	MUSEEQ "Install Museeq (Qt3 client)" On \
+	QSA "Build Museeq with Qt Script support" On \
+	MUSETUPGTK "Install musetup-gtk" On \
+	PYMUCIPHER "Install python bindings for Mucipher" On \
+	VORBIS "Enable OGG Vorbis support in muscan" On \
+	MURMUR "Install PyGTK client" Off \
+	MUCOUS "Install Curses Python client" Off \
+	OPTIMIZED_CFLAGS "Build with optmizations" Off \
+	DEBUG "Build in debug mode" Off
 
-.if defined(WITHOUT_MUSEEQ)
-SCONS_ARGS+=	MUSEEQ=no
-PLIST_SUB+=	MUSEEQ="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if defined(WITH_PYMUCIPHER) || defined(WITH_BINDINGS) || defined(WITH_MURMUR) || defined(WITH_CLIENTS) || defined(WITH_MUCOUS)
+USE_PYTHON=	yes
+.endif
+
+.ifdef(WITH_MUSEEQ)
 USE_QT_VER=	3
 SCONS_ARGS+=	MUSEEQ=yes
-PLIST_SUB+=	MUSEEQ=""
 MAN1+=		museeq.1
-.if defined(WITHOUT_QSA)
-SCONS_ARGS+=	QSA=no
-.else
+PLIST_SUB+=	MUSEEQ=""
+.ifdef(WITH_QSA)
 SCONS_ARGS+=	QSA=yes
 LIB_DEPENDS+=	qsa:${PORTSDIR}/devel/qsa
+.else
+SCONS_ARGS+=	QSA=no
 .endif
+.else
+SCONS_ARGS+=	MUSEEQ=no
+PLIST_SUB+=	MUSEEQ="@comment "
+SCONS_ARGS+=	QSA=no
 .endif
-
-.if defined(WITH_DEBUG)
-SCONS_ARGS+=	MULOG="cycle,debug"
+.ifdef(WITH_VORBIS)
+SCONS_ARGS+=	VORBIS=yes
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 .else
-SCONS_ARGS+=	MULOG=""
+SCONS_ARGS+=	VORBIS=no
 .endif
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
-SCONS_ARGS+=	RELEASE=yes
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_MUSETUPGTK)
+SCONS_ARGS+=	MUSETUPGTK=yes
+MAN1+=		musetup-gtk.1
+PLIST_SUB+=	MUSETUPGTK=""
 .else
-SCONS_ARGS+=	RELEASE=no
+SCONS_ARGS+=	MUSETUPGTK=no
+PLIST_SUB+=	MUSETUPGTK="@comment "
 .endif
-
-pre-everything::
-.if !defined(WITHOUT_MUSEEQ)
-	@${ECHO_MSG} "Define WITHOUT_MUSEEQ to build without the Qt frontend"
+.ifdef(WITH_PYMUCIPHER)
+SCONS_ARGS+=	PYMUCIPHER=yes
+PLIST_SUB+=	PYMUCIPHER=""
+.else
+SCONS_ARGS+=	PYMUCIPHER=no
+PLIST_SUB+=	PYMUCIPHER="@comment "
+.endif
+.ifdef(WITH_MURMUR)
+SCONS_ARGS+=	MURMUR=yes
+MAN1+=		murmur.1
+PLIST_SUB+=	MURMUR=""
+.else
+SCONS_ARGS+=	MURMUR=no
+PLIST_SUB+=	MURMUR="@comment "
 .endif
-.if !defined(WITH_DEBUG)
-	@${ECHO_MSG} "Define WITH_DEBUG to build with debugging messages"
+.ifdef(WITH_MUCOUS)
+SCONS_ARGS+=	MUCOUS=yes
+MAN1+=		mucous.1
+PLIST_SUB+=	MUCOUS=""
+.else
+SCONS_ARGS+=	MUCOUS=no
+PLIST_SUB+=	MUCOUS="@comment "
 .endif
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFALGS to build with optmizations"
+.ifdef(WITH_OPTIMIZED_CFLAGS)
+SCONS_ARGS+=	RELEASE=yes
+.else
+SCONS_ARGS+=	RELEASE=no
+.endif
+.ifdef(WITH_DEBUG)
+SCONS_ARGS+=	MULOG="cycle,debug"
 .endif
 
 post-patch:
@@ -86,11 +118,14 @@ post-patch:
 		${WRKSRC}/python-bindings/museek/SConscript
 
 post-install:
-	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" \
-		${PREFIX}/bin/mucous \
-		${PREFIX}/bin/musetup-gtk
+.ifdef(WITH_MUCOUS)
+	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/mucous
+.endif
+.ifdef(WITH_MUSETUPGTK)
+	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/musetup-gtk
+.endif
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-p2p/museekplus/pkg-plist b/net-p2p/museekplus/pkg-plist
index 97b84ee8decb..0d968d5ad6f5 100644
--- a/net-p2p/museekplus/pkg-plist
+++ b/net-p2p/museekplus/pkg-plist
@@ -1,41 +1,41 @@
-bin/mucous
+%%MUCOUS%%bin/mucous
 bin/mulog
-bin/murmur
+%%MURMUR%%bin/murmur
 bin/muscan
 bin/muscand
 bin/museekcontrol
 bin/museekd
 %%MUSEEQ%%bin/museeq
 bin/musetup
-bin/musetup-gtk
-%%PYTHON_SITELIBDIR%%/museek/__init__.py
-%%PYTHON_SITELIBDIR%%/museek/driver.py
-%%PYTHON_SITELIBDIR%%/museek/messages.py
-%%PYTHON_SITELIBDIR%%/pymucous/ConfigParser.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousAlerts.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousChatRooms.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousFormat.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousHelp.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousInput.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousLists.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousMuscan.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousNetworking.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousPopup.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousPrivateChat.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousRecommendations.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousRoomsList.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousSearch.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousSetup.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousShares.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousTransfers.py
-%%PYTHON_SITELIBDIR%%/pymucous/MucousUserInfo.py
-%%PYTHON_SITELIBDIR%%/pymucous/__init__.py
-%%PYTHON_SITELIBDIR%%/pymurmur/__init__.py
-%%PYTHON_SITELIBDIR%%/pymurmur/entrydialog.py
-%%PYTHON_SITELIBDIR%%/pymurmur/imagedata.py
-%%PYTHON_SITELIBDIR%%/pymurmur/muscan.py
-%%PYTHON_SITELIBDIR%%/pymurmur/settings.py
-%%PYTHON_SITELIBDIR%%/pymurmur/utils.py
+%%MUSETUPGTK%%bin/musetup-gtk
+%%PYMUCIPHER%%%%PYTHON_SITELIBDIR%%/museek/__init__.py
+%%PYMUCIPHER%%%%PYTHON_SITELIBDIR%%/museek/driver.py
+%%PYMUCIPHER%%%%PYTHON_SITELIBDIR%%/museek/messages.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/ConfigParser.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousAlerts.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousChatRooms.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousFormat.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousHelp.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousInput.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousLists.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousMuscan.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousNetworking.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousPopup.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousPrivateChat.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousRecommendations.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousRoomsList.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousSearch.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousSetup.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousShares.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousTransfers.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/MucousUserInfo.py
+%%MUCOUS%%%%PYTHON_SITELIBDIR%%/pymucous/__init__.py
+%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/__init__.py
+%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/entrydialog.py
+%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/imagedata.py
+%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/muscan.py
+%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/settings.py
+%%MURMUR%%%%PYTHON_SITELIBDIR%%/pymurmur/utils.py
 %%DATADIR%%/museekd/config.xml.tmpl
 %%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-banned.png
 %%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-buddied.png
@@ -204,6 +204,6 @@ bin/musetup-gtk
 %%MUSEEQ%%@dirrm %%DATADIR%%/museeq
 @dirrm %%DATADIR%%/museekd
 @dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/pymucous
-@dirrm %%PYTHON_SITELIBDIR%%/pymurmur
-@dirrm %%PYTHON_SITELIBDIR%%/museek
+%%MUCOUS%%@dirrm %%PYTHON_SITELIBDIR%%/pymucous
+%%MURMUR%%@dirrm %%PYTHON_SITELIBDIR%%/pymurmur
+%%PYMUCIPHER%%@dirrm %%PYTHON_SITELIBDIR%%/museek