From e7539d27cbff5b58501ad8ef6861ad31241d3599 Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Wed, 6 Sep 2023 14:54:48 -0400
Subject: development/xa: Updated for version 2.3.14.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/xa/xa.SlackBuild | 21 +++++++++++----------
 development/xa/xa.info       |  6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'development')

diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index 4e4f56e6cbeb..74d43ba8eb23 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230906 bkw: update for xz-2.3.14.
+# - add ChangeLog.dxa to doc dir.
+# - correctly apply SLKCFLAGS and -DLONG_OPTIONS to dxa.
+
 # 20230103 bkw: update for xa-2.3.13 and dxa-0.1.5.
 
 # 20201024 bkw:
@@ -33,7 +37,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xa
-VERSION=${VERSION:-2.3.13}
+VERSION=${VERSION:-2.3.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -60,16 +64,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -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
@@ -98,21 +98,22 @@ strip $PKG/usr/bin/*
 chmod -x $PKG/usr/man/man?/*.?
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README* COPYING ChangeLog TODO doc/* examples tests mkrom.sh \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* COPYING ChangeLog TODO doc/* examples tests mkrom.sh $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 # now build dxa
 tar xvf $CWD/dxa-$DXAVER.tar.gz
 cd dxa-$DXAVER
 
 # Can't see a disadvantage to enabling the --long-options
-sed -i "s,-O6,$SLKCFLAGS -DLONG_OPTIONS," Makefile
+sed -i "/^CFLAGS/s,-O2,$SLKCFLAGS -DLONG_OPTIONS," Makefile
 
 make
 install -s -m0755 dxa $PKG/usr/bin
 gzip -9c < dxa.1 > $PKG/usr/man/man1/dxa.1.gz
+cp -a ChangeLog $PKGDOC/ChangeLog.dxa
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/xa/xa.info b/development/xa/xa.info
index 49e53bd2853e..0a8ee8d3475c 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,9 +1,9 @@
 PRGNAM="xa"
-VERSION="2.3.13"
+VERSION="2.3.14"
 HOMEPAGE="https://www.floodgap.com/retrotech/xa/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.13.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.14.tar.gz \
           https://slackware.uk/~urchlay/src/dxa-0.1.5.tar.gz"
-MD5SUM="3f785ae9a33e154ae3630e815983f790 \
+MD5SUM="c708214bf5d79a6c9ac98424bf7840a5 \
         6d69ae1772ed58de97b0180e480dfe0c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3