diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/kismet/Makefile | 6 | ||||
| -rw-r--r-- | net/tor/Makefile | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/net/kismet/Makefile b/net/kismet/Makefile index 256442fda1b..4619eb684d5 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -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 @@ PLIST_SRC= PLIST 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 --git a/net/tor/Makefile b/net/tor/Makefile index 68eefb14781..810caa83dfa 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -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 @@ TEST_TARGET= check 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 @@ PKG_USERS_VARS= TOR_USER 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/tor-tsocks.conf \ 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 |