1 files changed, 21 insertions, 9 deletions
diff --git a/graphics/openscad-mcad/openscad-mcad.SlackBuild b/graphics/openscad-mcad/openscad-mcad.SlackBuild
index 2834c0043d..89a7f51b45 100644
--- a/graphics/openscad-mcad/openscad-mcad.SlackBuild
+++ b/graphics/openscad-mcad/openscad-mcad.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openscad-mcad
 
@@ -22,33 +22,45 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220312 bkw: Modified by SlackBuilds.org: VERSION must be constant,
+# and match VERSION in the .info file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openscad-mcad
 COMVER=1ea402208c3127ffb443931e9bb1681c191dacca
-VERSION=${VERSION:-2020.10.09.$( printf %s $COMVER | cut -c1-7 )}
+VERSION=${VERSION:-2020.10.09.1ea4022}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
+SRCNAM=MCAD
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf MCAD-$COMVER
-tar xvf $CWD/$PRGNAM-$COMVER.tar.?z
-cd MCAD-$COMVER
+rm -rf $SRCNAM-$COMVER
+tar xvf $CWD/$SRCNAM-$COMVER.tar.gz
+cd $SRCNAM-$COMVER
 
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/openscad/libraries/MCAD/bitmap
 
@@ -103,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE