summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorwiz <wiz>2012-07-09 15:44:06 +0000
committerwiz <wiz>2012-07-09 15:44:06 +0000
commitadca53b0b18a98d41f422e5ec590e390bb68df79 (patch)
tree039f052917e2191cb4d7ce90732eae162042779f /mk
parent4718f58d1b5926ce046d937e6fcd370686c4ce0a (diff)
downloadpkgsrc-adca53b0b18a98d41f422e5ec590e390bb68df79.tar.gz
Move USE_GAMESGROUP and SETGIDGAME defaults out of mk.conf, where they
don't belong (package-setable, not user-setable).
Diffstat (limited to 'mk')
-rw-r--r--mk/defaults/mk.conf19
-rw-r--r--mk/pkginstall/bsd.pkginstall.mk13
2 files changed, 13 insertions, 19 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index cac8f4e9d51..6ef2e16fb93 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.213 2012/07/03 11:19:56 joerg Exp $
+# $NetBSD: mk.conf,v 1.214 2012/07/09 15:44:06 wiz Exp $
#
# This file provides default values for variables that may be overridden
@@ -538,23 +538,6 @@ PRE_ROOT_CMD?= ${TRUE}
# Possible: any shell commands
# Default: none
-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
-
SU_CMD?= ${ROOT_CMD}
# Command to perform before "make install", if the user does not have
# an effective uid of 0. A possible substitute is "sudo sh -c"
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 0eea934ee72..9d45c2843da 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.55 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.56 2012/07/09 15:44:06 wiz 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,20 @@ _PKG_USER_SHELL?= ${NOLOGIN}
FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME:Q}
FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL:Q}
+USE_GAMESGROUP?= no
+SETGIDGAME?= ${USE_GAMESGROUP}
# If USE_GAMESGROUP == yes, then we need the "games" group.
# SETGIDGAME is a deprecated alias for USE_GAMESGROUP.
#
+# If USE_GAMESGROUP is set, 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.
+#
# 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])) ||\