Changes 2.2:

* Have different colours for each of the numbers.
* Allow left click on exposed number to clear adjacent unmarked areas.
* Several compilation fixes for portability.

4 files changed, 18 insertions, 35 deletions

diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 1e8a608da19..879ae5c2a69 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/11/21 16:48:33 adam Exp $
 
-DISTNAME=	xbomb-2.1a
-PKGREVISION=	4
+DISTNAME=	xbomb-2.2
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
 EXTRACT_SUFX=	.tgz
@@ -10,9 +9,12 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gedanken.demon.co.uk/xbomb/
 COMMENT=	Square, hexagonal, and triangual minesweeper clone
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake
 BUILD_TARGET=		xbomb
 MAKE_ENV+=		SCORE_PATH=${SCORE_PATH:Q}
+INSTALL_MAKE_FLAGS+=	INSTDIR=${DESTDIR}${PREFIX}
 
 SCORE_PATH=	${VARBASE}/games/xbomb
 SCORE_USER=	games
@@ -21,10 +23,9 @@ PKG_USERS=	${SCORE_USER}:${SCORE_GROUP}
 PKG_GROUPS=	${SCORE_GROUP}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6 lib/X11/app-defaults
-CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH}/xbomb3.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
-CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH}/xbomb4.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
-CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH}/xbomb6.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
-
+CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH:Q}/xbomb3.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH:Q}/xbomb4.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH:Q}/xbomb6.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xbomb/PLIST b/games/xbomb/PLIST
index 3266f84a471..5ecae4e0a64 100644
--- a/games/xbomb/PLIST
+++ b/games/xbomb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/08 15:50:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/11/21 16:48:33 adam Exp $
 bin/xbomb
-man/man6/xbomb.6
 lib/X11/app-defaults/XBomb
+man/man6/xbomb.6
diff --git a/games/xbomb/distinfo b/games/xbomb/distinfo
index 4496db84aa8..f1ab9bd9d1d 100644
--- a/games/xbomb/distinfo
+++ b/games/xbomb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 23:12:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2008/11/21 16:48:33 adam Exp $
 
-SHA1 (xbomb-2.1a.tgz) = 55a27717d13de310656641e675b743cc51ec4f51
-RMD160 (xbomb-2.1a.tgz) = 4e9a25ba71b32088c1ddf0fe9d129e28001d9102
-Size (xbomb-2.1a.tgz) = 23942 bytes
+SHA1 (xbomb-2.2.tgz) = 065d9283c92ff0dca844b637f237a381b1ad72c0
+RMD160 (xbomb-2.2.tgz) = 51a212d8cbe62d765e75751ae7b3d341ce6a3ada
+Size (xbomb-2.2.tgz) = 24872 bytes
 SHA1 (patch-aa) = b064540c8b092c5c317e2a91ff72a1ce1325509e
-SHA1 (patch-ab) = 4031c9e7d84560bdc449ce830eaca5277057c296
+SHA1 (patch-ab) = b9e4123e8ed936a8c4c8c5b533ffdefd7f2c0a98
diff --git a/games/xbomb/patches/patch-ab b/games/xbomb/patches/patch-ab
index 678da15a754..48e1cf96a47 100644
--- a/games/xbomb/patches/patch-ab
+++ b/games/xbomb/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/14 12:28:03 adam Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/21 16:48:33 adam Exp $
 
---- hiscore.c.orig	1998-01-16 19:50:39.000000000 +0000
+--- hiscore.c.orig	2008-01-05 20:23:07.000000000 +0100
 +++ hiscore.c
-@@ -47,7 +47,7 @@ extern int widths[NLEVELS],     /*+ widt
+@@ -50,7 +50,7 @@ extern int widths[NLEVELS],     /*+ widt
             nbombs[NLEVELS];     /*+ number of bombs. +*/
  
  /*+ The names of the high score tables. +*/
@@ -11,21 +11,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/10/14 12:28:03 adam Exp $
  
  /*+ The names of the positions in the high score tables. +*/
  static char pos[11][5]={"Top","2nd","3rd","4th","5th","6th","7th","8th","9th","10th","Lost"};
-@@ -131,7 +131,7 @@ void AddHighScore(int ticks)
- 
-  which_hiscore=10;
-  score[grid_level-GAME_LEVEL][10]=ticks;
-- cuserid(name[grid_level-GAME_LEVEL][10]);
-+ strcpy(name[grid_level-GAME_LEVEL][10], getlogin());
-  date[grid_level-GAME_LEVEL][10]=time(NULL);
- 
-  for(j=0;j<10;j++)
-@@ -147,7 +147,7 @@ void AddHighScore(int ticks)
-        date[grid_level-GAME_LEVEL][j]=date[grid_level-GAME_LEVEL][j-1];
-       }
-     score[grid_level-GAME_LEVEL][changed]=ticks;
--    cuserid(name[grid_level-GAME_LEVEL][changed]);
-+    strcpy(name[grid_level-GAME_LEVEL][changed], getlogin());
-     date[grid_level-GAME_LEVEL][changed]=time(NULL);
- 
-     save_high_scores();