summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bind9/Makefile7
-rw-r--r--net/freeradius/Makefile6
-rw-r--r--net/hobbitclient/Makefile5
-rw-r--r--net/hobbitmon/Makefile5
-rw-r--r--net/howl/Makefile5
-rw-r--r--net/ja-samba/Makefile6
-rw-r--r--net/kismet/Makefile6
-rw-r--r--net/lambdamoo/Makefile5
-rw-r--r--net/mldonkey/Makefile8
-rw-r--r--net/mydns-pgsql/Makefile.common5
-rw-r--r--net/nagios-base/Makefile.common6
-rw-r--r--net/nagios-nrpe/Makefile5
-rw-r--r--net/nagios-nsca/Makefile.common4
-rw-r--r--net/netdisco/Makefile6
-rw-r--r--net/netsaint-base/Makefile.common5
-rw-r--r--net/pygopherd/Makefile5
-rw-r--r--net/rbldnsd/Makefile7
-rw-r--r--net/snort/Makefile4
-rw-r--r--net/spread/Makefile7
-rw-r--r--net/teamspeak-server/Makefile6
-rw-r--r--net/tor/Makefile5
-rw-r--r--net/userppp/Makefile5
-rw-r--r--net/uucp/Makefile5
-rw-r--r--net/vsftpd/Makefile5
24 files changed, 93 insertions, 40 deletions
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 7af38400631..c4f68f5df2d 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2007/06/12 14:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.90 2007/07/04 20:54:48 jlam Exp $
DISTNAME= bind-${BIND_VERSION}
CATEGORIES= net
@@ -16,7 +16,7 @@ BIND_VERSION= 9.4.1
BUILD_DEFS+= USE_INET6
# No need to set USE_INET6, will auto-detect.
-BUILD_DEFS+= BIND_USER BIND_GROUP BIND_DIR VARBASE
+BUILD_DEFS+= BIND_DIR VARBASE
USE_LIBTOOL= yes
@@ -29,6 +29,9 @@ CONFIGURE_ARGS+=--with-libtool=yes \
# include at the bottom to use OpenSSL shipped with BIND9.
CONFIGURE_ARGS+=--with-openssl=${SSLBASE:Q}
+PKG_GROUPS_VARS+= BIND_GROUP
+PKG_USERS_VARS+= BIND_USER
+
PKG_GROUPS= ${BIND_GROUP}
PKG_USERS= ${BIND_USER}:${BIND_GROUP}
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 809967cfd32..971df8b7575 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2007/04/14 10:16:47 adrianp Exp $
+# $NetBSD: Makefile,v 1.60 2007/07/04 20:54:48 jlam Exp $
DISTNAME= freeradius-${RADVER}
CATEGORIES= net
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_OLD_DES_API= YES
-BUILD_DEFS= VARBASE RADIUS_USER RADIUS_GROUP
+BUILD_DEFS= VARBASE
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
FILES_SUBST+= RADIUS_USER=${RADIUS_USER:Q}
FILES_SUBST+= RADIUS_GROUP=${RADIUS_GROUP:Q}
@@ -33,6 +33,8 @@ RADIUS_USER?= radius
RADIUS_GROUP?= radius
PKG_GROUPS= ${RADIUS_USER}
PKG_USERS= ${RADIUS_USER}:${RADIUS_GROUP}
+PKG_GROUPS_VARS+= RADIUS_GROUP
+PKG_USERS_VARS+= RADIUS_USER
OWN_DIRS_PERMS+= ${VARBASE}/run/radiusd \
${RADIUS_USER} ${RADIUS_GROUP} 0750
OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \
diff --git a/net/hobbitclient/Makefile b/net/hobbitclient/Makefile
index d95e9755b30..b8f428f0842 100644
--- a/net/hobbitclient/Makefile
+++ b/net/hobbitclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/05/29 04:58:06 gendalia Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:49 jlam Exp $
#
DISTNAME= hobbit-4.2.0
@@ -37,6 +37,9 @@ PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q}
PKG_GECOS.${BBUSER}= Hobbit monitor
PKG_HOME.${BBUSER}= ${BBTOPDIR}
+PKG_GROUPS_VARS+= BBGROUP
+PKG_USERS_VARS+= BBUSER
+
CONFIGURE_ARGS+="--client"
CONFIGURE_ENV+= TARGET=hobbit
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index cb6e505daac..dcbb31f477b 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/21 16:20:42 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/07/04 20:54:49 jlam Exp $
#
DISTNAME= hobbit-4.0-beta6
@@ -34,6 +34,9 @@ PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q}
PKG_GECOS.${BBUSER}= Hobbit monitor
PKG_HOME.${BBUSER}= ${BBTOPDIR}
+PKG_GROUPS_VARS+= BBGROUP
+PKG_USERS_VARS+= BBUSER
+
EVAL_PREFIX+= PREFIX.fping=fping
CONFIGURE_ENV+= TARGET=hobbit
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 69834a1732c..e52cdc4e475 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/07/04 20:54:49 jlam Exp $
DISTNAME= howl-1.0.0
CATEGORIES= net
@@ -18,7 +18,8 @@ PKG_GROUPS+= ${HOWL_GROUP}
PKG_USERS+= ${HOWL_USER:Q}:${HOWL_GROUP:Q}
PKG_GECOS.${HOWL_USER}= Zeroconf user
-BUILD_DEFS+= HOWL_GROUP HOWL_USER
+PKG_GROUPS_VARS+= HOWL_GROUP
+PKG_USERS_VARS+= HOWL_USER
FILES_SUBST+= HOWL_GROUP=${HOWL_GROUP:Q}
FILES_SUBST+= HOWL_USER=${HOWL_USER:Q}
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index dd5a81e2a84..642a316d3d1 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/10/14 08:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/07/04 20:54:49 jlam Exp $
DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION}
PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -26,6 +26,9 @@ PKG_SYSCONFVAR= samba
SAMBA_USER?= samba
SAMBA_GROUP?= samba
+PKG_GROUPS_VARS+= SAMBA_GROUP
+PKG_USERS_VARS+= SAMBA_USER
+
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_LIBDIR?= ${PREFIX}/lib/samba
SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba
@@ -127,7 +130,6 @@ PKG_USERS= ${SAMBA_USER}:${SAMBA_GROUP}
PKG_GECOS.${SAMBA_USER}= Samba pseudo-user
-BUILD_DEFS+= SAMBA_USER SAMBA_GROUP
MAKE_FLAGS+= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"'
INSTALL_LIBRARY= \
diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 0cc3db0ce22..8cbb1ca6553 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/17 23:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/04 20:54:50 jlam Exp $
DISTNAME= kismet-2006-04-R1
PKGNAME= kismet-2006.04.01
@@ -26,7 +26,9 @@ KISMET_USER?= kismet
KISMET_GROUP?= kismet
PKG_GROUPS= ${KISMET_GROUP}
PKG_USERS= ${KISMET_USER}:${KISMET_GROUP}::Kismet\ user:${VARBASE}/log/kismet
-BUILD_DEFS+= KISMET_USER KISMET_GROUP VARBASE
+PKG_GROUPS_VARS+= KISMET_GROUP
+PKG_USERS_VARS+= KISMET_USER
+BUILD_DEFS+= VARBASE
PKG_SYSCONFSUBDIR= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 21062c5d23d..82d8c851a98 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/20 22:15:58 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:50 jlam Exp $
DISTNAME= LambdaMOO-1.8.1
PKGNAME= lambdamoo-1.8.1
@@ -24,6 +24,9 @@ PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
PKG_HOME.${LAMBDAMOO_USER}= ${LAMBDAMOO_HOME}
PKG_SHELL.${LAMBDAMOO_USER}= ${SH}
+PKG_GROUPS_VARS+= LAMBDAMOO_GROUP
+PKG_USERS_VARS+= LAMBDAMOO_USER
+
FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q}
WRKSRC= ${WRKDIR}/MOO-1.8.1
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index b317f3a69f2..6b1d3d3c722 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2007/02/16 06:42:33 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2007/07/04 20:54:50 jlam Exp $
#
.include "Makefile.common"
RCD_SCRIPTS= mldonkey
-BUILD_DEFS+= MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER
-BUILD_DEFS+= VARBASE
+PKG_GROUPS_VARS+= MLDONKEY_GROUP
+PKG_USERS_VARS+= MLDONKEY_USER
+
+BUILD_DEFS+= MLDONKEY_HOME VARBASE
OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
OWN_DIRS_PERMS+= ${VARBASE}/log/mldonkey \
diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common
index 488fbe81029..a3710563472 100644
--- a/net/mydns-pgsql/Makefile.common
+++ b/net/mydns-pgsql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/04/23 00:12:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/07/04 20:54:50 jlam Exp $
DISTNAME= mydns-1.1.0
CATEGORIES= net
@@ -18,7 +18,8 @@ MYDNS_USER?= mydns
MYDNS_GROUP?= mydns
MYDNS_PERMS= ${ROOT_USER} ${ROOT_GROUP} 600
-BUILD_DEFS+= MYDNS_USER MYDNS_GROUP
+PKG_GROUPS_VARS+= MYDNS_GROUP
+PKG_USERS_VARS+= MYDNS_USER
SUBST_CLASSES+= user
SUBST_STAGE.user= pre-build
diff --git a/net/nagios-base/Makefile.common b/net/nagios-base/Makefile.common
index 7753ab34e38..48a440166ea 100644
--- a/net/nagios-base/Makefile.common
+++ b/net/nagios-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2007/02/22 19:26:55 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/07/04 20:54:51 jlam Exp $
#
NAGIOS_USER?= nagios
@@ -7,8 +7,8 @@ NAGIOS_GROUP?= ${NAGIOS_USER}
NAGIOSADM_USER?= nagadmin
NAGIOSADM_GROUP?= ${NAGIOSADM_USER}
-BUILD_DEFS+= NAGIOS_USER NAGIOS_GROUP
-BUILD_DEFS+= NAGIOSADM_USER NAGIOSADM_GROUP
+PKG_GROUPS_VARS+= NAGIOS_GROUP NAGIOSADM_GROUP
+PKG_USERS_VARS+= NAGIOS_USER NAGIOSADM_USER
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/net/nagios-nrpe/Makefile b/net/nagios-nrpe/Makefile
index 0c3daa3221f..21e81663902 100644
--- a/net/nagios-nrpe/Makefile
+++ b/net/nagios-nrpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/24 19:21:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/04 20:54:51 jlam Exp $
#
DISTNAME= nrpe-2.5.2
@@ -25,6 +25,9 @@ PKG_GROUPS+= ${NAGIOS_GROUP}
PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}
PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User
+PKG_GROUPS_VARS+= NAGIOS_GROUP
+PKG_USERS_VARS+= NAGIOS_USER
+
CONFIGURE_ARGS+= --with-nrpe-user=${NAGIOS_USER:Q}
CONFIGURE_ARGS+= --with-nrpe-group=${NAGIOS_GROUP:Q}
diff --git a/net/nagios-nsca/Makefile.common b/net/nagios-nsca/Makefile.common
index e0081ed25a9..2af9cc50ae7 100644
--- a/net/nagios-nsca/Makefile.common
+++ b/net/nagios-nsca/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2007/02/22 19:26:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/07/04 20:54:51 jlam Exp $
#
NAGIOS_USER?= nagios
@@ -7,6 +7,8 @@ NAGIOS_GROUP?= ${NAGIOS_USER}
NAGIOSADM_USER?= nagadmin
NAGIOSADM_GROUP?= ${NAGIOSADM_USER}
+PKG_GROUPS_VARS+= NAGIOS_GROUP NAGIOSADM_GROUP
+PKG_USERS_VARS+= NAGIOS_USER NAGIOSADM_USER
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 42b26adf5e6..965a76a3134 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/16 15:25:41 bouyer Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/04 20:54:51 jlam Exp $
#
DISTNAME= netdisco-0.95_with_mibs
@@ -79,7 +79,9 @@ SUBST_MESSAGE.varbase= Fixing data directory.
NETDISCOUSER?= netdisco
NETDISCOGROUP?= netdisco
-BUILD_DEFS+= NETDISCOUSER NETDISCOGROUP
+
+PKG_GROUPS_VARS+= NETDISCOGROUP
+PKG_USERS_VARS+= NETDISCOUSER
PKG_GROUPS= ${NETDISCOGROUP}
PKG_USERS= ${NETDISCOUSER:Q}:${NETDISCOGROUP:Q}
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 927a9621497..4a687778ea6 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2007/02/06 18:28:23 joerg Exp $
+# $NetBSD: Makefile.common,v 1.14 2007/07/04 20:54:51 jlam Exp $
#
CATEGORIES= net sysutils
@@ -9,6 +9,9 @@ NETSAINT_GROUP?= ${NETSAINT_USER}
NETSTADM_USER?= netstadm
NETSTADM_GROUP?= ${NETSTADM_USER}
+PKG_GROUPS_VARS+= NETSAINT_GROUP NETSTADM_GROUP
+PKG_USERS_VARS+= NETSAINT_USER NETSTADM_USER
+
PKG_GROUPS+= ${NETSAINT_GROUP}
PKG_GROUPS+= ${NETSTADM_GROUP}
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 69c017ed40f..4707e37b4e1 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/03/28 13:25:12 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/07/04 20:54:52 jlam Exp $
#
DISTNAME= pygopherd_2.0.9
@@ -18,6 +18,9 @@ PKG_SYSCONFSUBDIR= pygopherd
EXAMPLEDIR= ${PREFIX}/share/examples/pygopherd
RUNTIMEDIR= ${VARBASE}/gopher
+PKG_GROUPS_VARS+= GOPHER_GROUP
+PKG_USERS_VARS+= GOPHER_USER
+
GOPHER_USER= gopher
GOPHER_GROUP= gopher
PKG_GROUPS= ${GOPHER_GROUP}
diff --git a/net/rbldnsd/Makefile b/net/rbldnsd/Makefile
index 363b1a7c045..5c00df2edb2 100644
--- a/net/rbldnsd/Makefile
+++ b/net/rbldnsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/24 19:21:30 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/07/04 20:54:52 jlam Exp $
#
DISTNAME= rbldnsd_0.996a
@@ -15,7 +15,7 @@ HAS_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+= RBLDNSD_USER RBLDNSD_GROUP RBLDNSD_DIR VARBASE
+BUILD_DEFS+= RBLDNSD_DIR VARBASE
RBLDNSD_USER?= rbldns
RBLDNSD_GROUP?= rbldns
@@ -25,6 +25,9 @@ PKG_GROUPS= ${RBLDNSD_GROUP}
PKG_USERS= ${RBLDNSD_USER}:${RBLDNSD_GROUP}
PKG_HOME.${RBLDNSD_USER}= ${RBLDNSD_DIR}
+PKG_GROUPS_VARS+= RBLDNSD_GROUP
+PKG_USERS_VARS+= RBLDNSD_USER
+
FILES_SUBST+= RBLDNSD_USER=${RBLDNSD_USER} RBLDNSD_GROUP=${RBLDNSD_GROUP}
RCD_SCRIPTS= rbldnsd
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 9d04718591d..fba1d37bc97 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/05/18 22:20:09 adrianp Exp $
+# $NetBSD: Makefile,v 1.31 2007/07/04 20:54:52 jlam Exp $
#
DISTNAME= snort-2.6.1.5
@@ -24,6 +24,8 @@ SNORT_GROUP?= snort
EGDIR= ${PREFIX}/share/examples/snort
PKG_GROUPS= ${SNORT_GROUP}
PKG_USERS= ${SNORT_USER}:${SNORT_GROUP}
+PKG_GROUPS_VARS+= SNORT_GROUP
+PKG_USERS_VARS+= SNORT_USER
FILES_SUBST+= SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q}
BUILD_DEFS+= VARBASE
OWN_DIRS_PERMS= ${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 43625805347..2d53351e8c1 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/29 06:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:52 jlam Exp $
#
DISTNAME= spread-src-3.17.3
@@ -17,6 +17,9 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --includedir=${PREFIX:Q}/include/spread
MAKE_FLAGS+= LD=${CC:Q}
+PKG_GROUPS_VARS+= SPREAD_GROUP
+PKG_USERS_VARS+= SPREAD_USER
+
SPREAD_USER= spread
SPREAD_GROUP= spread
@@ -24,8 +27,6 @@ FILES_SUBST+= SPREAD_USER=${SPREAD_USER:Q}
FILES_SUBST+= SPREAD_GROUP=${SPREAD_GROUP:Q}
FILES_SUBST+= RUNTIME_DIR=${RUNTIME_DIR:Q}
-BUILD_DEFS+= SPREAD_USER SPREAD_GROUP
-
INCLUDEDIR= ${PREFIX}/include/spread
DOCSDIR= ${PREFIX}/share/doc/spread
EXAMPLEDIR= ${PREFIX}/share/examples/spread
diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile
index 6476100cfe0..a2211a9c0c8 100644
--- a/net/teamspeak-server/Makefile
+++ b/net/teamspeak-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/06/12 14:39:22 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/04 20:54:53 jlam Exp $
PKGNAME= teamspeak-server-2.0.23.15
DISTNAME= ts2_server_rc2_20201
@@ -49,7 +49,9 @@ TSUSER?= teamspeak
TSGROUP?= teamspeak
TSHOME?= ${HOMEBASE}/${TSUSER}
-BUILD_DEFS+= TSUSER TSGROUP TSHOME
+PKG_GROUPS_VARS+= TSGROUP
+PKG_USERS_VARS+= TSUSER
+BUILD_DEFS+= TSHOME
PKG_GROUPS= ${TSGROUP}
PKG_USERS= ${TSUSER}:${TSGROUP}
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 4ef31700697..42ecc6eea87 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/04/26 20:04:37 tv Exp $
+# $NetBSD: Makefile,v 1.42 2007/07/04 20:54:53 jlam Exp $
#
DISTNAME= tor-0.1.1.26
@@ -20,6 +20,9 @@ TOR_USER?= tor
TOR_GROUP?= tor
PKG_HOME?= /var/chroot/tor
+PKG_GROUPS_VARS+= TOR_GROUP
+PKG_USERS_VARS+= TOR_USER
+
RCD_SCRIPTS= tor
PKG_GROUPS= ${TOR_GROUP}
PKG_USERS= ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index b5e926627e4..cb5e2dd958a 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/07/04 20:54:54 jlam Exp $
DISTNAME= ppp-001107.src
PKGNAME= userppp-001107
@@ -30,9 +30,10 @@ post-patch:
.include "../../mk/bsd.prefs.mk"
USERPPP_GROUP?= network
-BUILD_DEFS+= USERPPP_GROUP
MAKE_ENV+= USERPPP_GROUP=${USERPPP_GROUP:Q}
PKG_GROUPS= ${USERPPP_GROUP}
+PKG_GROUPS_VARS+= USERPPP_GROUP
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/uucp/Makefile b/net/uucp/Makefile
index a54ce5aa78f..e6dd2e93990 100644
--- a/net/uucp/Makefile
+++ b/net/uucp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/06/19 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/04 20:54:54 jlam Exp $
DISTNAME= uucp-1.07
PKGREVISION= 4
@@ -25,6 +25,9 @@ CONFIGURE_ENV+= RMDIR_PROGRAM=${TOOLS_RMDIR:Q}
PKG_GROUPS= ${UUCP_GROUP}
PKG_USERS= ${UUCP_USER}:${UUCP_GROUP}
+PKG_GROUPS_VARS+= UUCP_GROUP
+PKG_USERS_VARS+= UUCP_USER
+
PKG_GECOS.${UUCP_USER}= UNIX-to-UNIX Copy
PKG_HOMES.${UUCP_USER}= ${UUCP_PUBDIR}
PKG_SHELL.${UUCP_USER}= ${PREFIX}/libexec/uucp/uucico
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 3789b2ed8c1..2156016401e 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/01/07 09:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2007/07/04 20:54:54 jlam Exp $
#
DISTNAME= vsftpd-2.0.4
@@ -15,6 +15,9 @@ PKG_SYSCONFSUBDIR= vsftpd
BUILD_TARGET= vsftpd
RCD_SCRIPTS= vsftpd
+PKG_GROUPS_VARS+= VSFTPD_GROUP
+PKG_USERS_VARS+= VSFTPD_USER
+
VSFTPD_USER?= vsftpd
VSFTPD_GROUP?= vsftpd
PKG_GROUPS= ${VSFTPD_GROUP}