4 files changed, 16 insertions, 29 deletions
diff --git a/system/bin2iso/README b/system/bin2iso/README
index d1cc5b5005..5f9577bde7 100644
--- a/system/bin2iso/README
+++ b/system/bin2iso/README
@@ -4,5 +4,4 @@ bin2iso converts raw format (.bin/.cue) CD image files to ISO-9660 or
 .wav format. It's also (sometimes) capable of creating a .cue file for
 a .bin file whose .cue file has gone missong.
 
-There is no man page or --help option; run 'bin2iso' with no arguments
-for usage.
+There is no man page; run 'bin2iso --help' for usage.
diff --git a/system/bin2iso/bin2iso.SlackBuild b/system/bin2iso/bin2iso.SlackBuild
index 6401daf7f2..d01ef12820 100644
--- a/system/bin2iso/bin2iso.SlackBuild
+++ b/system/bin2iso/bin2iso.SlackBuild
@@ -7,6 +7,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20241126 bkw: update for v2.0 (new upstream, fork, actually maintained).
 # 20240829 bkw:
 # - new maintainer.
 # - fix VERSION: it was "19b", for version 1.9b.
@@ -20,15 +21,11 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bin2iso
-VERSION=${VERSION:-1.9b}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-# 20240829 bkw: no tags in the github repo, use the one and only
-# commit tarball.
-COMMIT=${COMMIT:-a08f6f93b833878dc009fe59da072643f06a7830}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -61,29 +58,20 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$COMMIT
-tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz --wildcards '*/*.txt' '*/src/linux_macos/*.c'
-cd $PRGNAM-$COMMIT
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-find . -type f -exec chmod 644 {} + -o -type d -exec chmod 755 {} +
-
-# 20240829 bkw: Fix a couple of warnings, the ones we get *without* -Wall.
-# One of these constitutes an actual bug, but it only affects files that
-# aren't an even number of CD sectors (premature EOF; the last sector was
-# supposed to be zero-filled, but it used == instead of = for assignment).
-# Not gonna worry about the -Wall ones for now.
-patch -p1 < $CWD/fixwarnings.diff
-
-# 20240829 bkw: WALL=yes for my own use.
-[ "${WALL:-no}" = "yes" ] && SLKCFLAGS+=" -Wall"
+chmod 644 *
 
-# 20240829 bkw: -Wl,-s builds stripped binaries.
+sed -i "s,-O2,$SLKCFLAGS," Makefile
+make
 mkdir -p $PKG/usr/bin
-${CC:-cc} $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$PRGNAM src/linux_macos/*.c
+install -s $PRGNAM $PKG/usr/bin
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
-cp -a README.txt $PKGDOC
+cp -a README* $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/bin2iso/bin2iso.info b/system/bin2iso/bin2iso.info
index 84669de9da..b1c5df80ac 100644
--- a/system/bin2iso/bin2iso.info
+++ b/system/bin2iso/bin2iso.info
@@ -1,8 +1,8 @@
 PRGNAM="bin2iso"
-VERSION="1.9b"
-HOMEPAGE="https://github.com/einsteinx2/bin2iso/"
-DOWNLOAD="https://github.com/einsteinx2/bin2iso/archive/a08f6f93b833878dc009fe59da072643f06a7830/bin2iso-a08f6f93b833878dc009fe59da072643f06a7830.tar.gz"
-MD5SUM="b0add21add73472a83eb60d8ce5c160e"
+VERSION="2.0"
+HOMEPAGE="https://gitlab.com/bunnylin/bin2iso/"
+DOWNLOAD="https://gitlab.com/bunnylin/bin2iso/-/archive/2.0/bin2iso-2.0.tar.gz"
+MD5SUM="76ff75fb5096b205fed1496c97649bdc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/bin2iso/slack-desc b/system/bin2iso/slack-desc
index 42c1fcee23..4284b19c26 100644
--- a/system/bin2iso/slack-desc
+++ b/system/bin2iso/slack-desc
@@ -12,7 +12,7 @@ bin2iso: bin2iso converts raw format (.bin/.cue) CD image files to ISO-9660 or
 bin2iso: .wav format. It's also (sometimes) capable of creating a .cue file for
 bin2iso: a .bin file whose .cue file has gone missong.
 bin2iso:
-bin2iso: Homepage: https://github.com/einsteinx2/bin2iso/
+bin2iso: Homepage: https://gitlab.com/bunnylin/bin2iso/
 bin2iso:
 bin2iso:
 bin2iso: