xbomb: Update to 2.2b

2014-08-15  Andrew M. Bishop <amb>

        Version 2.2b Released

2014-08-15 [r76]  Andrew M. Bishop <amb>

	* FILES, README, xbomb.c, xwindow.c: Updated for version 2.2b.

2014-08-15 [r74]  Andrew M. Bishop <amb>

	* xwindow.c: Fix off-by-one error in creation of graphic contexts
	  leading to writing beyond end of array [fixes Debian bug
	  #757902]..

2013-03-16 [r73]  Andrew M. Bishop <amb>

	* README, xbomb.c: Change web-page and e-mail addresses from
	  gedanken.demon.co.uk to gedanken.org.uk.

2013-03-16 [r73]  Andrew M. Bishop <amb>

	* xbomb.c, README: Change web-page and e-mail addresses from
	  gedanken.demon.co.uk to gedanken.org.uk.

2011-10-03 [r72]  Andrew M. Bishop <amb>

	* FILES (added), ANNOUNCE (removed), LSM (removed): Don't include
	  the ANNOUNCE or LSM files in future releases. Do include the
	  FILES file in subversion.

2010-12-27 [r70]  Andrew M. Bishop <amb>

	* ChangeLog (removed): Remove the ChangeLog from version control.

2010-12-24 [r67]  Andrew M. Bishop <amb>

	* ANNOUNCE (added), COPYING (added), ChangeLog (added), LSM
	  (added): Added the uncontrolled files from the xbomb 2.2a
	  release.

2010-12-24  Andrew M. Bishop <amb@gedanken.demon.co.uk>

	Changed version control environment from RCS to CVS to SVN.

2009-11-29  Andrew M. Bishop  <amb@gedanken.demon.co.uk>

        Version 2.2a Released

2009-11-29  Andrew M. Bishop  <amb@gedanken.demon.co.uk>

	* xbomb.ad:
	Add the app-defaults for the different numbers (missed in version 2.2 release).

	* xbomb.c, xwindow.c:
	Change the colour of the number 8 from white (invisible) to light green.
	Change the version number to 2.2a.

3 files changed, 19 insertions, 16 deletions

diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index d5c7891df61..ae0ba3fd7ce 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.17 2019/10/06 14:44:35 jakllsch Exp $
+# $NetBSD: Makefile,v 1.18 2021/02/10 12:12:39 nia Exp $
 
-DISTNAME=	xbomb-2.2
-PKGREVISION=	1
+DISTNAME=	xbomb-2.2b
 CATEGORIES=	games x11
-MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
+MASTER_SITES=	https://www.gedanken.org.uk/software/xbomb/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.gedanken.demon.co.uk/xbomb/
+HOMEPAGE=	https://www.gedanken.org.uk/software/xbomb/
 COMMENT=	Square, hexagonal, and triangual minesweeper clone
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		gmake
 BUILD_TARGET=		xbomb
 MAKE_ENV+=		SCORE_PATH=${SCORE_PATH:Q}
 INSTALL_MAKE_FLAGS+=	INSTDIR=${DESTDIR}${PREFIX}
 
+OWN_DIRS_PERMS+=	${VARBASE}/games/xbomb \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+
 SETGIDGAME=	yes
 SCORE_PATH=	${VARBASE}/games/xbomb
 
diff --git a/games/xbomb/distinfo b/games/xbomb/distinfo
index 48540fadccf..2910b9c5610 100644
--- a/games/xbomb/distinfo
+++ b/games/xbomb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2019/10/06 14:41:07 jakllsch Exp $
+$NetBSD: distinfo,v 1.7 2021/02/10 12:12:39 nia Exp $
 
-SHA1 (xbomb-2.2.tgz) = 065d9283c92ff0dca844b637f237a381b1ad72c0
-RMD160 (xbomb-2.2.tgz) = 51a212d8cbe62d765e75751ae7b3d341ce6a3ada
-SHA512 (xbomb-2.2.tgz) = fd3c77c4c5e13a880a95cd2e478ea0778ef1a3c68416ecce17e57354822f11c5493e67f6d144deb40bf6402801aa64bc3347d1a72b926d3cb7b8251fc952877b
-Size (xbomb-2.2.tgz) = 24872 bytes
+SHA1 (xbomb-2.2b.tgz) = 1aae92bbc686b4fa4b8940289fb5beced0e535d8
+RMD160 (xbomb-2.2b.tgz) = 7ba64ecd6ccefd4734567503e071dfc7f60bf005
+SHA512 (xbomb-2.2b.tgz) = 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1
+Size (xbomb-2.2b.tgz) = 24774 bytes
 SHA1 (patch-aa) = e25b71c414b67d8d7d588cabbd8da7e667678835
 SHA1 (patch-ab) = 94ba453322e35eb07a81f223e36563dceac04bdc
-SHA1 (patch-xwindow.c) = e0e216c48214c1b976f8d18359ef97e4f9438f71
+SHA1 (patch-xwindow.c) = 33bc57b4ecde2dd7f629d701bf07e7602b72e386
diff --git a/games/xbomb/patches/patch-xwindow.c b/games/xbomb/patches/patch-xwindow.c
index 05693e778b1..9e8acf55112 100644
--- a/games/xbomb/patches/patch-xwindow.c
+++ b/games/xbomb/patches/patch-xwindow.c
@@ -1,16 +1,16 @@
-$NetBSD: patch-xwindow.c,v 1.1 2019/10/06 14:41:07 jakllsch Exp $
+$NetBSD: patch-xwindow.c,v 1.2 2021/02/10 12:12:39 nia Exp $
 
 Avoid segfault in InitialiseX()
 
---- xwindow.c.orig	2008-01-05 19:24:16.000000000 +0000
+--- xwindow.c.orig	2014-08-15 16:25:59.000000000 +0000
 +++ xwindow.c
-@@ -245,7 +245,8 @@ void InitialiseX(int *argc,char **argv)
+@@ -243,7 +243,8 @@ void InitialiseX(int *argc,char **argv)
   values.font=resources.fontstruct->fid;
-  for(i=0;i<NUM_GC;i++)
+  for(i=0;i<NUM_GC-1;i++)
     {
 -    values.foreground=resources.colours[i];
 +    if(i<(sizeof(resources.colours)/sizeof(resources.colours[0])))
-+       values.foreground=resources.colours[i];
++      values.foreground=resources.colours[i];
      if(i==GC_UNSEEN)
        {
         GC tempgc;