academic/ng-spice: Updated for version rework_17

3 files changed, 39 insertions, 21 deletions

diff --git a/academic/ng-spice/ng-spice.SlackBuild b/academic/ng-spice/ng-spice.SlackBuild
index c01d8aec0a..b0e1701ea0 100644
--- a/academic/ng-spice/ng-spice.SlackBuild
+++ b/academic/ng-spice/ng-spice.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Kyle Guinn <elyk03@gmail.com>
 
 PRGNAM="ng-spice"
-VERSION="rework-17"
+VERSION="rework_17"
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -13,14 +13,21 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
-PKGVER=$(echo $VERSION | sed s/-/_/)
 
-DOCS="ANALYSES AUTHORS BUGS COPYING ChangeLog DEVICES FAQ INSTALL NEWS README doc/ngspice.pdf"
+SRCVER=$(echo $VERSION | sed s/_/-/)
+
+DOCS="ANALYSES AUTHORS BUGS COPYING ChangeLog \
+  DEVICES FAQ INSTALL NEWS README doc/ngspice.pdf"
 
 if [ "$ARCH" = "i486" ]; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -28,31 +35,32 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar -xzvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 chmod -R u+w,go+r-w,a-st .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--enable-shared \
-	--disable-static \
-	--with-readline \
-	--build=$ARCH-slackware-linux
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-shared \
+  --disable-static \
+  --with-readline \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 ( 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
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l); do \
+    ln -s $(readlink $i).gz $i.gz; rm $i; \
+  done
 )
 
 rm -f $PKG/usr/info/dir
@@ -66,4 +74,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/ng-spice/ng-spice.info b/academic/ng-spice/ng-spice.info
index b521e8182b..bf86c52a01 100644
--- a/academic/ng-spice/ng-spice.info
+++ b/academic/ng-spice/ng-spice.info
@@ -1,8 +1,10 @@
 PRGNAM="ng-spice"
-VERSION="rework-17"
+VERSION="rework_17"
 HOMEPAGE="http://ngspice.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/ngspice/ng-spice-rework-17.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="abe283dea98b913a2122f085076865b1"
+MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
 APPROVED="Erik Hanson"
diff --git a/academic/ng-spice/slack-desc b/academic/ng-spice/slack-desc
index 4a1e04c743..212a25934e 100644
--- a/academic/ng-spice/slack-desc
+++ b/academic/ng-spice/slack-desc
@@ -1,3 +1,11 @@
+# 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
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler---------------------------------------------------|
 ng-spice: Ngspice (circuit simulator)
 ng-spice:
 ng-spice: Ngspice is a mixed-level/mixed-signal circuit simulator.  Its