1 files changed, 18 insertions, 18 deletions
diff --git a/audio/yoshimi/yoshimi.SlackBuild b/audio/yoshimi/yoshimi.SlackBuild
index 9108177be7..8459b9d7ab 100644
--- a/audio/yoshimi/yoshimi.SlackBuild
+++ b/audio/yoshimi/yoshimi.SlackBuild
@@ -5,13 +5,13 @@
 # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
 PRGNAM=yoshimi
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.5.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar jxvf $CWD/${PRGNAM}-${VERSION}.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -51,33 +51,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cat $CWD/0001-Fix-for-fltk-1.3.patch | patch -p1
-
 cd src
-# Both "DDefaultAudio/Midi..." lines can be removed for default JACK audio/MIDI
+sed -i \
+  -e "s|\${CMAKE_INSTALL_DATAROOTDIR}/doc/yoshimi|/usr/doc/$PRGNAM-$VERSION|" \
+  CMakeLists.txt
+
+mkdir -p build
+cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DDefaultAudio:STRING=alsa \
-    -DDefaultMidi:STRING=alsa \
-    .
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
 
   make VERBOSE=1
   make install DESTDIR=$PKG
-cd ..
-
-# Move man pages to correct location
-#mv $PKG/usr/share/man $PKG/usr/
+cd ../..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-#find $PKG/usr/man -type f -exec gzip -9 {} \;
-#for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING INSTALL README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog COPYING INSTALL README.txt \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install