[pkgsrc/trunk]: pkgsrc/mk/install Ensure that @VAR@ placeholders in usergroup...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e2ae641bc8d
branches:  trunk
changeset: 512035:3e2ae641bc8d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Apr 29 04:36:13 2006 +0000

description:
Ensure that @VAR@ placeholders in usergroupfuncs are properly substituted
for by running it through a separate FILES_SUBST_SED filter.  This fixes
the case where the user wasn't being created if USERGROUP_PHASE was
defined.

diffstat:

 mk/install/bsd.pkginstall.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r e888d335dabd -r 3e2ae641bc8d mk/install/bsd.pkginstall.mk
--- a/mk/install/bsd.pkginstall.mk      Sat Apr 29 03:54:10 2006 +0000
+++ b/mk/install/bsd.pkginstall.mk      Sat Apr 29 04:36:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.52 2006/04/29 03:54:10 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.53 2006/04/29 04:36:13 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -232,8 +232,8 @@
                ${INSTALL_USERGROUPFUNCS_FILE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${SED}  -e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ${FILES_SUBST_SED}                              \
-               ../../mk/install/usergroup > ${.TARGET}
+       ${SED}  -e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ../../mk/install/usergroup |                    \
+       ${SED} ${FILES_SUBST_SED} > ${.TARGET}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if ${_ZERO_FILESIZE_P} ${_INSTALL_USERGROUP_DATAFILE}; then     \
                ${RM} -f ${.TARGET};                                    \