academic/xcircuit: Updated for version 3.10.30. New maintainer.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 51 insertions, 31 deletions

diff --git a/academic/xcircuit/README b/academic/xcircuit/README
index b8eca76d61..0dba86217d 100644
--- a/academic/xcircuit/README
+++ b/academic/xcircuit/README
@@ -1,5 +1,4 @@
-XCircuit is a UNIX/X11 (and Windows, if you have an X-Server running,
-or Windows API, if not) program for drawing publishable-quality
+XCircuit is a program for drawing publishable-quality
 electrical circuit schematic diagrams and related figures, and produce
 circuit netlists through schematic capture. XCircuit regards circuits
 as inherently hierarchical, and writes both hierarchical PostScript
@@ -8,3 +7,5 @@ in and retrieved from libraries which are fully editable. XCircuit
 does not separate artistic expression from circuit drawing; it
 maintains flexiblity in style without compromising the power of
 schematic capture.
+
+ngspice is an optional dependency
diff --git a/academic/xcircuit/slack-desc b/academic/xcircuit/slack-desc
index 8d83821bbe..dc34decbd6 100644
--- a/academic/xcircuit/slack-desc
+++ b/academic/xcircuit/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-xcircuit: xcircuit (circuit design tool)
-xcircuit: XCircuit is a UNIX/X11 (and Windows, if you have an X-Server running,
-xcircuit: or Windows API, if not) program for drawing publishable-quality
+xcircuit: xcircuit (Circuit drawing and schematic capture program)
+xcircuit:
+xcircuit: XCircuit is a UNIX/X11 program for drawing publishable-quality
 xcircuit: electrical circuit schematic diagrams and related figures, and
 xcircuit: produce circuit netlists through schematic capture. XCircuit regards
 xcircuit: circuits as inherently hierarchical, and writes both hierarchical
diff --git a/academic/xcircuit/xcircuit.SlackBuild b/academic/xcircuit/xcircuit.SlackBuild
index 25562d5b0a..9429418716 100644
--- a/academic/xcircuit/xcircuit.SlackBuild
+++ b/academic/xcircuit/xcircuit.SlackBuild
@@ -1,12 +1,32 @@
 #!/bin/bash
 
-# Slackware build script for grace
+# Slackware build script for xcircuit
+
 # Written by B. Jogai <jogaib {at} comcast [dot] net>
+# Copyright 2023  Johannes Schoepfer, Germany
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xcircuit
-VERSION=${VERSION:-3.7.54}
+VERSION=${VERSION:-3.10.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-"_SBo"}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -19,9 +39,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -55,10 +72,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tgz
 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 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
     ./configure \
@@ -66,27 +83,28 @@ CFLAGS="$SLKCFLAGS" \
     --bindir=/usr/bin \
     --libdir=/usr/lib${LIBDIRSUFFIX} \
     --mandir=/usr/man \
-    --with-x \
+    --with-cairo \
     --with-ngspice \
     --with-tcl=/usr/lib${LIBDIRSUFFIX} \
+    --with-tk=/usr/lib${LIBDIRSUFFIX} \
     --build=$ARCH-slackware-linux \
 
 make
 make DESTDIR=$PKG install
 
+[ "$ARCH" = "x86_64" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Add desktop menu entries
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/xcircuit.png > $PKG/usr/share/pixmaps/xcircuit.png
-cat $CWD/xcircuit.desktop > $PKG/usr/share/applications/xcircuit.desktop
-
-# Copy the man pages from the lib to the man directory.
-# Don't move it in case the program needs it there for some reason.
-rm -rf $PKG/usr/man
-mkdir -p $PKG/usr/man/man1
-cp $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-3.7/man/*.1 $PKG/usr/man/man1
+mkdir -p $PKG/usr/share/{applications,icons}
+convert $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-*.*/pixmaps/$PRGNAM.gif \
+  $PKG/usr/share/icons/$PRGNAM.png
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir $PKG/usr/man
+mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-*.*/man $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/xcircuit/xcircuit.desktop b/academic/xcircuit/xcircuit.desktop
index f687451b21..8ff88e11c3 100644
--- a/academic/xcircuit/xcircuit.desktop
+++ b/academic/xcircuit/xcircuit.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Application
 Exec=xcircuit
-Name=xcircuit
-GenericName=Circuit drawing program
+Name=Xcircuit
+Comment=A program for drawing publishable-quality electrical circuit schematic diagrams
 Icon=xcircuit
 Terminal=false
-Categories=Qt;KDE;Graphics;Development;
+StartupNotify=false
+Categories=Development;
diff --git a/academic/xcircuit/xcircuit.info b/academic/xcircuit/xcircuit.info
index 02b589bf38..e7e79a3d25 100644
--- a/academic/xcircuit/xcircuit.info
+++ b/academic/xcircuit/xcircuit.info
@@ -1,10 +1,10 @@
 PRGNAM="xcircuit"
-VERSION="3.7.54"
+VERSION="3.10.30"
 HOMEPAGE="http://opencircuitdesign.com/xcircuit/"
-DOWNLOAD="http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.54.tgz"
-MD5SUM="25e60837e5db6b4ff71615505493a481"
+DOWNLOAD="http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.10.30.tgz"
+MD5SUM="f83be9d40d5bea00f27391b979bb1f76"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Glenn Becker"
-EMAIL="glenn.becker@gmail.com"
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/academic/xcircuit/xcircuit.png b/academic/xcircuit/xcircuit.png
deleted file mode 100644
index 85cc4da406..0000000000
--- a/academic/xcircuit/xcircuit.png
+++ /dev/null