From b6318472ea70d3dd3701fd1fd08855f4a0ae5d42 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Wed, 4 Aug 2004 02:56:01 +0000
Subject: Introduce GAMEDATAMODE and INSTALL_GAME_DATA, which will take care of
 files installed for SETGIDGAME packages. This will help address PR pkg/25313
 and PR pkg/26236.

---
 mk/bsd.pkg.defaults.mk | 12 +++++++++++-
 mk/bsd.pkg.mk          |  7 +++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index e2fb67ff8cd..f587f88b4fb 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.270 2004/08/02 04:01:38 schmonz Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.271 2004/08/04 02:56:01 jschauma Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -991,6 +991,16 @@ FREEWNN_GROUP?=	jserver
 # Possible: any group name
 # Default: jserver
 
+.if !empty(SETGIDGAME:M[yY][eE][sS])
+GAMEDATAMODE?=	664
+.else
+GAMEDATAMODE?=	${SHAREMODE}
+.endif
+# Used for various games to allow writing to a group-owned score file.
+# See also:	GAMEMODE, GAMEOWN, SETGIDGAME
+# Possible:	any file ownership
+# Default:	${SHAREMODE} if SETGIDGAME is not set to 'yes', 644 otherwise
+
 GAMEGRP?=	${BINGRP}
 # Used for various games to allow writing to a group-owned score file.
 # If SETGIDGAME is 'yes', setting this to a dedicated group, such as 'games'
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 41aa1edbbba..37823d682ed 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1481 2004/07/31 12:24:02 seb Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1482 2004/08/04 02:56:01 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -588,6 +588,8 @@ INSTALL_LIB?= 		\
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_DATA?= 		\
 	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
+INSTALL_GAME_DATA?= 	\
+	${INSTALL} ${COPY} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEDATAMODE}
 INSTALL_MAN?= 		\
 	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 INSTALL_PROGRAM_DIR?= 	\
@@ -612,7 +614,8 @@ INSTALL_MACROS=	BSD_INSTALL_PROGRAM="${INSTALL_PROGRAM}"		\
 		BSD_INSTALL_LIB_DIR="${INSTALL_LIB_DIR}"		\
 		BSD_INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"		\
 		BSD_INSTALL_MAN_DIR="${INSTALL_MAN_DIR}"		\
-		BSD_INSTALL_GAME="${INSTALL_GAME}"
+		BSD_INSTALL_GAME="${INSTALL_GAME}"			\
+		BSD_INSTALL_GAME_DATA="${INSTALL_GAME_DATA}"
 MAKE_ENV+=	${INSTALL_MACROS}
 SCRIPTS_ENV+=	${INSTALL_MACROS}
 
-- 
cgit v1.2.3