1 files changed, 20 insertions, 28 deletions
diff --git a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
index d18d0f566e..f2378b331c 100644
--- a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
+++ b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild
@@ -1,42 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for AVR8 Burn-O-Mat
 
 # Written by Andrzej Telszewski <atelszewski@gmail.com>
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - make noarch (it's java with no JNI).
+# - fix .desktop file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="avr8-burn-o-mat"
 SRCNAM="AVR8_Burn-O-Mat"
 VERSION=${VERSION:-2.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -49,9 +40,9 @@ cd $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 \) -exec chmod 755 {} \; -o \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/share/{avr8-burn-o-mat,applications,pixmaps}
@@ -64,8 +55,9 @@ cp -a AVR8_Burn-O-Mat.png $PKG/usr/share/avr8-burn-o-mat
 cp -a icon/AVR8_Burn-O-Mat_Icon_16.png $PKG/usr/share/avr8-burn-o-mat
 cp -a "Installer Debian/avr8-burn-o-mat" $PKG/usr/bin
 cp -a icon/AVR8_Burn-O-Mat_Icon_48.png $PKG/usr/share/pixmaps/avr8-burn-o-mat.png
-cp -a "Installer Debian/avr8-burn-o-mat.desktop" $PKG/usr/share/applications
-sed -i 's/'REPLACE_PROG_VERSION'/'$VERSION'/g' $PKG/usr/share/applications/avr8-burn-o-mat.desktop
+
+# 20220408 bkw: use a .desktop file that passes desktop-file-validate.
+cat $CWD/avr8-burn-o-mat.desktop > $PKG/usr/share/applications/avr8-burn-o-mat.desktop
 
 cp -a license_gpl-3.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -75,4 +67,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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