Add INSTALL_GAME_DIR to complement INSTALL_GAME_DATA. The directories

are group-writeable by the games user on those platforms, where
GAMEMODE includes setgid. It defaults to PKGDIRMODE otherwise.

14 files changed, 38 insertions, 15 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ac9806be601..74754ce997f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1815 2006/04/12 19:28:47 reed Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1816 2006/04/12 21:01:15 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -385,6 +385,8 @@ INSTALL_MAN?= 		\
 	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 INSTALL_PROGRAM_DIR?= 	\
 	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${PKGDIRMODE}
+INSTALL_GAME_DIR?=		\
+	${INSTALL} -d -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEDIRMODE}
 INSTALL_SCRIPT_DIR?= 	\
 	${INSTALL_PROGRAM_DIR}
 INSTALL_LIB_DIR?= 	\
@@ -406,7 +408,8 @@ INSTALL_MACROS=	BSD_INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}		\
 		BSD_INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}		\
 		BSD_INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q}		\
 		BSD_INSTALL_GAME=${INSTALL_GAME:Q}			\
-		BSD_INSTALL_GAME_DATA=${INSTALL_GAME_DATA:Q}
+		BSD_INSTALL_GAME_DATA=${INSTALL_GAME_DATA:Q}		\
+		BSD_INSTALL_GAME_DIR=${INSTALL_GAME_DIR:Q}
 MAKE_ENV+=	${INSTALL_MACROS}
 SCRIPTS_ENV+=	${INSTALL_MACROS}
 
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 48574e38002..75977eecdb0 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.115 2006/04/06 06:23:06 reed Exp $
+# $NetBSD: mk.conf,v 1.116 2006/04/12 21:01:15 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -824,6 +824,14 @@ GAMEMODE?=	${BINMODE}
 # Possible:	any mode
 # Default:	${BINMODE}
 
+GAMEDIRMODE?=	${PKGDIRMODE}
+# Used for various games to allow writing to a group-owned directory
+# e.g. for logfiles.
+# If SETGIDGAME is 'yes', setting this to 0775 would make sense.
+# See also:	GAMEGRP, GAMEOWN, GAMEMODE, SETGIDGAME
+# Possible:	any mode
+# Default:	${PKGDIRMODE}
+
 GAMEOWN?=	${BINOWN}
 # Used for various games to allow writing to a group-owned score file.
 # If SETGIDGAME is 'yes', setting this to a dedicated user, such as 'games'
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 6901b08db48..7198bb190d9 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.23 2006/03/18 21:40:44 jlam Exp $
+# $NetBSD: AIX.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -92,4 +92,5 @@ SERIAL_DEVICES?=	/dev/tty0 \
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index a3001169ba0..0ebdf6f7869 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.18 2006/03/18 21:40:44 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.19 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -94,4 +94,5 @@ PKG_CREATE_USERGROUP=	NO # until it works
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 31019fcc2b0..efc456d13a2 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.18 2006/04/10 13:38:36 schwarz Exp $
+# $NetBSD: Darwin.mk,v 1.19 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -107,4 +107,5 @@ CONFIGURE_ENV+=		ac_cv_func_poll=no
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 4ab845a1158..76d61797431 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.26 2006/03/18 21:40:44 jlam Exp $
+# $NetBSD: DragonFly.mk,v 1.27 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -95,4 +95,5 @@ _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 GAMEOWN=		games
 GAMEGRP=		games
 GAMEMODE=		2555
+GAMEDIRMODE=		0775
 .endif
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 36fa38e001b..779b842e2b6 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.17 2006/03/18 21:40:44 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.18 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -90,4 +90,5 @@ _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 GAMEOWN=		games
 GAMEGRP=		games
 GAMEMODE=		2555
+GAMEDIRMODE=		0775
 .endif
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 42bec733e3e..f5f4f3e0253 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.23 2006/04/10 13:38:36 schwarz Exp $
+# $NetBSD: IRIX.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -125,4 +125,5 @@ _OPSYS_MAX_CMDLEN_CMD=	/usr/sbin/sysconf ARG_MAX
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index dba6ddb334d..c9ae7298192 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.49 2006/03/18 21:40:44 jlam Exp $
+# $NetBSD: Interix.mk,v 1.50 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -180,4 +180,5 @@ _OPSYS_MAX_CMDLEN_CMD=	${ECHO} 262144
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index e544bdcb954..a6bd9099a31 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.23 2006/03/18 21:40:45 jlam Exp $
+# $NetBSD: Linux.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -89,6 +89,7 @@ LOCALBASE?=		${DESTDIR}/usr/pkg
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
 .if (${MACHINE_ARCH} == "x86_64")
 ABI?=	64
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 969df54f5d8..8ff100ebfd0 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.19 2006/03/18 21:40:45 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.20 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -142,4 +142,5 @@ _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 GAMEOWN=		games
 GAMEGRP=		games
 GAMEMODE=		2555
+GAMEDIRMODE=		0775
 .endif
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index ac452f3abbe..b28896e83dd 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.22 2006/03/18 21:40:45 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.23 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -110,4 +110,5 @@ _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index a1c5e48216e..75fa647a15d 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.23 2006/04/01 23:27:49 grant Exp $
+# $NetBSD: SunOS.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -131,4 +131,5 @@ PKG_TOOLS_BIN?=		${LOCALBASE}/bin
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 645e6cc2d72..ad364bf92ab 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.20 2006/03/18 21:40:45 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.21 2006/04/12 21:01:15 joerg Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -94,4 +94,5 @@ PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 #GAMEOWN=		games
 #GAMEGRP=		games
 #GAMEMODE=		2555
+#GAMEDIRMODE=		0775
 #.endif