14 files changed, 188 insertions, 78 deletions

diff --git a/net-p2p/museek+/Makefile b/net-p2p/museek+/Makefile
index a4c0d07aae43..7f90b69c43af 100644
--- a/net-p2p/museek+/Makefile
+++ b/net-p2p/museek+/Makefile
@@ -12,22 +12,19 @@
 # WITH_OPTIMIZED_CFLAGS - build with optimizations and exclude debug symbols
 
 PORTNAME=	museekplus
-PORTVERSION=	0.1.12
-PORTREVISION=	2
+PORTVERSION=	0.1.13
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
 DISTNAME=	museek+-${PORTVERSION}
 
-MAINTAINER=	stefan@FreeBSD.org
+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
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
-BROKEN=		Does not build
-
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_SCONS=	yes
@@ -36,8 +33,8 @@ USE_FAM=	yes
 SCONS_ARGS=	QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
 DATADIR=	share/museek
 
-MAN1=		muscan.1 muscand.1 museekd.1 musetup.1 musetup-gtk.1 mulog.1 \
-		museekcontrol.1 mucous.1
+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
@@ -83,11 +80,14 @@ post-patch:
 		-e "s,%%PYTHONPREFIX_SITELIBDIR%%,${PYTHONPREFIX_SITELIBDIR},g"\
 		${WRKSRC}/Mucipher/python/SConscript \
 		${WRKSRC}/mucous/pymucous/SConscript \
-		${WRKSRC}/pymuseekd/museek/SConscript
+		${WRKSRC}/murmur/pymurmur/SConscript \
+		${WRKSRC}/museekd/SConscript \
+		${WRKSRC}/python-bindings/museek/SConscript
 
 post-install:
 	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" \
-		${PREFIX}/bin/mucous
+		${PREFIX}/bin/mucous \
+		${PREFIX}/bin/musetup-gtk
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/net-p2p/museek+/distinfo b/net-p2p/museek+/distinfo
index 441309cd4348..23bbb9269e73 100644
--- a/net-p2p/museek+/distinfo
+++ b/net-p2p/museek+/distinfo
@@ -1,3 +1,3 @@
-MD5 (museek+-0.1.12.tar.bz2) = 5d871e40dc93c04e60688a06e0e143e8
-SHA256 (museek+-0.1.12.tar.bz2) = 458a6d98cfec13c416382df32c99ff7862d70f54bc94ff3ad1cdb0723a7b3a53
-SIZE (museek+-0.1.12.tar.bz2) = 758908
+MD5 (museek+-0.1.13.tar.bz2) = 7aada627839578ebe525c54a1cef7dc4
+SHA256 (museek+-0.1.13.tar.bz2) = e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e
+SIZE (museek+-0.1.13.tar.bz2) = 1186870
diff --git a/net-p2p/museek+/files/patch-Mucipher_python_SConscript b/net-p2p/museek+/files/patch-Mucipher_python_SConscript
index b4b0ef4f1442..7eac66f45a16 100644
--- a/net-p2p/museek+/files/patch-Mucipher_python_SConscript
+++ b/net-p2p/museek+/files/patch-Mucipher_python_SConscript
@@ -1,11 +1,10 @@
 --- Mucipher/python/SConscript.orig	Sat Aug 12 13:50:30 2006
 +++ Mucipher/python/SConscript	Sat Aug 12 13:51:26 2006
-@@ -28,7 +28,7 @@
- 
-     mucipherc = env_swigpy.SharedLibrary('_mucipherc', sources, SWIGFLAGS='-python')
+@@ -38,6 +38,6 @@
  
+        mucipherc = mucipherc[0]
 -    py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages")
 +    py_dest = env['DESTDIR'] + "%%PYTHONPREFIX_SITELIBDIR%%"
  
-     install = env.Install(py_dest, source = [ mucipherc, 'mucipherc.py',  'mucipher.py'])
+    dp1 = env_swigpy.Install(py_dest, 'mucipherc.py')
  
diff --git a/net-p2p/museek+/files/patch-murmur_pymurmur_SConscript b/net-p2p/museek+/files/patch-murmur_pymurmur_SConscript
new file mode 100644
index 000000000000..b545c57bda23
--- /dev/null
+++ b/net-p2p/museek+/files/patch-murmur_pymurmur_SConscript
@@ -0,0 +1,11 @@
+--- murmur/pymurmur/SConscript.orig	2007-08-23 18:03:02.000000000 +0300
++++ murmur/pymurmur/SConscript	2007-10-18 11:25:48.000000000 +0300
+@@ -11,7 +11,7 @@
+ 
+ import sys, os
+ py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
+-py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "pymurmur")
++py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "pymurmur")
+ 
+ install = env.Install(py_dest, files)
+ env.Alias('install_murmur', install)
diff --git a/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript b/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript
index d55afb2145ed..e69de29bb2d1 100644
--- a/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript
+++ b/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript
@@ -1,11 +0,0 @@
---- pymuseekd/museek/SConscript.orig	Sat Aug 12 14:07:46 2006
-+++ pymuseekd/museek/SConscript	Sat Aug 12 14:08:21 2006
-@@ -14,7 +14,7 @@
- 
- import sys, os
- py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
--py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "museek")
-+py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "museek")
- 
- install = env.Install(py_dest, files)
- env.Alias('install_pymuseekd', install)
diff --git a/net-p2p/museek+/files/patch-python-bindings_museek_SConscript b/net-p2p/museek+/files/patch-python-bindings_museek_SConscript
new file mode 100644
index 000000000000..02eadc281767
--- /dev/null
+++ b/net-p2p/museek+/files/patch-python-bindings_museek_SConscript
@@ -0,0 +1,11 @@
+--- python-bindings/museek/SConscript.orig	2007-08-21 09:25:18.000000000 +0300
++++ python-bindings/museek/SConscript	2007-10-18 11:30:12.000000000 +0300
+@@ -8,7 +8,7 @@
+ 
+ import sys, os
+ py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
+-py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "museek")
++py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "museek")
+ 
+ install = env.Install(py_dest, files)
+ env.Alias('install_pymuseekd', install)
diff --git a/net-p2p/museek+/pkg-plist b/net-p2p/museek+/pkg-plist
index 6e2e53dd5267..97b84ee8decb 100644
--- a/net-p2p/museek+/pkg-plist
+++ b/net-p2p/museek+/pkg-plist
@@ -1,5 +1,6 @@
 bin/mucous
 bin/mulog
+bin/murmur
 bin/muscan
 bin/muscand
 bin/museekcontrol
@@ -7,15 +8,56 @@ bin/museekd
 %%MUSEEQ%%bin/museeq
 bin/musetup
 bin/musetup-gtk
-%%PYTHON_SITELIBDIR%%/_mucipherc.so
-%%PYTHON_SITELIBDIR%%/mucipher.py
-%%PYTHON_SITELIBDIR%%/mucipherc.py
 %%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%%/pymucous/utils.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
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-banned.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-buddied.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-ignored.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-trusted.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/browser.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/chatroom.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-banned.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-buddied.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-ignored.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-trusted.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-banned.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-buddied.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-ignored.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-trusted.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/privatechat.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/search.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/transfer.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/userinfo.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-banned.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-buddied.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-ignored.png
@@ -144,21 +186,24 @@ bin/musetup-gtk
 %%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/tab_remove.png
 %%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/transfer.png
 %%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/userinfo.png
+%%MUSEEQ%%%%DATADIR%%/museeq/nowplaying.qs
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_de.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_es.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_fr.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_it.qm
+%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_nl.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_pl.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_pt_BR.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/nowplaying.qs
 %%MUSEEQ%%%%DATADIR%%/museeq/uptime.qs
-@dirrm %%PYTHON_SITELIBDIR%%/museek
-@dirrm %%PYTHON_SITELIBDIR%%/pymucous
-@dirrm %%DATADIR%%/museekd
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/bluebox
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/default
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-silk
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-tri
 %%MUSEEQ%%@dirrm %%DATADIR%%/museeq/translations
+%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-tri
+%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-silk
+%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/default
+%%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
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index a4c0d07aae43..7f90b69c43af 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -12,22 +12,19 @@
 # WITH_OPTIMIZED_CFLAGS - build with optimizations and exclude debug symbols
 
 PORTNAME=	museekplus
-PORTVERSION=	0.1.12
-PORTREVISION=	2
+PORTVERSION=	0.1.13
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
 DISTNAME=	museek+-${PORTVERSION}
 
-MAINTAINER=	stefan@FreeBSD.org
+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
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
-BROKEN=		Does not build
-
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_SCONS=	yes
@@ -36,8 +33,8 @@ USE_FAM=	yes
 SCONS_ARGS=	QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
 DATADIR=	share/museek
 
-MAN1=		muscan.1 muscand.1 museekd.1 musetup.1 musetup-gtk.1 mulog.1 \
-		museekcontrol.1 mucous.1
+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
@@ -83,11 +80,14 @@ post-patch:
 		-e "s,%%PYTHONPREFIX_SITELIBDIR%%,${PYTHONPREFIX_SITELIBDIR},g"\
 		${WRKSRC}/Mucipher/python/SConscript \
 		${WRKSRC}/mucous/pymucous/SConscript \
-		${WRKSRC}/pymuseekd/museek/SConscript
+		${WRKSRC}/murmur/pymurmur/SConscript \
+		${WRKSRC}/museekd/SConscript \
+		${WRKSRC}/python-bindings/museek/SConscript
 
 post-install:
 	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" \
-		${PREFIX}/bin/mucous
+		${PREFIX}/bin/mucous \
+		${PREFIX}/bin/musetup-gtk
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/net-p2p/museekplus/distinfo b/net-p2p/museekplus/distinfo
index 441309cd4348..23bbb9269e73 100644
--- a/net-p2p/museekplus/distinfo
+++ b/net-p2p/museekplus/distinfo
@@ -1,3 +1,3 @@
-MD5 (museek+-0.1.12.tar.bz2) = 5d871e40dc93c04e60688a06e0e143e8
-SHA256 (museek+-0.1.12.tar.bz2) = 458a6d98cfec13c416382df32c99ff7862d70f54bc94ff3ad1cdb0723a7b3a53
-SIZE (museek+-0.1.12.tar.bz2) = 758908
+MD5 (museek+-0.1.13.tar.bz2) = 7aada627839578ebe525c54a1cef7dc4
+SHA256 (museek+-0.1.13.tar.bz2) = e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e
+SIZE (museek+-0.1.13.tar.bz2) = 1186870
diff --git a/net-p2p/museekplus/files/patch-Mucipher_python_SConscript b/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
index b4b0ef4f1442..7eac66f45a16 100644
--- a/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
+++ b/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
@@ -1,11 +1,10 @@
 --- Mucipher/python/SConscript.orig	Sat Aug 12 13:50:30 2006
 +++ Mucipher/python/SConscript	Sat Aug 12 13:51:26 2006
-@@ -28,7 +28,7 @@
- 
-     mucipherc = env_swigpy.SharedLibrary('_mucipherc', sources, SWIGFLAGS='-python')
+@@ -38,6 +38,6 @@
  
+        mucipherc = mucipherc[0]
 -    py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages")
 +    py_dest = env['DESTDIR'] + "%%PYTHONPREFIX_SITELIBDIR%%"
  
-     install = env.Install(py_dest, source = [ mucipherc, 'mucipherc.py',  'mucipher.py'])
+    dp1 = env_swigpy.Install(py_dest, 'mucipherc.py')
  
diff --git a/net-p2p/museekplus/files/patch-murmur_pymurmur_SConscript b/net-p2p/museekplus/files/patch-murmur_pymurmur_SConscript
new file mode 100644
index 000000000000..b545c57bda23
--- /dev/null
+++ b/net-p2p/museekplus/files/patch-murmur_pymurmur_SConscript
@@ -0,0 +1,11 @@
+--- murmur/pymurmur/SConscript.orig	2007-08-23 18:03:02.000000000 +0300
++++ murmur/pymurmur/SConscript	2007-10-18 11:25:48.000000000 +0300
+@@ -11,7 +11,7 @@
+ 
+ import sys, os
+ py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
+-py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "pymurmur")
++py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "pymurmur")
+ 
+ install = env.Install(py_dest, files)
+ env.Alias('install_murmur', install)
diff --git a/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript b/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript
index d55afb2145ed..e69de29bb2d1 100644
--- a/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript
+++ b/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript
@@ -1,11 +0,0 @@
---- pymuseekd/museek/SConscript.orig	Sat Aug 12 14:07:46 2006
-+++ pymuseekd/museek/SConscript	Sat Aug 12 14:08:21 2006
-@@ -14,7 +14,7 @@
- 
- import sys, os
- py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
--py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "museek")
-+py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "museek")
- 
- install = env.Install(py_dest, files)
- env.Alias('install_pymuseekd', install)
diff --git a/net-p2p/museekplus/files/patch-python-bindings_museek_SConscript b/net-p2p/museekplus/files/patch-python-bindings_museek_SConscript
new file mode 100644
index 000000000000..02eadc281767
--- /dev/null
+++ b/net-p2p/museekplus/files/patch-python-bindings_museek_SConscript
@@ -0,0 +1,11 @@
+--- python-bindings/museek/SConscript.orig	2007-08-21 09:25:18.000000000 +0300
++++ python-bindings/museek/SConscript	2007-10-18 11:30:12.000000000 +0300
+@@ -8,7 +8,7 @@
+ 
+ import sys, os
+ py_ver = str(sys.version_info[0]) + "." + str(sys.version_info[1])
+-py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages", "museek")
++py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "museek")
+ 
+ install = env.Install(py_dest, files)
+ env.Alias('install_pymuseekd', install)
diff --git a/net-p2p/museekplus/pkg-plist b/net-p2p/museekplus/pkg-plist
index 6e2e53dd5267..97b84ee8decb 100644
--- a/net-p2p/museekplus/pkg-plist
+++ b/net-p2p/museekplus/pkg-plist
@@ -1,5 +1,6 @@
 bin/mucous
 bin/mulog
+bin/murmur
 bin/muscan
 bin/muscand
 bin/museekcontrol
@@ -7,15 +8,56 @@ bin/museekd
 %%MUSEEQ%%bin/museeq
 bin/musetup
 bin/musetup-gtk
-%%PYTHON_SITELIBDIR%%/_mucipherc.so
-%%PYTHON_SITELIBDIR%%/mucipher.py
-%%PYTHON_SITELIBDIR%%/mucipherc.py
 %%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%%/pymucous/utils.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
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-banned.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-buddied.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-ignored.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away-trusted.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/away.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/browser.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/chatroom.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-banned.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-buddied.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-ignored.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline-trusted.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/offline.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-banned.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-buddied.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-ignored.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online-trusted.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/online.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/privatechat.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/search.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/transfer.png
+%%MUSEEQ%%%%DATADIR%%/museeq/birdies/userinfo.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-banned.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-buddied.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-ignored.png
@@ -144,21 +186,24 @@ bin/musetup-gtk
 %%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/tab_remove.png
 %%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/transfer.png
 %%MUSEEQ%%%%DATADIR%%/museeq/mikelabo-tri/userinfo.png
+%%MUSEEQ%%%%DATADIR%%/museeq/nowplaying.qs
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_de.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_es.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_fr.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_it.qm
+%%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_nl.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_pl.qm
 %%MUSEEQ%%%%DATADIR%%/museeq/translations/museeq_pt_BR.qm
-%%MUSEEQ%%%%DATADIR%%/museeq/nowplaying.qs
 %%MUSEEQ%%%%DATADIR%%/museeq/uptime.qs
-@dirrm %%PYTHON_SITELIBDIR%%/museek
-@dirrm %%PYTHON_SITELIBDIR%%/pymucous
-@dirrm %%DATADIR%%/museekd
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/bluebox
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/default
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-silk
-%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-tri
 %%MUSEEQ%%@dirrm %%DATADIR%%/museeq/translations
+%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-tri
+%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/mikelabo-silk
+%%MUSEEQ%%@dirrm %%DATADIR%%/museeq/default
+%%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