games/sgt-puzzles: update to 20210407

Upstream has switched to CMake and merged my changes allowing
to simplify the port greatly.

3 files changed, 133 insertions, 58 deletions

diff --git a/games/sgt-puzzles/Makefile b/games/sgt-puzzles/Makefile
index 5b354bc4e649..113293edb389 100644
--- a/games/sgt-puzzles/Makefile
+++ b/games/sgt-puzzles/Makefile
@@ -1,7 +1,5 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-
 PORTNAME=	puzzles
-PORTVERSION=	20201208
+PORTVERSION=	20210407
 CATEGORIES=	games
 MASTER_SITES=	https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ \
 		https://mirror.amdmi3.ru/distfiles/
@@ -14,63 +12,23 @@ COMMENT=	Simon Tatham's Portable Puzzle Collection
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-COMMITHASH=	84cb4c6
-
-USES=		autoreconf gmake gnome pkgconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=sgt-
-INSTALL_TARGET=	install-strip
+COMMITHASH=	245e4f8
 
-PORTDOCS=	*
+BUILD_DEPENDS=	convert:graphics/ImageMagick6-nox11
 
-PUZZLE_LIST=	blackbox bridges cube dominosa fifteen filling flip \
-		flood galaxies guess inertia keen lightup loopy magnets map \
-		mines net netslide palisade pattern pearl pegs range rect \
-		samegame signpost singles sixteen slant solo tents towers \
-		tracks twiddle undead unequal unruly untangle
+USES=		cmake gnome perl5 pkgconfig shebangfix
+USE_PERL5=	build
+SHEBANG_FILES=	icons/square.pl icons/cicon.pl
+CMAKE_ARGS=	-DNAME_PREFIX:STRING=sgt-
 
-.for f in ${PUZZLE_LIST}
-PLIST_FILES+=	bin/sgt-${f}
-DESKTOP_FILES_PLIST_FILES+=\
-		share/pixmaps/sgt-${f}.png
-DESKTOP_FILES_DESKTOP_ENTRIES+=\
-		"${f}" \
-		"${f} puzzle game" \
-		"sgt-${f}" \
-		"sgt-${f}" \
-		"Game;LogicGame;" \
-		""
-.endfor
-
-OPTIONS_DEFINE=	DESKTOP_FILES DOCS
-OPTIONS_DEFAULT=DESKTOP_FILES GTK2
 OPTIONS_SINGLE=	GTK
 OPTIONS_SINGLE_GTK=	GTK2 GTK3
+OPTIONS_DEFAULT=GTK3
 
-DESKTOP_FILES_DESC=	Install menu entries (lots of them)
-
-GTK_DESC=		Gtk version
-GTK2_CONFIGURE_ON=	--with-gtk=2
-GTK2_USE=		GNOME=gtk20
-GTK3_CONFIGURE_ON=	--with-gtk=3
-GTK3_USE=		GNOME=gtk30
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure.ac \
-		${WRKSRC}/configure
-
-post-install-DESKTOP_FILES-on:
-.for f in ${PUZZLE_LIST}
-	${INSTALL_DATA} ${WRKSRC}/icons/${f}-48d24.png ${STAGEDIR}${PREFIX}/share/pixmaps/sgt-${f}.png
-.endfor
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/puzzles.txt ${WRKSRC}/HACKING ${STAGEDIR}${DOCSDIR}/
-
-check-puzzle-list-completeness: extract
-	@${ECHO_CMD} ${PUZZLE_LIST} | ${FMT} -w 1 | ${SORT} > ${WRKDIR}/puzzle_list.port
-	@${LS} ${WRKSRC}/icons | ${GREP} 48d24.png | ${CUT} -f 1 -d- | ${SORT} > ${WRKDIR}/puzzle_list.upstream
-	@cmp ${WRKDIR}/puzzle_list.port ${WRKDIR}/puzzle_list.upstream
+GTK_DESC=	Gtk version
+GTK2_CMAKE_ON=	-DPUZZLES_GTK_VERSION=2
+GTK2_USE=	GNOME=gtk20
+GTK3_CMAKE_ON=	-DPUZZLES_GTK_VERSION=3
+GTK3_USE=	GNOME=gtk30
 
 .include <bsd.port.mk>
diff --git a/games/sgt-puzzles/distinfo b/games/sgt-puzzles/distinfo
index eb65f9758241..f84a69553d7c 100644
--- a/games/sgt-puzzles/distinfo
+++ b/games/sgt-puzzles/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607605072
-SHA256 (puzzles-20201208.84cb4c6.tar.gz) = fd49aabdd7c7e521c990991dab59700a40719cca172113ac8df693afe11d284d
-SIZE (puzzles-20201208.84cb4c6.tar.gz) = 3261715
+TIMESTAMP = 1617829907
+SHA256 (puzzles-20210407.245e4f8.tar.gz) = a225347da27303c25578258c10efe99d074823b239b889b95441cd5f843f4143
+SIZE (puzzles-20210407.245e4f8.tar.gz) = 1669525
diff --git a/games/sgt-puzzles/pkg-plist b/games/sgt-puzzles/pkg-plist
new file mode 100644
index 000000000000..48dcda831815
--- /dev/null
+++ b/games/sgt-puzzles/pkg-plist
@@ -0,0 +1,117 @@
+bin/sgt-blackbox
+bin/sgt-bridges
+bin/sgt-cube
+bin/sgt-dominosa
+bin/sgt-fifteen
+bin/sgt-filling
+bin/sgt-flip
+bin/sgt-flood
+bin/sgt-galaxies
+bin/sgt-guess
+bin/sgt-inertia
+bin/sgt-keen
+bin/sgt-lightup
+bin/sgt-loopy
+bin/sgt-magnets
+bin/sgt-map
+bin/sgt-mines
+bin/sgt-net
+bin/sgt-netslide
+bin/sgt-palisade
+bin/sgt-pattern
+bin/sgt-pearl
+bin/sgt-pegs
+bin/sgt-range
+bin/sgt-rect
+bin/sgt-samegame
+bin/sgt-signpost
+bin/sgt-singles
+bin/sgt-sixteen
+bin/sgt-slant
+bin/sgt-solo
+bin/sgt-tents
+bin/sgt-towers
+bin/sgt-tracks
+bin/sgt-twiddle
+bin/sgt-undead
+bin/sgt-unequal
+bin/sgt-unruly
+bin/sgt-untangle
+share/applications/sgt-blackbox.desktop
+share/applications/sgt-bridges.desktop
+share/applications/sgt-cube.desktop
+share/applications/sgt-dominosa.desktop
+share/applications/sgt-fifteen.desktop
+share/applications/sgt-filling.desktop
+share/applications/sgt-flip.desktop
+share/applications/sgt-flood.desktop
+share/applications/sgt-galaxies.desktop
+share/applications/sgt-guess.desktop
+share/applications/sgt-inertia.desktop
+share/applications/sgt-keen.desktop
+share/applications/sgt-lightup.desktop
+share/applications/sgt-loopy.desktop
+share/applications/sgt-magnets.desktop
+share/applications/sgt-map.desktop
+share/applications/sgt-mines.desktop
+share/applications/sgt-net.desktop
+share/applications/sgt-netslide.desktop
+share/applications/sgt-palisade.desktop
+share/applications/sgt-pattern.desktop
+share/applications/sgt-pearl.desktop
+share/applications/sgt-pegs.desktop
+share/applications/sgt-range.desktop
+share/applications/sgt-rect.desktop
+share/applications/sgt-samegame.desktop
+share/applications/sgt-signpost.desktop
+share/applications/sgt-singles.desktop
+share/applications/sgt-sixteen.desktop
+share/applications/sgt-slant.desktop
+share/applications/sgt-solo.desktop
+share/applications/sgt-tents.desktop
+share/applications/sgt-towers.desktop
+share/applications/sgt-tracks.desktop
+share/applications/sgt-twiddle.desktop
+share/applications/sgt-undead.desktop
+share/applications/sgt-unequal.desktop
+share/applications/sgt-unruly.desktop
+share/applications/sgt-untangle.desktop
+share/pixmaps/sgt-blackbox-48d24.png
+share/pixmaps/sgt-bridges-48d24.png
+share/pixmaps/sgt-cube-48d24.png
+share/pixmaps/sgt-dominosa-48d24.png
+share/pixmaps/sgt-fifteen-48d24.png
+share/pixmaps/sgt-filling-48d24.png
+share/pixmaps/sgt-flip-48d24.png
+share/pixmaps/sgt-flood-48d24.png
+share/pixmaps/sgt-galaxies-48d24.png
+share/pixmaps/sgt-guess-48d24.png
+share/pixmaps/sgt-inertia-48d24.png
+share/pixmaps/sgt-keen-48d24.png
+share/pixmaps/sgt-lightup-48d24.png
+share/pixmaps/sgt-loopy-48d24.png
+share/pixmaps/sgt-magnets-48d24.png
+share/pixmaps/sgt-map-48d24.png
+share/pixmaps/sgt-mines-48d24.png
+share/pixmaps/sgt-net-48d24.png
+share/pixmaps/sgt-netslide-48d24.png
+share/pixmaps/sgt-palisade-48d24.png
+share/pixmaps/sgt-pattern-48d24.png
+share/pixmaps/sgt-pearl-48d24.png
+share/pixmaps/sgt-pegs-48d24.png
+share/pixmaps/sgt-range-48d24.png
+share/pixmaps/sgt-rect-48d24.png
+share/pixmaps/sgt-samegame-48d24.png
+share/pixmaps/sgt-signpost-48d24.png
+share/pixmaps/sgt-singles-48d24.png
+share/pixmaps/sgt-sixteen-48d24.png
+share/pixmaps/sgt-slant-48d24.png
+share/pixmaps/sgt-solo-48d24.png
+share/pixmaps/sgt-tents-48d24.png
+share/pixmaps/sgt-towers-48d24.png
+share/pixmaps/sgt-tracks-48d24.png
+share/pixmaps/sgt-twiddle-48d24.png
+share/pixmaps/sgt-undead-48d24.png
+share/pixmaps/sgt-unequal-48d24.png
+share/pixmaps/sgt-unruly-48d24.png
+share/pixmaps/sgt-untangle-48d24.png