Updated puzzles to 20160429.

Adds three games:
flood
palisade
tracks

4 files changed, 32 insertions, 27 deletions

diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile
index 45530161ec0..11f5ee55d9d 100644
--- a/games/puzzles/Makefile
+++ b/games/puzzles/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2016/08/03 10:22:47 adam Exp $
+# $NetBSD: Makefile,v 1.51 2016/10/05 13:09:38 wiz Exp $
 
-DISTNAME=	puzzles-20141021.r10286
-PKGREVISION=	2
+DISTNAME=	puzzles
+PKGNAME=	puzzles-20160429
 CATEGORIES=	games
-# distfile changes daily
+# distfile changes every day
 MASTER_SITES=	# http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
@@ -13,6 +14,7 @@ LICENSE=	mit
 
 INSTALLATION_DIRS=	bin share/doc/puzzles
 
+WRKSRC=		${WRKDIR}/puzzles-20160429.b31155b
 USE_TOOLS+=	gmake pkg-config
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
diff --git a/games/puzzles/PLIST b/games/puzzles/PLIST
index 672705dde77..16e31dc701e 100644
--- a/games/puzzles/PLIST
+++ b/games/puzzles/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/05/26 18:43:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/10/05 13:09:38 wiz Exp $
 bin/blackbox
 bin/bridges
 bin/cube
@@ -6,6 +6,7 @@ bin/dominosa
 bin/fifteen
 bin/filling
 bin/flip
+bin/flood
 bin/galaxies
 bin/guess
 bin/inertia
@@ -17,6 +18,7 @@ bin/map
 bin/mines
 bin/netgame
 bin/netslide
+bin/palisade
 bin/pattern
 bin/pearl
 bin/pegs
@@ -30,6 +32,7 @@ bin/slant
 bin/solo
 bin/tents
 bin/towers
+bin/tracks
 bin/twiddle
 bin/undead
 bin/unequal
diff --git a/games/puzzles/distinfo b/games/puzzles/distinfo
index 5f98bb263cb..aabd43db8b8 100644
--- a/games/puzzles/distinfo
+++ b/games/puzzles/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 20:57:02 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/10/05 13:09:38 wiz Exp $
 
-SHA1 (puzzles-20141021.r10286.tar.gz) = 972c89134c0901a07022dbc6b67e45f29a688595
-RMD160 (puzzles-20141021.r10286.tar.gz) = af9a4b1e067615d5f5d4eff0e4ef77108187c103
-SHA512 (puzzles-20141021.r10286.tar.gz) = b6c7fb53f2fd0aba73bfc5399542cfe1eb4fecdc6b07770a90bdf0e80ce762fb1d12a21f0436d8ed9404942ff1a70fec08bf3dc58ac16c66ad4809a89d8be343
-Size (puzzles-20141021.r10286.tar.gz) = 2933208 bytes
-SHA1 (patch-aa) = dbea43f7cf4368d18b92a8c7788cf1e5cd058487
+SHA1 (puzzles-20160429/puzzles.tar.gz) = 3fd39e4d2f658654e3b28c007eae00710ec656c5
+RMD160 (puzzles-20160429/puzzles.tar.gz) = d8736c7358071bd61f3d7d41a1cdd7d4bdefdfd7
+SHA512 (puzzles-20160429/puzzles.tar.gz) = 7bf3d97f0a48bba27070148f6b68b13f01a2baaf48b0bce05ad4e61ca35f0f2d7b9c1996e4eca5e64d84eacb86935468f7ae394c37aaee974d468476108ec2f0
+Size (puzzles-20160429/puzzles.tar.gz) = 2896119 bytes
+SHA1 (patch-aa) = 515d93b8c43bb22646ffa812309e92af8682855d
diff --git a/games/puzzles/patches/patch-aa b/games/puzzles/patches/patch-aa
index 9d47d08f991..93aee4dec17 100644
--- a/games/puzzles/patches/patch-aa
+++ b/games/puzzles/patches/patch-aa
@@ -1,40 +1,40 @@
-$NetBSD: patch-aa,v 1.7 2013/07/07 10:37:56 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2016/10/05 13:09:38 wiz Exp $
 
 Rename "net" to "netgame" so there's less chances of conflicts
 with other packages.
 
---- Makefile.gtk.orig	2013-05-26 00:35:23.000000000 +0000
+--- Makefile.gtk.orig	2016-04-29 00:37:35.000000000 +0000
 +++ Makefile.gtk
-@@ -38,7 +38,7 @@ all: $(BINPREFIX)blackbox $(BINPREFIX)br
+@@ -39,7 +39,7 @@ all: $(BINPREFIX)blackbox $(BINPREFIX)br
  		$(BINPREFIX)loopysolver $(BINPREFIX)magnets \
  		$(BINPREFIX)magnetssolver $(BINPREFIX)map \
  		$(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc \
 -		$(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide \
 +		$(BINPREFIX)mines $(BINPREFIX)netgame $(BINPREFIX)netslide \
- 		$(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)pattern \
+ 		$(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade \
+ 		$(BINPREFIX)pattern $(BINPREFIX)patternpicture \
  		$(BINPREFIX)patternsolver $(BINPREFIX)pearl \
- 		$(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range \
-@@ -199,7 +199,7 @@ $(BINPREFIX)mines: drawing.o gtk.o mallo
+@@ -212,7 +212,7 @@ $(BINPREFIX)mines: drawing.o gtk.o mallo
  		misc.o printing.o ps.o random.o tree234.o version.o  \
  		$(XLFLAGS) $(XLIBS)
  
--$(BINPREFIX)net: drawing.o dsf.o gtk.o malloc.o midend.o misc.o net.o \
-+$(BINPREFIX)netgame: drawing.o dsf.o gtk.o malloc.o midend.o misc.o net.o \
- 		net-icon.o printing.o ps.o random.o tree234.o version.o
- 	$(CC) -o $@ drawing.o dsf.o gtk.o malloc.o midend.o misc.o net.o \
- 		net-icon.o printing.o ps.o random.o tree234.o version.o  \
-@@ -708,7 +708,7 @@ GAMES += loopy
+-$(BINPREFIX)net: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
++$(BINPREFIX)netgame: drawing.o dsf.o findloop.o gtk.o malloc.o midend.o misc.o \
+ 		net.o net-icon.o printing.o ps.o random.o tree234.o \
+ 		version.o
+ 	$(CC) -o $@ drawing.o dsf.o findloop.o gtk.o malloc.o midend.o \
+@@ -769,7 +769,7 @@ GAMES += loopy
  GAMES += magnets
  GAMES += map
  GAMES += mines
 -GAMES += net
 +GAMES += netgame
  GAMES += netslide
+ GAMES += palisade
  GAMES += pattern
- GAMES += pearl
-@@ -763,4 +763,4 @@ benchmark.txt: $(GAMES)
- 	done > $@
+@@ -806,4 +806,4 @@ benchmark.txt: benchmark.sh $(GAMES)
+ 
  
  clean:
--	rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)filling $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver $(BINPREFIX)latincheck $(BINPREFIX)lightup $(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)pattern $(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver $(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver $(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
+-	rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)fifteensolver $(BINPREFIX)filling $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)flood $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver $(BINPREFIX)latincheck $(BINPREFIX)lightup $(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc $(BINPREFIX)mines $(BINPREFIX)net $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)palisade $(BINPREFIX)pattern $(BINPREFIX)patternpicture $(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver $(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver $(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)tracks $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver $(BINPREFIX)untangle
 +	rm -f *.o $(BINPREFIX)blackbox $(BINPREFIX)bridges $(BINPREFIX)cube $(BINPREFIX)dominosa $(BINPREFIX)fifteen $(BINPREFIX)filling $(BINPREFIX)fillingsolver $(BINPREFIX)flip $(BINPREFIX)galaxies $(BINPREFIX)galaxiespicture $(BINPREFIX)galaxiessolver $(BINPREFIX)guess $(BINPREFIX)inertia $(BINPREFIX)keen $(BINPREFIX)keensolver $(BINPREFIX)latincheck $(BINPREFIX)lightup $(BINPREFIX)lightupsolver $(BINPREFIX)loopy $(BINPREFIX)loopysolver $(BINPREFIX)magnets $(BINPREFIX)magnetssolver $(BINPREFIX)map $(BINPREFIX)mapsolver $(BINPREFIX)mineobfusc $(BINPREFIX)mines $(BINPREFIX)netgame $(BINPREFIX)netslide $(BINPREFIX)nullgame $(BINPREFIX)obfusc $(BINPREFIX)pattern $(BINPREFIX)patternsolver $(BINPREFIX)pearl $(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range $(BINPREFIX)rect $(BINPREFIX)samegame $(BINPREFIX)signpost $(BINPREFIX)signpostsolver $(BINPREFIX)singles $(BINPREFIX)singlessolver $(BINPREFIX)sixteen $(BINPREFIX)slant $(BINPREFIX)slantsolver $(BINPREFIX)solo $(BINPREFIX)solosolver $(BINPREFIX)tents $(BINPREFIX)tentssolver $(BINPREFIX)towers $(BINPREFIX)towerssolver $(BINPREFIX)twiddle $(BINPREFIX)undead $(BINPREFIX)unequal $(BINPREFIX)unequalsolver $(BINPREFIX)unruly $(BINPREFIX)unrulysolver $(BINPREFIX)untangle