Mon Jul 9 21:56:39 2012 UTC ()
Add GAMES_GROUP GAMES_USER GAMEDATAMODE GAMEDIRMODE GAMEMODE to BUILD_DEFS.


(wiz)
diff -r1.56 -r1.57 pkgsrc/mk/pkginstall/bsd.pkginstall.mk
cvs diff -r1.56 -r1.57 pkgsrc/mk/pkginstall/bsd.pkginstall.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkginstall/bsd.pkginstall.mk 2012/07/09 15:44:06 1.56
+++ pkgsrc/mk/pkginstall/bsd.pkginstall.mk 2012/07/09 21:56:38 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkginstall.mk,v 1.56 2012/07/09 15:44:06 wiz Exp $ 1# $NetBSD: bsd.pkginstall.mk,v 1.57 2012/07/09 21:56:38 wiz Exp $
2# 2#
3# This Makefile fragment is included by bsd.pkg.mk and implements the 3# This Makefile fragment is included by bsd.pkg.mk and implements the
4# common INSTALL/DEINSTALL scripts framework. To use the pkginstall 4# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
5# framework, simply set the relevant variables to customize the install 5# framework, simply set the relevant variables to customize the install
6# scripts to the package. 6# scripts to the package.
7# 7#
8# User-settable variables: 8# User-settable variables:
9# 9#
10# PKGINSTALL_VERBOSE 10# PKGINSTALL_VERBOSE
11# A list of scriptlets that will be verbose and output a message 11# A list of scriptlets that will be verbose and output a message
12# noting the actions taken. 12# noting the actions taken.
13# 13#
14# * "all" is a special value that implies all of the other items 14# * "all" is a special value that implies all of the other items
@@ -213,26 +213,27 @@ SETGIDGAME?= ${USE_GAMESGROUP @@ -213,26 +213,27 @@ SETGIDGAME?= ${USE_GAMESGROUP
213# files. 213# files.
214# 214#
215# SETGIDGAME is a deprecated alternative variable with the same 215# SETGIDGAME is a deprecated alternative variable with the same
216# purpose but a murky history and unclear semantics; it is being 216# purpose but a murky history and unclear semantics; it is being
217# phased out because it conflicts with a like-named build variable in 217# phased out because it conflicts with a like-named build variable in
218# the NetBSD base system. 218# the NetBSD base system.
219# 219#
220# For now we also create the "games" user; this should not be used and 220# For now we also create the "games" user; this should not be used and
221# should be removed at some point. 221# should be removed at some point.
222.if (defined(USE_GAMESGROUP) && !empty(USE_GAMESGROUP:M[yY][eE][sS])) ||\ 222.if (defined(USE_GAMESGROUP) && !empty(USE_GAMESGROUP:M[yY][eE][sS])) ||\
223 (defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS])) 223 (defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS]))
224PKG_GROUPS+= ${GAMES_GROUP} 224PKG_GROUPS+= ${GAMES_GROUP}
225PKG_USERS+= ${GAMES_USER}:${GAMES_GROUP} 225PKG_USERS+= ${GAMES_USER}:${GAMES_GROUP}
 226_BUILD_DEFS+= GAMES_GROUP GAMES_USER GAMEDATAMODE GAMEDIRMODE GAMEMODE
226.endif 227.endif
227 228
228# Interix is very special in that users and groups cannot have the 229# Interix is very special in that users and groups cannot have the
229# same name. Interix.mk tries to work around this by overriding 230# same name. Interix.mk tries to work around this by overriding
230# some specific package defaults. If we get here and there's still a 231# some specific package defaults. If we get here and there's still a
231# conflict, add a breakage indicator to make sure the package won't 232# conflict, add a breakage indicator to make sure the package won't
232# compile without changing something. 233# compile without changing something.
233# 234#
234.if !empty(OPSYS:MInterix) 235.if !empty(OPSYS:MInterix)
235. for user in ${PKG_USERS:C/\\\\//g:C/:.*//} 236. for user in ${PKG_USERS:C/\\\\//g:C/:.*//}
236. if !empty(PKG_GROUPS:M${user}) 237. if !empty(PKG_GROUPS:M${user})
237PKG_FAIL_REASON+= "User and group '${user}' cannot have the same name on Interix" 238PKG_FAIL_REASON+= "User and group '${user}' cannot have the same name on Interix"
238. endif 239. endif