1 files changed, 10 insertions, 22 deletions
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