From ba3a2f58426b49a6ff50d7326b5417eaea30e692 Mon Sep 17 00:00:00 2001
From: "R. S. Ananda Murthy" <rsamurti@gmail.com>
Date: Thu, 23 Nov 2017 17:27:05 +0000
Subject: academic/ngspice: Updated for version 27.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 academic/ngspice/README             |  1 -
 academic/ngspice/doinst.sh          | 13 +++++++++++++
 academic/ngspice/ngspice.SlackBuild | 29 +++++++++--------------------
 academic/ngspice/ngspice.desktop    |  9 +++++++++
 academic/ngspice/ngspice.info       | 10 +++++-----
 5 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 academic/ngspice/doinst.sh
 create mode 100644 academic/ngspice/ngspice.desktop

(limited to 'academic')

diff --git a/academic/ngspice/README b/academic/ngspice/README
index 083dce3887..ea5d793ea4 100644
--- a/academic/ngspice/README
+++ b/academic/ngspice/README
@@ -2,4 +2,3 @@ Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is
 based on three open source software packages: Spice3f5, Cider1b1 and
 Xspice. Ngspice is part of gEDA project, a full GPL'd suite of
 Electronic Design Automation tools.
-
diff --git a/academic/ngspice/doinst.sh b/academic/ngspice/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/academic/ngspice/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/academic/ngspice/ngspice.SlackBuild b/academic/ngspice/ngspice.SlackBuild
index f26a847ed9..475b67f9b1 100644
--- a/academic/ngspice/ngspice.SlackBuild
+++ b/academic/ngspice/ngspice.SlackBuild
@@ -7,13 +7,13 @@
 # Set initial variables:
 
 PRGNAM=ngspice
-VERSION=${VERSION:-26}
+VERSION=${VERSION:-27}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -24,8 +24,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,7 +63,6 @@ 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 {} \;
 
-
 # Fix the lib path to the code modules
 if [ "$ARCH" = "x86_64" ]; then
     sed -i "s%/lib/%/lib${LIBDIRSUFFIX}/%g" src/spinit.in
@@ -92,9 +91,6 @@ CFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -111,18 +107,11 @@ mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
 install -m644 $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/share/applications
-cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Name=Ngspice
-Comment=A mixed-level/mixed-signal circuit simulator
-Exec=ngspice
-Terminal=true
-Type=Application
-Categories=Other
-Icon=ngspice
-StartupNotify=true
-EOF
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/ngspice/ngspice.desktop b/academic/ngspice/ngspice.desktop
new file mode 100644
index 0000000000..4e2410583b
--- /dev/null
+++ b/academic/ngspice/ngspice.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Ngspice
+Comment=A mixed-level/mixed-signal circuit simulator
+Exec=ngspice
+Terminal=true
+Type=Application
+Categories=Education
+Icon=ngspice
+StartupNotify=true
diff --git a/academic/ngspice/ngspice.info b/academic/ngspice/ngspice.info
index 49aaa227ae..6af2b2103f 100644
--- a/academic/ngspice/ngspice.info
+++ b/academic/ngspice/ngspice.info
@@ -1,10 +1,10 @@
 PRGNAM="ngspice"
-VERSION="26"
+VERSION="27"
 HOMEPAGE="http://ngspice.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/ngspice/ng-spice-rework/26/ngspice-26.tar.gz \
-          http://downloads.sourceforge.net/project/ngspice/ng-spice-rework/26/ngspice-doc-26.tar.gz"
-MD5SUM="7fd9cdd11b1bb109eb48201222de4c50 \
-        6a2acfe2574798dac9d3844dd1750dbb"
+DOWNLOAD="https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/27/ngspice-27.tar.gz \
+          https://downloads.sourceforge.net/project/ngspice/ng-spice-rework/27/ngspice-doc-27.tar.gz"
+MD5SUM="f0f8753f413d33233e5d2f7dd8094d68 \
+        f0c0d73c9a3488398035faa7aa4eca10"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3