Update to 9076. Fix About-dialog to include version number.

Two new games "range" and "signpost" and bug fixes.

4 files changed, 27 insertions, 22 deletions

diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile
index 89bc9170fa0..46bb3f12397 100644
--- a/games/puzzles/Makefile
+++ b/games/puzzles/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2011/01/13 13:37:49 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2011/01/21 23:15:39 wiz Exp $
 #
 
-DISTNAME=	puzzles-r8839
+DISTNAME=	puzzles-r9076
 PKGNAME=	${DISTNAME:S/-r/-/}
-PKGREVISION=	4
 CATEGORIES=	games
 # distfile changes daily
 MASTER_SITES=	# http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
@@ -21,6 +20,7 @@ USE_TOOLS+=	gmake pkg-config
 BUILDLINK_TRANSFORM+=	rm:-Werror
 MAKE_FLAGS=	prefix=${PREFIX}
 MAKE_FLAGS=	gamesdir=${PREFIX}/bin
+CFLAGS+=	-DREVISION=${DISTNAME:S/puzzles-r//}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/puzzles.txt \
diff --git a/games/puzzles/PLIST b/games/puzzles/PLIST
index 7b4818e8458..adf3a2a7a09 100644
--- a/games/puzzles/PLIST
+++ b/games/puzzles/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/16 17:23:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/01/21 23:15:39 wiz Exp $
 bin/blackbox
 bin/bridges
 bin/cube
@@ -19,8 +19,10 @@ bin/netgame
 bin/netslide
 bin/pattern
 bin/pegs
+bin/range
 bin/rect
 bin/samegame
+bin/signpost
 bin/singles
 bin/sixteen
 bin/slant
diff --git a/games/puzzles/distinfo b/games/puzzles/distinfo
index e0c1297c0c6..bb79d9315f7 100644
--- a/games/puzzles/distinfo
+++ b/games/puzzles/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/01/16 17:23:50 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/01/21 23:15:39 wiz Exp $
 
-SHA1 (puzzles-r8839.tar.gz) = 3121a9ce1ab9e0aa0d8f968e854219b1639d28be
-RMD160 (puzzles-r8839.tar.gz) = 588fffe9a67cf46d031d9ac07101200fabdf64b6
-Size (puzzles-r8839.tar.gz) = 2684990 bytes
-SHA1 (patch-aa) = 0374d75ca96b74ebd00c426bc1e75503846a1e72
+SHA1 (puzzles-r9076.tar.gz) = df0773ec64b602b1da2cb799aa6523e838760253
+RMD160 (puzzles-r9076.tar.gz) = feb0e89dec9b8594bc39ee2ad39c9941af5c8f0d
+Size (puzzles-r9076.tar.gz) = 2952825 bytes
+SHA1 (patch-aa) = 277a60fe10e9336619ae3f8ca19eea7f90e69010
diff --git a/games/puzzles/patches/patch-aa b/games/puzzles/patches/patch-aa
index 49388e5e36c..02b928b74e0 100644
--- a/games/puzzles/patches/patch-aa
+++ b/games/puzzles/patches/patch-aa
@@ -1,6 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2010/01/16 17:23:50 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2011/01/21 23:15:39 wiz Exp $
 
---- Makefile.orig	2010-01-16 01:39:44.000000000 +0000
+Rename "net" to "netgame" so there's less chances of conflicts
+with other packages.
+
+--- Makefile.orig	2011-01-21 01:38:52.000000000 +0000
 +++ Makefile
 @@ -31,7 +31,7 @@ all: blackbox bridges cube dominosa fift
  		galaxies galaxiespicture galaxiessolver guess inertia keen \
@@ -8,19 +11,19 @@ $NetBSD: patch-aa,v 1.2 2010/01/16 17:23:50 wiz Exp $
  		loopysolver magnets magnetssolver map mapsolver mineobfusc \
 -		mines net netslide nullgame obfusc pattern patternsolver \
 +		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
-@@ -168,7 +168,7 @@ mines: drawing.o gtk.o malloc.o midend.o
- 		mines-icon.o misc.o printing.o ps.o random.o tree234.o \
- 		version.o 
+ 		pegs range rect samegame signpost signpostsolver singles \
+ 		singlessolver sixteen slant slantsolver solo solosolver \
+ 		tents tentssolver towers towerssolver twiddle unequal \
+@@ -167,7 +167,7 @@ mines: drawing.o gtk.o malloc.o midend.o
+ 		misc.o printing.o ps.o random.o tree234.o version.o  \
+ 		$(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
- 	$(CC) $(XLDFLAGS) -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 \
-@@ -582,7 +582,7 @@ GAMES += loopy
+ 	$(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  \
+@@ -609,7 +609,7 @@ GAMES += loopy
  GAMES += magnets
  GAMES += map
  GAMES += mines
@@ -29,9 +32,9 @@ $NetBSD: patch-aa,v 1.2 2010/01/16 17:23:50 wiz Exp $
  GAMES += netslide
  GAMES += pattern
  GAMES += pegs
-@@ -613,4 +613,4 @@ install:
+@@ -649,4 +649,4 @@ install:
  	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 pegs rect samegame 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 net netslide nullgame obfusc pattern patternsolver 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