4 files changed, 32 insertions, 36 deletions
diff --git a/academic/qucs/qucs.SlackBuild b/academic/qucs/qucs.SlackBuild
index 1cf3b6d6ca0e..c6e6450c54c2 100644
--- a/academic/qucs/qucs.SlackBuild
+++ b/academic/qucs/qucs.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Qucs
 
 # Copyright 2011-2014  Fridrich von Stauffenberg <cancellor2@gmail.com>
-# Copyright 2020 Fellype do Nascimento, Campinas - Brazil
+# Copyright 2020-2024 Fellype do Nascimento, Guaratingueta - Brazil
 #
 # All rights reserved.
 #
@@ -27,8 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qucs
-VERSION=${VERSION:-0.0.19}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.0.20}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -71,7 +71,6 @@ else
 fi
 
 set -e
-source /etc/profile.d/qt4.sh
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -86,32 +85,40 @@ 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 {} \;
 
+sed -i "s:ARCHIVE DESTINATION lib COMPONENT devel:ARCHIVE DESTINATION lib${LIBDIRSUFFIX} COMPONENT devel:" qucs/CMakeLists.txt
+sed -i "s:LIBRARY DESTINATION lib COMPONENT library:LIBRARY DESTINATION lib${LIBDIRSUFFIX} COMPONENT library:" qucs/CMakeLists.txt
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-doc \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_RPATH=OFF \
+    -DCMAKE_INSTALL_RPATH=/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_DL_LIBS=/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+mv $PKG/usr/share/man $PKG/usr
 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,pixmaps}
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+# move perl and shell scripts from /usr/bin to a more appropriated location
+mkdir $PKG/usr/share/qucs/scripts
+cd $PKG/usr/bin/
+  cp -a ps2sp qucsdigi qucsdigilib qucsveri $PKG/usr/share/qucs/scripts
+  rm ps2sp qucsdigi qucsdigilib qucsveri
+cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a qucs/AUTHORS qucs/COPYING README.md qucs/README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $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
deleted file mode 100644
index 61c61f41b35c..000000000000
--- a/academic/qucs/qucs.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Name=Qucs
-GenericName=Circuit simulator
-Comment=
-Icon=qucs
-Exec=qucs
-Categories=Education;Electronics;
-MimeType=
diff --git a/academic/qucs/qucs.info b/academic/qucs/qucs.info
index 2d17c1db1f46..82330ade6902 100644
--- a/academic/qucs/qucs.info
+++ b/academic/qucs/qucs.info
@@ -1,10 +1,10 @@
 PRGNAM="qucs"
-VERSION="0.0.19"
-HOMEPAGE="http://qucs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qucs/qucs-0.0.19.tar.gz"
-MD5SUM="321b22b88099c6c8ac42ee8b7ab637a8"
+VERSION="0.0.20"
+HOMEPAGE="https://qucs.sourceforge.net"
+DOWNLOAD="https://github.com/Qucs/qucs/archive/0.0.20/qucs-0.0.20.tar.gz"
+MD5SUM="263b06702a0f83bbfc7912a0e1a76aed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="adms qt4"
+REQUIRES="qt4 qucsator"
 MAINTAINER="Fellype do Nascimento"
 EMAIL="fellype (at) gmail (dot) com"
diff --git a/academic/qucs/qucs.png b/academic/qucs/qucs.png
deleted file mode 100644
index 33dd12340984..000000000000
--- a/academic/qucs/qucs.png
+++ /dev/null