4 files changed, 15 insertions, 25 deletions
diff --git a/graphics/yagf/doinst.sh b/graphics/yagf/doinst.sh
index 1f8ff67ded..3e5691a052 100644
--- a/graphics/yagf/doinst.sh
+++ b/graphics/yagf/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/graphics/yagf/slack-desc b/graphics/yagf/slack-desc
index 269ad2307a..061d5bdf07 100644
--- a/graphics/yagf/slack-desc
+++ b/graphics/yagf/slack-desc
@@ -6,14 +6,14 @@
 # leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-yagf: yagf (graphical interface for cuneiform(
-yagf: 
+yagf: yagf (graphical interface for cuneiform)
+yagf:
 yagf: YAGF is a graphical interface for the cuneiform text recognition
 yagf: program on the Linux platform. With YAGF you can scan images via
 yagf: XSane, perform images preprocessing and recognize texts using
 yagf: cuneiform from a single command centre. YAGF also makes it easy to
 yagf: scan and recognize several images sequentially.
-yagf: 
+yagf:
 yagf: Homepage: http://symmetrica.net/cuneiform-linux/yagf-en.html
 yagf:
 yagf:
diff --git a/graphics/yagf/yagf.SlackBuild b/graphics/yagf/yagf.SlackBuild
index 3fbc5f358a..efe8cc088a 100644
--- a/graphics/yagf/yagf.SlackBuild
+++ b/graphics/yagf/yagf.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=yagf
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -43,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-Source
+tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.gz
+cd $PRGNAM-$VERSION-Source
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,18 +51,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Remove .svn directories and fix desktop menu item.
-find . -type d -name ".svn" | xargs rm -rf {} \;
+# Fix desktop menu item.
 sed -i 's|true|false|' YAGF.desktop
 
 # Make translations. Cmake doesn't handle them properly.
 lrelease src/*.ts
 mv src/*.qm .
 
-mkdir build && cd build
+mkdir -p build
+cd build
   cmake \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCPACK_INSTALL_PREFIX:PATH=/usr \
     -DLIB_PATH_SUFFIX="$LIBDIRSUFFIX" \
     -DCPACK_BINARY_TGZ=ON \
     -DCPACK_BINARY_TZ=ON \
@@ -76,12 +73,6 @@ mkdir build && cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE=Release ..
 
-  # Remove -O3 flags.
-  REM_O3=$(find . -type f | xargs grep '\-O3' | cut -d ':' -f1 | uniq | sort)
-  for i in $REM_O3; do
-    sed -i 's|-O3 ||g' $i
-  done
-
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
@@ -91,7 +82,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING DESCRIPTION README \
+  AUTHORS ChangeLog COPYING DESCRIPTION README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/yagf/yagf.info b/graphics/yagf/yagf.info
index a6e0115afd..535b9c9bf8 100644
--- a/graphics/yagf/yagf.info
+++ b/graphics/yagf/yagf.info
@@ -1,10 +1,10 @@
 PRGNAM="yagf"
-VERSION="0.8.1"
+VERSION="0.8.4"
 HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
-DOWNLOAD="http://symmetrica.net/cuneiform-linux/yagf-0.8.1.tar.gz"
-MD5SUM="72558252cba34003d26ea31fba24ca67"
+DOWNLOAD="http://symmetrica.net/cuneiform-linux/yagf-0.8.4-Source.tar.gz"
+MD5SUM="77d4046d15196e3a7ec2847424ea92a3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"