Multiple: Support alternate tarball name.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

35 files changed, 50 insertions, 51 deletions

diff --git a/games/SLADE/SLADE.SlackBuild b/games/SLADE/SLADE.SlackBuild
index 37d5411e46..e2081fbed4 100644
--- a/games/SLADE/SLADE.SlackBuild
+++ b/games/SLADE/SLADE.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/games/crispy-doom/crispy-doom.SlackBuild b/games/crispy-doom/crispy-doom.SlackBuild
index 680fe26c91..e8278bba76 100644
--- a/games/crispy-doom/crispy-doom.SlackBuild
+++ b/games/crispy-doom/crispy-doom.SlackBuild
@@ -59,8 +59,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/games/vcmi/vcmi.SlackBuild b/games/vcmi/vcmi.SlackBuild
index eafc85bc37..9915cd178f 100644
--- a/games/vcmi/vcmi.SlackBuild
+++ b/games/vcmi/vcmi.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/libraries/MyGUI/MyGUI.SlackBuild b/libraries/MyGUI/MyGUI.SlackBuild
index d2d643f9ab..91b4cbc557 100644
--- a/libraries/MyGUI/MyGUI.SlackBuild
+++ b/libraries/MyGUI/MyGUI.SlackBuild
@@ -23,6 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=MyGUI
+SRCNAM=mygui-MyGUI  # Yes, really (github)
 VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -61,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM$VERSION.tar.gz
-cd mygui-$PRGNAM$VERSION
+rm -rf $SRCNAM$VERSION
+tar xvf $CWD/$PRGNAM$VERSION.tar.gz || tar xvf $CWD/$SRCNAM$VERSION.tar.gz
+cd $SRCNAM$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/multimedia/cuetools/cuetools.SlackBuild b/multimedia/cuetools/cuetools.SlackBuild
index 37113df872..4c8c2c1e07 100644
--- a/multimedia/cuetools/cuetools.SlackBuild
+++ b/multimedia/cuetools/cuetools.SlackBuild
@@ -54,7 +54,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/multimedia/flowblade/flowblade.SlackBuild b/multimedia/flowblade/flowblade.SlackBuild
index ea9bab9153..5e62b7bd49 100644
--- a/multimedia/flowblade/flowblade.SlackBuild
+++ b/multimedia/flowblade/flowblade.SlackBuild
@@ -48,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v"$VERSION".tar.gz
+tar xvf $CWD/v"$VERSION".tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION/$PRGNAM-trunk
 chown -R root:root .
 find -L . \
diff --git a/multimedia/plex-home-theater/plex-home-theater.SlackBuild b/multimedia/plex-home-theater/plex-home-theater.SlackBuild
index eb00a1df79..3f0a9beffc 100644
--- a/multimedia/plex-home-theater/plex-home-theater.SlackBuild
+++ b/multimedia/plex-home-theater/plex-home-theater.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-public-$VERSION-$REV
-tar xvf $CWD/$PRGNAM-public-$VERSION-$REV.tar.xz || tar xvf $CWD/v$VERSION-$REV.tar.gz
+tar xvf $CWD/$PRGNAM-public-$VERSION-$REV.tar.gz || tar xvf $CWD/v$VERSION-$REV.tar.gz
 cd $PRGNAM-public-$VERSION-$REV
 chown -R root:root .
 find -L . \
diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild
index 37358b8eb5..2b79ff96ed 100644
--- a/multimedia/tvheadend/tvheadend.SlackBuild
+++ b/multimedia/tvheadend/tvheadend.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/multimedia/whistle/whistle.SlackBuild b/multimedia/whistle/whistle.SlackBuild
index 589c981026..6173984014 100644
--- a/multimedia/whistle/whistle.SlackBuild
+++ b/multimedia/whistle/whistle.SlackBuild
@@ -56,7 +56,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/google-cli/google-cli.SlackBuild b/network/google-cli/google-cli.SlackBuild
index 9d4fb46e65..5f76af2808 100644
--- a/network/google-cli/google-cli.SlackBuild
+++ b/network/google-cli/google-cli.SlackBuild
@@ -62,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$SRCVER.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/nbwmon/nbwmon.SlackBuild b/network/nbwmon/nbwmon.SlackBuild
index 0708ce07ec..49808a3ea5 100644
--- a/network/nbwmon/nbwmon.SlackBuild
+++ b/network/nbwmon/nbwmon.SlackBuild
@@ -48,7 +48,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-[ -e $CWD/$PRGNAM-$VERSION.tar.gz ] && tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || [ -e $CWD/$VERSION.tar.gz ] && tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/polipo/polipo.SlackBuild b/network/polipo/polipo.SlackBuild
index 217e9378c8..9421ff945c 100644
--- a/network/polipo/polipo.SlackBuild
+++ b/network/polipo/polipo.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 
 # Fix Makefile
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index 90281cc73e..cbf7d1c4c6 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -41,7 +41,8 @@ mkdir -p $TMP $PKG $OUTPUT
 
 # Install sqlmap in /opt
 mkdir -p $PKG/opt
-tar xvf $CWD/$VERSION.tar.gz -C $PKG/opt
+tar xvf $CWD/$VERSION.tar.gz -C $PKG/opt || \
+  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PKG/opt
 chown -R root:root $PKG/opt/$PRGNAM-$VERSION
 find -L $PKG/opt/$PRGNAM-$VERSION \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/office/mairix/mairix.SlackBuild b/office/mairix/mairix.SlackBuild
index c8408b40e6..a70e9e270d 100644
--- a/office/mairix/mairix.SlackBuild
+++ b/office/mairix/mairix.SlackBuild
@@ -43,7 +43,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/office/odt2txt/odt2txt.SlackBuild b/office/odt2txt/odt2txt.SlackBuild
index e16fc15bda..7a37299080 100644
--- a/office/odt2txt/odt2txt.SlackBuild
+++ b/office/odt2txt/odt2txt.SlackBuild
@@ -40,8 +40,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-v$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/perl/perl-Sidef/perl-Sidef.SlackBuild b/perl/perl-Sidef/perl-Sidef.SlackBuild
index 66c6fcf898..23c62d65e9 100644
--- a/perl/perl-Sidef/perl-Sidef.SlackBuild
+++ b/perl/perl-Sidef/perl-Sidef.SlackBuild
@@ -61,10 +61,9 @@ SRCNAM="sidef"
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
-mv $SRCNAM-$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/perl/perl-mojo/perl-mojo.SlackBuild b/perl/perl-mojo/perl-mojo.SlackBuild
index 5aa64bfcdf..1796a034f2 100644
--- a/perl/perl-mojo/perl-mojo.SlackBuild
+++ b/perl/perl-mojo/perl-mojo.SlackBuild
@@ -62,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/PyXB/PyXB.SlackBuild b/python/PyXB/PyXB.SlackBuild
index 1f7c67aaac..92097ccff2 100644
--- a/python/PyXB/PyXB.SlackBuild
+++ b/python/PyXB/PyXB.SlackBuild
@@ -59,8 +59,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf pyxb-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/pyxb-$PRGNAM-$VERSION.tar.gz
 cd pyxb-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/ps_mem/ps_mem.SlackBuild b/python/ps_mem/ps_mem.SlackBuild
index f77f629b1e..5dd178d029 100644
--- a/python/ps_mem/ps_mem.SlackBuild
+++ b/python/ps_mem/ps_mem.SlackBuild
@@ -56,13 +56,11 @@ fi
 
 set -e
 
-SRCVER="v3.6"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/pyPdf/pyPdf.SlackBuild b/python/pyPdf/pyPdf.SlackBuild
index 8933033457..1f5f7149a5 100644
--- a/python/pyPdf/pyPdf.SlackBuild
+++ b/python/pyPdf/pyPdf.SlackBuild
@@ -50,8 +50,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+rm -rf $SRCDIRNAM-$VERSION
+tar xvf $CWD/$SRCDIRNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $SRCDIRNAM-$VERSION
 
 chown -R root:root .
diff --git a/python/python-ipcalc/python-ipcalc.SlackBuild b/python/python-ipcalc/python-ipcalc.SlackBuild
index 9d274df6fc..9255fdcfa3 100644
--- a/python/python-ipcalc/python-ipcalc.SlackBuild
+++ b/python/python-ipcalc/python-ipcalc.SlackBuild
@@ -62,8 +62,8 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+rm -rf $SRCNAM-$SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/python/python-whisper/python-whisper.SlackBuild b/python/python-whisper/python-whisper.SlackBuild
index bfdca3622c..175b827bda 100644
--- a/python/python-whisper/python-whisper.SlackBuild
+++ b/python/python-whisper/python-whisper.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$SRCVER
-tar xvf $CWD/$SRCVER.tar.gz
+tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
 cd $SRCNAM-$SRCVER
 chown -R root:root .
 find -L . \
diff --git a/python/python3-defusedxml/python3-defusedxml.SlackBuild b/python/python3-defusedxml/python3-defusedxml.SlackBuild
index b2f87eb682..a5bdd82b6f 100644
--- a/python/python3-defusedxml/python3-defusedxml.SlackBuild
+++ b/python/python3-defusedxml/python3-defusedxml.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$REV
-tar xvf $CWD/v$VERSION.tar.bz2
+tar xvf $CWD/v$VERSION.tar.bz2 || tar xvf $CWD/$SRCNAM-$REV.tar.bz2
 cd $SRCNAM-$REV
 chown -R root:root .
 find -L . \
diff --git a/python/python3-dugong/python3-dugong.SlackBuild b/python/python3-dugong/python3-dugong.SlackBuild
index f743d393b5..08603f2ff2 100644
--- a/python/python3-dugong/python3-dugong.SlackBuild
+++ b/python/python3-dugong/python3-dugong.SlackBuild
@@ -64,7 +64,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$REV
-tar xvf $CWD/release-$VERSION.tar.bz2
+tar xvf $CWD/release-$VERSION.tar.bz2 || tar xvf $CWD/$SRCNAM-$REV.tar.bz2
 cd $SRCNAM-$REV
 chown -R root:root .
 find -L . \
diff --git a/system/blocks/blocks.SlackBuild b/system/blocks/blocks.SlackBuild
index ebff0f1b02..cfbdb7ce9d 100644
--- a/system/blocks/blocks.SlackBuild
+++ b/system/blocks/blocks.SlackBuild
@@ -55,14 +55,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 # Prepare directories
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$COMMIT.tar.gz
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz || tar xvf $CWD/$COMMIT.tar.gz
 cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
diff --git a/system/gitolite/gitolite.SlackBuild b/system/gitolite/gitolite.SlackBuild
index 379f2091f9..c0e62f96d2 100644
--- a/system/gitolite/gitolite.SlackBuild
+++ b/system/gitolite/gitolite.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild
index 2213f6220e..ddd170f8ad 100644
--- a/system/ktsuss/ktsuss.SlackBuild
+++ b/system/ktsuss/ktsuss.SlackBuild
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$COMMIT
-tar xvf $CWD/$COMMIT.tar.gz
+tar xvf $CWD/$COMMIT.tar.gz || tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
 cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
diff --git a/system/multibootusb/multibootusb.SlackBuild b/system/multibootusb/multibootusb.SlackBuild
index 1c438447fc..58f9259d55 100644
--- a/system/multibootusb/multibootusb.SlackBuild
+++ b/system/multibootusb/multibootusb.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/physlock/physlock.SlackBuild b/system/physlock/physlock.SlackBuild
index 0e4f734e28..a5084e762d 100644
--- a/system/physlock/physlock.SlackBuild
+++ b/system/physlock/physlock.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/reptyr/reptyr.SlackBuild b/system/reptyr/reptyr.SlackBuild
index f42da43ba2..64e746f73d 100644
--- a/system/reptyr/reptyr.SlackBuild
+++ b/system/reptyr/reptyr.SlackBuild
@@ -41,9 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION  # weird
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/system/scanmem/scanmem.SlackBuild b/system/scanmem/scanmem.SlackBuild
index 941c6f9856..16a7003b99 100644
--- a/system/scanmem/scanmem.SlackBuild
+++ b/system/scanmem/scanmem.SlackBuild
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/v$VERSION.zip
+unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/v$VERSION.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild
index 37eb9234f5..004f487c6a 100644
--- a/system/tinyvm/tinyvm.SlackBuild
+++ b/system/tinyvm/tinyvm.SlackBuild
@@ -58,7 +58,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$SRCVERSION.tar.gz
+tar xvf $CWD/$SRCVERSION.tar.gz || tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
 cd $PRGNAM-$SRCVERSION
 
 ## default compiler (clang)
diff --git a/system/uptimed/uptimed.SlackBuild b/system/uptimed/uptimed.SlackBuild
index bc9384b204..5319ecf835 100644
--- a/system/uptimed/uptimed.SlackBuild
+++ b/system/uptimed/uptimed.SlackBuild
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/z/z.SlackBuild b/system/z/z.SlackBuild
index 44e1fbca32..e531f29576 100644
--- a/system/z/z.SlackBuild
+++ b/system/z/z.SlackBuild
@@ -40,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/zopfli/zopfli.SlackBuild b/system/zopfli/zopfli.SlackBuild
index bf1b4974a5..a4cc1a214e 100644
--- a/system/zopfli/zopfli.SlackBuild
+++ b/system/zopfli/zopfli.SlackBuild
@@ -46,7 +46,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \