From 0fd2feb5a0cf7e47dd02236f28ac214c6b1e12b3 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sat, 24 Oct 2020 14:26:42 -0400
Subject: [PATCH] development/xa: Updated for version 2.3.11.

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

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

diff --git a/development/xa/README b/development/xa/README
index 41fa1f24a0..27afcbe09f 100644
--- a/development/xa/README
+++ b/development/xa/README
@@ -9,3 +9,7 @@ This build includes xa's companion piece, the disassembler dxa. dxa is
 considered alpha-quality software, but is included because it's still
 very useful. It produces output that can be reassembled with xa, but
 doesn't support the 65816 CPU.
+
+If you want to run the xa test suite as part of the build, export
+MAKETEST=yes in the script's environment. The build will fail if any
+of the tests fail.
diff --git a/development/xa/xa.SlackBuild b/development/xa/xa.SlackBuild
index ffe7d9fba6..4a7069bc35 100644
--- a/development/xa/xa.SlackBuild
+++ b/development/xa/xa.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201024 bkw:
+# - update for xa-2.3.11 (dxa still the same)
+# - add support for running the test suite
+# - exclude windows (visual studio) stuff when extracting tarball
+
 # 20191129 bkw:
 # - update for xa-2.3.10 and dxa-0.1.4
 # - remove the patches for dxa, 0.1.4 has all the fixes applied
@@ -24,7 +29,7 @@
 # they were included in the script tarball all along.
 
 PRGNAM=xa
-VERSION=${VERSION:-2.3.10}
+VERSION=${VERSION:-2.3.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,17 +69,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --exclude="*/vstudio/*"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
 # tarball permissions are worse than usual.
-find . -type d -exec chmod 755 {} \; -o -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} \+ -o -type f -exec chmod 644 {} \+
+chmod 755 tests/harness tests/hextool
 
 sed -i "s,-O2,$SLKCFLAGS," Makefile
 
 # Note: non-standard use of DESTDIR
 make DESTDIR=/usr
+[ "${MAKETEST:-no}" = "yes" ] && make -j1 test
 make install DESTDIR=$PKG/usr MANDIR=$PKG/usr/man/man1
 strip $PKG/usr/bin/*
 
diff --git a/development/xa/xa.info b/development/xa/xa.info
index 51ddf18a6c..6b872338ad 100644
--- a/development/xa/xa.info
+++ b/development/xa/xa.info
@@ -1,9 +1,9 @@
 PRGNAM="xa"
-VERSION="2.3.10"
+VERSION="2.3.11"
 HOMEPAGE="http://www.floodgap.com/retrotech/xa/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.10.tar.gz \
+DOWNLOAD="https://slackware.uk/~urchlay/src/xa-2.3.11.tar.gz \
           https://slackware.uk/~urchlay/src/dxa-0.1.4.tar.gz"
-MD5SUM="14265129071922dd964d89599775d13e \
+MD5SUM="72cbd5619f75b0c9839b90c41d0f9ea6 \
         3a7993751bcb94e5f9081cc2f27eee1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""