From fc795a2666c3702a1b084cf64cc71851a5cbec2d Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Fri, 8 Apr 2022 16:02:42 -0400
Subject: development/asem51: Clean up package.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/asem51/asem51.SlackBuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/development/asem51/asem51.SlackBuild b/development/asem51/asem51.SlackBuild
index d3d0133817..ab7bdb1a05 100644
--- a/development/asem51/asem51.SlackBuild
+++ b/development/asem51/asem51.SlackBuild
@@ -22,25 +22,26 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - don't install redundant upload and upload.new.
+# - don't install empty /usr/share dir in package.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=asem51
 VERSION=${VERSION:-1.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -50,8 +51,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,12 +76,11 @@ cd $PRGNAM
 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
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/include/asem51
 mkdir -p $PKG/etc/profile.d
@@ -90,8 +90,12 @@ cp boot $PKG/usr/bin/boot
 cp customiz $PKG/usr/bin/customiz
 cp hexbin $PKG/usr/bin/hexbin
 cp reset51 $PKG/usr/bin/reset51
-cp upload $PKG/usr/bin/upload
-cp upload.new $PKG/usr/bin/upload.new
+
+# 20220408 bkw: upload and upload.new are almost identical, except
+# that upload.new uses "stty -F" instead of redirecting from stdin.
+# no reason to install both, and the .new one seems more correct
+# to me.
+cp upload.new $PKG/usr/bin/upload
 
 mv html $PKG/usr/doc/$PRGNAM-$VERSION/html
 mv mcu $PKG/usr/include/asem51
-- 
cgit v1.2.3