- Make port respect PREFIX for all installed files and fix plist. [1]

- Remove custom do-build and do-install targets that are superfluous with
  USE_SCONS.
- Bump PORTREVISION.

Reported by:	kris [1]
Patch by:	stefan
Approved by:	arved (mentor)

10 files changed, 122 insertions, 28 deletions

diff --git a/net-p2p/museek+/Makefile b/net-p2p/museek+/Makefile
index 0791f9b2b4e2..3ede5e14d49d 100644
--- a/net-p2p/museek+/Makefile
+++ b/net-p2p/museek+/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	museekplus
 PORTVERSION=	0.1.11
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
@@ -30,38 +31,38 @@ USE_PYTHON=	yes
 USE_SCONS=	yes
 USE_FAM=	yes
 
-SCONS_PARAMS=	QTDIR=${X11BASE} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
+SCONS_ARGS=	QTDIR=${X11BASE} 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
 
 .if defined(WITHOUT_MUSEEQ)
-SCONS_PARAMS+=	MUSEEQ=no
+SCONS_ARGS+=	MUSEEQ=no
 PLIST_SUB+=	MUSEEQ="@comment "
 .else
 USE_QT_VER=	3
-SCONS_PARAMS+=	MUSEEQ=yes
+SCONS_ARGS+=	MUSEEQ=yes
 PLIST_SUB+=	MUSEEQ=""
 MAN1+=		museeq.1
 .if defined(WITHOUT_QSA)
-SCONS_PARAMS+=	QSA=no
+SCONS_ARGS+=	QSA=no
 .else
-SCONS_PARAMS+=	QSA=yes
+SCONS_ARGS+=	QSA=yes
 LIB_DEPENDS+=	qsa:${PORTSDIR}/devel/qsa
 .endif
 .endif
 
 .if defined(WITH_DEBUG)
-SCONS_PARAMS+=	MULOG="cycle,debug"
+SCONS_ARGS+=	MULOG="cycle,debug"
 .else
-SCONS_PARAMS+=	MULOG=""
+SCONS_ARGS+=	MULOG=""
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
-SCONS_PARAMS+=	RELEASE=yes
+SCONS_ARGS+=	RELEASE=yes
 .else
-SCONS_PARAMS+=	RELEASE=no
+SCONS_ARGS+=	RELEASE=no
 .endif
 
 pre-everything::
@@ -75,16 +76,19 @@ pre-everything::
 	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFALGS to build with optmizations"
 .endif
 
-do-build:
-	@cd ${WRKSRC} && scons ${SCONS_PARAMS}
-
-do-install:
-	@cd ${WRKSRC} && scons install
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s,%%PYTHONPREFIX_SITELIBDIR%%,${PYTHONPREFIX_SITELIBDIR},g"\
+		${WRKSRC}/Mucipher/python/SConscript \
+		${WRKSRC}/mucous/pymucous/SConscript \
+		${WRKSRC}/pymuseekd/museek/SConscript
 
 post-install:
 	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" \
 		${PREFIX}/bin/mucous
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-p2p/museek+/files/patch-Mucipher_python_SConscript b/net-p2p/museek+/files/patch-Mucipher_python_SConscript
new file mode 100644
index 000000000000..b4b0ef4f1442
--- /dev/null
+++ b/net-p2p/museek+/files/patch-Mucipher_python_SConscript
@@ -0,0 +1,11 @@
+--- 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')
+ 
+-    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'])
+ 
diff --git a/net-p2p/museek+/files/patch-mucous_pymucous_SConscript b/net-p2p/museek+/files/patch-mucous_pymucous_SConscript
new file mode 100644
index 000000000000..5aafa5f8c66c
--- /dev/null
+++ b/net-p2p/museek+/files/patch-mucous_pymucous_SConscript
@@ -0,0 +1,11 @@
+--- mucous/pymucous/SConscript.orig	Sat Aug 12 14:06:25 2006
++++ mucous/pymucous/SConscript	Sat Aug 12 14:07:11 2006
+@@ -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", "pymucous")
++py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "pymucous")
+ 
+ install = env.Install(py_dest, files)
+ env.Alias('install_mucous', install)
diff --git a/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript b/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript
new file mode 100644
index 000000000000..d55afb2145ed
--- /dev/null
+++ b/net-p2p/museek+/files/patch-pymuseekd_museek_SConscript
@@ -0,0 +1,11 @@
+--- 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+/pkg-plist b/net-p2p/museek+/pkg-plist
index 93eeebc73525..0d91d1556f38 100644
--- a/net-p2p/museek+/pkg-plist
+++ b/net-p2p/museek+/pkg-plist
@@ -7,6 +7,14 @@ 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/__init__.py
+%%PYTHON_SITELIBDIR%%/pymucous/utils.py
 %%DATADIR%%/museekd/config.xml.tmpl
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-banned.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-buddied.png
@@ -80,6 +88,8 @@ bin/musetup-gtk
 %%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
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index 0791f9b2b4e2..3ede5e14d49d 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	museekplus
 PORTVERSION=	0.1.11
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	museek-plus
@@ -30,38 +31,38 @@ USE_PYTHON=	yes
 USE_SCONS=	yes
 USE_FAM=	yes
 
-SCONS_PARAMS=	QTDIR=${X11BASE} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
+SCONS_ARGS=	QTDIR=${X11BASE} 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
 
 .if defined(WITHOUT_MUSEEQ)
-SCONS_PARAMS+=	MUSEEQ=no
+SCONS_ARGS+=	MUSEEQ=no
 PLIST_SUB+=	MUSEEQ="@comment "
 .else
 USE_QT_VER=	3
-SCONS_PARAMS+=	MUSEEQ=yes
+SCONS_ARGS+=	MUSEEQ=yes
 PLIST_SUB+=	MUSEEQ=""
 MAN1+=		museeq.1
 .if defined(WITHOUT_QSA)
-SCONS_PARAMS+=	QSA=no
+SCONS_ARGS+=	QSA=no
 .else
-SCONS_PARAMS+=	QSA=yes
+SCONS_ARGS+=	QSA=yes
 LIB_DEPENDS+=	qsa:${PORTSDIR}/devel/qsa
 .endif
 .endif
 
 .if defined(WITH_DEBUG)
-SCONS_PARAMS+=	MULOG="cycle,debug"
+SCONS_ARGS+=	MULOG="cycle,debug"
 .else
-SCONS_PARAMS+=	MULOG=""
+SCONS_ARGS+=	MULOG=""
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
-SCONS_PARAMS+=	RELEASE=yes
+SCONS_ARGS+=	RELEASE=yes
 .else
-SCONS_PARAMS+=	RELEASE=no
+SCONS_ARGS+=	RELEASE=no
 .endif
 
 pre-everything::
@@ -75,16 +76,19 @@ pre-everything::
 	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFALGS to build with optmizations"
 .endif
 
-do-build:
-	@cd ${WRKSRC} && scons ${SCONS_PARAMS}
-
-do-install:
-	@cd ${WRKSRC} && scons install
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s,%%PYTHONPREFIX_SITELIBDIR%%,${PYTHONPREFIX_SITELIBDIR},g"\
+		${WRKSRC}/Mucipher/python/SConscript \
+		${WRKSRC}/mucous/pymucous/SConscript \
+		${WRKSRC}/pymuseekd/museek/SConscript
 
 post-install:
 	@${REINPLACE_CMD} -i "" -e "s,/usr/bin/python,${PYTHON_CMD},g" \
 		${PREFIX}/bin/mucous
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-p2p/museekplus/files/patch-Mucipher_python_SConscript b/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
new file mode 100644
index 000000000000..b4b0ef4f1442
--- /dev/null
+++ b/net-p2p/museekplus/files/patch-Mucipher_python_SConscript
@@ -0,0 +1,11 @@
+--- 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')
+ 
+-    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'])
+ 
diff --git a/net-p2p/museekplus/files/patch-mucous_pymucous_SConscript b/net-p2p/museekplus/files/patch-mucous_pymucous_SConscript
new file mode 100644
index 000000000000..5aafa5f8c66c
--- /dev/null
+++ b/net-p2p/museekplus/files/patch-mucous_pymucous_SConscript
@@ -0,0 +1,11 @@
+--- mucous/pymucous/SConscript.orig	Sat Aug 12 14:06:25 2006
++++ mucous/pymucous/SConscript	Sat Aug 12 14:07:11 2006
+@@ -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", "pymucous")
++py_dest = env['DESTDIR'] + os.path.join("%%PYTHONPREFIX_SITELIBDIR%%", "pymucous")
+ 
+ install = env.Install(py_dest, files)
+ env.Alias('install_mucous', install)
diff --git a/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript b/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript
new file mode 100644
index 000000000000..d55afb2145ed
--- /dev/null
+++ b/net-p2p/museekplus/files/patch-pymuseekd_museek_SConscript
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/net-p2p/museekplus/pkg-plist
index 93eeebc73525..0d91d1556f38 100644
--- a/net-p2p/museekplus/pkg-plist
+++ b/net-p2p/museekplus/pkg-plist
@@ -7,6 +7,14 @@ 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/__init__.py
+%%PYTHON_SITELIBDIR%%/pymucous/utils.py
 %%DATADIR%%/museekd/config.xml.tmpl
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-banned.png
 %%MUSEEQ%%%%DATADIR%%/museeq/bluebox/away-buddied.png
@@ -80,6 +88,8 @@ bin/musetup-gtk
 %%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