From b8c024c400d7b2ad559f8f73797cba600b6e0747 Mon Sep 17 00:00:00 2001
From: Jorge Giner <malferit@gmail.com>
Date: Mon, 8 May 2023 18:40:50 +0100
Subject: development/bas55: Updated for version 2.0.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/bas55/bas55.SlackBuild | 39 ++++++--------------------------------
 development/bas55/bas55.info       |  8 +++-----
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/development/bas55/bas55.SlackBuild b/development/bas55/bas55.SlackBuild
index 439340f003..b2143bd157 100644
--- a/development/bas55/bas55.SlackBuild
+++ b/development/bas55/bas55.SlackBuild
@@ -22,6 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230506 Jorge: upstream (since v2.0) supports GNU readline:
+# - removing static linking with libedit.
+
 # 20230424 bkw: modified by B. Watson, at the maintainer's request. There is
 # an issue with modern libedit that I've temporarily fixed by including an
 # older static libedit in this build. libedit upstream has already fixed the
@@ -37,14 +40,11 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bas55
-VERSION=${VERSION:-1.19}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-LIBVER=${LIBVER:-20170329-3.1}
-LIBSRC=libedit-$LIBVER
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -82,39 +82,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-TOPDIR="$(pwd)"
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/$LIBSRC.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# 20230424 bkw: Use an old libedit. Tried 20191231-3.1, it's still too new.
-# Statically linked, and not included in the final package.
-cd $LIBSRC
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --enable-static \
-  --disable-shared \
-  --build=$ARCH-slackware-linux
-make V=1
-
-cd $TOPDIR/$PRGNAM-$VERSION
-
-# 20230424 bkw: bas55.info is a bit off: when you run "info" and choose
-# bas55 from the menu, it goes to the "Invoking bas55" node. Fix it so
-# it goes to the top (menu) node for bas55 instead.
-sed -i '/^\* bas55: (/s,).*,).                       ECMA-55 Minimal BASIC System.,' doc/bas55.info
-
-# 20230424 bkw: --with-ncurses is needed for the static libedit.
-CFLAGS="$SLKCFLAGS -I$TOPDIR/$LIBSRC/src/editline" \
-LDFLAGS="-L$TOPDIR/$LIBSRC/src/.libs/" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -124,8 +98,7 @@ LDFLAGS="-L$TOPDIR/$LIBSRC/src/.libs/" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --with-libedit \
-  --with-ncurses
+  --with-readline
 
 make V=1
 make install-strip DESTDIR=$PKG
diff --git a/development/bas55/bas55.info b/development/bas55/bas55.info
index e63e7d71fe..569711d35d 100644
--- a/development/bas55/bas55.info
+++ b/development/bas55/bas55.info
@@ -1,10 +1,8 @@
 PRGNAM="bas55"
-VERSION="1.19"
+VERSION="2.0"
 HOMEPAGE="https://jorgicor.niobe.org/bas55"
-DOWNLOAD="https://jorgicor.niobe.org/bas55/bas55-1.19.tar.gz \
-          https://thrysoee.dk/editline/libedit-20170329-3.1.tar.gz"
-MD5SUM="083f7f13b9b436287e0c909421852338 \
-        c57a0690e62ef523c083598730272cfd"
+DOWNLOAD="https://jorgicor.niobe.org/bas55/bas55-2.0.tar.gz"
+MD5SUM="0b0160e2bb3cc712edfde4cdd51ceb05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3