Update to 9840:

Two new games: undead and unruly. And, of course, bugfixes.

4 files changed, 30 insertions, 30 deletions

diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile
index 927e87ff6ca..c31ab8162a5 100644
--- a/games/puzzles/Makefile
+++ b/games/puzzles/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/02/16 11:21:26 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.28 2013/05/26 18:43:17 wiz Exp $
 
-DISTNAME=	puzzles-r9455
+DISTNAME=	puzzles-r9840
 PKGNAME=	${DISTNAME:S/-r/-/}
-PKGREVISION=	5
 CATEGORIES=	games
 # distfile changes daily
 MASTER_SITES=	# http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
diff --git a/games/puzzles/PLIST b/games/puzzles/PLIST
index 6773e59da72..672705dde77 100644
--- a/games/puzzles/PLIST
+++ b/games/puzzles/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/22 15:04:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/05/26 18:43:17 wiz Exp $
 bin/blackbox
 bin/bridges
 bin/cube
@@ -31,6 +31,8 @@ bin/solo
 bin/tents
 bin/towers
 bin/twiddle
+bin/undead
 bin/unequal
+bin/unruly
 bin/untangle
 share/doc/puzzles/puzzles.txt
diff --git a/games/puzzles/distinfo b/games/puzzles/distinfo
index c7bd310c4c2..21804e560fd 100644
--- a/games/puzzles/distinfo
+++ b/games/puzzles/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/04/22 15:04:09 wiz Exp $
+$NetBSD: distinfo,v 1.11 2013/05/26 18:43:17 wiz Exp $
 
-SHA1 (puzzles-r9455.tar.gz) = f5981457f5c4537548e7d876fb6fb461911796eb
-RMD160 (puzzles-r9455.tar.gz) = ab3f3c09229ceb26d601cefecca07eb7cb0b9674
-Size (puzzles-r9455.tar.gz) = 3049599 bytes
-SHA1 (patch-aa) = d2bb92a1d358a454774be272dae0cc1fde113516
+SHA1 (puzzles-r9840.tar.gz) = 0fedbcdfe2cfab44c1387f75d49a66a41c6a783a
+RMD160 (puzzles-r9840.tar.gz) = 01ab4c941ed9431b4be17526ddc7bafde7be9ca7
+Size (puzzles-r9840.tar.gz) = 3255209 bytes
+SHA1 (patch-aa) = 126800f5545a74d32284a3ee13fc192c82707660
diff --git a/games/puzzles/patches/patch-aa b/games/puzzles/patches/patch-aa
index 08f68245e86..fcd129c2e26 100644
--- a/games/puzzles/patches/patch-aa
+++ b/games/puzzles/patches/patch-aa
@@ -1,29 +1,29 @@
-$NetBSD: patch-aa,v 1.5 2012/04/22 15:04:09 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2013/05/26 18:43:17 wiz Exp $
 
 Rename "net" to "netgame" so there's less chances of conflicts
 with other packages.
 
---- Makefile.orig	2012-04-22 00:35:41.000000000 +0000
+--- Makefile.orig	2013-05-26 00:35:23.000000000 +0000
 +++ Makefile
-@@ -31,7 +31,7 @@ all: blackbox bridges cube dominosa fift
- 		galaxies galaxiespicture galaxiessolver guess inertia keen \
- 		keensolver latincheck lightup lightupsolver loopy \
- 		loopysolver magnets magnetssolver map mapsolver mineobfusc \
--		mines net netslide nullgame obfusc pattern patternsolver \
-+		mines netgame netslide nullgame obfusc pattern patternsolver \
- 		pearl pearlbench pegs range rect samegame signpost \
- 		signpostsolver singles singlessolver sixteen slant \
- 		slantsolver solo solosolver tents tentssolver towers \
-@@ -176,7 +176,7 @@ mines: drawing.o gtk.o malloc.o midend.o
+@@ -38,7 +38,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)patternsolver $(BINPREFIX)pearl \
+ 		$(BINPREFIX)pearlbench $(BINPREFIX)pegs $(BINPREFIX)range \
+@@ -199,7 +199,7 @@ $(BINPREFIX)mines: drawing.o gtk.o mallo
  		misc.o printing.o ps.o random.o tree234.o version.o  \
  		$(XLFLAGS) $(XLIBS)
  
--net: drawing.o dsf.o gtk.o malloc.o midend.o misc.o net.o net-icon.o \
-+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
+-$(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  \
-@@ -651,7 +651,7 @@ GAMES += loopy
+@@ -708,7 +708,7 @@ GAMES += loopy
  GAMES += magnets
  GAMES += map
  GAMES += mines
@@ -32,9 +32,9 @@ with other packages.
  GAMES += netslide
  GAMES += pattern
  GAMES += pearl
-@@ -692,4 +692,4 @@ install:
- 	done
+@@ -763,4 +763,4 @@ benchmark.txt: $(GAMES)
+ 	done > $@
  
  clean:
--	rm -f *.o blackbox bridges cube dominosa fifteen filling fillingsolver flip galaxies galaxiespicture galaxiessolver guess inertia keen keensolver latincheck lightup lightupsolver loopy loopysolver magnets magnetssolver map mapsolver mineobfusc mines net netslide nullgame obfusc pattern patternsolver pearl pearlbench pegs range rect samegame signpost signpostsolver singles singlessolver sixteen slant slantsolver solo solosolver tents tentssolver towers towerssolver twiddle unequal unequalsolver untangle
-+	rm -f *.o blackbox bridges cube dominosa fifteen filling fillingsolver flip galaxies galaxiespicture galaxiessolver guess inertia keen keensolver latincheck lightup lightupsolver loopy loopysolver magnets magnetssolver map mapsolver mineobfusc mines netgame netslide nullgame obfusc pattern patternsolver pegs rect samegame singles singlessolver sixteen slant slantsolver solo solosolver tents tentssolver towers towerssolver twiddle unequal unequalsolver 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)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)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