[pkgsrc/trunk]: pkgsrc/mk/install Fixed evaluation of the PKG_USERS and PKG_G...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09ac4060e782
branches:  trunk
changeset: 497820:09ac4060e782
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Aug 05 07:06:47 2005 +0000

description:
Fixed evaluation of the PKG_USERS and PKG_GROUPS variables. Noted by
martii on tech-pkg.

diffstat:

 mk/install/bsd.pkginstall.mk |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r ef4120d18be8 -r 09ac4060e782 mk/install/bsd.pkginstall.mk
--- a/mk/install/bsd.pkginstall.mk      Fri Aug 05 06:21:10 2005 +0000
+++ b/mk/install/bsd.pkginstall.mk      Fri Aug 05 07:06:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.8 2005/08/04 21:37:33 rillig Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.9 2005/08/05 07:06:47 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -154,14 +154,20 @@
        ${ECHO} "       \$${CAT} > ./+USERGROUP << 'EOF_USERGROUP'";    \
        ${SED} ${FILES_SUBST_SED} ../../mk/install/usergroup;           \
        ${ECHO} "";                                                     \
-       pkg_groups=${PKG_GROUPS:Q};                                     \
-       for i in $$pkg_groups; do                                       \
+       if ${TEST} x${PKG_GROUPS:M*:Q} != x; then                       \
+       eval set -- ${PKG_GROUPS} ;                                     \
+       while ${TEST} $$# -gt 0; do                                     \
+               i=$$1; shift;                                           \
                ${ECHO} "# GROUP: $$i";                                 \
        done;                                                           \
-       pkg_users=${PKG_USERS:Q};                                       \
-       for i in $$pkg_users; do                                        \
+       fi;                                                             \
+       if ${TEST} x${PKG_USERS:M*:Q} != x; then                        \
+       eval set -- ${PKG_USERS} ;                                      \
+       while ${TEST} $$# -gt 0; do                                     \
+               i=$$1; shift;                                           \
                ${ECHO} "# USER: $$i";                                  \
        done;                                                           \
+       fi;                                                             \
        ${ECHO} "EOF_USERGROUP";                                        \
        ${ECHO} "       \$${CHMOD} +x ./+USERGROUP";                    \
        ${ECHO} "       ;;";                                            \