- Update to 20160429

3 files changed, 32 insertions, 21 deletions

diff --git a/games/sgt-puzzles/Makefile b/games/sgt-puzzles/Makefile
index 857d5a1ef2d4..eada6f5b8769 100644
--- a/games/sgt-puzzles/Makefile
+++ b/games/sgt-puzzles/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	puzzles
-PORTVERSION=	r10116
+PORTVERSION=	20160429
 CATEGORIES=	games
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ \
 		http://mirror.amdmi3.ru/distfiles/
 PKGNAMEPREFIX=	sgt-
+DISTNAME=	${PORTNAME}-${PORTVERSION}.${COMMITHASH}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simon Tatham's Portable Puzzle Collection
@@ -14,28 +15,23 @@ COMMENT=	Simon Tatham's Portable Puzzle Collection
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
+COMMITHASH=	b31155b
+
+USES=		autoreconf gmake pkgconfig
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GNOME=	gtk20
 CONFIGURE_ARGS=	--program-prefix=sgt-
 INSTALL_TARGET=	install-strip
 
 PUZZLE_LIST=	blackbox bridges cube dominosa fifteen filling flip \
-		galaxies guess inertia keen lightup loopy magnets map \
-		mines net netslide pattern pearl pegs range rect samegame \
-		signpost singles sixteen slant solo tents towers twiddle \
-		undead unequal unruly untangle
+		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
 
 .for f in ${PUZZLE_LIST}
 PLIST_FILES+=	bin/sgt-${f}
-.endfor
-
-OPTIONS_DEFINE=	DESKTOP_FILES
-OPTIONS_DEFAULT=DESKTOP_FILES
-DESKTOP_FILES_DESC=Install menu entries (lots of them)
-
-.for f in ${PUZZLE_LIST}
-DESKTOP_FILES_PLIST_FILES+=	share/pixmaps/sgt-${f}.png
+DESKTOP_FILES_PLIST_FILES+=\
+		share/pixmaps/sgt-${f}.png
 DESKTOP_FILES_DESKTOP_ENTRIES+=\
 		"${f}" \
 		"${f} puzzle game" \
@@ -45,6 +41,19 @@ DESKTOP_FILES_DESKTOP_ENTRIES+=\
 		""
 .endfor
 
+OPTIONS_DEFINE=	DESKTOP_FILES
+OPTIONS_DEFAULT=DESKTOP_FILES GTK2
+OPTIONS_SINGLE=	GTK
+OPTIONS_SINGLE_GTK=	GTK2 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
diff --git a/games/sgt-puzzles/distinfo b/games/sgt-puzzles/distinfo
index 397dbc5740f1..7516a4ecdcb0 100644
--- a/games/sgt-puzzles/distinfo
+++ b/games/sgt-puzzles/distinfo
@@ -1,2 +1,3 @@
-SHA256 (puzzles-r10116.tar.gz) = db0df89c70a807843d6284de191bab6e7e179b82104466444bf3f62a6b8e8c14
-SIZE (puzzles-r10116.tar.gz) = 2958422
+TIMESTAMP = 1474081308
+SHA256 (puzzles-20160429.b31155b.tar.gz) = f1bf9999ebd138422216b0dea0800b2674fdf148445dde640ca71807b33e0079
+SIZE (puzzles-20160429.b31155b.tar.gz) = 2896119
diff --git a/games/sgt-puzzles/pkg-descr b/games/sgt-puzzles/pkg-descr
index 37881aaa41d4..fe301a2850a4 100644
--- a/games/sgt-puzzles/pkg-descr
+++ b/games/sgt-puzzles/pkg-descr
@@ -1,8 +1,9 @@
 Simon Tatham's Portable Puzzle Collection is a set of popular puzzle
 games for one player including Black Box, Bridges, Cube, Dominosa,
-Fifteen, Filling, Flip, Galaxies, Guess, Inertia, Keen, Light Up,
-Loopy, Magnets, Map, Mines, Net, Netslide, Pattern, Pearl, Pegs,
-Range, Rectangles, Same Game, Signpost, Singles, Sixteen, Slant,
-Solo, Tents, Towers, Twiddle, Undead, Unequal, Unruly and Untangle.
+Fifteen, Filling, Flip, Flood, Galaxies, Guess, Inertia, Keen,
+Light Up, Loopy, Magnets, Map, Mines, Net, Netslide, Palisade,
+Pattern, Pearl, Pegs, Range, Rectangles, Same Game, Signpost,
+Singles, Sixteen, Slant, Solo, Tents, Towers, Tracks, Twiddle,
+Undead, Unequal, Unruly and Untangle.
 
 WWW: http://www.chiark.greenend.org.uk/~sgtatham/puzzles/