Use INSTALL_GAME_DATA as well as GAMEOWN, GAMEGRP and GAMEMODE instead

of hardcoding the values.  Partially addresses PR pkg/26236.

4 files changed, 19 insertions, 22 deletions

diff --git a/games/svb/Makefile b/games/svb/Makefile
index 45acf29139d..a96d978b42a 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/04 03:08:01 jschauma Exp $
 
 DISTNAME=		svb
 PKGNAME=		svb-1.0
@@ -14,11 +14,9 @@ USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
-	${TOUCH} /var/games/svb.scorefile
-	${CHOWN} games:games /var/games/svb.scorefile
-	${CHMOD} 664 /var/games/svb.scorefile
-	${CHOWN} bin:games ${PREFIX}/bin/svb
-	${CHMOD} 2755 ${PREFIX}/bin/svb
+	${INSTALL_GAME_DATA} /dev/null /var/games/svb.scorefile
+	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/svb
+	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/svb
 	${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/man/man6/svb.6
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 0f2e02b1fda..c9a73c200a0 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 01:29:25 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/08/04 03:06:55 jschauma Exp $
 #
 
 DISTNAME=		xboing2.4
@@ -18,8 +18,8 @@ USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
 
 post-install:
-	${CHOWN} bin:games ${X11PREFIX}/bin/xboing
-	${CHMOD} 2755 ${X11PREFIX}/bin/xboing
+	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${X11PREFIX}/bin/xboing
+	${CHMOD} ${GAMEMODE} ${X11PREFIX}/bin/xboing
 	${INSTALL_MAN} ${WRKSRC}/xboing.man ${X11PREFIX}/man/man6/xboing.6
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/games/xboing/distinfo b/games/xboing/distinfo
index 37d3b6748f2..1dc2744855e 100644
--- a/games/xboing/distinfo
+++ b/games/xboing/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/02/28 18:36:38 snj Exp $
+$NetBSD: distinfo,v 1.7 2004/08/04 03:06:55 jschauma Exp $
 
 SHA1 (xboing2.4.tar.gz) = 57fad37ab99e6a3ff87ff814d0de1baad3b93b91
 Size (xboing2.4.tar.gz) = 588811 bytes
-SHA1 (patch-aa) = 7236098cd0f15f38e6d20947ecb5efe8c8e6c1b0
+SHA1 (patch-aa) = e73052a2a9a3db2cc0cc3ce3e7b06cdfbcab1823
 SHA1 (patch-ab) = 94b232e173ad7bb39e37d4287669bd0842ef5610
 SHA1 (patch-ac) = c8b7d1b323be04c2456768eabf24da43707c4b98
 SHA1 (patch-ad) = 444331ce4cbca8e291331bc3d5e698e9f01d8f6e
diff --git a/games/xboing/patches/patch-aa b/games/xboing/patches/patch-aa
index 0f623a79a4f..2c7abc2abd6 100644
--- a/games/xboing/patches/patch-aa
+++ b/games/xboing/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2002/09/23 10:21:19 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2004/08/04 03:06:55 jschauma Exp $
 
---- Imakefile.orig	Fri Nov 22 02:28:46 1996
-+++ Imakefile
+--- Imakefile.orig	1996-11-21 20:28:46.000000000 -0500
++++ Imakefile	2004-08-01 14:02:34.000000000 -0400
 @@ -24,23 +24,23 @@
  XCOMM This is the directory where the highscore, level & sound data will be 
  XCOMM placed. Default will be the current directory.
@@ -17,14 +17,12 @@ $NetBSD: patch-aa,v 1.6 2002/09/23 10:21:19 jlam Exp $
 +    XPMLIB 			= -L$(X11BASE)/lib -lXpm
 +    XPMINCLUDE 			= -I$(X11BASE)/include/X11
      XBOINGINCLUDE 		= -I./include
--    LEVEL_INSTALL_DIR 	= $(XBOING_DIR)/levels
-+    LEVEL_INSTALL_DIR 		= $(XBOING_DIR)/levels
+     LEVEL_INSTALL_DIR 	= $(XBOING_DIR)/levels
      SOUNDS_DIR 			= $(XBOING_DIR)/sounds
      BACKUP_DIR 			= $(XBOING_DIR)/../backups
 -    HIGH_SCORE_FILE 	= $(XBOING_DIR)/.xboing.scr
--    AUDIO_AVAILABLE 	= False
 +    HIGH_SCORE_FILE 		= /var/games/xboing.scr
-+    AUDIO_AVAILABLE 		= False
+     AUDIO_AVAILABLE 	= False
      AUDIO_SRC 			= audio/NOaudio.c
      AUDIO_INCLUDE 		=
      AUDIO_LIB 			=
@@ -67,13 +65,14 @@ $NetBSD: patch-aa,v 1.6 2002/09/23 10:21:19 jlam Exp $
  XCOMM   -DNEED_USLEEP=\"True\" \
  XCOMM   -DNO_LOCKING=\"True\" 
  
-@@ -205,7 +205,8 @@
+@@ -204,8 +204,8 @@
+ 	 fi
  	@:
  	@echo "Creating a highscore file " $(HIGH_SCORE_FILE)
- 	@touch $(HIGH_SCORE_FILE);
+-	@touch $(HIGH_SCORE_FILE);
 -	@chmod a+rw $(HIGH_SCORE_FILE);
-+	@chown bin:games $(HIGH_SCORE_FILE);
-+	@chmod 0664 $(HIGH_SCORE_FILE);
++	@touch xboing.scr
++	@${BSD_INSTALL_GAME_DATA} xboing.scr $(HIGH_SCORE_FILE);
  
  XCOMM I use this for my daily backup of my code.