diff -urN museekplus.old/Makefile museekplus/Makefile --- museekplus.old/Makefile 2008-06-18 23:15:27.000000000 +0300 +++ museekplus/Makefile 2008-12-19 11:45:25.000000000 +0200 @@ -1,19 +1,12 @@ # New ports collection makefile for: museekplus -# Date created: 06 Aug 2006 -# Whom: Stefan Walter +# Date created: 19 Dec 2008 +# Whom: Silver Salonen # -# $FreeBSD: ports/net-p2p/museekplus/Makefile,v 1.12 2008/06/18 20:15:27 pav Exp $ -# -# 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 +# $FreeBSD$ 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,59 +15,143 @@ 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= mucous.1 mulog.1 murmur.1 muscan.1 muscand.1 museekcontrol.1 \ - museekd.1 musetup-gtk.1 musetup.1 - -.if defined(WITHOUT_MUSEEQ) -SCONS_ARGS+= MUSEEQ=no -PLIST_SUB+= MUSEEQ="@comment " +OPTIONS= \ + ONLYMUSEEQ "Install only Mucipher and Museeq (excludes all other options!)" Off \ + 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 (hashing library: SHA1, MD5, ...)" On \ + VORBIS "Enable OGG Vorbis support in file scanner (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 + +.include + +.if !defined(WITH_ONLYMUSEEQ) +MAN1= musetup.1 mulog.1 museekcontrol.1 +PLIST_SUB+= MUSEEK="" .else +PLIST_SUB+= MUSEEK="@comment " +.endif + +.if defined(WITH_PYMUCIPHER) || defined(WITH_BINDINGS) || defined(MURMUR) || defined(WITH_CLIENTS) || defined(MUCOUS) +USE_PYTHON= yes +.endif + +.if defined(WITH_MUSEEQ) || defined(WITH_ONLYMUSEEQ) +.ifdef(WITH_ONLYMUSEEQ) +SCONS_ARGS+= ONLYMUSEEQ=yes +.endif 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) && !defined(WITH_ONLYMUSEEQ) +SCONS_ARGS+= VORBIS=yes +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis .else -SCONS_ARGS+= MULOG="" +SCONS_ARGS+= VORBIS=no .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.include + +.ifdef(WITH_MUSETUPGTK) && !defined(WITH_ONLYMUSEEQ) +SCONS_ARGS+= MUSETUPGTK=yes +MAN1+= musetup-gtk.1 +PLIST_SUB+= MUSETUPGTK="" +.else +SCONS_ARGS+= MUSETUPGTK=no +PLIST_SUB+= MUSETUPGTK="@comment " +.endif +.ifdef(WITH_PYMUCIPHER) && !defined(WITH_ONLYMUSEEQ) +SCONS_ARGS+= PYMUCIPHER=yes +PLIST_SUB+= PYMUCIPHER="" +.else +SCONS_ARGS+= PYMUCIPHER=no +PLIST_SUB+= PYMUCIPHER="@comment " +.endif +.ifdef(WITH_MURMUR) && !defined(WITH_ONLYMUSEEQ) +SCONS_ARGS+= MURMUR=yes +MAN1+= murmur.1 +PLIST_SUB+= MURMUR="" +.else +SCONS_ARGS+= MURMUR=no +PLIST_SUB+= MURMUR="@comment " +.endif +.ifdef(WITH_MUCOUS) && !defined(WITH_ONLYMUSEEQ) +SCONS_ARGS+= MUCOUS=yes +MAN1+= mucous.1 +PLIST_SUB+= MUCOUS="" +.else +SCONS_ARGS+= MUCOUS=no +PLIST_SUB+= MUCOUS="@comment " +.endif +.ifdef(WITH_OPTIMIZED_CFLAGS) SCONS_ARGS+= RELEASE=yes .else SCONS_ARGS+= RELEASE=no .endif +.ifdef(WITH_DEBUG) +SCONS_ARGS+= MULOG="cycle,debug" +.endif pre-everything:: -.if !defined(WITHOUT_MUSEEQ) - @${ECHO_MSG} "Define WITHOUT_MUSEEQ to build without the Qt frontend" +.if defined(WITH_ONLYMUSEEQ) + @${ECHO_CMD} + @${ECHO_MSG} "Only Mucipher and Museeq are installed!" + @${ECHO_CMD} + @${ECHO_MSG} "All other options are ignored!" + @${ECHO_CMD} +.else +.if !defined(WITH_MUSETUPGTK) + @${ECHO_MSG} "Define WITH_MUSETUPGTK to install musetup-gtk" .endif -.if !defined(WITH_DEBUG) - @${ECHO_MSG} "Define WITH_DEBUG to build with debugging messages" +.if !defined(WITH_PYMUCIPHER) + @${ECHO_MSG} "Define WITH_PYMUCIPHER to install python bindings for mucipher (hashing library: SHA1, MD5, ...)" +.endif +.if !defined(WITH_MUSEEQ) + @${ECHO_MSG} "Define WITH_MUSEEQ to install Museeq (Qt3 client)" +.endif +.if !defined(WITH_ONLYMUSEEQ) + @${ECHO_MSG} "Define WITH_MUSEEQ to install only Mucipher and Museeq" +.endif +.if !defined(WITH_MURMUR) + @${ECHO_MSG} "Define WITH_MURMUR to install PyGTK client" +.endif +.if !defined(WITH_MUCOUS) + @${ECHO_MSG} "Define WITH_MUCOUS to install Curses Python client" .endif .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} "Define WITH_OPTIMIZED_CFALGS to build with optmizations" .endif +.if !defined(WITH_DEBUG) + @${ECHO_MSG} "Define WITH_DEBUG to build in debug mode" +.endif +.endif + post-patch: @${REINPLACE_CMD} \ @@ -86,11 +163,14 @@ ${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) && !defined(WITH_ONLYMUSEEQ) + @${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/mucous +.endif +.ifdef(WITH_MUSETUPGTK) && !defined(WITH_ONLYMUSEEQ) + @${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" ${PREFIX}/bin/musetup-gtk +.endif @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include diff -urN museekplus.old/pkg-plist museekplus/pkg-plist --- museekplus.old/pkg-plist 2007-10-19 19:33:06.000000000 +0300 +++ museekplus/pkg-plist 2008-12-18 14:37:46.000000000 +0200 @@ -1,42 +1,42 @@ -bin/mucous -bin/mulog -bin/murmur -bin/muscan -bin/muscand -bin/museekcontrol -bin/museekd +%%MUCOUS%%bin/mucous +%%MUSEEK%%bin/mulog +%%MURMUR%%bin/murmur +%%MUSEEK%%bin/muscan +%%MUSEEK%%bin/muscand +%%MUSEEK%%bin/museekcontrol +%%MUSEEK%%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 -%%DATADIR%%/museekd/config.xml.tmpl +%%MUSEEK%%bin/musetup +%%MUSETUPGTK%%bin/musetup-gtk +%%MUSEEK%%%%PYTHON_SITELIBDIR%%/museek/__init__.py +%%MUSEEK%%%%PYTHON_SITELIBDIR%%/museek/driver.py +%%MUSEEK%%%%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 +%%MUSEEK%%%%DATADIR%%/museekd/config.xml.tmpl %%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-banned.png %%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-buddied.png %%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-ignored.png @@ -202,8 +202,8 @@ %%MUSEEQ%%@dirrm %%DATADIR%%/museeq/bluebox %%MUSEEQ%%@dirrm %%DATADIR%%/museeq/birdies %%MUSEEQ%%@dirrm %%DATADIR%%/museeq -@dirrm %%DATADIR%%/museekd -@dirrm %%DATADIR%% -@dirrm %%PYTHON_SITELIBDIR%%/pymucous -@dirrm %%PYTHON_SITELIBDIR%%/pymurmur -@dirrm %%PYTHON_SITELIBDIR%%/museek +%%MUSEEK%%@dirrm %%DATADIR%%/museekd +%%MUSEEK%%@dirrm %%DATADIR%% +%%MUCOUS%%@dirrm %%PYTHON_SITELIBDIR%%/pymucous +%%MURMUR%%@dirrm %%PYTHON_SITELIBDIR%%/pymurmur +%%MUSEEK%%@dirrm %%PYTHON_SITELIBDIR%%/museek