[pkgsrc/trunk]: pkgsrc/mk Allow pre-install for USERGROUP_PHASE. This is inte...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90cbcb231568
branches:  trunk
changeset: 576636:90cbcb231568
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 15 19:23:55 2010 +0000

description:
Allow pre-install for USERGROUP_PHASE. This is intended for
PKG_DESTDIR_SUPPORT=destdir packages, that don't otherwise need the
user/group during build.

Export USERGROUP_PHASE for the sake of pbulk.

diffstat:

 mk/pbulk/pbulk-index.mk         |  3 ++-
 mk/pkginstall/bsd.pkginstall.mk |  4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 5a57f0a7f62d -r 90cbcb231568 mk/pbulk/pbulk-index.mk
--- a/mk/pbulk/pbulk-index.mk   Tue Jun 15 16:56:16 2010 +0000
+++ b/mk/pbulk/pbulk-index.mk   Tue Jun 15 19:23:55 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: pbulk-index.mk,v 1.9 2008/06/19 18:36:51 joerg Exp $
+#      $NetBSD: pbulk-index.mk,v 1.10 2010/06/15 19:23:55 joerg Exp $
 
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to the parallel bulk build
@@ -94,6 +94,7 @@
        @echo "MAINTAINER="${MAINTAINER:Q}
        @echo "USE_DESTDIR="${_USE_DESTDIR:Q}
        @echo "BOOTSTRAP_PKG="${BOOTSTRAP_PKG}
+       @echo "USERGROUP_PHASE="${USERGROUP_PHASE:Q}
 .if defined(_PBULK_MULTI_NEEDED)
        @printf "MULTI_VERSION="
 .for _t in ${_PBULK_MULTI_NEEDED}
diff -r 5a57f0a7f62d -r 90cbcb231568 mk/pkginstall/bsd.pkginstall.mk
--- a/mk/pkginstall/bsd.pkginstall.mk   Tue Jun 15 16:56:16 2010 +0000
+++ b/mk/pkginstall/bsd.pkginstall.mk   Tue Jun 15 19:23:55 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.49 2010/05/07 14:29:36 jmmv Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.50 2010/06/15 19:23:56 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -320,6 +320,8 @@
 pre-configure: create-usergroup
 .  elif !empty(USERGROUP_PHASE:M*build)
 pre-build: create-usergroup
+.  elif !empty(USERGROUP_PHASE:Mpre-install) && ${_USE_DESTDIR} != "no"
+pre-install: create-usergroup
 .  endif
 .endif