3 files changed, 47 insertions, 34 deletions
diff --git a/audio/zynaddsubfx/doinst.sh b/audio/zynaddsubfx/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/audio/zynaddsubfx/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/audio/zynaddsubfx/zynaddsubfx.SlackBuild b/audio/zynaddsubfx/zynaddsubfx.SlackBuild
index be23e7d468..3338595ed7 100644
--- a/audio/zynaddsubfx/zynaddsubfx.SlackBuild
+++ b/audio/zynaddsubfx/zynaddsubfx.SlackBuild
@@ -7,12 +7,10 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=zynaddsubfx
-VERSION=${VERSION:-2.4.1}
+VERSION=${VERSION:-2.5.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-SRCNAM=ZynAddSubFX
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -45,48 +43,60 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# This fixes a asciidoc problem.
-sed -i s/___________/===========/ doc/zynaddsubfx.txt
-
-cd src
-  make -j1 \
-   LINUX_AUDIOOUT=JACK \
-   LINUX_USE_LASH=YES
-
-  mkdir -p $PKG/usr/bin
-  install -m 755 zynaddsubfx $PKG/usr/bin/
-cd -
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDefaultOutput=jack \
+    -DDefaultInput=jack \
+    -DGuiModule=fltk \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
-# Build the documentation
-cd doc
+( cd ExternalPrograms/Spliter
   make
-cd -
+  cp -a spliter $PKG/usr/bin
+)
 
-# Install the pre-made patches and examples in the $PKG directory
-mkdir -p $PKG/usr/share/ZynAddSubFX
-cp -a banks $PKG/usr/share/ZynAddSubFX/
-cp -a examples $PKG/usr/share/ZynAddSubFX/
+( cd ExternalPrograms/Controller
+  sed -i "s|Box\.h|Box\.H|" ControllerUI.fl
+  make
+  cp -a controller $PKG/usr/bin
+)
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+( cd doc
+  make man xhtml
+)
+
+mkdir -p $PKG/usr/man/man1
+gzip -9 < doc/zynaddsubfx.1 > $PKG/usr/man/man1/zynaddsubfx.1.gz
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog *.txt doc/images doc/zynaddsubfx.html \
+cp -a \
+  COPYING ChangeLog *.txt doc/images doc/zynaddsubfx.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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.${PKGTYPE:-tgz}
diff --git a/audio/zynaddsubfx/zynaddsubfx.info b/audio/zynaddsubfx/zynaddsubfx.info
index a8d6a4d74d..f2b45d756b 100644
--- a/audio/zynaddsubfx/zynaddsubfx.info
+++ b/audio/zynaddsubfx/zynaddsubfx.info
@@ -1,10 +1,10 @@
 PRGNAM="zynaddsubfx"
-VERSION="2.4.1"
+VERSION="2.5.2"
 HOMEPAGE="http://zynaddsubfx.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/zynaddsubfx/ZynAddSubFX-2.4.1.tar.bz2"
-MD5SUM="59eb69ce24d6f8c605f8ba43958d0526"
+DOWNLOAD="http://sourceforge.net/projects/zynaddsubfx/files/zynaddsubfx/2.5.2/zynaddsubfx-2.5.2.tar.gz"
+MD5SUM="c0d09b8e8d79691e79e7d424bc4f0263"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fltk lash mxml"
+REQUIRES="liblo fltk lash mxml"
 MAINTAINER="Arik Miller"
 EMAIL="ad423520@hotmail.com"