4 files changed, 46 insertions, 25 deletions
diff --git a/games/pysolfc-extra-cardsets/README b/games/pysolfc-extra-cardsets/README
index f81c787572..60b9b04ba2 100644
--- a/games/pysolfc-extra-cardsets/README
+++ b/games/pysolfc-extra-cardsets/README
@@ -1,6 +1,6 @@
 pysolfc-extra-cardsets (extra card graphics for pysolfc)
 
-Almost 30MB of extra cardsets for use with pysolfc, including large
+Almost 90MB of extra cardsets for use with pysolfc, including large
 cards for high resolution displays (or for the vision impaired).
 
 Most of the cardsets come from the PySolFC sourceforge download page.
diff --git a/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.SlackBuild b/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.SlackBuild
index b9f7464d25..2c6b58633b 100644
--- a/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.SlackBuild
+++ b/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.SlackBuild
@@ -1,19 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pysolfc-extra-cardsets
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20231217 bkw: updated for v2.2.
+# 20230111 bkw: updated for v2.1.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pysolfc-extra-cardsets
 SRCNAM=PySolFC-Cardsets
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -27,20 +37,31 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 --strip-components=1
 tar xvf $CWD/pysolfc-cardsets-bknoll.tar.xz --strip-components=1
 
 # Don't include cardsets that are already in the main pysolfc package.
+# 20231217 bkw: matching and matching-xl moved to the main pkg in 2.20.0.
 rm -rf \
-   cardset-2000 \
-   cardset-crystal-mahjongg \
-   cardset-dashavatara-ganjifa \
-   cardset-dondorf \
-   cardset-gnome-mahjongg-1 \
-   cardset-hanafuda-200-years \
-   cardset-hexadeck \
-   cardset-matrix \
-   cardset-mughal-ganjifa \
-   cardset-oxymoron \
-   cardset-standard \
-   cardset-tuxedo \
-   cardset-vienna-2k
+    cardset-2000 \
+    cardset-crystal-mahjongg \
+    cardset-dashavatara-ganjifa \
+    cardset-dashavatara-ganjifa-xl \
+    cardset-dondorf \
+    cardset-gnome-mahjongg-1 \
+    cardset-hanafuda-200-years \
+    cardset-hexadeck \
+    cardset-louie-mantia-hanafuda \
+    cardset-matching \
+    cardset-matching-xl \
+    cardset-matrix \
+    cardset-mughal-ganjifa \
+    cardset-mughal-ganjifa-xl \
+    cardset-neo \
+    cardset-neo-hex \
+    cardset-neo-tarock \
+    cardset-next-matrix \
+    cardset-oxymoron \
+    cardset-standard \
+    cardset-tuxedo \
+    cardset-uni-mahjongg \
+    cardset-vienna-2k
 
 chown -R root:root .
 
@@ -57,4 +78,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info b/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info
index 7f5f1a1e6a..b00d09b1df 100644
--- a/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info
+++ b/games/pysolfc-extra-cardsets/pysolfc-extra-cardsets.info
@@ -1,12 +1,12 @@
 PRGNAM="pysolfc-extra-cardsets"
-VERSION="2.0"
+VERSION="2.2"
 HOMEPAGE="https://pysolfc.sourceforge.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2 \
-          http://urchlay.naptime.net/~urchlay/src/pysolfc-cardsets-bknoll.tar.xz"
-MD5SUM="0ce4aa6801196f9166815b244aeea47e \
+DOWNLOAD="https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.2/PySolFC-Cardsets-2.2.tar.bz2 \
+          https://slackware.uk/~urchlay/src/pysolfc-cardsets-bknoll.tar.xz"
+MD5SUM="a44b410e2a3c9939fc03c298aabd8eb6 \
         35e3df2c464019167377dc35d5d8354e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pysolfc"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/games/pysolfc-extra-cardsets/slack-desc b/games/pysolfc-extra-cardsets/slack-desc
index aa4e784cc1..4b8dd20561 100644
--- a/games/pysolfc-extra-cardsets/slack-desc
+++ b/games/pysolfc-extra-cardsets/slack-desc
@@ -8,7 +8,7 @@
                       |-----handy-ruler------------------------------------------------------|
 pysolfc-extra-cardsets: pysolfc-extra-cardsets (extra card graphics for pysolfc)
 pysolfc-extra-cardsets:
-pysolfc-extra-cardsets: Almost 30MB of extra cardsets for use with pysolfc, including large
+pysolfc-extra-cardsets: Almost 90MB of extra cardsets for use with pysolfc, including large
 pysolfc-extra-cardsets: cards for high resolution displays (or for the vision impaired).
 pysolfc-extra-cardsets:
 pysolfc-extra-cardsets: