academic/xcircuit: Updated for version 3.7.13.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 14 insertions, 38 deletions

diff --git a/academic/xcircuit/doinst.sh b/academic/xcircuit/doinst.sh
index 4df207194f..12d65ed7bd 100644
--- a/academic/xcircuit/doinst.sh
+++ b/academic/xcircuit/doinst.sh
@@ -1,3 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-/usr/bin/update-desktop-database -q /usr/share/applications >/dev/null 2>&1
+  /usr/bin/update-desktop-database -q /usr/share/applications >/dev/null 2>&1
 fi
diff --git a/academic/xcircuit/xcircuit.SlackBuild b/academic/xcircuit/xcircuit.SlackBuild
index 3aea5a9a4c..8c51c56b93 100644
--- a/academic/xcircuit/xcircuit.SlackBuild
+++ b/academic/xcircuit/xcircuit.SlackBuild
@@ -3,27 +3,23 @@
 # Slackware build script for grace
 # Written by B. Jogai <jogaib {at} comcast [dot] net>
 
-# Set initial variables:
-
 PRGNAM=xcircuit
-VERSION=3.7.6
+VERSION=3.7.13
 BUILD=${BUILD:-1}
 TAG=${TAG:-"_SBo"}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-"/tmp/SBo"}
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-"/tmp"}
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -50,9 +46,6 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
 CFLAGS="$SLKCFLAGS" \
     ./configure \
     --prefix=/usr \
@@ -67,19 +60,9 @@ CFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-
-cp -a CHANGES README* TODO VERSION examples/ \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
 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
@@ -89,24 +72,17 @@ cat $CWD/xcircuit.desktop > $PKG/usr/share/applications/xcircuit.desktop
 # 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
-rm -f $PKG/usr/man/man1/*.1
 cp $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-3.7/man/*.1 $PKG/usr/man/man1
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-# Compress the man pages if they exist
-if [ -d $PKG/usr/man ]; then
-    ( cd $PKG/usr/man
-	find . -type f -exec gzip -9 {} \;
-	for i in $(find . -type l) ; do
-	    ln -s $(readlink $i).gz $i.gz
-	    rm $i
-	done
-	) 
-fi
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES README* TODO VERSION examples $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 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/xcircuit/xcircuit.desktop b/academic/xcircuit/xcircuit.desktop
index e5e86f2300..f687451b21 100644
--- a/academic/xcircuit/xcircuit.desktop
+++ b/academic/xcircuit/xcircuit.desktop
@@ -3,6 +3,6 @@ Type=Application
 Exec=xcircuit
 Name=xcircuit
 GenericName=Circuit drawing program
-Icon=/usr/share/pixmaps/xcircuit.png
+Icon=xcircuit
 Terminal=false
 Categories=Qt;KDE;Graphics;Development;
diff --git a/academic/xcircuit/xcircuit.info b/academic/xcircuit/xcircuit.info
index 26db3cdd66..0b0a90f8f3 100644
--- a/academic/xcircuit/xcircuit.info
+++ b/academic/xcircuit/xcircuit.info
@@ -1,10 +1,10 @@
 PRGNAM="xcircuit"
-VERSION="3.7.6"
+VERSION="3.7.13"
 HOMEPAGE="http://opencircuitdesign.com/xcircuit/"
-DOWNLOAD="http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.6.tgz"
-MD5SUM="0b4122adcc2821791c5d2acaaf187996"
+DOWNLOAD="http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.13.tgz"
+MD5SUM="93e4bd03d339fc190fa4614766bf0c96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="B. Jogai"
 EMAIL="jogaib <at> comcast {dot} net"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"