diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-08 03:30:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-08 03:30:37 +0000 |
| commit | 0c1e91164b5edcf657af3fb20476265817eb30bb (patch) | |
| tree | 617dfb7e83a431d17ac69beebc3d10d99f9ab530 | |
| parent | 92a54f35b8d6a5ca9523ceaa809dd21fcd0a86f5 (diff) | |
| download | pkgsrc-0c1e91164b5edcf657af3fb20476265817eb30bb.tar.gz | |
Avoid using ::= construct which apparently is somewhat buggy in bmake.
This hopefully fixes user/group creation problems on platforms using
bootstrap bmake, e.g. Solaris. Problem noted by adrianp in private
email.
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 0d81f898211..d49e5dc5c6e 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.7 2006/06/07 17:44:29 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.8 2006/06/08 03:30:37 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -203,7 +203,7 @@ PKG_UID.${_entry_:C/\:.*//}_cmd= \ ${PERL5} -le 'print scalar getpwnam shift' ${_entry_:C/\:.*//} PKG_UID.${_entry_:C/\:.*//}?= ${PKG_UID.${_entry_:C/\:.*//}_cmd:sh:M*} . endif -_PKG_USERS+= ${_user_::=${_entry_:C/\:.*//}}${_entry_}:${PKG_UID.${_user_}}:${PKG_GECOS.${_user_}:Q}:${PKG_HOME.${_user_}:Q}:${PKG_SHELL.${_user_}:Q} +_PKG_USERS+= ${_entry_}:${PKG_UID.${_entry_:C/\:.*//}}:${PKG_GECOS.${_entry_:C/\:.*//}:Q}:${PKG_HOME.${_entry_:C/\:.*//}:Q}:${PKG_SHELL.${_entry_:C/\:.*//}:Q} .endfor ${_INSTALL_USERGROUP_DATAFILE}: |