diff options
| author | jlam <jlam@pkgsrc.org> | 2007-07-04 20:54:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-07-04 20:54:31 +0000 |
| commit | 4390d56940778d6ab856866401c0690f1c28c724 (patch) | |
| tree | 651c1d29a5b557efafa04d2bb6f2cb512a979f64 | |
| parent | a6f8cbe795a03d65965cf24d3c410970c17f620e (diff) | |
| download | pkgsrc-4390d56940778d6ab856866401c0690f1c28c724.tar.gz | |
Make it easier to build and install packages "unprivileged", where
the owner of all installed files is a non-root user. This change
affects most packages that require special users or groups by making
them use the specified unprivileged user and group instead.
(1) Add two new variables PKG_GROUPS_VARS and PKG_USERS_VARS to
unprivileged.mk. These two variables are lists of other bmake
variables that define package-specific users and groups. Packages
that have user-settable variables for users and groups, e.g. apache
and APACHE_{USER,GROUP}, courier-mta and COURIER_{USER,GROUP},
etc., should list these variables in PKG_USERS_VARS and PKG_GROUPS_VARS
so that unprivileged.mk can know to set them to ${UNPRIVILEGED_USER}
and ${UNPRIVILEGED_GROUP}.
(2) Modify packages to use PKG_GROUPS_VARS and PKG_USERS_VARS.
137 files changed, 533 insertions, 243 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index 3c41b82b631..f96f7aa50bf 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2007/02/22 19:26:05 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2007/07/04 20:54:31 jlam Exp $ # DISTNAME= icecast-2.3.0 @@ -24,6 +24,8 @@ ICECAST_LOGDIR?= ${ICECAST_CHROOTDIR}/log ICECAST_USER?= icecast ICECAST_GROUP?= icecast +PKG_USERS_VARS+= ICECAST_USER +PKG_GROUPS_VARS+= ICECAST_GROUP PKG_GROUPS= ${ICECAST_GROUP} PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP} diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile index 1827ed77080..a22e3231281 100644 --- a/audio/mt-daapd/Makefile +++ b/audio/mt-daapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/02/17 16:39:23 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/04 20:54:31 jlam Exp $ DISTNAME= mt-daapd-0.2.4 PKGREVISION= 2 @@ -22,7 +22,10 @@ MTDAAPD_USER?= mtdaapd MTDAAPD_GROUP?= mtdaapd PKG_USERS= ${MTDAAPD_USER}:${MTDAAPD_GROUP} PKG_GROUPS= ${MTDAAPD_GROUP} -BUILD_DEFS+= VARBASE MTDAAPD_USER +BUILD_DEFS+= VARBASE + +PKG_USERS_VARS+= MTDAAPD_USER +PKG_GROUPS_VARS+= MTDAAPD_GROUP CONF_FILES_PERMS= ${EGDIR}/mt-daapd.conf ${PKG_SYSCONFDIR}/mt-daapd.conf \ ${MTDAAPD_USER} ${MTDAAPD_GROUP} 0660 diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile index 41d52c3bad3..087f8464ad6 100644 --- a/audio/ubs/Makefile +++ b/audio/ubs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:07 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/07/04 20:54:31 jlam Exp $ # DISTNAME= ubs-0.17 @@ -19,11 +19,12 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= UBS_BASEDIR UBS_USER UBS_GROUP - UBS_BASEDIR?= /var/spool/ubs UBS_USER?= ubs UBS_GROUP?= ubs +PKG_USERS_VARS+= UBS_USER +PKG_GROUPS_VARS+= UBS_GROUP +BUILD_DEFS+= UBS_BASEDIR PKG_GROUPS= ${UBS_GROUP} PKG_USERS= ${UBS_USER}:${UBS_GROUP} diff --git a/chat/anope/Makefile b/chat/anope/Makefile index 7ad742aafec..943d6a32891 100644 --- a/chat/anope/Makefile +++ b/chat/anope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/04/09 09:40:23 adrianp Exp $ +# $NetBSD: Makefile,v 1.3 2007/07/04 20:54:32 jlam Exp $ DISTNAME= anope-1.7.18 CATEGORIES= net @@ -17,6 +17,9 @@ RCD_SCRIPTS= anope FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q} FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q} +PKG_USERS_VARS+= ANOPE_USER +PKG_GROUPS_VARS+= ANOPE_GROUP + .include "../../mk/bsd.prefs.mk" PKG_USERS= ${ANOPE_USER}:${ANOPE_GROUP}::anope\ user:${PREFIX}/lib/anope:${NOLOGIN} diff --git a/chat/i2cbd/Makefile b/chat/i2cbd/Makefile index 18ce015f01a..7576ef8a990 100644 --- a/chat/i2cbd/Makefile +++ b/chat/i2cbd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/03/24 19:21:19 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:32 jlam Exp $ # DISTNAME= i2cbd-2.0_BETA5 @@ -15,6 +15,7 @@ COMMENT= Next generation Internet Citizens Band chat server BUILD_DEFS+= ICBD_OWNER ICBD_OWNER?= ${ROOT_USER} +PKG_USERS_VARS+= ICBD_OWNER PLIST_SUBST+= ICBD_OWNER=${ICBD_OWNER:Q} PKG_SYSCONFSUBDIR= icbd diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index 1abdc758a22..06d3168ed48 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2007/02/01 23:19:56 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2007/07/04 20:54:32 jlam Exp $ DISTNAME= ircd-hybrid-7.2.2 PKGREVISION= 1 @@ -15,8 +15,7 @@ CONFLICTS+= ircu-[0-9]* GNU_CONFIGURE= YES BUILD_DEFS+= IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \ IRCD_HYBRID_TOPICLEN IRCD_HYBRID_MAXCONN \ - IRCD_HYBRID_SYSLOG_EVENTS IRCD_HYBRID_IRC_USER \ - IRCD_HYBRID_IRC_GROUP VARBASE + IRCD_HYBRID_SYSLOG_EVENTS VARBASE .include "../../mk/bsd.prefs.mk" @@ -41,6 +40,9 @@ FILES_SUBST+= VARBASE=${VARBASE:Q} PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP} PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP} +PKG_USERS_VARS+= IRCD_HYBRID_IRC_USER +PKG_GROUPS_VARS+= IRCD_HYBRID_IRC_GROUP + SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths. SUBST_STAGE.paths= post-patch diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index f8034d897c4..0bff8021baf 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/06/15 14:15:40 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:32 jlam Exp $ # DISTNAME= ircu2.10.12.10 @@ -29,6 +29,9 @@ PKG_SYSCONFSUBDIR= ircd IRCD_USER?= ircd IRCD_GROUP?= ircd +PKG_USERS_VARS+= IRCD_USER +PKG_GROUPS_VARS+= IRCD_GROUP + DATADIR= ${VARBASE}/ircd OWN_DIRS_PERMS= ${DATADIR} ${IRCD_USER} ${IRCD_GROUP} 0700 EGDIR= ${PREFIX}/share/examples/ircd diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index f1fadd64c51..e9c00cd3b8c 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/10/08 21:58:47 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:32 jlam Exp $ # DISTNAME= jabber-1.4.2 @@ -35,13 +35,15 @@ INCDIR= ${PREFIX}/include/jabberd # some systems don't have u_intN_t CPPFLAGS+= -Du_int8_t=uint8_t -BUILD_DEFS+= JABBERD_USER JABBERD_GROUP \ - JABBERD_LOGDIR JABBERD_SPOOLDIR \ +BUILD_DEFS+= JABBERD_LOGDIR JABBERD_SPOOLDIR \ JABBERD_PIDDIR PKG_GROUPS= ${JABBERD_GROUP} PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP} +PKG_USERS_VARS+= JABBERD_USER +PKG_GROUPS_VARS+= JABBERD_GROUP + FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q} FILES_SUBST+= JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR:Q} diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 59ae770dad8..5516039f2fc 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/06/12 15:26:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.38 2007/07/04 20:54:33 jlam Exp $ # DISTNAME= jabberd-2.1.6 @@ -39,7 +39,7 @@ REPLACE_PERL+= tools/*.pl JABBERD_DBDIR?= ${VARBASE}/db/jabberd -BUILD_DEFS+= VARBASE JABBERD_USER JABBERD_GROUP +BUILD_DEFS+= VARBASE BUILD_DEFS+= JABBERD_LOGDIR JABBERD_PIDDIR JABBERD_DBDIR PKG_SYSCONFSUBDIR= jabberd @@ -50,6 +50,8 @@ FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q} FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q} FILES_SUBST+= JABBERD_LOGDIR=${JABBERD_LOGDIR:Q} +PKG_USERS_VARS+= JABBERD_USER +PKG_GROUPS_VARS+= JABBERD_GROUP PKG_GROUPS= ${JABBERD_GROUP} PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP} diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile index e9c44c48ca1..a25dae3a978 100644 --- a/chat/mu-conference/Makefile +++ b/chat/mu-conference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:25 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2007/07/04 20:54:33 jlam Exp $ # DISTNAME= mu-conference-0.6.0 @@ -24,8 +24,9 @@ RCD_SCRIPTS= muc .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= JABBERD_USER JABBERD_LOGDIR JABBERD_PIDDIR +BUILD_DEFS+= JABBERD_LOGDIR JABBERD_PIDDIR JABBERD_USER?= jabberd +PKG_USERS_VARS+= JABBERD_USER FILES_SUBST+= JABBERD_PIDDIR=${JABBERD_PIDDIR:Q} FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 88496a0e270..ac44c3029e5 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2007/06/03 22:40:25 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2007/07/04 20:54:33 jlam Exp $ # DISTNAME= silc-server-1.0.4 @@ -24,6 +24,8 @@ SILCD_USER?= silcd SILCD_GROUP?= silcd PKG_GROUPS= ${SILCD_GROUP} PKG_USERS= ${SILCD_USER}:${SILCD_GROUP} +PKG_USERS_VARS+= SILCD_USER +PKG_GROUPS_VARS+= SILCD_GROUP PKG_SYSCONFSUBDIR?= ${PKGBASE} diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile index 09c25897265..3b6c82f2d5e 100644 --- a/chat/unrealircd/Makefile +++ b/chat/unrealircd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/05/13 21:15:58 adrianp Exp $ +# $NetBSD: Makefile,v 1.19 2007/07/04 20:54:33 jlam Exp $ DISTNAME= Unreal3.2.6 PKGNAME= unrealircd-3.2.6 @@ -54,8 +54,8 @@ IRCD_DOCS= ${PREFIX:Q}/share/doc/unrealircd IRCD_SHARE= ${PREFIX:Q}/share/unrealircd IRCD_EG= ${PREFIX:Q}/share/examples/unrealircd -BUILD_DEFS+= UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_USER UIRCD_HOST -BUILD_DEFS+= UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE UIRCD_GROUP VARBASE +BUILD_DEFS+= UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_HOST +BUILD_DEFS+= UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE VARBASE PTHREAD_OPTS+= require @@ -78,6 +78,9 @@ CONF_FILES_PERMS= ${IRCD_EG:Q}/example.conf \ ${UIRCD_HOME:Q}/unrealircd.conf \ ${UIRCD_USER} ${UIRCD_GROUP} 0660 +PKG_USERS_VARS+= UIRCD_USER +PKG_GROUPS_VARS+= UIRCD_GROUP + PKG_GROUPS= ${UIRCD_GROUP:Q} PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q} diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 23ac72d305d..5fe65336c8b 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2007/06/24 07:52:47 mjl Exp $ +# $NetBSD: Makefile,v 1.39 2007/07/04 20:54:34 jlam Exp $ DISTNAME= asterisk-1.2.19 CATEGORIES= comms net audio @@ -21,6 +21,8 @@ INSTALL_TARGET= install samples #ASTERISK_GROUP?= asterisk #PKG_GROUPS= ${ASTERISK_GROUP} #PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP} +#PKG_GROUPS_VARS+= ASTERISK_GROUP +#PKG_USERS_VARS+= ASTERISK_USER # Various path settings for Asterisk PKG_SYSCONFSUBDIR= asterisk diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index 573dcf46654..8f96da76cba 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2007/06/19 21:46:39 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2007/07/04 20:54:34 jlam Exp $ DISTNAME= minicom-2.1 PKGREVISION= 3 @@ -26,6 +26,9 @@ EGDIR= ${PREFIX}/share/examples/minicom PKG_GROUPS= ${DIALER_GROUP} PKG_USERS= ${UUCP_USER}:${UUCP_GROUP} +PKG_GROUPS_VARS+= DIALER_GROUP UUCP_GROUP +PKG_USERS_VARS+= UUCP_USER + SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555 OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755 CONF_FILES_PERMS= ${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \ diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile index 9c4f60f4407..2752e04bda7 100644 --- a/comms/xisp/Makefile +++ b/comms/xisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:53 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:34 jlam Exp $ # DISTNAME= xisp-2.7p1 @@ -13,7 +13,7 @@ HOMEPAGE= http://xisp.hellug.gr/ COMMENT= User-friendly X11 interface to pppd/chat PKG_GROUPS= ${DIALER_GROUP} -BUILD_DEFS+= DIALER_GROUP +PKG_GROUPS_VARS+= DIALER_GROUP MAKE_ENV+= DIALER_GROUP="${DIALER_GROUP}" MAKE_ENV+= VARBASE=${VARBASE:Q} MESSAGE_SUBST+= DIALER_GROUP=${DIALER_GROUP} diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 04083d4e98f..610cb00555e 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/06/16 09:32:33 rillig Exp $ +# $NetBSD: Makefile,v 1.30 2007/07/04 20:54:34 jlam Exp $ DISTNAME= gnats-4.1.0 PKGREVISION= 2 @@ -36,6 +36,9 @@ GNATS_HOME?= ${VARBASE}/db/gnats PKG_GROUPS= ${GNATS_GROUP} PKG_USERS= ${GNATS_USER}:${GNATS_GROUP} +PKG_GROUPS_VARS+= GNATS_GROUP +PKG_USERS_VARS+= GNATS_USER + PKG_GECOS.${GNATS_USER}= GNATS database owner PKG_HOME.${GNATS_USER}= ${GNATS_HOME} PKG_SHELL.${GNATS_USER}= ${SH} diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index e167c5ff47b..d67c12cb09f 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.57 2007/05/23 08:11:48 martti Exp $ +# $NetBSD: Makefile.common,v 1.58 2007/07/04 20:54:35 jlam Exp $ DISTNAME= mysql-4.1.22 CATEGORIES= databases @@ -22,6 +22,9 @@ MYSQL_USER?= mysql MYSQL_GROUP?= mysql MYSQL_DATADIR?= ${VARBASE}/mysql +PKG_USERS_VARS+= MYSQL_USER +PKG_GROUPS_VARS+= MYSQL_GROUP + # MYSQL_CHARSET default character set # MYSQL_EXTRA_CHARSET additional character set to be compiled in. # diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common index 0a548f80489..f8c6368085f 100644 --- a/databases/mysql5-client/Makefile.common +++ b/databases/mysql5-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2007/05/21 04:39:59 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.22 2007/07/04 20:54:35 jlam Exp $ DISTNAME= mysql-5.0.41 CATEGORIES= databases @@ -22,6 +22,9 @@ MYSQL_USER?= mysql MYSQL_GROUP?= mysql MYSQL_DATADIR?= ${VARBASE}/mysql +PKG_USERS_VARS+= MYSQL_USER +PKG_GROUPS_VARS+= MYSQL_GROUP + # MYSQL_CHARSET default character set # MYSQL_EXTRA_CHARSET additional character set to be compiled in. # diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index 0daa511954f..d0229d69e10 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/01/02 11:29:16 ghen Exp $ +# $NetBSD: Makefile,v 1.7 2007/07/04 20:54:35 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} COMMENT= Lightweight Directory Access Protocol server suite @@ -32,7 +32,6 @@ BUILD_DIRS= include libraries servers TEST_DIRS= tests INSTALL_DIRS= servers -BUILD_DEFS+= SLAPD_USER SLURPD_USER LDAP_GROUP BUILD_DEFS+= OPENLDAP_ETCDIR OPENLDAP_VARDIR PKG_GROUPS= ${LDAP_GROUP} diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index ef32fa3c040..c1e59332cdc 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2007/01/10 18:15:36 ghen Exp $ +# $NetBSD: Makefile.common,v 1.9 2007/07/04 20:54:35 jlam Exp $ # please stick to the "stable" releases as much as possible! DISTNAME= openldap-2.3.32 @@ -44,6 +44,9 @@ SLAPD_USER?= slapd SLURPD_USER?= slurpd LDAP_GROUP?= ldap +PKG_GROUPS_VARS+= LDAP_GROUP +PKG_USERS_VARS+= SLAPD_USER SLURPD_USER + # the internal avl_* prototypes conflict with those in <sys/avl.h> which # is included by another system header file on Solaris, so subst them. .if ${OPSYS} == "SunOS" diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index 84448d57202..ed6d097e4d7 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2007/07/03 14:18:14 tron Exp $ +# $NetBSD: Makefile,v 1.61 2007/07/04 20:54:36 jlam Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION}-all-languages PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} @@ -30,7 +30,9 @@ APACHE_USER?= www APACHE_GROUP?= www PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} -BUILD_DEFS+= APACHE_USER APACHE_GROUP + +PKG_USERS_VARS+= APACHE_USER +PKG_GROUPS_VARS+= APACHE_GROUP EXDIR= ${PREFIX}/share/examples/phpmyadmin PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc.php diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 953b3d223ac..d63fb6ac99b 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/05/08 15:58:38 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:36 jlam Exp $ PKGNAME= postgresql80-server-${BASE_VERS} PKGREVISION= 1 @@ -58,7 +58,10 @@ PGHOME?= ${PREFIX}/${PGUSER} FILES_SUBST+= PGUSER=${PGUSER:Q} FILES_SUBST+= PGGROUP=${PGGROUP:Q} FILES_SUBST+= PGHOME=${PGHOME:Q} -BUILD_DEFS+= PGUSER PGGROUP PGHOME +BUILD_DEFS+= PGHOME + +PKG_GROUPS_VARS+= PGGROUP +PKG_USERS_VARS+= PGUSER PKG_GROUPS= ${PGGROUP} PKG_USERS= ${PGUSER}:${PGGROUP} diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 0fac65e3a05..4ee2a221951 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/01/08 18:55:39 adam Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/04 20:54:36 jlam Exp $ PKGNAME= postgresql81-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -59,7 +59,10 @@ PGHOME?= ${PREFIX}/${PGUSER} FILES_SUBST+= PGUSER=${PGUSER} FILES_SUBST+= PGGROUP=${PGGROUP} FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS+= PGUSER PGGROUP PGHOME +BUILD_DEFS+= PGHOME + +PKG_GROUPS_VARS+= PGGROUP +PKG_USERS_VARS+= PGUSER PKG_GROUPS= ${PGGROUP} PKG_USERS= ${PGUSER}:${PGGROUP} diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 44376a0bdef..28d7e9668e9 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/12/09 15:34:40 adam Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/04 20:54:37 jlam Exp $ PKGNAME= postgresql82-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -59,7 +59,10 @@ PGHOME?= ${PREFIX}/${PGUSER} FILES_SUBST+= PGUSER=${PGUSER} FILES_SUBST+= PGGROUP=${PGGROUP} FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS+= PGUSER PGGROUP PGHOME +BUILD_DEFS+= PGHOME + +PKG_GROUPS_VARS+= PGGROUP +PKG_USERS_VARS+= PGUSER PKG_GROUPS= ${PGGROUP} PKG_USERS= ${PGUSER}:${PGGROUP} diff --git a/databases/sqlitemanager/Makefile b/databases/sqlitemanager/Makefile index d6eb7f3137b..476bfa4ef57 100644 --- a/databases/sqlitemanager/Makefile +++ b/databases/sqlitemanager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/16 10:58:08 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/04 20:54:37 jlam Exp $ # DISTNAME= SQLiteManager-1.0.4 @@ -14,7 +14,7 @@ DEPENDS+= php>=5.0.3nb1:../../lang/php5 NO_BUILD= yes -BUILD_DEFS+= APACHE_USER +PKG_USERS_VARS+= APACHE_USER do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share diff --git a/devel/RTx-Shredder/Makefile b/devel/RTx-Shredder/Makefile index c59c08d51c0..32713d54f5f 100644 --- a/devel/RTx-Shredder/Makefile +++ b/devel/RTx-Shredder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/05/01 09:42:13 cube Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/04 20:54:37 jlam Exp $ # DISTNAME= RTx-Shredder-0.03 @@ -15,6 +15,8 @@ BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite .include "../../devel/rt3/dirs.mk" +PKG_USERS_VARS+= APACHE_USER + OWN_DIRS_PERMS+= ${RT_VAR_DIR}/data/RTx-Shredder ${APACHE_USER} ${APACHE_GROUP} 0770 PLIST_SUBST+= RT_SHARE_DIR=share/rt3 diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 318e1c9fb63..4a97aacc2c8 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/06/15 14:20:10 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:37 jlam Exp $ # DISTNAME= bugzilla-2.22.2 @@ -31,7 +31,10 @@ BZ_WEB_GROUP?= ${APACHE_GROUP} SENDMAIL?= /usr/sbin/sendmail CVS?= /usr/bin/cvs -BUILD_DEFS+= BZ_WEB_GROUP SENDMAIL APACHE_USER APACHE_GROUP CVS +BUILD_DEFS+= SENDMAIL CVS + +PKG_USERS_VARS+= APACHE_USER +PKG_GROUPS_VARS+= BZ_WEB_GROUP APACHE_GROUP MESSAGE_SUBST+= BZDIR=${BZDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index d3606b8a318..f83a36a89c4 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/02/17 20:59:47 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:37 jlam Exp $ DISTNAME= cvsd-1.0.13 CATEGORIES= devel scm @@ -24,6 +24,8 @@ CVSD_GROUP?= cvsd PKG_USERS= ${CVSD_USER}:${CVSD_GROUP} PKG_GECOS.${CVSD_USER}= CVS wrapper PKG_GROUPS= ${CVSD_GROUP} +PKG_GROUPS_VARS+= CVSD_GROUP +PKG_USERS_VARS+= CVSD_USER pre-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index dd384e5e124..6012efc7680 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/10/12 17:25:18 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2007/07/04 20:54:38 jlam Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 2 @@ -17,6 +17,8 @@ DISTCC_USER?= distcc DISTCC_GROUP?= distcc PKG_GROUPS= ${DISTCC_GROUP} PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q} +PKG_GROUPS_VARS+= DISTCC_GROUP +PKG_USERS_VARS+= DISTCC_USER DISTCC_PIDDIR?= ${VARBASE}/run/distccd OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER:Q} ${DISTCC_GROUP:Q} 0750 diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile index 362bfde7135..70e7e8d484a 100644 --- a/devel/mantis/Makefile +++ b/devel/mantis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/06/15 18:08:25 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2007/07/04 20:54:38 jlam Exp $ DISTNAME= mantis-1.0.6 CATEGORIES= devel www @@ -26,7 +26,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-jpgraph-[0-9]*:../../graphics/php-jpgraph APACHE_USER?= www -BUILD_DEFS+= APACHE_USER +PKG_USERS_VARS+=APACHE_USER MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} MANTIS_HOME= ${PREFIX}/share/mantis diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile index b488acad535..b5d1706d619 100644 --- a/devel/monotone-server/Makefile +++ b/devel/monotone-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/06/24 20:55:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2007/07/04 20:54:38 jlam Exp $ # DISTNAME= monotone-server-0.35 @@ -24,8 +24,6 @@ PKG_SYSCONFSUBDIR= monotone-server OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/keys \ ${MONOTONE_USER} ${MONOTONE_GROUP} 700 -BUILD_DEFS+= MONOTONE_GROUP MONOTONE_USER - EXAMPLEDIR= ${PREFIX}/share/examples/monotone-server CONF_FILES_PERMS= ${EXAMPLEDIR}/hooks.conf \ ${PKG_SYSCONFDIR}/hooks.conf \ @@ -40,6 +38,9 @@ CONF_FILES_PERMS+= ${EXAMPLEDIR}/write-permissions \ PKG_GROUPS= ${MONOTONE_GROUP} PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP} +PKG_GROUPS_VARS+= MONOTONE_GROUP +PKG_USERS_VARS+= MONOTONE_USER + .include "../../mk/bsd.prefs.mk" PKG_GECOS.${MONOTONE_USER}= Monotone dedicated server diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile index 2cafd8fbc19..e0f273c6cac 100644 --- a/devel/p4d/Makefile +++ b/devel/p4d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/08/31 08:37:53 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2007/07/04 20:54:38 jlam Exp $ # DISTNAME= p4d @@ -10,7 +10,7 @@ P4BINONLY= # defined .include "../../devel/p4/Makefile.common" -BUILD_DEFS+= P4USER P4GROUP P4ROOT P4PORT +BUILD_DEFS+= P4ROOT P4PORT FILES_SUBST+= P4USER=${P4USER:Q} FILES_SUBST+= P4ROOT=${P4ROOT:Q} @@ -21,6 +21,9 @@ FILES_SUBST+= P4JOURNAL=${P4JOURNAL:Q} PKG_GROUPS?= ${P4GROUP} PKG_USERS?= ${P4USER}:${P4GROUP} +PKG_GROUPS_VARS+= P4GROUP +PKG_USERS_VARS+= P4USER + PKG_GECOS.${P4USER}?= Perforce Server PKG_HOME.${P4USER}?= ${P4ROOT} diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common index 6b76659b678..4f6100900a7 100644 --- a/devel/rt-mysql/Makefile.common +++ b/devel/rt-mysql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2007/02/22 19:26:25 wiz Exp $ +# $NetBSD: Makefile.common,v 1.15 2007/07/04 20:54:38 jlam Exp $ DISTNAME= rt-2-0-15 CATEGORIES= devel @@ -24,6 +24,9 @@ RT_DB_PASS?= changemeplease RT_WEB_USER?= nobody RT_WEB_GROUP?= nobody +PKG_GROUPS_VARS+= RT_GROUP RT_WEB_GROUP +PKG_USERS_VARS+= RT_DB_USER RT_WEB_USER + PKGDIR= ${.CURDIR}/../../devel/rt-mysql DISTINFO_FILE= ${PKGDIR}/distinfo FILESDIR= ${PKGDIR}/files diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile index 783e0260d1c..e56ed85e728 100644 --- a/devel/rt3/Makefile +++ b/devel/rt3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/05/19 14:05:45 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:39 jlam Exp $ DISTNAME= rt-3.4.5 PKGREVISION= 4 @@ -107,6 +107,8 @@ NO_BUILD= yes PKG_SYSCONFSUBDIR= rt3 PKG_GROUPS= ${RT_GROUP} +PKG_GROUPS_VARS+= RT_GROUP APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER CONFIGURE_ARGS+= --enable-layout=pkgsrc CONFIGURE_ARGS+= --with-rt-group=${RT_GROUP:Q} diff --git a/devel/rt3/options.mk b/devel/rt3/options.mk index c8ce377c23d..3d317947dcb 100644 --- a/devel/rt3/options.mk +++ b/devel/rt3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2006/10/01 18:44:57 rillig Exp $ +# $NetBSD: options.mk,v 1.4 2007/07/04 20:54:39 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rt PKG_OPTIONS_REQUIRED_GROUPS= backend frontend @@ -17,4 +17,4 @@ PKG_OPTIONS_LEGACY_OPTS= backend-mysql:mysql backend-pgsql:pgsql \ # Other options RT_GROUP?= rt -BUILD_DEFS+= RT_GROUP +PKG_GROUPS_VARS+= RT_GROUP diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile index ff3b6452ac9..6f5a8e2e7cc 100644 --- a/inputmethod/canna-server/Makefile +++ b/inputmethod/canna-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:37 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2007/07/04 20:54:39 jlam Exp $ PKGREVISION= 2 CANNA_MODULE= server @@ -7,7 +7,6 @@ CANNA_MODULE= server INSTALL_TARGET= instserver -BUILD_DEFS+= CANNA_USER CANNA_GROUP MESSAGE_SUBST+= CANNA_USER=${CANNA_USER} MESSAGE_SUBST+= CANNA_GROUP=${CANNA_GROUP} diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common index 562d0f2a8d7..ea939821820 100644 --- a/inputmethod/canna/Makefile.common +++ b/inputmethod/canna/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2006/07/05 04:48:28 jlam Exp $ +# $NetBSD: Makefile.common,v 1.17 2007/07/04 20:54:39 jlam Exp $ # # Canna common makefile. # @@ -24,6 +24,9 @@ USE_IMAKE= yes CANNA_SPOOL= ${VARBASE}/spool/canna CANNA_MODE= 0755 +PKG_GROUPS_VARS+= CANNA_GROUP +PKG_USERS_VARS+= CANNA_USER + # XXX IPv6 support. To be done. #BUILD_DEFS+= USE_INET6 #.include "../../mk/bsd.prefs.mk" diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common index 89aebcbdcdd..e92b80e2ba7 100644 --- a/inputmethod/ja-freewnn-lib/Makefile.common +++ b/inputmethod/ja-freewnn-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2006/07/05 06:53:13 jlam Exp $ +# $NetBSD: Makefile.common,v 1.13 2007/07/04 20:54:39 jlam Exp $ # DISTNAME= FreeWnn-1.10 @@ -21,6 +21,8 @@ WNNOWNER?= ${FREEWNN_USER} SEDSCRIPT+= -e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|' SEDSCRIPT+= -e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${IMDICTDIR}/wnn/$$(\1WNNLANG)|' +PKG_USERS_VARS+= WNNOWNER FREEWNN_USER + .if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER") MAKE_ENV+= "WNN_TARGET=SERVER" SEDSCRIPT+= -e 's|$$([CK]*WNNJLIBSRC)/lib\([ck]*wnn\).a|-l\1|' diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile index f233f69ba87..880ca0a7691 100644 --- a/inputmethod/ja-freewnn-server-bin/Makefile +++ b/inputmethod/ja-freewnn-server-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/07/05 06:53:13 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2007/07/04 20:54:40 jlam Exp $ # PKGNAME= ja-FreeWnn-server-bin-1.10 @@ -24,10 +24,12 @@ RCD_SCRIPTS= ja_freewnn FREEWNN_USER?= wnn FREEWNN_GROUP?= jserver -BUILD_DEFS+= FREEWNN_USER FREEWNN_GROUP PKG_GROUPS= ${FREEWNN_GROUP} PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP} +PKG_GROUPS_VARS+= FREEWNN_GROUP +PKG_USERS_VARS+= FREEWNN_USER + .include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" .include "../../inputmethod/ja-freewnn-lib/Makefile.common" diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile index d2dfb0d88c8..0361596895b 100644 --- a/inputmethod/sj3-server-bin/Makefile +++ b/inputmethod/sj3-server-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/07/05 04:55:24 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/07/04 20:54:40 jlam Exp $ # DISTNAME= sj3-2.0.1.20 @@ -31,6 +31,9 @@ FILES_SUBST+= SJ3GROUP=${SJ3GROUP:Q} PKG_GROUPS+= ${SJ3GROUP} PKG_USERS+= ${SJ3OWNER}:${SJ3GROUP} +PKG_GROUPS_VARS+= SJ3GROUP +PKG_USERS_VARS+= SJ3USER + MAKE_DIRS+= ${IMDICTDIR} OWN_DIRS+= ${IMDICTDIR}/sj3 OWN_DIRS_PERMS+= ${IMDICTDIR}/sj3/user ${SJ3OWNER} ${SJ3GROUP} 0755 diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 3c4547025fb..7648fddaf0b 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2007/06/17 22:06:33 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2007/07/04 20:54:40 jlam Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-readdir-r CONFIGURE_ARGS+= --enable-readdir_r .endif -BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR +BUILD_DEFS+= CLAMAV_DBDIR FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q} MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} @@ -41,6 +41,9 @@ RCD_SCRIPTS= clamd freshclamd PKG_GROUPS+= ${CLAMAV_GROUP} PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP} +PKG_GROUPS_VARS+= CLAMAV_GROUP +PKG_USERS_VARS+= CLAMAV_USER + EGDIR= ${PREFIX}/share/examples/clamav FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR:Q} diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile index 7a5c5221b1c..8afc0d73874 100644 --- a/mail/clamsmtp/Makefile +++ b/mail/clamsmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/06/15 09:47:06 martti Exp $ +# $NetBSD: Makefile,v 1.33 2007/07/04 20:54:40 jlam Exp $ DISTNAME= clamsmtp-1.8 PKGREVISION= 3 @@ -26,7 +26,7 @@ CONF_FILES= ${EGDIR}/clamsmtpd.conf \ INSTALLATION_DIRS= share/examples/${PKGBASE} -BUILD_DEFS+= CLAMAV_USER +PKG_USERS_VARS+= CLAMAV_USER post-install: ${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${EGDIR} diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common index acc3a8dedf3..0ed0675b47d 100644 --- a/mail/courier-mta/Makefile.common +++ b/mail/courier-mta/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2007/06/07 07:50:57 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.4 2007/07/04 20:54:41 jlam Exp $ # # Package Makefiles should include this file after setting PKGNAME and # PKG_SUPPORTED_OPTIONS. @@ -23,6 +23,9 @@ COURIER_FILE_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0644 COURIER_DIR_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755 COURIER_SCRIPT_PERMS= ${COURIER_USER} ${COURIER_GROUP} 0755 +PKG_GROUPS_VARS+= COURIER_GROUP +PKG_USERS_VARS+= COURIER_USER + FILES_SUBST+= COURIER_STATEDIR=${COURIER_STATEDIR:Q} .include "../../security/courier-authlib/Makefile.common" diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk index 116e2f12894..0e271ec1c3a 100644 --- a/mail/courier-mta/options.mk +++ b/mail/courier-mta/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/06/19 21:29:10 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2007/07/04 20:54:41 jlam Exp $ # Global and legacy options @@ -99,6 +99,8 @@ CONF_FILES_PERMS+= ${EGDIR}/module.local \ COURIER_TRANSPORTS+= uucp PKG_GROUPS+= ${UUCP_GROUP} PKG_USERS+= ${UUCP_USER}:${UUCP_GROUP} +PKG_GROUPS_VARS+= UUCP_GROUP +PKG_USERS_VARS+= UUCP_USER PLIST_SRC+= ${PKGDIR}/PLIST.uucp CONF_FILES_PERMS+= ${EGDIR}/module.uucp \ diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 5a69753de28..ec4fc57657b 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2007/06/08 13:11:55 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2007/07/04 20:54:41 jlam Exp $ DISTNAME= cyrus-imapd-2.2.13 PKGREVISION= 4 @@ -23,7 +23,8 @@ BDB_ACCEPTED= db4 db3 CYRUS_USER?= cyrus CYRUS_GROUP?= mail -BUILD_DEFS+= CYRUS_USER CYRUS_GROUP +PKG_GROUPS_VARS+= CYRUS_GROUP +PKG_USERS_VARS+= CYRUS_USER FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q} diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 79375eb2fd9..56db2952bfc 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2006/10/04 21:47:16 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2007/07/04 20:54:41 jlam Exp $ DISTNAME= cyrus-imapd-2.1.18 PKGREVISION= 3 @@ -25,7 +25,8 @@ USE_TOOLS+= autoconf213 CYRUS_USER?= cyrus CYRUS_GROUP?= mail -BUILD_DEFS+= CYRUS_USER CYRUS_GROUP +PKG_GROUPS_VARS+= CYRUS_GROUP +PKG_USERS_VARS+= CYRUS_USER FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q} diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 5b5509dd907..88646012f2d 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2007/06/16 15:01:17 ghen Exp $ +# $NetBSD: Makefile,v 1.98 2007/07/04 20:54:41 jlam Exp $ DISTNAME= dovecot-1.0.1 CATEGORIES= mail @@ -28,6 +28,8 @@ DOVECOT_USER?= dovecot DOVECOT_GROUP?= dovecot PKG_GROUPS= ${DOVECOT_GROUP} PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP} +PKG_GROUPS_VARS+= DOVECOT_GROUP +PKG_USERS_VARS+= DOVECOT_USER PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 2a17faa6ec5..63a544d2a9a 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2007/05/07 09:29:54 adrianp Exp $ +# $NetBSD: Makefile,v 1.57 2007/07/04 20:54:42 jlam Exp $ DISTNAME= dspam-3.8.0 CATEGORIES= mail @@ -32,16 +32,14 @@ SUBST_SED.cgi+= -e "s|\"\\/\";|\"${DSPAM_WWWHOME}\";|" SUBST_SED.cgi+= -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|" SUBST_MESSAGE.cgi= Fixing paths and default options. -BUILD_DEFS+= DSPAM_HOME VARBASE APACHE_USER APACHE_GROUP +BUILD_DEFS+= DSPAM_HOME VARBASE BUILD_DEFS+= DSPAM_SIGNATURE_LIFE -BUILD_DEFS+= DSPAM_USER DSPAM_GROUP BUILD_DEFS+= DSPAM_BINMODE BUILD_DEFS+= DSPAM_LOGDIR BUILD_DEFS+= DSPAM_LOGFILE BUILD_DEFS+= DSPAM_DOMAIN BUILD_DEFS+= DSPAM_WWWHOME BUILD_DEFS+= DSPAM_PIDDIR -BUILD_DEFS+= DSPAM_WWWUSER DSPAM_WWWGROUP .include "../../mk/bsd.prefs.mk" @@ -59,6 +57,9 @@ DSPAM_PIDDIR?= ${VARBASE}/run/dspam DSPAM_WWWUSER?= ${APACHE_USER} DSPAM_WWWGROUP?= ${APACHE_GROUP} +PKG_GROUPS_VARS+= DSPAM_GROUP DSPAM_WWWGROUP +PKG_USERS_VARS+= DSPAM_USER DSPAM_WWWUSER + CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE:Q} CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \ --with-dspam-home-owner=${DSPAM_USER:Q} \ diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 7142bcf112a..691cf55bdf0 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2007/06/24 10:55:40 abs Exp $ +# $NetBSD: Makefile,v 1.85 2007/07/04 20:54:42 jlam Exp $ DISTNAME= exim-4.67 CATEGORIES= mail net @@ -22,11 +22,14 @@ MAKE_FLAGS+= FULLECHO='' .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB EXIM_MAX_INCLUDE_SIZE +BUILD_DEFS+= EXIM_DB EXIM_MAX_INCLUDE_SIZE PKG_GROUPS= ${EXIM_GROUP} PKG_USERS= ${EXIM_USER}:${EXIM_GROUP} +PKG_GROUPS_VARS+= EXIM_GROUP +PKG_USERS_VARS+= EXIM_USER + PKG_GECOS.${EXIM_USER}= Exim mail server user PKG_HOME.${EXIM_USER}= ${VARBASE}/mail PKG_SHELL.${EXIM_USER}= ${NOLOGIN} diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index f05425048c9..d1819bd3ebd 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2007/03/24 19:21:26 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2007/07/04 20:54:43 jlam Exp $ DISTNAME= exim-3.36 PKGREVISION= 7 @@ -13,8 +13,6 @@ COMMENT= The Exim mail transfer agent, a replacement for sendmail CONFLICTS+= exim-exiscan-[0-9]* - -BUILD_DEFS+= EXIM_USER EXIM_GROUP BUILD_DEFS+= EXIM_DB.mysql EXIM_DB.pgsql PKG_SYSCONFSUBDIR?= exim @@ -31,6 +29,9 @@ OWN_DIRS_PERMS+= /var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750 PKG_GROUPS= ${EXIM_GROUP} PKG_USERS= ${EXIM_USER}:${EXIM_GROUP} +PKG_GROUPS_VARS+= EXIM_GROUP +PKG_USERS_VARS+= EXIM_USER + PKG_UID.${EXIM_USER}?= 8 PKG_GECOS.${EXIM_USER}= Exim mail server user PKG_HOME.${EXIM_USER}= ${VARBASE}/mail diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile index 3c59a7510b5..bd55f7a8580 100644 --- a/mail/freepops/Makefile +++ b/mail/freepops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/06/28 18:50:06 schmonz Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:43 jlam Exp $ # DISTNAME= freepops-0.2.5 @@ -47,6 +47,8 @@ PKG_USERS= ${FREEPOPSD_USER}:${FREEPOPSD_GROUP} PKG_GECOS.${FREEPOPSD_USER}= freepopsd POP3 user FILES_SUBST+= FREEPOPSD_USER=${FREEPOPSD_USER:Q} FILES_SUBST+= FREEPOPSD_GROUP=${FREEPOPSD_GROUP:Q} +PKG_GROUPS_VARS+= FREEPOPSD_GROUP +PKG_USERS_VARS+= FREEPOPSD_USER .include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/mail/gld/Makefile b/mail/gld/Makefile index 508c69a3f06..04e14e40030 100644 --- a/mail/gld/Makefile +++ b/mail/gld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2007/04/18 17:06:16 ghen Exp $ +# $NetBSD: Makefile,v 1.23 2007/07/04 20:54:43 jlam Exp $ # DISTNAME= gld-1.7 @@ -24,7 +24,8 @@ GLD_GROUP?= gld PKG_GROUPS= ${GLD_GROUP} PKG_USERS= ${GLD_USER}:${GLD_GROUP} PKG_GECOS.${GLD_USER}= Greylisting Daemon user -BUILD_DEFS+= GLD_USER GLD_GROUP +PKG_GROUPS_VARS+= GLD_GROUP +PKG_USERS_VARS+= GLD_USER SUBST_CLASSES+= gld users SUBST_STAGE.gld= post-patch diff --git a/mail/imp/Makefile b/mail/imp/Makefile index b1c7f5ccd71..d31454a5772 100644 --- a/mail/imp/Makefile +++ b/mail/imp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2007/03/18 12:15:48 adrianp Exp $ +# $NetBSD: Makefile,v 1.42 2007/07/04 20:54:44 jlam Exp $ DISTNAME= imp-h3-${IMPVER} PKGNAME= imp-${IMPVER} @@ -24,7 +24,8 @@ HORDEDIR= ${PREFIX}/share/horde IMPDIR= ${HORDEDIR}/imp IMPVER= 4.1.4 PAXDIRS= lib locale po scripts templates themes -BUILD_DEFS+= APACHE_USER + +PKG_USERS_VARS+= APACHE_USER MESSAGE_SUBST+= IMPDIR=${IMPDIR:Q} MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile index 2b642183b65..ff92fae3f1d 100644 --- a/mail/ingo/Makefile +++ b/mail/ingo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/03/18 12:09:33 adrianp Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/04 20:54:44 jlam Exp $ DISTNAME= ingo-h3-${INGOVER} PKGNAME= ingo-${INGOVER} @@ -33,6 +33,8 @@ SUBST_FILES.files= ingo.conf.dist SUBST_SED.files= -e "s|@INGODIR@|${INGODIR}|g" SUBST_MESSAGE.files= Fixing configuration files. +PKG_USERS_VARS+= APACHE_USER + CONF_FILES= ${EGDIR}/ingo.conf ${PKG_SYSCONFDIR}/ingo.conf CONF_FILES_PERMS+= ${INGODIR}/config/conf.xml.dist \ ${INGODIR}/config/conf.xml \ diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index af910f41f93..405be6de389 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2007/03/28 20:55:58 bouyer Exp $ +# $NetBSD: Makefile,v 1.48 2007/07/04 20:54:44 jlam Exp $ DISTNAME= mailman-2.1.9 CATEGORIES= mail www @@ -35,6 +35,9 @@ MESSAGE_SUBST+= MAILMAN_USER=${MAILMAN_USER} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//} +PKG_GROUPS_VARS+= MAILMAN_GROUP MAILMAN_CGIGROUP MAILMAN_MAILGROUP +PKG_USERS_VARS+= MAILMAN_USER + PKG_GROUPS= ${MAILMAN_GROUP} PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP} @@ -85,10 +88,6 @@ CONFIGURE_ARGS+= --with-mailhost=localhost CONFIGURE_ARGS+= --with-urlhost=localhost BUILD_DEFS+= MAILMAN_DATADIR -BUILD_DEFS+= MAILMAN_USER -BUILD_DEFS+= MAILMAN_GROUP -BUILD_DEFS+= MAILMAN_CGIGROUP -BUILD_DEFS+= MAILMAN_MAILGROUP BUILD_DEFS+= MAILMAN_CGIEXT SUBST_CLASSES+= paths diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index 0039bf86394..fc6b6cdae13 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/02/22 19:26:41 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2007/07/04 20:54:44 jlam Exp $ DISTNAME= majordomo-1.94.5 PKGREVISION= 2 @@ -26,6 +26,9 @@ MAJORDOMO_HOMEDIR?= /home MAJORDOMO_USER?= majordom MAJORDOMO_GROUP?= majordom +PKG_GROUPS_VARS+= MAJORDOMO_GROUP +PKG_USERS_VARS+= MAJORDOMO_USER + MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \ MAJORDOMO_USER=${MAJORDOMO_USER} \ MAJORDOMO_GROUP=${MAJORDOMO_GROUP} @@ -41,7 +44,7 @@ EXDIRS= archives archives/example-l digests \ EXFILES= example-l.passwd example-l.info EXLISTS= example-l example-l-digest -BUILD_DEFS+= MAJORDOMO_USER MAJORDOMO_GROUP MAJORDOMO_TMPDIR +BUILD_DEFS+= MAJORDOMO_TMPDIR USERGROUP_PHASE= configure PKG_GROUPS= ${MAJORDOMO_GROUP} diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index b4af5f3f627..3f39a22c71c 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2007/03/14 11:21:33 markd Exp $ +# $NetBSD: Makefile,v 1.37 2007/07/04 20:54:45 jlam Exp $ DISTNAME= mimedefang-2.61 CATEGORIES= mail @@ -30,8 +30,10 @@ DEFANG_GROUP?= defang PKG_GROUPS= ${DEFANG_GROUP} PKG_USERS= ${DEFANG_USER}:${DEFANG_GROUP} -BUILD_DEFS+= PKG_SYSCONFSUBDIR DEFANG_SPOOLDIR -BUILD_DEFS+= DEFANG_USER DEFANG_GROUP VARBASE +PKG_GROUPS_VARS+= DEFANG_GROUP +PKG_USERS_VARS+= DEFANG_USER + +BUILD_DEFS+= PKG_SYSCONFSUBDIR DEFANG_SPOOLDIR VARBASE EGDIR= ${PREFIX}/share/examples/mimedefang SHAREDIR= ${PREFIX}/share/mimedefang diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index e46785148ba..f95b53273bd 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/03/24 06:49:02 schmonz Exp $ +# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:45 jlam Exp $ DISTNAME= nullmailer-1.03 CATEGORIES= mail @@ -23,6 +23,8 @@ NULLMAILER_GROUP?= nullmail NULLMAILER_USER?= nullmail PKG_GROUPS= ${NULLMAILER_GROUP} PKG_USERS= ${NULLMAILER_USER}:${NULLMAILER_GROUP} +PKG_GROUPS_VARS+= NULLMAILER_GROUP +PKG_USERS_VARS+= NULLMAILER_USER MAKE_ENV+= NULLMAILER_GROUP=${NULLMAILER_GROUP:Q} MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER:Q} diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index f0686ca8908..e6919b1858e 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2007/01/07 09:13:59 rillig Exp $ +# $NetBSD: Makefile,v 1.48 2007/07/04 20:54:45 jlam Exp $ # DISTNAME= popa3d-1.0.2 @@ -18,6 +18,9 @@ POPA3D_GROUP?= popa3d PKG_GROUPS= ${POPA3D_GROUP} PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP} +PKG_GROUPS_VARS+= POPA3D_GROUP +PKG_USERS_VARS+= POPA3D_USER + RCD_SCRIPTS= popa3d FILES_SUBST+= POPA3D_USER=${POPA3D_USER:Q} diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile index 56453c53217..c76cdf88fe3 100644 --- a/mail/postgrey/Makefile +++ b/mail/postgrey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/06/08 12:25:04 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2007/07/04 20:54:45 jlam Exp $ # DISTNAME= postgrey-1.27 @@ -32,10 +32,12 @@ EGDIR= share/examples/${PKGBASE} RCD_SCRIPTS= postgrey PKG_GROUPS= ${POSTGREY_GROUP} PKG_USERS= ${POSTGREY_USER}:${POSTGREY_GROUP} +PKG_GROUPS_VARS+= POSTGREY_GROUP +PKG_USERS_VARS+= POSTGREY_USER PKG_GECOS.${POSTGREY_USER}= Postgrey Daemon User -BUILD_DEFS+= POSTGREY_USER POSTGREY_GROUP POSTGREY_DBDIR VARBASE +BUILD_DEFS+= POSTGREY_DBDIR VARBASE .for i in postgrey_whitelist_clients postgrey_whitelist_recipients CONF_FILES+= ${PREFIX}/${EGDIR}/${i} \ diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile index 648f91fead9..74da93512dc 100644 --- a/mail/prayer/Makefile +++ b/mail/prayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2007/06/15 23:28:16 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2007/07/04 20:54:46 jlam Exp $ # DISTNAME= prayer-1.0.18 @@ -15,7 +15,9 @@ PRAYER_GROUP= prayer PKG_GROUPS= ${PRAYER_GROUP} PKG_USERS= ${PRAYER_USER}:${PRAYER_GROUP} -BUILD_DEFS+= PRAYER_USER PRAYER_GROUP VARBASE +PKG_GROUPS_VARS+= PRAYER_GROUP +PKG_USERS_VARS+= PRAYER_USER +BUILD_DEFS+= VARBASE MAKE_ENV+= EGDIR=${EGDIR:Q} MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 52750e96e92..78f9df9bcff 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2007/03/24 19:21:27 joerg Exp $ +# $NetBSD: Makefile,v 1.59 2007/07/04 20:54:46 jlam Exp $ # DISTNAME= qpopper${VERSION} @@ -26,8 +26,9 @@ QPOPPER_USER?= pop QPOPPER_GROUP?= mail QPOPPER_APOP_AUTH?= ${PKG_SYSCONFDIR}/apop.auth -BUILD_DEFS+= QPOPPER_USER QPOPPER_GROUP BUILD_DEFS+= QPOPPER_APOP_AUTH +PKG_GROUPS_VARS+= QPOPPER_GROUP +PKG_USERS_VARS+= QPOPPER_USER .if defined(QPOPPER_SPOOL_DIR) CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR:Q} diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index e69b3ef61fa..58062ad1adc 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/06/05 20:25:26 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2007/07/04 20:54:47 jlam Exp $ # DISTNAME= roundcube-0.1-20070528 @@ -19,7 +19,10 @@ WRKSRC= ${WRKDIR}/roundcubemail PKG_SYSCONFSUBDIR?= httpd -BUILD_DEFS+= APACHE_USER APACHE_GROUP VARBASE +PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER +BUILD_DEFS+= VARBASE + RCDIR= ${PREFIX}/share/roundcube EGDIR= ${PREFIX}/share/examples/roundcube DOCDIR= ${PREFIX}/share/doc/roundcube diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 3f235d423c2..54f702aa31f 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2007/05/22 11:13:27 taca Exp $ +# $NetBSD: Makefile,v 1.89 2007/07/04 20:54:47 jlam Exp $ DISTNAME= squirrelmail-1.4.10a PKGREVISION= 2 @@ -21,7 +21,10 @@ USE_LANGUAGES= # empty NO_BUILD= yes USE_TOOLS+= perl:run REPLACE_PERL+= config/conf.pl -BUILD_DEFS+= APACHE_GROUP APACHE_USER VARBASE + +PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER +BUILD_DEFS+= VARBASE .include "options.mk" diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 61b1374a19f..41f5548d5cf 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/06/15 18:15:19 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2007/07/04 20:54:47 jlam Exp $ # DISTNAME= sympa-5.2.4 @@ -83,8 +83,6 @@ SYMPA_USER?= sympa SYMPA_GROUP?= sympa SYMPA_VARBASE?= ${HOMEBASE}/sympa -BUILD_DEFS+= SYMPA_USER SYMPA_GROUP SYMPA_VARBASE - SYMPA_PREFIX= ${PREFIX}/sympa SYMPA_SPOOL= ${SYMPA_VARBASE}/spool SYMPA_BIN= ${SYMPA_PREFIX}/bin @@ -94,6 +92,10 @@ PKG_USERS= ${SYMPA_USER}:${SYMPA_GROUP} PKG_HOME.${SYMPA_USER}= ${SYMPA_VARBASE} +PKG_GROUPS_VARS+= SYMPA_GROUP +PKG_USERS_VARS+= SYMPA_USER +BUILD_DEFS+= SYMPA_VARBASE + .for d in sympa sympa/create_list_templates sympa/general_task_models \ sympa/scenari sympa/task_models sympa/templates sympa/wws_templates OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${d} ${SYMPA_USER} ${SYMPA_GROUP} 755 diff --git a/mail/turba/Makefile b/mail/turba/Makefile index 79ef7715dbc..c85f07efac6 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/03/18 12:14:05 adrianp Exp $ +# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:47 jlam Exp $ DISTNAME= turba-h3-${TURBAVER} PKGNAME= turba-${TURBAVER} @@ -28,6 +28,8 @@ REPLACE_PERL+= ${WRKSRC}/scripts/ldap/addou.pl PKG_SYSCONFSUBDIR?= httpd +PKG_USERS_VARS+= APACHE_USER + SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= turba.conf.dist diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 4b8724ce05a..8fe0868380e 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2007/01/31 00:04:12 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2007/07/04 20:54:48 jlam Exp $ DISTNAME= jitterbug-1.6.2 PKGREVISION= 1 @@ -49,6 +49,9 @@ JB_FQHOSTNAME= ${JB_LONGNAME} .endif JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME} +PKG_GROUPS_VARS+= JB_GROUP +PKG_USERS_VARS+= JB_USER + HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX:Q} diff --git a/mk/unprivileged.mk b/mk/unprivileged.mk index 0b3685566b7..f12d19bd3dd 100644 --- a/mk/unprivileged.mk +++ b/mk/unprivileged.mk @@ -1,4 +1,4 @@ -# $NetBSD: unprivileged.mk,v 1.11 2007/06/06 12:41:53 rillig Exp $ +# $NetBSD: unprivileged.mk,v 1.12 2007/07/04 20:54:48 jlam Exp $ # # This file collects definitions that are useful when using pkgsrc as an # unprivileged (non-root) user. It is included automatically by the @@ -17,7 +17,15 @@ # Specifies the user name (or uid) that will be used to install # files. -.if (defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss])) || ${_USE_DESTDIR} == "user-destdir" +_UNPRIVILEGED= # empty +.if defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss]) +_UNPRIVILEGED+= unprivileged +.endif +.if (${_USE_DESTDIR} == "user-destdir") +_UNPRIVILEGED+= user-destdir +.endif + +.if !empty(_UNPRIVILEGED) # Guess which user/group has to be used. . if !defined(UNPRIVILEGED_USER) || empty(UNPRIVILEGED_USER) @@ -27,7 +35,8 @@ UNPRIVILEGED_USER!= ${ID} -n -u UNPRIVILEGED_GROUP!= ${ID} -n -g . endif -. if ${_USE_DESTDIR} == "user-destdir" && (!defined(UNPRIVILEGED) || empty(UNPRIVILEGED:M[Yy][Ee][Ss])) +. if empty(_UNPRIVILEGED:Munprivileged) && !empty(_UNPRIVILEGED:Muser-destdir) +# Only do following for privileged, user-destdir builds. _SU_ROOT_USER:= ${ROOT_USER} REAL_ROOT_USER:= ${ROOT_USER} REAL_ROOT_GROUP:= ${ROOT_GROUP} @@ -53,9 +62,32 @@ DOCOWN= ${UNPRIVILEGED_USER} # when overwriting files if they are not writable. BINMODE= 755 NONBINMODE= 644 + +. if !empty(_UNPRIVILEGED:Munprivileged) && empty(_UNPRIVILEGED:Muser-destdir) +# Only do the following for unprivileged, normal builds. + +# PKG_USERS_VARS is a list of variables that hold bare user names, e.g +# APACHE_USER, etc. +# +# PKG_GROUPS_VARS is a list of variables that hold bare group names, e.g +# UUCP_GROUP, etc. +# +PKG_USERS_VARS?= # empty +PKG_GROUPS_VARS?= # empty +BUILD_DEFS+= ${PKG_USERS_VARS} ${PKG_GROUPS_VARS} + +# Override per-package, custom users and groups. +. for _var_ in ${PKG_USERS_VARS} +${_var_}= ${UNPRIVILEGED_USER} +. endfor +. for _var_ in ${PKG_GROUPS_VARS} +${_var_}= ${UNPRIVILEGED_GROUP} +. endfor +. endif + .endif -.if (defined(UNPRIVILEGED) && !empty(UNPRIVILEGED:M[Yy][Ee][Ss])) +.if !empty(_UNPRIVILEGED:Munprivileged) # As a regular user, creation of other users and groups won't work, so # disable this step by default. PKG_CREATE_USERGROUP= NO @@ -67,5 +99,4 @@ SU_CMD= ${SH} -c # Do not attempt to modify /etc/shells as a regular user. PKG_REGISTER_SHELLS= NO - .endif 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} diff --git a/news/inn/Makefile b/news/inn/Makefile index 0d38ffb2b5b..6f457d95a22 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2006/10/14 08:08:28 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2007/07/04 20:54:54 jlam Exp $ DISTNAME= inn-2.4.3 PKGREVISION= 1 @@ -15,7 +15,7 @@ CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]* .include "Makefile.common" BUILD_DEFS+= USE_INET6 -BUILD_DEFS+= INN_DATA_DIR INN_USER INN_GROUP +BUILD_DEFS+= INN_DATA_DIR FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q} GNU_CONFIGURE= YES @@ -42,6 +42,9 @@ CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT:Q} CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q} USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc +PKG_GROUPS_VARS+= INN_GROUP +PKG_USERS_VARS+= INN_USER + PKG_GROUPS= ${INN_GROUP} PKG_USERS= ${INN_USER}:${INN_GROUP} PKG_GECOS.${INN_USER}= Internet\ News diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 1e6f4f9e3ca..9538ec31cd6 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/10/15 20:06:59 schwarz Exp $ +# $NetBSD: Makefile,v 1.36 2007/07/04 20:54:55 jlam Exp $ DISTNAME= leafnode-1.11.3.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -21,7 +21,7 @@ LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode # Default data dir, login and group are the same as used by inn # -BUILD_DEFS+= LEAFNODE_DATA_DIR LEAFNODE_GROUP LEAFNODE_USER +BUILD_DEFS+= LEAFNODE_DATA_DIR PKG_GROUPS= ${LEAFNODE_GROUP} PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP} LEAFNODE_HOME?= ${INN_DATA_DIR} @@ -30,6 +30,8 @@ PKG_GECOS.${LEAFNODE_USER}= Internet News PKG_HOME.${LEAFNODE_USER}= ${LEAFNODE_DATA_DIR} PKG_SHELL.${LEAFNODE_USER}= ${SH} +PKG_GROUPS_VARS+= LEAFNODE_GROUP +PKG_USERS_VARS+= LEAFNODE_USER BUILD_DEFS+= USE_INET6 FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q} diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index 7626f4cd073..cf8b3597e52 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/06/08 12:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2007/07/04 20:54:55 jlam Exp $ # PKGNAME= sge-6.0.8 @@ -40,6 +40,8 @@ SGE_USER?= sgeadmin SGE_GROUP?= sgeadmin PKG_GROUPS= ${SGE_GROUP} PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator +PKG_GROUPS_VARS+= SGE_GROUP +PKG_USERS_VARS+= SGE_USER EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl diff --git a/print/cups/Makefile b/print/cups/Makefile index 2f69d549a69..0e5fcde80ac 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.123 2007/06/15 18:15:20 jlam Exp $ +# $NetBSD: Makefile,v 1.124 2007/07/04 20:54:55 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -91,7 +91,8 @@ CUPS_GROUP?= sys FILES_SUBST+= CUPS_USER=${CUPS_USER:Q} FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q} -BUILD_DEFS+= CUPS_USER CUPS_GROUP +PKG_GROUPS_VARS+= CUPS_GROUP +PKG_USERS_VARS+= CUPS_USER DOCDIR= ${PREFIX}/share/doc/cups EGDIR= ${PREFIX}/share/examples/cups diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index c8f556ffdb5..6e2fee00cb7 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/07/03 14:21:06 xtraeme Exp $ +# $NetBSD: Makefile,v 1.33 2007/07/04 20:54:56 jlam Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -47,7 +47,9 @@ DOCDIR= ${PREFIX}/share/doc/amavisd-new EGDIR= ${PREFIX}/share/examples/amavisd-new MESSAGE_SRC= ${PKGDIR}/MESSAGE -BUILD_DEFS+= AMAVIS_USER AMAVIS_GROUP AMAVIS_DIR AMAVIS_QUARANTINE +PKG_GROUPS_VARS+= AMAVIS_GROUP +PKG_USERS_VARS+= AMAVIS_USER +BUILD_DEFS+= AMAVIS_DIR AMAVIS_QUARANTINE FILES_SUBST+= AMAVIS_USER=${AMAVIS_USER:Q} FILES_SUBST+= AMAVIS_GROUP=${AMAVIS_GROUP:Q} FILES_SUBST+= AMAVIS_DIR=${AMAVIS_DIR:Q} diff --git a/security/base/Makefile b/security/base/Makefile index 25962166101..3ff38f4b19a 100644 --- a/security/base/Makefile +++ b/security/base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/06/30 13:47:38 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2007/07/04 20:54:56 jlam Exp $ # DISTNAME= base-1.3.6 @@ -33,10 +33,12 @@ MESSAGE_SUBST+= EGDIR=${EGDIR:Q} BASE_DIR=${BASE_DIR:Q} PAX_DIRS= admin help images includes languages scripts setup sql styles WWW_USER?= ${APACHE_USER} WWW_GROUP?= ${APACHE_GROUP} -BUILD_DEFS+= WWW_USER WWW_GROUP USE_TOOLS+= perl:run REPLACE_PERL+= scripts/base_maintenance.pl +PKG_GROUPS_VARS+= WWW_GROUP +PKG_USERS_VARS+= WWW_USER + CONF_FILES= ${EGDIR}/base.conf ${PKG_SYSCONFDIR}/base.conf CONF_FILES_PERMS= ${EGDIR}/base_conf.php ${BASE_DIR}/base_conf.php \ diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common index 9131c7feaf5..0bd034df792 100644 --- a/security/courier-authlib/Makefile.common +++ b/security/courier-authlib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2006/04/28 14:41:23 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2007/07/04 20:54:56 jlam Exp $ COURIER_USER?= courier COURIER_GROUP?= mail @@ -10,6 +10,9 @@ MESSAGE_SUBST+= COURIER_GROUP=${COURIER_GROUP:Q} PKG_GROUPS= ${COURIER_GROUP} PKG_USERS= ${COURIER_USER}:${COURIER_GROUP} +PKG_GROUPS_VARS+= COURIER_GROUP +PKG_USERS_VARS+= COURIER_USER + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER:Q} CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP:Q} diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 032f3b8571a..9657c9abebe 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2007/02/22 19:27:07 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2007/07/04 20:54:57 jlam Exp $ .include "Makefile.common" @@ -55,7 +55,8 @@ CYRUS_USER?= cyrus CYRUS_GROUP?= mail FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} -BUILD_DEFS+= CYRUS_USER CYRUS_GROUP +PKG_GROUPS_VARS+= CYRUS_GROUP +PKG_USERS_VARS+= CYRUS_USER PKG_GROUPS= ${CYRUS_GROUP} PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP} diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 19c45cd834a..280c1d71895 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/05/12 11:19:18 shannonjr Exp $ +# $NetBSD: Makefile,v 1.29 2007/07/04 20:54:57 jlam Exp $ # DISTNAME= dirmngr-1.0.0 @@ -19,6 +19,8 @@ DIRMNGR_USER?= dirmngr DIRMNGR_GROUP?= dirmngr PKG_GROUPS= ${DIRMNGR_GROUP} PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP} +PKG_GROUPS_VARS+= DIRMNGR_GROUP +PKG_USERS_VARS+= DIRMNGR_USER PKG_HOME.${DIRMNGR_USER}= ${VARBASE}/dirmngr diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index b836b494bac..6259ad95cb3 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2007/06/05 05:37:00 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2007/07/04 20:54:57 jlam Exp $ # DISTNAME= libprelude-0.9.14 PKGREVISION= 1 @@ -16,7 +16,10 @@ COMMENT= Provides the framework for using the Prelude system PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude -BUILD_DEFS+= PRELUDE_USER PRELUDE_GROUP VARBASE +PKG_GROUPS_VARS+= PRELUDE_GROUP +PKG_USERS_VARS+= PRELUDE_USER + +BUILD_DEFS+= VARBASE USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 78474dd63fc..4400982d4cb 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2007/02/22 19:27:08 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2007/07/04 20:54:57 jlam Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -44,6 +44,9 @@ INSTALL_TARGET= install-nokeys PLIST_SRC= # empty MESSAGE_SRC= ${.CURDIR}/MESSAGE +PKG_GROUPS_VARS+= OPENSSH_GROUP +PKG_USERS_VARS+= OPENSSH_USER + PKG_GROUPS= ${OPENSSH_GROUP} PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP} diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 77ec2bd4d51..fe81c40cb8c 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.179 2007/03/18 12:38:44 taca Exp $ +# $NetBSD: Makefile,v 1.180 2007/07/04 20:54:58 jlam Exp $ DISTNAME= openssh-4.6p1 PKGNAME= openssh-4.6.1 @@ -30,7 +30,9 @@ CRYPTO= yes # retain the following line, for IPv6-ready pkgsrc webpage BUILD_DEFS+= USE_INET6 -BUILD_DEFS+= OPENSSH_CHROOT OPENSSH_GROUP OPENSSH_USER +PKG_GROUPS_VARS+= OPENSSH_GROUP +PKG_USERS_VARS+= OPENSSH_USER +BUILD_DEFS+= OPENSSH_CHROOT BUILD_DEFS+= VARBASE INSTALL_TARGET= install-nokeys diff --git a/security/pks/Makefile b/security/pks/Makefile index 0b9b5238d01..5ad61ef4725 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:42 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2007/07/04 20:54:58 jlam Exp $ DISTNAME= pks-0.9.4 PKGREVISION= 3 @@ -18,6 +18,9 @@ COMMENT= PGP Public Key Server GNU_CONFIGURE= YES +PKG_GROUPS_VARS+= PKS_GROUP +PKG_USERS_VARS+= PKS_USER + PKS_USER= pks PKS_GROUP= pks PKS_SERVER?= localhost diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index 597ad382fed..74a6ab798bf 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/06/05 05:37:34 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2007/07/04 20:54:58 jlam Exp $ # DISTNAME= prelude-lml-0.9.9 @@ -16,6 +16,9 @@ COMMENT= Log analyzer monitoring your logfile and received syslog messages PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude +PKG_GROUPS_VARS+= PRELUDE_GROUP +PKG_USERS_VARS+= PRELUDE_USER + USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index ce6a0a5cb06..47b18516b37 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/06/05 05:37:34 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2007/07/04 20:54:58 jlam Exp $ # DISTNAME= prelude-manager-0.9.8 @@ -26,6 +26,9 @@ PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude PRELUDE_HOME?= /var/spool/prelude-manager +PKG_GROUPS_VARS+= PRELUDE_GROUP +PKG_USERS_VARS+= PRELUDE_USER + PKG_GROUPS= ${PRELUDE_GROUP} PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP} diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index 8e873267904..12548d76b44 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/06/05 05:37:35 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:59 jlam Exp $ # DISTNAME= prewikka-${VERSION} @@ -40,6 +40,9 @@ PKG_USERS= ${PREWIKKA_USER}:${PREWIKKA_GROUP} PKG_GECOS.${PREWIKKA_USER}= Prelude-IDS console PKG_HOME.${PREWIKKA_USER}= ${PREWIKKA_HOME} +PKG_GROUPS_VARS+= PREWIKKA_GROUP +PKG_USERS_VARS+= PREWIKKA_USER + SUBST_CLASSES+= code SUBST_STAGE.code= post-patch SUBST_FILES.code= runPrewikka.c diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index 18a5bf263c4..3d1b41b9c62 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2006/10/02 21:05:44 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2007/07/04 20:54:59 jlam Exp $ PKGNAME= amanda-common-${VERS} PKGREVISION= 4 @@ -34,6 +34,6 @@ PKG_SHELL.${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 -BUILD_DEFS+= AMANDA_VAR AMANDA_USER AMANDA_GROUP +BUILD_DEFS+= AMANDA_VAR .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 453cb529c1d..8efb9d2f19a 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2007/01/05 12:47:27 obache Exp $ +# $NetBSD: Makefile.common,v 1.25 2007/07/04 20:54:59 jlam Exp $ # # common make file fragment shared by all amanda-* pkgs. # @@ -24,8 +24,9 @@ AMANDA_USER?= backup AMANDA_TMP?= /tmp/amanda AMANDA_VAR?= ${VARBASE}/amanda -BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB -BUILD_DEFS+= AMANDA_TMP AMANDA_VAR VARBASE +PKG_GROUPS_VARS+= AMANDA_GROUP +PKG_USERS_VARS+= AMANDA_USER +BUILD_DEFS+= AMANDA_SMB AMANDA_TMP AMANDA_VAR VARBASE USE_LIBTOOL= yes diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile index cb01137fc32..e06e7c55b92 100644 --- a/sysutils/bacula-clientonly/Makefile +++ b/sysutils/bacula-clientonly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/03 08:18:45 ghen Exp $ +# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:59 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-clientonly-/} COMMENT= The Network Backup Solution (client only) @@ -13,8 +13,6 @@ PLIST_SRC= ${.CURDIR}/../../sysutils/bacula/PLIST.common CONFIGURE_ARGS+= --enable-client-only -BUILD_DEFS+= BACULA_GROUP - OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770 PKG_GROUPS= ${BACULA_GROUP} diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 6699231edc5..eefc3e84c3e 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/01/04 12:16:57 ghen Exp $ +# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:59 jlam Exp $ CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* @@ -14,8 +14,6 @@ MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER:Q} --with-dir-group=${BACULA_GROUP:Q} CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER:Q} --with-sd-group=${BACULA_GROUP:Q} -BUILD_DEFS+= BACULA_DIR_USER BACULA_SD_USER BACULA_GROUP - OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770 PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP} diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index bc780f1c907..0bcaf7eb55d 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.38 2007/04/16 16:10:42 ghen Exp $ +# $NetBSD: Makefile.common,v 1.39 2007/07/04 20:55:00 jlam Exp $ DISTNAME= bacula-2.0.3 CATEGORIES= sysutils @@ -18,6 +18,9 @@ BACULA_GROUP?= bacula BACULA_DIR_USER?= bacula-dir BACULA_SD_USER?= bacula-sd +PKG_GROUPS_VARS+= BACULA_GROUP +PKG_USERS_VARS+= BACULA_DIR_USER BACULA_SD_USER + PKG_SYSCONFSUBDIR?= bacula BACULA_PIDDIR?= ${VARBASE}/run BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index 2661bd2de50..fb07ee76171 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/01/17 02:46:59 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.24 2007/07/04 20:55:00 jlam Exp $ # DISTNAME= dbus-1.0.2 @@ -66,7 +66,8 @@ INSTALLATION_DIRS= ${EGDIR} RCD_SCRIPTS= dbus -BUILD_DEFS+= DBUS_USER DBUS_GROUP +PKG_GROUPS_VARS+= DBUS_GROUP +PKG_USERS_VARS+= DBUS_USER PKG_GROUPS= ${DBUS_GROUP} PKG_USERS= ${DBUS_USER}:${DBUS_GROUP} diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 7a023922a87..2f80d87a03a 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/12/05 14:53:32 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2007/07/04 20:55:00 jlam Exp $ # DISTNAME= munin_${VER} @@ -21,6 +21,9 @@ USE_PKGINSTALL= YES WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:} +PKG_GROUPS_VARS+= MUNIN_GROUP +PKG_USERS_VARS+= MUNIN_USER + MUNIN_GROUP?= munin MUNIN_USER?= munin diff --git a/sysutils/munin-server/Makefile b/sysutils/munin-server/Makefile index 824f038776f..f2cbebe0d25 100644 --- a/sysutils/munin-server/Makefile +++ b/sysutils/munin-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/12/05 14:53:32 xtraeme Exp $ +# $NetBSD: Makefile,v 1.8 2007/07/04 20:55:00 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV:S:-server-:_:} @@ -25,6 +25,9 @@ PERL5_CONFIGURE=NO WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:} CHECK_PORTABILITY_SKIP+= node/node.d/* +PKG_GROUPS_VARS+= MUNIN_GROUP +PKG_USERS_VARS+= MUNIN_USER + MUNIN_GROUP?= munin MUNIN_USER?= munin diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 75ff6532a00..9b72039736f 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2006/08/16 13:15:54 ghen Exp $ +# $NetBSD: Makefile,v 1.48 2007/07/04 20:55:01 jlam Exp $ .include "Makefile.common" @@ -14,7 +14,9 @@ CONFIGURE_ARGS+= --with-pidpath=${NUT_STATEDIR:Q} NUT_USER?= nut NUT_GROUP?= nut -BUILD_DEFS+= NUT_STATEDIR NUT_USER NUT_GROUP +PKG_GROUPS_VARS+= NUT_GROUP +PKG_USERS_VARS+= NUT_USER +BUILD_DEFS+= NUT_STATEDIR FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR:Q} FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR:Q} diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile index f1c63b32614..a2710e8045b 100644 --- a/time/kronolith/Makefile +++ b/time/kronolith/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/03/18 12:11:28 adrianp Exp $ +# $NetBSD: Makefile,v 1.10 2007/07/04 20:55:01 jlam Exp $ DISTNAME= kronolith-h3-${KRONOLITHVER} PKGNAME= kronolith-${KRONOLITHVER} @@ -35,6 +35,8 @@ SUBST_FILES.files= kronolith.conf.dist SUBST_SED.files= -e "s|@KRONOLITHDIR@|${KRONOLITHDIR}|g" SUBST_MESSAGE.files= Fixing configuration files. +PKG_USERS_VARS+= APACHE_USER + CONF_FILES= ${EGDIR}/kronolith.conf ${PKG_SYSCONFDIR}/kronolith.conf CONF_FILES_PERMS+= ${KRONOLITHDIR}/config/conf.xml.dist \ ${KRONOLITHDIR}/config/conf.xml \ diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile index 9d82a353cee..c4ed4428237 100644 --- a/www/ap2-suphp/Makefile +++ b/www/ap2-suphp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/06/30 15:05:08 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2007/07/04 20:55:02 jlam Exp $ # DISTNAME= suphp-0.6.0 @@ -20,7 +20,8 @@ CONFIGURE_ARGS+= --with-apache-user=${APACHE_USER:Q} CONFIGURE_ARGS+= --with-logfile=${VARBASE}/httpd/suphp_log CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -BUILD_DEFS+= APACHE_USER VARBASE +PKG_USERS_VARS+= APACHE_USER +BUILD_DEFS+= VARBASE EGDIR= ${PREFIX}/share/examples/suphp CONF_FILES= ${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf diff --git a/www/apache/Makefile b/www/apache/Makefile index 4c736c7c670..b2a11c48b00 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.190 2007/06/28 00:38:00 lkundrak Exp $ +# $NetBSD: Makefile,v 1.191 2007/07/04 20:55:02 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -58,7 +58,8 @@ USE_TOOLS+= perl APACHE_USER?= www APACHE_GROUP?= www -BUILD_DEFS+= APACHE_USER APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER +PKG_GROUPS_VARS+= APACHE_GROUP CONFIGURE_ARGS+= --server-uid=${APACHE_USER:Q} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP:Q} diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 68114f91909..f7dd73c58db 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.114 2007/06/28 01:49:04 lkundrak Exp $ +# $NetBSD: Makefile,v 1.115 2007/07/04 20:55:03 jlam Exp $ .include "Makefile.common" @@ -93,7 +93,8 @@ APACHE_USER?= www APACHE_GROUP?= www PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} -BUILD_DEFS+= APACHE_USER APACHE_GROUP +PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER PKG_SYSCONFVAR= apache PKG_SYSCONFSUBDIR?= httpd diff --git a/www/apache2/options.mk b/www/apache2/options.mk index 67d30d215d7..072af02318b 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:19 wiz Exp $ +# $NetBSD: options.mk,v 1.7 2007/07/04 20:55:03 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec @@ -6,7 +6,8 @@ PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msuexec) -BUILD_DEFS+= VARBASE APACHE_USER APACHE_SUEXEC_PATH +PKG_USERS_VARS+= APACHE_USER +BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs diff --git a/www/apache22/Makefile b/www/apache22/Makefile index d3769554e69..c21002914fb 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/06/28 01:20:52 lkundrak Exp $ +# $NetBSD: Makefile,v 1.15 2007/07/04 20:55:03 jlam Exp $ .include "Makefile.common" @@ -105,7 +105,8 @@ APACHE_USER?= www APACHE_GROUP?= www PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} -BUILD_DEFS+= APACHE_USER APACHE_GROUP +PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER PKG_SYSCONFVAR= apache PKG_SYSCONFSUBDIR?= httpd diff --git a/www/apache22/options.mk b/www/apache22/options.mk index 54bea89d5f4..57c12e5f48a 100644 --- a/www/apache22/options.mk +++ b/www/apache22/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $ +# $NetBSD: options.mk,v 1.2 2007/07/04 20:55:04 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec @@ -6,7 +6,8 @@ PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msuexec) -BUILD_DEFS+= VARBASE APACHE_USER APACHE_SUEXEC_PATH +PKG_USERS_VARS+= APACHE_USER +BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs diff --git a/www/awstats/Makefile b/www/awstats/Makefile index 68658e66ea5..e12a3a75a92 100644 --- a/www/awstats/Makefile +++ b/www/awstats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/02/20 18:29:49 minskim Exp $ +# $NetBSD: Makefile,v 1.33 2007/07/04 20:55:04 jlam Exp $ # DISTNAME= awstats-6.6 @@ -25,7 +25,10 @@ REPLACE_PERL+= tools/*.pl \ APACHE_USER?= www APACHE_GROUP?= www -BUILD_DEFS+= APACHE_USER APACHE_GROUP VARBASE + +PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER +BUILD_DEFS+= VARBASE # OWN_DIRS= ${VARBASE}/awstats OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700 diff --git a/www/drupal/Makefile b/www/drupal/Makefile index 6bf268ab524..159ed9430a7 100644 --- a/www/drupal/Makefile +++ b/www/drupal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/04/09 19:30:48 adrianp Exp $ +# $NetBSD: Makefile,v 1.22 2007/07/04 20:55:04 jlam Exp $ DISTNAME= drupal-5.1 CATEGORIES= www @@ -14,7 +14,9 @@ DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd NO_BUILD= YES DRUPAL= ${PREFIX}/share/drupal PAX_DIRS= includes misc modules scripts themes -BUILD_DEFS+= APACHE_USER APACHE_GROUP + +PKG_GROUPS_VARS+= APACHE_GROUP +PKG_USERS_VARS+= APACHE_USER OWN_DIRS+= ${DRUPAL}/sites/default OWN_DIRS_PERMS+= ${DRUPAL}/files ${APACHE_USER} ${APACHE_GROUP} 0750 diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile index 63b43f72926..b64ceabaa50 100644 --- a/www/geeklog/Makefile +++ b/www/geeklog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/05/20 15:56:44 taca Exp $ +# $NetBSD: Makefile,v 1.16 2007/07/04 20:55:04 jlam Exp $ # DISTNAME= geeklog-${VER} @@ -16,7 +16,8 @@ DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.0:../../databases/php-mysql VER= 1.4.1 NO_BUILD= YES -BUILD_DEFS+= APACHE_GROUP GEEKLOG_SITEBASE +PKG_GROUPS_VARS+= APACHE_GROUP +BUILD_DEFS+= GEEKLOG_SITEBASE GEEKLOG_SYS= emailgeeklogstories language plugins readme sql system GEEKLOG_TMPL_SUB= backend images/articles images/library \ diff --git a/www/horde/Makefile b/www/horde/Makefile index 4445fd5311b..bf5d1ce0128 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2007/03/18 12:24:13 adrianp Exp $ +# $NetBSD: Makefile,v 1.50 2007/07/04 20:55:04 jlam Exp $ DISTNAME= horde-3.1.4 CATEGORIES= www @@ -35,7 +35,7 @@ EGDIR= ${PREFIX}/share/examples/horde HORDEDIR= ${PREFIX}/share/horde PAXDIRS= js lib locale po scripts services templates themes util admin SENDMAIL?= /usr/sbin/sendmail -BUILD_DEFS+= APACHE_USER +PKG_USERS_VARS+=APACHE_USER PKG_SYSCONFSUBDIR?= httpd MESSAGE_SUBST+= HORDEDIR=${HORDEDIR:Q} diff --git a/www/iasp/Makefile b/www/iasp/Makefile index bb8badf9c28..765b22a587b 100644 --- a/www/iasp/Makefile +++ b/www/iasp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/22 20:37:45 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/07/04 20:55:05 jlam Exp $ .include "../../www/iasp/Makefile.common" @@ -19,13 +19,15 @@ PLIST_SUBST+= IASP=${IASP_DESTDIR:S/^${PREFIX}\///:Q} IASP_USER?= ${APACHE_USER} IASP_GROUP?= ${APACHE_GROUP} -BUILD_DEFS+= IASP_USER IASP_GROUP FILES_SUBST+= IASP_USER=${IASP_USER:Q} FILES_SUBST+= IASP_GROUP=${IASP_GROUP:Q} PKG_USERS= ${IASP_USER}:${IASP_GROUP} PKG_GROUPS= ${IASP_GROUP} +PKG_GROUPS_VARS+= IASP_GROUP +PKG_USERS_VARS+= IASP_USER + WRKSRC= ${WRKDIR}/${IASP_DIR} REQD_DIRS= ${IASP_DESTDIR} OWN_DIRS_PERMS= ${IASP_DESTDIR}/logs ${IASP_USER} ${IASP_GROUP} 0750 diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index cdd260e41ee..c4a47622040 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/11/24 18:26:06 drochner Exp $ +# $NetBSD: Makefile,v 1.31 2007/07/04 20:55:05 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -14,7 +14,8 @@ COMMENT= Web proxy with advanced filtering capabilities PRIVOXY_USER?= privoxy PRIVOXY_GROUP?= privoxy -BUILD_DEFS+= PRIVOXY_USER PRIVOXY_GROUP +PKG_GROUPS_VARS+= PRIVOXY_GROUP +PKG_USERS_VARS+= PRIVOXY_USER PKG_SYSCONFSUBDIR?= privoxy diff --git a/www/screws/Makefile b/www/screws/Makefile index 1a8d8ac141c..d34946976a2 100644 --- a/www/screws/Makefile +++ b/www/screws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/07/02 09:44:39 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2007/07/04 20:55:05 jlam Exp $ # DISTNAME= screws-0.56 @@ -12,7 +12,8 @@ COMMENT= SCRipt Enhanced Web Server USE_TOOLS+= perl:run -BUILD_DEFS+= SCREWS_USER SCREWS_GROUP +PKG_GROUPS_VARS+= SCREWS_GROUP +PKG_USERS_VARS+= SCREWS_USER PKG_USERS= ${SCREWS_USER}:${SCREWS_GROUP} PKG_GROUPS= ${SCREWS_GROUP} diff --git a/www/squid/Makefile b/www/squid/Makefile index e124a63fea3..3d6e4134ca9 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.192 2007/05/13 16:45:44 taca Exp $ +# $NetBSD: Makefile,v 1.193 2007/07/04 20:55:05 jlam Exp $ DISTNAME= squid-2.6.STABLE13 PKGNAME= ${DISTNAME:S/STABLE//} @@ -30,6 +30,9 @@ MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} PLIST_SRC= ${WRKDIR}/PLIST RCD_SCRIPTS= squid +PKG_GROUPS_VARS+= SQUID_GROUP +PKG_USERS_VARS+= SQUID_USER + PKG_GROUPS= ${SQUID_GROUP} PKG_USERS= ${SQUID_USER}:${SQUID_GROUP} @@ -52,7 +55,7 @@ PKG_SYSCONFSUBDIR?= squid SQUID_USER?= squid SQUID_GROUP?= squid -BUILD_DEFS+= SQUID_USER SQUID_GROUP VARBASE +BUILD_DEFS+= VARBASE CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \ --enable-cachemgr-hostname=localhost \ diff --git a/www/squirm/Makefile b/www/squirm/Makefile index e30968342f3..e5a6aee3b74 100644 --- a/www/squirm/Makefile +++ b/www/squirm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/10/02 17:12:19 rillig Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/04 20:55:06 jlam Exp $ # DISTNAME= squirm-1.0betaB @@ -20,7 +20,9 @@ SQUID_USER?= squid SQUID_GROUP?= squid PKG_USERS+= ${SQUID_USER}:${SQUID_GROUP} PKG_GROUPS+= ${SQUID_GROUP} -BUILD_DEFS+= SQUID_USER SQUID_GROUP VARBASE +PKG_USERS_VARS+= SQUID_USER +PKG_GROUPS_VARS+= SQUID_GROUP +BUILD_DEFS+= VARBASE PKG_SYSCONFSUBDIR= squirm EGDIR= ${PREFIX}/share/examples/squirm diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index 6bcb371f292..12c3e2919cf 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/09/19 08:31:18 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2007/07/04 20:55:06 jlam Exp $ # DISTNAME= tinyproxy-1.6.2 @@ -17,12 +17,14 @@ PKG_SYSCONFSUBDIR= tinyproxy .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= TINYPROXY_USER TINYPROXY_GROUP VARBASE +BUILD_DEFS+= VARBASE TINYPROXY_USER?= tinyproxy TINYPROXY_GROUP?= tinyproxy PKG_GROUPS= ${TINYPROXY_GROUP} PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP} +PKG_GROUPS_VARS+= TINYPROXY_GROUP +PKG_USERS_VARS+= TINYPROXY_USER FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q} FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q} diff --git a/www/zope29/Makefile b/www/zope29/Makefile index cd7e2ecb439..c91fc9b2b65 100644 --- a/www/zope29/Makefile +++ b/www/zope29/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/04/01 15:29:45 taca Exp $ +# $NetBSD: Makefile,v 1.12 2007/07/04 20:55:06 jlam Exp $ # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp DISTNAME= Zope-${VER}-final @@ -35,6 +35,8 @@ SZOPEBASEDIR?= ${WEBBASEDIR}/Zope29 # Do not change anything below this line. +PKG_USERS_VARS+= ZOPE_USER + .if defined(INSTANCENAME) ZOPEINSTANCENAME= ${INSTANCENAME} .endif diff --git a/www/zope3/Makefile b/www/zope3/Makefile index eec1d0bed7f..c0839202209 100644 --- a/www/zope3/Makefile +++ b/www/zope3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/02/28 15:49:55 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2007/07/04 20:55:06 jlam Exp $ # DISTNAME= Zope-3.3.1 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-python ${PYTHONBIN} \ EXTRACT_USING= gtar .endif -BUILD_DEFS+= VARBASE ZOPE3_GROUP ZOPE3_USER +BUILD_DEFS+= VARBASE BUILD_TARGET= build RCD_SCRIPTS= zope3 zss3 diff --git a/www/zope3/Makefile.common b/www/zope3/Makefile.common index fa3258bbaa5..e338feadabe 100644 --- a/www/zope3/Makefile.common +++ b/www/zope3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2006/05/06 22:38:27 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2007/07/04 20:55:07 jlam Exp $ # PYTHON_VERSIONS_ACCEPTED= 24 @@ -9,4 +9,7 @@ ZOPE3_DOCDIR= ${PREFIX}/share/doc/zope3 ZOPE3_GROUP?= zope3 ZOPE3_USER?= zope3 +PKG_GROUPS_VARS+= ZOPE3_GROUP +PKG_USERS_VARS+= ZOPE3_USER + .include "../../lang/python/application.mk" |