4 files changed, 20 insertions, 10 deletions
diff --git a/academic/qucs/doinst.sh b/academic/qucs/doinst.sh
index 4e8ba7071dea..5fb28930db0b 100644
--- a/academic/qucs/doinst.sh
+++ b/academic/qucs/doinst.sh
@@ -1,4 +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/academic/qucs/qucs.SlackBuild b/academic/qucs/qucs.SlackBuild
index c0793a561d3f..d3a5520dca5f 100644
--- a/academic/qucs/qucs.SlackBuild
+++ b/academic/qucs/qucs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Qucs
 
-# Copyright 2011-2013  Fridrich von Stauffenberg <cancellor2@gmail.com>
+# Copyright 2011-2014  Fridrich von Stauffenberg <cancellor2@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qucs
-VERSION=${VERSION:-0.0.17}
+VERSION=${VERSION:-0.0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,18 +64,26 @@ 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 {} \;
+ \( -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 {} \;
 
 find . -type f -exec sed -i "s,QTDIR,QT4DIR,g" {} \;
 
+# in x86_64, qucs-doc and examples requires newer automake
+cd qucs-doc
+autoreconf -vi
+cd ../examples
+autoreconf -vi
+cd ..
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux
 
 make
@@ -89,6 +97,8 @@ cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS* PLATFORMS README RELEASE THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/qucs/qucs.desktop b/academic/qucs/qucs.desktop
index 650b7f10738e..61c61f41b35c 100644
--- a/academic/qucs/qucs.desktop
+++ b/academic/qucs/qucs.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
+Terminal=false
 Name=Qucs
 GenericName=Circuit simulator
 Comment=
diff --git a/academic/qucs/qucs.info b/academic/qucs/qucs.info
index c4589e66c26a..0ad1623f4cec 100644
--- a/academic/qucs/qucs.info
+++ b/academic/qucs/qucs.info
@@ -1,8 +1,8 @@
 PRGNAM="qucs"
-VERSION="0.0.17"
+VERSION="0.0.18"
 HOMEPAGE="http://qucs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qucs/qucs-0.0.17.tar.gz"
-MD5SUM="4b93ffcc2ef3dbbd6fa53a5743721532"
+DOWNLOAD="http://downloads.sourceforge.net/qucs/qucs-0.0.18.tar.gz"
+MD5SUM="4985d66565e8c29c9e6d7e7c98781e60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""