games/puzzles: update to 20220127

Changes since 20181212:
* new game 'mosaic'
* several bug fixes to the existing games
* build system switched from autotools to CMake

4 files changed, 98 insertions, 44 deletions

diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile
index 9ee265e6c2e..936d7be763f 100644
--- a/games/puzzles/Makefile
+++ b/games/puzzles/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2021/12/08 16:04:39 adam Exp $
+# $NetBSD: Makefile,v 1.71 2022/06/08 21:25:58 rillig Exp $
 
-DISTNAME=	puzzles-20181212
-GIT_COMMIT=	ced51ada363d895eee796dd03923042f97f95321
-PKGREVISION=	8
+DISTNAME=	puzzles-20220127
+GIT_COMMIT=	c43a34fbfe430d235bafc379595761880a19ed9f
 CATEGORIES=	games
 MASTER_SITES=	-https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=${GIT_COMMIT};sf=tgz
 
@@ -12,22 +11,22 @@ COMMENT=	Collection of small one-player puzzle games by Simon Tatham
 LICENSE=	mit
 
 WRKSRC=		${WRKDIR}/puzzles-${GIT_COMMIT:C,(.......).*,\1,}
-USE_TOOLS+=	gmake pkg-config perl autoreconf autoconf automake
 AUTO_MKDIRS=	yes
 
 BUILD_DEPENDS+=		halibut>=1.1:../../textproc/halibut
 
 USE_LANGUAGES=		c99
-GNU_CONFIGURE=		yes
-BUILDLINK_TRANSFORM+=	rm:-Werror
-MAKE_FLAGS=		prefix=${PREFIX}
-MAKE_FLAGS+=		gamesdir=${PREFIX}/bin
-CFLAGS+=		-DREVISION=${DISTNAME:S/puzzles-//}
+USE_CMAKE=		yes
+USE_TOOLS+=		perl
+
+SUBST_CLASSES+=		net
+SUBST_STAGE.net=	pre-configure
+SUBST_FILES.net=	CMakeLists.txt
+SUBST_SED.net=		-e 's,puzzle(net$$,&game,'
 
 pre-configure:
-	cd ${WRKSRC} && perl mkfiles.pl
-	cd ${WRKSRC} && ${SH} mkauto.sh
-	cd ${WRKSRC} && gmake -f Makefile.doc puzzles.txt
+	cd ${WRKSRC} && make -f Makefile.doc puzzles.txt
+	cd ${WRKSRC} && mv net.c netgame.c && mv icons/net.sav icons/netgame.sav
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/puzzles.txt \
diff --git a/games/puzzles/PLIST b/games/puzzles/PLIST
index 16e31dc701e..1e2b6f98109 100644
--- a/games/puzzles/PLIST
+++ b/games/puzzles/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/10/05 13:09:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/06/08 21:25:58 rillig Exp $
 bin/blackbox
 bin/bridges
 bin/cube
@@ -16,6 +16,7 @@ bin/loopy
 bin/magnets
 bin/map
 bin/mines
+bin/mosaic
 bin/netgame
 bin/netslide
 bin/palisade
@@ -38,4 +39,84 @@ bin/undead
 bin/unequal
 bin/unruly
 bin/untangle
+share/applications/blackbox.desktop
+share/applications/bridges.desktop
+share/applications/cube.desktop
+share/applications/dominosa.desktop
+share/applications/fifteen.desktop
+share/applications/filling.desktop
+share/applications/flip.desktop
+share/applications/flood.desktop
+share/applications/galaxies.desktop
+share/applications/guess.desktop
+share/applications/inertia.desktop
+share/applications/keen.desktop
+share/applications/lightup.desktop
+share/applications/loopy.desktop
+share/applications/magnets.desktop
+share/applications/map.desktop
+share/applications/mines.desktop
+share/applications/mosaic.desktop
+share/applications/netgame.desktop
+share/applications/netslide.desktop
+share/applications/palisade.desktop
+share/applications/pattern.desktop
+share/applications/pearl.desktop
+share/applications/pegs.desktop
+share/applications/range.desktop
+share/applications/rect.desktop
+share/applications/samegame.desktop
+share/applications/signpost.desktop
+share/applications/singles.desktop
+share/applications/sixteen.desktop
+share/applications/slant.desktop
+share/applications/solo.desktop
+share/applications/tents.desktop
+share/applications/towers.desktop
+share/applications/tracks.desktop
+share/applications/twiddle.desktop
+share/applications/undead.desktop
+share/applications/unequal.desktop
+share/applications/unruly.desktop
+share/applications/untangle.desktop
 share/doc/puzzles/puzzles.txt
+share/pixmaps/blackbox-48d24.png
+share/pixmaps/bridges-48d24.png
+share/pixmaps/cube-48d24.png
+share/pixmaps/dominosa-48d24.png
+share/pixmaps/fifteen-48d24.png
+share/pixmaps/filling-48d24.png
+share/pixmaps/flip-48d24.png
+share/pixmaps/flood-48d24.png
+share/pixmaps/galaxies-48d24.png
+share/pixmaps/guess-48d24.png
+share/pixmaps/inertia-48d24.png
+share/pixmaps/keen-48d24.png
+share/pixmaps/lightup-48d24.png
+share/pixmaps/loopy-48d24.png
+share/pixmaps/magnets-48d24.png
+share/pixmaps/map-48d24.png
+share/pixmaps/mines-48d24.png
+share/pixmaps/mosaic-48d24.png
+share/pixmaps/netgame-48d24.png
+share/pixmaps/netslide-48d24.png
+share/pixmaps/palisade-48d24.png
+share/pixmaps/pattern-48d24.png
+share/pixmaps/pearl-48d24.png
+share/pixmaps/pegs-48d24.png
+share/pixmaps/range-48d24.png
+share/pixmaps/rect-48d24.png
+share/pixmaps/samegame-48d24.png
+share/pixmaps/signpost-48d24.png
+share/pixmaps/singles-48d24.png
+share/pixmaps/sixteen-48d24.png
+share/pixmaps/slant-48d24.png
+share/pixmaps/solo-48d24.png
+share/pixmaps/tents-48d24.png
+share/pixmaps/towers-48d24.png
+share/pixmaps/tracks-48d24.png
+share/pixmaps/twiddle-48d24.png
+share/pixmaps/undead-48d24.png
+share/pixmaps/unequal-48d24.png
+share/pixmaps/unruly-48d24.png
+share/pixmaps/untangle-48d24.png
diff --git a/games/puzzles/distinfo b/games/puzzles/distinfo
index f7ff140c777..84a1a095966 100644
--- a/games/puzzles/distinfo
+++ b/games/puzzles/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 10:44:21 nia Exp $
+$NetBSD: distinfo,v 1.32 2022/06/08 21:25:58 rillig Exp $
 
-BLAKE2s (puzzles-20181212.tar.gz) = 862c8317e49d6d146e30fb69857724a66a42f2e2a03969cb976199f1c32c9517
-SHA512 (puzzles-20181212.tar.gz) = 228534debb8cdefc0844d5660b224776df6f59b17576335eb76813a6f8ac131a640bc6fc1a7d1ea9d9f5997fe62ae938176428f2eb4260de11e2d631b4cd34a5
-Size (puzzles-20181212.tar.gz) = 1184217 bytes
-SHA1 (patch-net.R) = 423acdff821acc711fefacafc5d731fb3a944185
+BLAKE2s (puzzles-20220127.tar.gz) = 461f1211a55f9adb139b7566ae172e46f297c111ff6b94298b0028c685ad7a81
+SHA512 (puzzles-20220127.tar.gz) = ef286c1a07e23195853e72ac388602ceb157430a7c81197428b9c05cf318d28b66221490247277e019cbf99eb63a17cb8bad9717df7a77e2f2993f18fb1d8661
+Size (puzzles-20220127.tar.gz) = 1199134 bytes
diff --git a/games/puzzles/patches/patch-net.R b/games/puzzles/patches/patch-net.R
deleted file mode 100644
index 1371b869efe..00000000000
--- a/games/puzzles/patches/patch-net.R
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-net.R,v 1.1 2019/01/06 20:37:14 rillig Exp $
-
-Rename 'net' to 'netgame' (like on Windows) to avoid a conflict with
-net/samba and net/samba4.
-
---- net.R.orig	2018-12-12 22:18:00.000000000 +0000
-+++ net.R
-@@ -2,7 +2,7 @@
- 
- NET_EXTRA = tree234 dsf findloop
- 
--net      : [X] GTK COMMON net NET_EXTRA net-icon|no-icon
-+netgame  : [X] GTK COMMON net NET_EXTRA net-icon|no-icon
- 
- # The Windows Net shouldn't be called `net.exe' since Windows
- # already has a reasonably important utility program by that name!
-@@ -11,7 +11,7 @@ netgame  : [G] WINDOWS COMMON net NET_EX
- ALL += net[COMBINED] NET_EXTRA
- 
- !begin am gtk
--GAMES += net
-+GAMES += netgame
- !end
- 
- !begin >list.c