2 files changed, 18 insertions, 9 deletions
diff --git a/academic/ngspice/ngspice.SlackBuild b/academic/ngspice/ngspice.SlackBuild
index cea52c66f1..bae8ccaa44 100644
--- a/academic/ngspice/ngspice.SlackBuild
+++ b/academic/ngspice/ngspice.SlackBuild
@@ -6,7 +6,7 @@
 # Set initial variables:
 
 PRGNAM=ngspice
-VERSION=21
+VERSION=${VERSION:-25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,16 +43,25 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/ng-spice-rework-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 rm -rf $PRGNAM-doc-$VERSION
 tar xvf $CWD/$PRGNAM-doc-$VERSION.tar.gz
 (cd $PRGNAM-doc-$VERSION
     chown -R root:root .
-    chmod -R u+w,go+r-w,a-s .
+    find -L . \
+    \( -perm 777 -o -perm 775 -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 {} \;
 )
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find -L . \
+ \( -perm 777 -o -perm 775 -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 {} \;
+
 
 # Fix the lib path to the code modules
 if [ "$ARCH" = "x86_64" ]; then
diff --git a/academic/ngspice/ngspice.info b/academic/ngspice/ngspice.info
index 55da20651b..c2999e3153 100644
--- a/academic/ngspice/ngspice.info
+++ b/academic/ngspice/ngspice.info
@@ -1,10 +1,10 @@
 PRGNAM="ngspice"
-VERSION="21"
+VERSION="25"
 HOMEPAGE="http://ngspice.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/ngspice/files/ng-spice-rework-21.tar.gz \
-          http://sourceforge.net/projects/ngspice/files/ngspice-doc-21.tar.gz"
-MD5SUM="68ae18d4c1f7312a1b8e7a5c0858b146 \
-        6ee7d0f5f23a7c61bf96227ca523cad8"
+DOWNLOAD="http://sourceforge.net/projects/ngspice/files/ngspice-25.tar.gz \
+          http://sourceforge.net/projects/ngspice/files/ngspice-doc-25.tar.gz"
+MD5SUM="0a2c9f377c5da827f774c7b4f9248231 \
+        0e97d62444577ee186f2481f16b27db8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""