system/sdltrs: Updated for version 1.2.28.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 24 insertions, 20 deletions

diff --git a/system/sdltrs/README b/system/sdltrs/README
index 698d7b71a21d0..3ffccd90c3b51 100644
--- a/system/sdltrs/README
+++ b/system/sdltrs/README
@@ -20,3 +20,9 @@ nonexistent floppy disc. To recover from this:
 
 See the man page and the documentation at
 /usr/doc/sdltrs-$VERSION/html/index.html for further details.
+
+SlackBuild note: the previous version of this build,
+1.2.27+20230518_7dcf4ca9, installed the emulator as "sdl2trs". Now
+that upstream has merged the SDL2 port, there's no need for this, and
+the executable is called sdltrs. If you have any shortcuts or scripts
+using the old name, you'll have to update them.
diff --git a/system/sdltrs/sdltrs.SlackBuild b/system/sdltrs/sdltrs.SlackBuild
index 353f37989c17f..14f10e076739a 100644
--- a/system/sdltrs/sdltrs.SlackBuild
+++ b/system/sdltrs/sdltrs.SlackBuild
@@ -24,6 +24,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240213 bkw: update for v1.2.28.
+
 # 20230524 bkw: previous update had wrong version number. use latest
 # git (with fix for .desktop file), with correct tag.
 
@@ -53,9 +55,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sdltrs
-SRCNAM=sdltrs-sdl2
-EXENAM=sdl2trs
-VERSION=${VERSION:-1.2.27+20230518_7dcf4ca9}
+VERSION=${VERSION:-1.2.28}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -95,10 +95,10 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$SRCNAM-$VERSION
+rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 --exclude='*/bin/*' # debs/exes
+cd $PRGNAM-$VERSION
 chown -R root:root .
 # upstream permissions are wonky, do not revert to template.
 find . -type f -a -exec chmod 644 {} + -o \
@@ -121,37 +121,35 @@ cd build
     --sysconfdir=/etc \
     -Dstrip=true
   "${NINJA:=ninja}" -v
-  install -D -m0755 -s $EXENAM $PKG/usr/games/$EXENAM
-  ln -s $EXENAM $PKG/usr/games/$PRGNAM
+  install -D -m0755 -s $PRGNAM $PKG/usr/games/$PRGNAM
 cd ..
 
 # 20230418 bkw: use upstream's man page, but section 6.
 mkdir -p $PKG/usr/man/man6
 sed -e '/^\.TH/s, 1 , 6 ,' \
     -e '/^\.TH/s,$, SlackBuilds.org,' \
-    src/$EXENAM.1 \
-    | gzip -9c > $PKG/usr/man/man6/$EXENAM.6.gz
-ln -s $EXENAM.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
+    src/$PRGNAM.1 \
+    | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
 
-sed -i -e 's,^Exec=,&/usr/games/,' $EXENAM.desktop
-install -D -m0644 $EXENAM.desktop $PKG/usr/share/applications/$EXENAM.desktop
+sed -i -e 's,^Exec=,&/usr/games/,' $PRGNAM.desktop
+install -D -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 # 20230418 bkw: use upstream's icon, but pre-resized.
 HICOLOR=$PKG/usr/share/icons/hicolor
-SVGICON=icons/$EXENAM.svg
+SVGICON=icons/$PRGNAM.svg
 
 for px in 16 22 32 48 64 96 128; do
   size=${px}x${px}
   dir=$HICOLOR/$size/apps
   mkdir -p $dir
-  rsvg-convert -w $px -h $px -o $dir/$EXENAM.png $SVGICON
+  rsvg-convert -w $px -h $px -o $dir/$PRGNAM.png $SVGICON
 done
 
 mkdir -p $HICOLOR/scalable/apps
-cp -a $SVGICON $HICOLOR/scalable/apps/$EXENAM.svg
+cp -a $SVGICON $HICOLOR/scalable/apps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/share/pixmaps
-ln -s ../icons/hicolor/48x48/apps/$EXENAM.png $PKG/usr/share/pixmaps/$EXENAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
diff --git a/system/sdltrs/sdltrs.info b/system/sdltrs/sdltrs.info
index 3cfe389f0ae59..7308a23dbd94e 100644
--- a/system/sdltrs/sdltrs.info
+++ b/system/sdltrs/sdltrs.info
@@ -1,8 +1,8 @@
 PRGNAM="sdltrs"
-VERSION="1.2.27+20230518_7dcf4ca9"
+VERSION="1.2.28"
 HOMEPAGE="https://gitlab.com/jengun/sdltrs/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/sdltrs-sdl2-1.2.27+20230518_7dcf4ca9.tar.xz"
-MD5SUM="620585307cf9678e3d9bd20693b8582e"
+DOWNLOAD="https://gitlab.com/jengun/sdltrs/-/archive/1.2.28/sdltrs-1.2.28.tar.bz2"
+MD5SUM="1ae7542c28d9b63fcb723ba95d23e443"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="trs80-roms"