4 files changed, 34 insertions, 24 deletions
diff --git a/desktop/amiwm/README b/desktop/amiwm/README
index a03fa983b5c6..25c4871e38b2 100644
--- a/desktop/amiwm/README
+++ b/desktop/amiwm/README
@@ -4,9 +4,6 @@ amiwm is an X window manager that tries to make your display look and
 feel like an Amiga Workbench screen. It is fully functional and can do
 all the usual window manager stuff, like moving and resizing windows.
 
-The original website is https://www.lysator.liu.se/~marcus/amiwm.html
-but what's packaged here is a fork from github which has been
-updated (in 2017) to build on modern compilers.
-
 Due to license restrictions, you may not redistribute the binary
-package this script builds.
+package this script builds unless you include the complete source.
+See /usr/doc/amiwm-$VERSION/LICENSE for details.
diff --git a/desktop/amiwm/amiwm.SlackBuild b/desktop/amiwm/amiwm.SlackBuild
index f6ee8a63102e..bf3040c14027 100644
--- a/desktop/amiwm/amiwm.SlackBuild
+++ b/desktop/amiwm/amiwm.SlackBuild
@@ -6,19 +6,23 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# This thing is very early-90s, and not very much fun to use. However,
-# I never had an Amiga; for someone who grew up with one, maybe this
-# is how they expect GUIs to work.
-
-# One potential TODO: figure out how to make amiwm show up in the
-# list of window managers, in runlevel 4. I don't use runlevel 4
-# and couldn't figure it out in the 5 minutes I spent looking at it.
-# If you know how to do this, send me a patch.
+# This thing is very early-90s, and not very much fun to use (even
+# for me, who prefers WindowMaker). However, I never had an Amiga;
+# for someone who grew up with one, maybe this is how they expect GUIs
+# to work.
+
+# 20230427 bkw: update for v0.22pl2.
+# - Switched upstreams. Apparently the github version I packaged was a
+#   fork. Now I'm using the actual author's version. Thanks to luna on
+#   IRC for finding the original site and the new release (also for
+#   testing the previous version).
+# - Fix issue with parallel make.
+# - Clean up man page slightly.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=amiwm
-VERSION=${VERSION:-20170803_8e0948c}
+VERSION=${VERSION:-0.22pl2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -59,9 +63,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM$VERSION
+tar xvf $CWD/$PRGNAM$VERSION.tar.gz
+cd $PRGNAM$VERSION
 chown -R root:root .
 # permissions are awful, don't revert to template here.
 find -L .  -type d -a -exec chmod 755 {} \+ -o \
@@ -73,6 +77,12 @@ LIBDIR=/usr/$LIB
 # hardcoded wrong path in config file.
 sed -i "s,/usr/local/lib,$LIBDIR," system.amiwmrc
 
+# 20230427 bkw: man page has confusing wording. also left curly
+# quotes, but the right quotes are straight, which is weird-looking.
+sed -i -e 's,amiwmrc-file,amiwmrc file,' \
+       -e 's,\\f1\\\*(lq\\f3,",g' \
+       amiwm.1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 sh ./configure \
@@ -90,6 +100,9 @@ sh ./configure \
 # have to make the X* files here to avoid having $PKG in them,
 # though it doesn't really matter (we don't use these, they're
 # just there for reference I guess).
+# 20230427 bkw: it occasionally fails with -jN (but not always),
+# because gram.h isn't made before it's needed. so make it first.
+make gram.h
 make libdir=$LIBDIR all Xinitrc Xsession Xsession2
 make install prefix=$PKG/usr libdir=$PKG/$LIBDIR
 gzip -9 $PKG/usr/man/man*/*.*
@@ -110,7 +123,7 @@ rename rc rc.new $PKG/$LIBDIR/$PRGNAM/system.amiwmrc
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
-cp -a *.md $PKGDOC
+cp -a README* LICENSE* $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/amiwm/amiwm.info b/desktop/amiwm/amiwm.info
index 7f2da2609414..1cead02e7035 100644
--- a/desktop/amiwm/amiwm.info
+++ b/desktop/amiwm/amiwm.info
@@ -1,8 +1,8 @@
 PRGNAM="amiwm"
-VERSION="20170803_8e0948c"
-HOMEPAGE="https://github.com/redspl/amiwm/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/amiwm-20170803_8e0948c.tar.xz"
-MD5SUM="e765128f9f0755f86cf1121c5194f5f0"
+VERSION="0.22pl2"
+HOMEPAGE="https://www.lysator.liu.se/~marcus/amiwm.html"
+DOWNLOAD="ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/amiwm0.22pl2.tar.gz"
+MD5SUM="1179235617aeeb807e73f71605836b1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/amiwm/slack-desc b/desktop/amiwm/slack-desc
index 5f173582f636..7e8a238b8aa8 100644
--- a/desktop/amiwm/slack-desc
+++ b/desktop/amiwm/slack-desc
@@ -12,8 +12,8 @@ amiwm: amiwm is an X window manager that tries to make your display look and
 amiwm: feel like an Amiga Workbench screen. It is fully functional and can do
 amiwm: all the usual window manager stuff, like moving and resizing windows.
 amiwm:
-amiwm: Due to license restrictions, you may not redistribute the binary
-amiwm: package this script builds.
+amiwm:
+amiwm:
 amiwm:
 amiwm:
 amiwm: