diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-26 20:38:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-26 20:38:31 +0000 |
| commit | 678c0f86f876a6627f87f5035ca03d672e715ae2 (patch) | |
| tree | 72e7c5f0163f0edf167281176b0a2f60b193d72b /sysutils | |
| parent | 22d02d6b3ee441bb598f813d6f7a5421dca6335f (diff) | |
| download | pkgsrc-678c0f86f876a6627f87f5035ca03d672e715ae2.tar.gz | |
Use PKG_{USERS,GROUPS} instead of PKG_{USER,GROUP}.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/amanda-common/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/ups-nut/Makefile | 17 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index b06203e0346..5eec1c5adfe 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/11/20 07:00:13 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/11/26 20:38:32 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -34,10 +34,8 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no CONFIGURE_ENV+= ac_cv_lib_readline_readline=no -PKG_USER= ${AMANDA_USER} -PKG_USER_DESCR= Amanda user -PKG_USER_SHELL= ${SH} -PKG_GROUP= ${AMANDA_GROUP} +PKG_GROUPS= ${AMANDA_GROUP} +PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH} OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700 OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700 diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index c45109d98be..f1efe442964 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/11/25 18:59:48 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/11/26 20:38:32 jlam Exp $ # DISTNAME= nut-0.45.2 @@ -15,8 +15,8 @@ BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ - --with-user=${PKG_USER} \ - --with-group=${PKG_GROUP} \ + --with-user=${NUT_USER} \ + --with-group=${NUT_GROUP} \ --with-statepath=${NUT_STATEDIR} \ --with-modelpath=${LOCALBASE}/sbin/ups-drivers @@ -26,13 +26,14 @@ NUT_DOCDIR= ${PREFIX}/share/doc/nut NUT_EGDIR= ${PREFIX}/share/examples/nut NUT_STATEDIR= /var/db/nut +NUT_USER?= nut +NUT_GROUP?= nut + FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR} FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR} -PKG_USER= nut -PKG_USER_DESCR= Network UPS Tools -PKG_USER_SHELL= ${SH} -PKG_GROUP= nut +PKG_GROUPS= ${NUT_GROUP} +PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\\ UPS\\ Tools::${SH} CONF_FILES= ${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf CONF_FILES+= ${NUT_EGDIR}/multimon.conf.sample ${NUT_CONFDIR}/multimon.conf @@ -52,7 +53,7 @@ CONF_FILES_PERMS+= ${NUT_EGDIR}/upsd.users.sample \ RCD_SCRIPTS= ups upsd upsdriver upslog upsmon OWN_DIRS= ${NUT_CONFDIR} -OWN_DIRS_PERMS= ${NUT_STATEDIR} ${PKG_USER} ${PKG_GROUP} 0770 +OWN_DIRS_PERMS= ${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770 pre-configure: cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force |