pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix PKG_USERS usage.
details: https://anonhg.NetBSD.org/pkgsrc/rev/8780d1b618a5
branches: trunk
changeset: 626081:8780d1b618a5
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Thu Oct 31 15:58:30 2013 +0000
description:
Fix PKG_USERS usage.
diffstat:
filesystems/tahoe-lafs/Makefile | 5 +++--
mail/fml4/Makefile | 5 +++--
net/kismet/Makefile | 6 ++++--
net/tor/Makefile | 11 ++++++-----
parallel/gridscheduler/Makefile | 5 +++--
parallel/sge/Makefile | 5 +++--
security/stunnel/Makefile | 12 +++++++-----
sysutils/munin-server/Makefile | 5 +++--
8 files changed, 32 insertions(+), 22 deletions(-)
diffs (189 lines):
diff -r 714bd6ffef87 -r 8780d1b618a5 filesystems/tahoe-lafs/Makefile
--- a/filesystems/tahoe-lafs/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/filesystems/tahoe-lafs/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/07/18 00:09:32 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2013/10/31 16:04:05 jperkin Exp $
#
VERSION= 1.10.0
@@ -67,7 +67,8 @@
REPLACE_PYTHON+= src/allmydata/storage/shares.py
PKG_GROUPS= tahoes
-PKG_USERS= tahoes:tahoes::tahoe\ server
+PKG_USERS= tahoes:tahoes
+PKG_GECOS.tahoes= tahoe server
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
diff -r 714bd6ffef87 -r 8780d1b618a5 mail/fml4/Makefile
--- a/mail/fml4/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/mail/fml4/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/07/12 10:44:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2013/10/31 16:05:52 jperkin Exp $
#
DISTNAME= fml-4.0-stable-20040215
@@ -27,7 +27,8 @@
FML_USER?= fml
FML_GROUP?= fml
PKG_GROUPS= ${FML_GROUP}
-PKG_USERS= ${FML_USER}:${FML_GROUP}:::/bin/csh
+PKG_USERS= ${FML_USER}:${FML_GROUP}
+PKG_SHELL.${FML_USER}= /bin/csh
REPLACE_PERL= databases/examples/ldap-toymodel/dump.pl \
www/sbin/JapaneseToEnglish.pl sbin/showsystem.pl
diff -r 714bd6ffef87 -r 8780d1b618a5 net/kismet/Makefile
--- a/net/kismet/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/net/kismet/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/07/12 10:44:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2013/10/31 16:19:47 jperkin Exp $
DISTNAME= kismet-2008-05-R1
PKGNAME= kismet-2008.05.01
@@ -27,7 +27,9 @@
KISMET_USER?= kismet
KISMET_GROUP?= kismet
PKG_GROUPS= ${KISMET_GROUP}
-PKG_USERS= ${KISMET_USER}:${KISMET_GROUP}::Kismet\ user:${VARBASE}/log/kismet
+PKG_USERS= ${KISMET_USER}:${KISMET_GROUP}
+PKG_GECOS.${KISMET_USER}= Kismet user
+PKG_HOME.${KISMET_USER}= ${VARBASE}/log/kismet
PKG_GROUPS_VARS+= KISMET_GROUP
PKG_USERS_VARS+= KISMET_USER
BUILD_DEFS+= VARBASE
diff -r 714bd6ffef87 -r 8780d1b618a5 net/tor/Makefile
--- a/net/tor/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/net/tor/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2013/07/12 10:45:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.95 2013/10/31 16:22:23 jperkin Exp $
#
DISTNAME= tor-0.2.3.25
@@ -30,7 +30,8 @@
TOR_USER?= tor
TOR_GROUP?= tor
-PKG_HOME?= ${VARBASE}/chroot/tor
+PKG_GECOS.${TOR_USER}?= Torifier
+PKG_HOME.${TOR_USER}?= ${VARBASE}/chroot/tor
BUILD_DEFS+= VARBASE
PKG_SYSCONFSUBDIR= tor
@@ -40,10 +41,10 @@
RCD_SCRIPTS= tor
RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in
PKG_GROUPS= ${TOR_GROUP}
-PKG_USERS= ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
+PKG_USERS= ${TOR_USER}:${TOR_GROUP}
USER_GROUP= ${TOR_USER} ${TOR_GROUP}
-OWN_DIRS_PERMS+= ${PKG_HOME} ${USER_GROUP} 0700
+OWN_DIRS_PERMS+= ${PKG_HOME.${TOR_USER}} ${USER_GROUP} 0700
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
@@ -52,7 +53,7 @@
CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \
${PKG_SYSCONFDIR}/torrc
-FILES_SUBST+= PKG_HOME=${PKG_HOME}
+FILES_SUBST+= PKG_HOME=${PKG_HOME.${TOR_USER}}
FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}
SUBST_CLASSES+= fix-paths
diff -r 714bd6ffef87 -r 8780d1b618a5 parallel/gridscheduler/Makefile
--- a/parallel/gridscheduler/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/parallel/gridscheduler/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/07/12 10:45:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/31 16:24:31 jperkin Exp $
PKGNAME= gridscheduler-2011.11
DISTNAME= GE2011.11
@@ -29,7 +29,8 @@
SGE_USER?= sgeadmin
SGE_GROUP?= sgeadmin
PKG_GROUPS= ${SGE_GROUP}
-PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator
+PKG_USERS= ${SGE_USER}:${SGE_GROUP}
+PKG_GECOS.${SGE_USER}= Sun Grid Engine Administrator
PKG_GROUPS_VARS+= SGE_GROUP
PKG_USERS_VARS+= SGE_USER
diff -r 714bd6ffef87 -r 8780d1b618a5 parallel/sge/Makefile
--- a/parallel/sge/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/parallel/sge/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2013/07/12 10:45:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.56 2013/10/31 16:25:06 jperkin Exp $
#
DISTNAME= sge-8.0.0d
@@ -28,7 +28,8 @@
SGE_USER?= sgeadmin
SGE_GROUP?= sgeadmin
PKG_GROUPS= ${SGE_GROUP}
-PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator
+PKG_USERS= ${SGE_USER}:${SGE_GROUP}
+PKG_GECOS.${SGE_USER}= Sun Grid Engine Administrator
PKG_GROUPS_VARS+= SGE_GROUP
PKG_USERS_VARS+= SGE_USER
diff -r 714bd6ffef87 -r 8780d1b618a5 security/stunnel/Makefile
--- a/security/stunnel/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/security/stunnel/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2013/07/12 10:45:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.85 2013/10/31 15:58:30 jperkin Exp $
DISTNAME= stunnel-4.55
PKGREVISION= 2
@@ -21,16 +21,18 @@
STUNNEL_USER?= stunnel
STUNNEL_GROUP?= stunnel
-PKG_HOME?= ${VARBASE}/chroot/stunnel
-PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP}::Stunnel:${PKG_HOME}
+PKG_USERS= ${STUNNEL_USER}:${STUNNEL_GROUP}
PKG_GROUPS= ${STUNNEL_GROUP}
USER_GROUP= ${STUNNEL_USER} ${STUNNEL_GROUP}
+PKG_GECOS.${STUNNEL_USER}?= Stunnel
+PKG_HOME.${STUNNEL_USER}?= ${VARBASE}/chroot/stunnel
+
PKG_SYSCONFSUBDIR= stunnel
PKG_SYSCONFDIR_PERMS= ${ROOT_USER} ${STUNNEL_GROUP} 0750
-OWN_DIRS= ${PKG_HOME}/certs ${PKG_HOME}/crls
-OWN_DIRS_PERMS= ${PKG_HOME}/pid ${USER_GROUP} 0750
+OWN_DIRS= ${PKG_HOME.${STUNNEL_USER}}/certs ${PKG_HOME.${STUNNEL_USER}}/crls
+OWN_DIRS_PERMS= ${PKG_HOME.${STUNNEL_USER}}/pid ${USER_GROUP} 0750
CONF_FILES+= ${PREFIX}/share/examples/stunnel/stunnel.conf-sample \
${PKG_SYSCONFDIR}/stunnel.conf
diff -r 714bd6ffef87 -r 8780d1b618a5 sysutils/munin-server/Makefile
--- a/sysutils/munin-server/Makefile Thu Oct 31 15:10:49 2013 +0000
+++ b/sysutils/munin-server/Makefile Thu Oct 31 15:58:30 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/07/12 10:45:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2013/10/31 16:25:51 jperkin Exp $
#
DISTNAME= ${PKGNAME_NOREV:S:-server-:_:}
@@ -40,8 +40,9 @@
MUNIN_USER?= munin
PKG_GROUPS= ${MUNIN_GROUP}
-PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}:::${VARBASE}/munin
+PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}
PKG_GECOS.${MUNIN_USER}= Munin user
+PKG_HOME.${MUNIN_USER}= ${VARBASE}/munin
USERGROUP_PHASE= pre-install
PKG_SYSCONFSUBDIR?= munin
Home |
Main Index |
Thread Index |
Old Index