network/museek+: Updated for version 0.2

5 files changed, 76 insertions, 26 deletions

diff --git a/network/museek+/README b/network/museek+/README
index 658bb8338991..cc9b5b9cf21a 100644
--- a/network/museek+/README
+++ b/network/museek+/README
@@ -19,9 +19,7 @@ After installing museek+ follow these steps:
   4) Login into museekd via the interface socket or host:port and the 
      interface password.
 
-This requires qt4, scons, libsig++, libxml++, libevent, and swig. 
-
-QSA is an optional dependency, but it is not available at SlackBuilds.org.
+This requires scons, libsig++, libxml++, and libevent.  qsa is optional.
 
 An example init script (rc.museekd) for the museekd daemon is provided. 
 Feel free to modify it for your needs.  Use it at your own risk.
diff --git a/network/museek+/museek+.SlackBuild b/network/museek+/museek+.SlackBuild
index 57efd55ea6e2..91cdc9c464f9 100644
--- a/network/museek+/museek+.SlackBuild
+++ b/network/museek+/museek+.SlackBuild
@@ -3,23 +3,26 @@
 # Slackware build script for museek+
 # Written by Iskar Enev <iskar.enev[@]gmail.com>
 
-PRGNAM=museek+
+PKGNAME=museek+
 VERSION=0.2
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAME
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -27,28 +30,31 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAME-$VERSION
+tar xvf $CWD/$PKGNAME-$VERSION.tar.bz2
+cd $PKGNAME-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-cmake \
-  -DPREFIX=/usr \
-  -DMANDIR=man \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DSWIG_DIR:PATH=$(swig -swiglib) \
-  -DEVERYTHING=1 \
-  -DTRAYICON=1 \
-  -DBINRELOC=0
+# This patch fixes the python modules install path
+# to be architecture aware
+patch -p0 < $CWD/museek-python.diff
+
+cmake -DPREFIX=/usr \
+	-DMANDIR=man \
+	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+	-DSWIG_DIR:PATH=`swig -swiglib` \
+	-DEVERYTHING=1 \
+	-DTRAYICON=1 \
+	-DBINRELOC=0
 
 make VERBOSE=1
 make install VERBOSE=1 DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null
 )
@@ -58,16 +64,16 @@ make install VERBOSE=1 DESTDIR=$PKG
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
 cp -a \
   COPYING CREDITS FILES LICENSE README TODO INSTALL \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/rc.museekd > $PKG/usr/doc/$PRGNAM-$VERSION/rc.museekd.sample
+    $PKG/usr/doc/$PKGNAME-$VERSION
+cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
+cat $CWD/rc.museekd > $PKG/usr/doc/$PKGNAME-$VERSION/rc.museekd.new
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/museek+/museek+.info b/network/museek+/museek+.info
index 1340da42813b..2aeca5bf2197 100644
--- a/network/museek+/museek+.info
+++ b/network/museek+/museek+.info
@@ -3,6 +3,8 @@ VERSION="0.2"
 HOMEPAGE="http://museek-plus.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/museek-plus/museek+-0.2.tar.bz2"
 MD5SUM="66d3eab341e1cd6642f83d329a18c3b5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Iskar Enev"
-EMAIL="iskar.enev@gmail.com"
+EMAIL="<iskar.enev[@]gmail.com>"
 APPROVED="rworkman"
diff --git a/network/museek+/museek-python.diff b/network/museek+/museek-python.diff
new file mode 100644
index 000000000000..844d17d624b4
--- /dev/null
+++ b/network/museek+/museek-python.diff
@@ -0,0 +1,44 @@
+--- murmur/CMakeLists.txt	2008-09-22 11:49:33.000000000 +0300
++++ murmur/CMakeLists.txt.1	2009-09-01 12:04:34.000000000 +0300
+@@ -25,7 +25,7 @@
+   ${PYMURMUR_FILES}
+ )
+ 
+-EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
++EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
+ 
+ if (NOT sitepackages OR error)
+ 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
+--- mucous/CMakeLists.txt	2008-09-22 11:49:33.000000000 +0300
++++ mucous/CMakeLists.txt.1	2009-09-01 12:04:55.000000000 +0300
+@@ -28,7 +28,7 @@
+   ${PYMUCOUS_FILES}
+ )
+ 
+-EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
++EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
+ 
+ if (NOT sitepackages OR error)
+ 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
+--- python-bindings/CMakeLists.txt	2008-09-22 11:49:33.000000000 +0300
++++ python-bindings/CMakeLists.txt.1	2009-09-01 12:04:15.000000000 +0300
+@@ -18,7 +18,7 @@
+ museek/driver.py
+ )
+ 
+-EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
++EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
+ 
+ if (NOT sitepackages OR error)
+ 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
+--- Mucipher/PyMucipher/CMakeLists.txt	2008-10-07 19:58:27.000000000 +0300
++++ Mucipher/PyMucipher/CMakeLists.txt.1	2009-09-01 12:05:46.000000000 +0300
+@@ -37,7 +37,7 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py
+   ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so
+ )
+-EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
++EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
+ 
+ if (NOT sitepackages OR error)
+ 	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
diff --git a/network/museek+/slack-desc b/network/museek+/slack-desc
index 7203e36f4e42..6772ffa723e9 100644
--- a/network/museek+/slack-desc
+++ b/network/museek+/slack-desc
@@ -5,7 +5,7 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-           |-----handy-ruler---------------------------------------------------------|
+       |-----handy-ruler---------------------------------------------------------|
 museek+: museek+ (file-sharing application)
 museek+:
 museek+: Museek+ is a file-sharing application for the Soulseek p2p network,