6 files changed, 21 insertions, 32 deletions
diff --git a/academic/qucs/README b/academic/qucs/README
index 71af438dec1f2..429ba1189065b 100644
--- a/academic/qucs/README
+++ b/academic/qucs/README
@@ -1,5 +1,3 @@
 Qucs is an integrated circuit simulator which aims to support all
 kinds of circuit simulation types, e.g. DC, AC, S-parameter,
 harmonic balance analysis, noise analysis, etc.
-
-If the build fails, make sure that QTDIR is set properly.
diff --git a/academic/qucs/qucs-disable-tr1.patch b/academic/qucs/qucs-disable-tr1.patch
deleted file mode 100644
index 0be7ae00eb95e..0000000000000
--- a/academic/qucs/qucs-disable-tr1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qucs-core/configure.orig	2011-07-03 07:34:09.069218113 -0500
-+++ qucs-core/configure	2011-07-03 07:34:46.618990497 -0500
-@@ -5884,7 +5884,6 @@
- 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <tr1/complex>
- using namespace std;
- using namespace std::tr1;
- int
diff --git a/academic/qucs/qucs.SlackBuild b/academic/qucs/qucs.SlackBuild
index 51b60ec4845c1..e6a0871dc0f1e 100644
--- a/academic/qucs/qucs.SlackBuild
+++ b/academic/qucs/qucs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Qucs
 
-# Copyright 2011  Fridrich von Stauffenberg <cancellor2@gmail.com>
+# Copyright 2011-2013  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.16}
+VERSION=${VERSION:-0.0.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,17 +63,20 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -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 is vital!
-( cd $PRGNAM-core
-  patch -p1 < $CWD/$PRGNAM-disable-tr1.patch
-)
+find . -type f -exec sed -i "s,QTDIR,QT4DIR,g" {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -81,10 +84,8 @@ make install-strip DESTDIR=$PKG
 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/share/applications
+mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
-mkdir -p $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/qucs/qucs.desktop b/academic/qucs/qucs.desktop
index badf646a3df8b..650b7f10738e9 100644
--- a/academic/qucs/qucs.desktop
+++ b/academic/qucs/qucs.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Name=Qucs
@@ -8,3 +7,4 @@ Comment=
 Icon=qucs
 Exec=qucs
 Categories=Education;Electronics;
+MimeType=
diff --git a/academic/qucs/qucs.info b/academic/qucs/qucs.info
index d57a870b900f9..c4589e66c26af 100644
--- a/academic/qucs/qucs.info
+++ b/academic/qucs/qucs.info
@@ -1,10 +1,10 @@
 PRGNAM="qucs"
-VERSION="0.0.16"
+VERSION="0.0.17"
 HOMEPAGE="http://qucs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qucs/qucs-0.0.16.tar.gz"
-MD5SUM="c916502171d422ab168fe5fc681b29d8"
+DOWNLOAD="http://downloads.sourceforge.net/qucs/qucs-0.0.17.tar.gz"
+MD5SUM="4b93ffcc2ef3dbbd6fa53a5743721532"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt3"
+REQUIRES=""
 MAINTAINER="Fridrich von Stauffenberg"
 EMAIL="cancellor2@gmail.com"
diff --git a/academic/qucs/slack-desc b/academic/qucs/slack-desc
index f2eb7afced2cb..8a50b663caaf9 100644
--- a/academic/qucs/slack-desc
+++ b/academic/qucs/slack-desc
@@ -1,12 +1,12 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-qucs: Qucs (circuit simulator)
+qucs: qucs (circuit simulator)
 qucs:
 qucs: Qucs is an integrated circuit simulator which aims to support all
 qucs: kinds of circuit simulation types, e.g. DC, AC, S-parameter,