1 files changed, 45 insertions, 31 deletions
diff --git a/academic/ngspice/ngspice.SlackBuild b/academic/ngspice/ngspice.SlackBuild
index 26525cf138a40..988fcba6f0adf 100644
--- a/academic/ngspice/ngspice.SlackBuild
+++ b/academic/ngspice/ngspice.SlackBuild
@@ -7,7 +7,7 @@
 # Set initial variables:
 
 PRGNAM=ngspice
-VERSION=${VERSION:-31}
+VERSION=${VERSION:-32}
 BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
@@ -55,38 +55,46 @@ find -L . \
 
 # Fix the lib path to the code modules
 if [ "$ARCH" = "x86_64" ]; then
-    sed -i "s%/lib/%/lib${LIBDIRSUFFIX}/%g" src/spinit.in
+  sed -i "s%/lib/%/lib${LIBDIRSUFFIX}/%g" src/spinit.in
 fi
 
-./configure --prefix=/usr \
-            --mandir=/usr/man \
-            --infodir=/usr/info \
-            --with-readline=yes \
-            --enable-xspice \
-            --enable-cider \
-            --enable-openmp \
-            --with-ngshared
+mkdir release
+cd release
+
+  ../configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --enable-xspice \
+  --enable-cider \
+  --enable-openmp \
+  --with-x \
+  --disable-debug \
+  --with-ngshared
+
 make
 
 CFLAGS="$SLKCFLAGS" \
-    ./configure \
-    --prefix=/usr \
-    --bindir=/usr/bin \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --infodir=/usr/info \
-    --disable-debug \
-    --with-readline=yes \
-    --enable-xspice \
-    --enable-cider \
-    --enable-shared \
-    --disable-static \
-    --enable-ndev \
-    --enable-openmp \
-    --build=$ARCH-slackware-linux
+  ../configure --prefix=/usr \
+  --bindir=/usr/bin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-debug \
+  --enable-xspice \
+  --enable-cider \
+  --enable-shared \
+  --disable-static \
+  --enable-ndev \
+  --enable-openmp \
+  --with-x \
+  --build=$ARCH-slackware-linux
+
 make
 make DESTDIR=$PKG install
 
+cd ..
+
 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
 
@@ -94,17 +102,23 @@ 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/doc/$PRGNAM-$VERSION/examples
-cp -a ANALYSES AUTHORS BUGS COPYING ChangeLog DEVICES FAQ \
-    INSTALL NEWS README* examples/ $PKG/usr/doc/$PRGNAM-$VERSION/
+
+cp -a \
+  ANALYSES AUTHORS BUGS COPYING ChangeLog DEVICES FAQ \
+  INSTALL NEWS README* examples/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/$PRGNAM-$VERSION-manual.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-$VERSION-manual.pdf
+cat $CWD/$PRGNAM-$VERSION-manual.pdf \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-$VERSION-manual.pdf
+
+install -Dm755 ./release/src/.libs/libngspice.so.0.0.0 \
+  "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so.0.0.0"
 
-install -Dm755 src/.libs/libngspice.so.0.0.0 "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so.0.0.0"
 ln -s "libngspice.so.0.0.0" "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so.0"
 ln -s "libngspice.so.0.0.0" "$PKG/usr/lib${LIBDIRSUFFIX}/libngspice.so"
 
-mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
-install -m644 $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
+install -Dm644 $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop