Begin cleanup of setgid game infrastructure.

 * Introduce USE_GAMESGROUP, which causes the games user and group to
be made available.

 * Retain SETGIDGAME as an alias for USE_GAMESGROUP. Describe it as
deprecated.

 * Always define GAMES_USER, GAMES_GROUP, GAMEMODE, GAMEDIRMODE, and
GAMEDATAMODE, regardless of whether USE_GAMESGROUP is turned on or not.

 * Define these variables in defaults/mk.conf instead of separately in
every platform/*.mk file. The definitions used to be the same for each
of these platforms anyway, except for some where they were randomly
missing or commented out for no clear reason, leading to broken game
packages.

 * Handle all these variables properly when unprivileged.

 * Update the comments/documentation for these variables.

 * Describe GAMEOWN and GAMEGRP as deprecated. These need to be
retained as aliases for GAMES_USER and GAMES_GROUP respectively for
supporting packages that use bsd.*.mk but should otherwise not be
used.

 * Add GAMEDATA_PERMS and GAMEDIR_PERMS using GAMEDATAMODE and
GAMEDIRMODE respectively.

 * Fix a bug I noticed that was improperly mixing the "games" group
and "games" user.

Things this does *not* do:

 - get rid of GAMES_USER, for which there should ultimately be no need.

 - move the declaration/documentation/default value of USE_GAMESGROUP
to a suitable place. (It is currently where SETGIDGAME was, which is
suboptimal.)

 - touch any of the games, all of which need updating with at least
s/SETGIDGAME/USE_GAMESGROUP/ and probably more.

 - update the guide to explain how to handle games properly.

Also, it would be nice if using GAMES_GROUP without setting
USE_GAMESGROUP=yes caused an error but as far as I know there isn't
any particularly good way to arrange this right now.

Note that these changes may alter the build/install behavior of broken
game packages, e.g. some may silently become setgid when they weren't
before or things like that. If you run into any of this file a PR.

While one might arguably bump the PKGREVISION of all games or other
packages using any of these variables as a precaution, that seems like
a bad idea. Instead, I think I will be bumping each game once it
itself has been fixed up to do everything the right way.

16 files changed, 100 insertions, 235 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 4ffc4a3704f..3f0e333d26d 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.191 2010/06/08 19:04:09 wiz Exp $
+# $NetBSD: mk.conf,v 1.192 2010/07/08 04:57:36 dholland Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -541,10 +541,20 @@ PRE_ROOT_CMD?=	${TRUE}
 # Possible: any shell commands
 # Default: none
 
-SETGIDGAME?=	no
-# This flags specifies whether or not certain games are installed setgid,
-# which would allow them to write to a group-owned score file.
-# See also:	GAMEGRP, GAMEMODE, GAMEOWN
+USE_GAMESGROUP?=	no
+SETGIDGAME?=		${USE_GAMESGROUP}
+# This flag specifies whether a package uses the "games" group; if it is
+# set, the GAMES_GROUP, GAMEMODE, SETGID_GAMES_PERMS, etc. variables can
+# be used to install setgid games and their data files.
+#
+# SETGIDGAME is a deprecated alternative variable with the same
+# purpose but a murky history and unclear semantics; it is being
+# phased out because it conflicts with a like-named build variable in
+# the NetBSD base system.
+#
+# XXX: This variable should not be defined here.
+#
+# See also:	GAMES_GROUP, GAMEMODE
 # Possible:	yes, no
 # Default:	no
 
@@ -873,46 +883,58 @@ 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
+GAMES_USER?=	games
+# Used by games to own writeable material, normally in ${VARBASE}.
+# GAMES_USER has historically been "games" but in the absence of setuid
+# games, which are generally a bad idea, a games user is fairly pointless
+# and is expected to be removed in the future.
+# See also:	GAMES_GROUP, USE_GAMESGROUP
+# Possible:	any user name
+# Default:	games
 
-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'
-# would make sense.
-# See also:	GAMEMODE, GAMEOWN, SETGIDGAME
+GAMES_GROUP?=	games
+# Used by games to own writeable material, normally in ${VARBASE}.
+# See also:	GAMES_USER, GAMEMODE, GAMEDIRMODE, GAMEDATAMODE, USE_GAMESGROUP
 # Possible:	any group name
-# Default:	${BINGRP}
+# Default:	games
 
-GAMEMODE?=	${BINMODE}
-# Used for various games to allow writing to a group-owned score file.
-# If SETGIDGAME is 'yes', setting this to 2555 would make sense.
-# See also:	GAMEGRP, GAMEOWN, SETGIDGAME
+GAMEMODE?=	2555
+# Used by setgid games to install the setgid executable itself.
+# Note that USE_GAMESGROUP must be set to make the games group actually
+# exist.
+# See also:	GAMES_GROUP, GAMEDIRMODE, GAMEDATAMODE, USE_GAMESGROUP
 # 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
+# Default:	2555
+
+GAMEDIRMODE?=	775
+# Used by setgid games to allow writing to a group-owned directory for
+# e.g. logfiles. Note that this variable should only be used for
+# directories where the game needs write access at runtime; otherwise
+# stick to ${PKGDIRMODE}.
+# See also:	GAMES_USER, GAMES_GROUP, GAMEMODE, USE_GAMESGROUP
 # Possible:	any mode
-# Default:	${PKGDIRMODE}
+# Default:	775
+
+GAMEDATAMODE?=	664
+# Used by setgid games as the permissions for writeable material, such
+# as score files, normally found in ${VARBASE}.
+# See also:	GAMES_USER, GAMES_GROUP, USE_GAMESGROUP
+# Possible:	any file ownership
+# Default:	664
+
+GAMEGRP?=	${GAMES_GROUP}
+# Legacy form of GAMES_GROUP; should only be used in the context of
+# supporting packages that use bsd.*.mk.
+# See also:	GAMES_GROUP, USE_GAMESGROUP
+# Possible:	any group name
+# Default:	GAMES_GROUP
 
-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'
-# would make sense.
-# See also:	GAMEGRP, GAMEMODE, SETGIDGAME
+GAMEOWN?=	${GAMES_USER}
+# Legacy form of GAMES_USER; should only be used in the context of
+# supporting packages that use bsd.*.mk.
+# See also:	GAMES_USER
 # Possible:	any user name
-# Default:	${BINOWN}
+# Default:	GAMES_USER
 
 GNU_PROGRAM_PREFIX?=	g
 # This is the prefix to add for GNU programs, like gls or gnutouch.
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 5aa8f884ca2..da501ad3ab1 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.50 2010/06/15 19:23:56 joerg Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.51 2010/07/08 04:57:36 dholland Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -203,9 +203,14 @@ _PKG_USER_SHELL?=	${NOLOGIN}
 FILES_SUBST+=		PKG_USER_HOME=${_PKG_USER_HOME:Q}
 FILES_SUBST+=		PKG_USER_SHELL=${_PKG_USER_SHELL:Q}
 
-# If SETGIDGAME == yes, then we need the "games" user and group.
-.if defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS])
-PKG_GROUPS+=	${GAMES_USER}
+# If USE_GAMESGROUP == yes, then we need the "games" group.
+# SETGIDGAME is a deprecated alias for USE_GAMESGROUP.
+#
+# For now we also create the "games" user; this should not be used and
+# should be removed at some point.
+.if (defined(USE_GAMESGROUP) && !empty(USE_GAMESGROUP:M[yY][eE][sS])) ||\
+    (defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS]))
+PKG_GROUPS+=	${GAMES_GROUP}
 PKG_USERS+=	${GAMES_USER}:${GAMES_GROUP}
 .endif
 
@@ -377,15 +382,30 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER}
 #	SPECIAL_PERMS+=	/path/to/suidroot ${SETUID_ROOT_PERMS}
 #
 # SETGID_GAMES_PERMS is a convenience definition to note an executable is
-# meant to be setgid-game, and should be used as follows:
+# meant to be setgid games, and should be used as follows:
 #
 #	SPECIAL_PERMS+=	/path/to/sgidgame ${SETGID_GAMES_PERMS}
 #
+# GAMEDATA_PERMS and GAMEDIR_PERMS are convenience defintiions for files
+# that are meant to be accessed by things that are setgid games. Because
+# such files should normally be under ${VARBASE}, generally these 
+# definitions should be used roughly as follows:
+#
+#	REQD_DIRS_PERMS+=  /path/to/scoredir ${GAMEDIR_PERMS}
+#	REQD_FILES_PERMS+= /dev/null /path/to/scorefile ${GAMEDATA_PERMS}
+#
+# Note that GAMEDIR_PERMS should only be used when the game requires
+# write access to scribble in its directory; many games do not, in which
+# case REQD_DIRS instead of REQD_DIRS_PERMS can be used and GAMEDIR_PERMS
+# is not needed.
+#
 # Keywords: setuid setgid st_mode perms
 #
 SPECIAL_PERMS?=		# empty
 SETUID_ROOT_PERMS?=	${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4511
 SETGID_GAMES_PERMS?=	${GAMES_USER} ${GAMES_GROUP} ${GAMEMODE}
+GAMEDATA_PERMS?=	${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+GAMEDIR_PERMS?=		${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 
 _INSTALL_PERMS_FILE=		${_PKGINSTALL_DIR}/perms
 _INSTALL_PERMS_DATAFILE=	${_PKGINSTALL_DIR}/perms-data
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 37ea528587c..bb46f64f755 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.34 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: AIX.mk,v 1.35 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -76,17 +76,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index a9f432dd360..2b6dbabf3f5 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.27 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: BSDOS.mk,v 1.28 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -84,17 +84,3 @@ PKG_CREATE_USERGROUP=	NO # until it works
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 4afcae68da7..bb374e4f281 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.42 2009/09/24 06:31:27 tron Exp $
+# $NetBSD: Darwin.mk,v 1.43 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -127,17 +127,3 @@ CONFIGURE_ENV+=		ac_cv_func_poll=no
 .if empty(OS_VERSION:M[0-8].*) && exists(/bin/ksh)
 WRAPPER_BIN_SH?=	/bin/ksh
 .endif
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 23ba0157af0..edca4dfdbcc 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.38 2009/12/16 19:48:09 joerg Exp $
+# $NetBSD: DragonFly.mk,v 1.39 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -84,16 +84,3 @@ PKG_HAVE_KQUEUE=	# defined
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=		games
-GAMES_GROUP=		games
-GAMEOWN=		${GAMES_USER}
-GAMEGRP=		${GAMES_GROUP}
-GAMEMODE=		2555
-GAMEDIRMODE=		0775
-.endif
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 718afe1a4ee..f3c4207691f 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.26 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: FreeBSD.mk,v 1.27 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -87,16 +87,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=		games
-GAMES_GROUP=		games
-GAMEOWN=		${GAMES_USER}
-GAMEGRP=		${GAMES_GROUP}
-GAMEMODE=		2555
-GAMEDIRMODE=		0775
-.endif
diff --git a/mk/platform/Haiku.mk b/mk/platform/Haiku.mk
index 5eeb86f6943..d7bbcb0c66f 100644
--- a/mk/platform/Haiku.mk
+++ b/mk/platform/Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Haiku.mk,v 1.2 2010/06/20 04:05:39 obache Exp $
+# $NetBSD: Haiku.mk,v 1.3 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the Haiku operating system.
 
@@ -74,17 +74,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 525dc5631f9..50a273c9d66 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.35 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: IRIX.mk,v 1.36 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -110,17 +110,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/usr/sbin/sysconf ARG_MAX
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 1429036f4fd..07289c068a9 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.63 2009/12/16 19:48:09 joerg Exp $
+# $NetBSD: Interix.mk,v 1.64 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -160,17 +160,3 @@ CONFIGURE_ENV+=		${GNU_CONFIGURE:Dac_cv_func_hstrerror=yes}
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	${ECHO} 262144
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 133ad115622..ab892f75c0d 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.39 2010/05/20 07:57:23 sbd Exp $
+# $NetBSD: Linux.mk,v 1.40 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -93,20 +93,6 @@ _OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
-
 .if (${MACHINE_ARCH} == "x86_64")
 ABI?=	64
 LIBABISUFFIX?=          64
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 75edeb5eb90..414ca5ca8df 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.32 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: NetBSD.mk,v 1.33 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -147,16 +147,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=		games
-GAMES_GROUP=		games
-GAMEOWN=		${GAMES_USER}
-GAMEGRP=		${GAMES_GROUP}
-GAMEMODE=		2555
-GAMEDIRMODE=		0775
-.endif
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index d429625f0fe..5e22a04fe0d 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.29 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: OpenBSD.mk,v 1.30 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -100,17 +100,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 2ee89b9e732..4ec7028651a 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.38 2009/12/16 19:48:09 joerg Exp $
+# $NetBSD: SunOS.mk,v 1.39 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -89,16 +89,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=		games
-GAMES_GROUP=		games
-GAMEOWN=		${GAMES_USER}
-GAMEGRP=		${GAMES_GROUP}
-GAMEMODE=		2555
-GAMEDIRMODE=		0775
-.endif
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 29adb45a667..27439a77049 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.28 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: UnixWare.mk,v 1.29 2010/07/08 04:57:36 dholland Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -82,17 +82,3 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=		games
-#GAMES_GROUP=		games
-#GAMEOWN=		${GAMES_USER}
-#GAMEGRP=		${GAMES_GROUP}
-#GAMEMODE=		2555
-#GAMEDIRMODE=		0775
-#.endif
diff --git a/mk/unprivileged.mk b/mk/unprivileged.mk
index 624c68594cd..7708dc1047b 100644
--- a/mk/unprivileged.mk
+++ b/mk/unprivileged.mk
@@ -1,4 +1,4 @@
-# $NetBSD: unprivileged.mk,v 1.20 2010/02/28 19:57:52 tnn Exp $
+# $NetBSD: unprivileged.mk,v 1.21 2010/07/08 04:57:36 dholland Exp $
 #
 # This file collects definitions that are useful when using pkgsrc as an
 # unprivileged (non-root) user. It is included automatically by the
@@ -154,6 +154,7 @@ ROOT_USER=		${UNPRIVILEGED_USER}
 # Override "games" account.
 GAMES_GROUP=		${UNPRIVILEGED_GROUP}
 GAMES_USER=		${UNPRIVILEGED_USER}
+GAMEDATAMODE=		0644
 GAMEDIRMODE=		0755
 GAMEMODE=		0755
 .  endif