diff options
| author | jlam <jlam> | 2006-04-23 00:12:35 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-04-23 00:12:35 +0000 |
| commit | 20460d2ae15d7505f5cfb4ce57ff35f9c49cf1e5 (patch) | |
| tree | 6dc352508076c2511c051c32fe25d3b9ea6c8c20 | |
| parent | 1681e974bb6b92327674323cc6ecfcdc2381500b (diff) | |
| download | pkgsrc-20460d2ae15d7505f5cfb4ce57ff35f9c49cf1e5.tar.gz | |
Modify packages that set PKG_USERS and PKG_GROUPS to follow the new
syntax as specified in pkgsrc/mk/install/bsd.pkginstall.mk:1.47.
82 files changed, 374 insertions, 186 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index db2c68221ce..d665ca4e2d8 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/02/05 23:08:10 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2006/04/23 00:12:35 jlam Exp $ # DISTNAME= icecast-2.3.0 @@ -26,7 +26,7 @@ ICECAST_USER?= icecast ICECAST_GROUP?= icecast PKG_GROUPS= ${ICECAST_GROUP} -PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}::Icecast2\ user +PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP} EGDIR= ${PREFIX}/share/examples/icecast CONF_FILES= ${EGDIR}/icecast.xml ${PKG_SYSCONFDIR}/icecast.xml diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 4709c5e1532..86b5ff446ba 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/04/08 21:42:26 tonio Exp $ +# $NetBSD: Makefile,v 1.34 2006/04/23 00:12:35 jlam Exp $ # DISTNAME= bitlbee-1.0.2 @@ -31,7 +31,8 @@ STATEDIR= ${VARBASE}/db/bitlbee OWN_DIRS_PERMS= ${STATEDIR} bitlbee nobody 700 -PKG_USERS= bitlbee:nobody::Bitlbee\ user:${VARBASE}/db/bitlbee +PKG_USERS= bitlbee:nobody +PKG_HOME.bitlbee= ${VARBASE}/db/bitlbee INSTALLATION_DIRS= man/man5 man/man8 sbin diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index dccc38bd31f..8731b514a85 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:26 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2006/04/23 00:12:36 jlam Exp $ DISTNAME= ircd-hybrid-7.2.0 EXTRACT_SUFX= .tgz @@ -38,8 +38,8 @@ FILES_SUBST+= IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER:Q} FILES_SUBST+= IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP:Q} FILES_SUBST+= VARBASE=${VARBASE:Q} -PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::ircd-hybrid\ User::${NOLOGIN} PKG_GROUPS= ${IRCD_HYBRID_IRC_GROUP} +PKG_USERS= ${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP} SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Fixing hardcoded paths. diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index ff979811399..50bb508423a 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/04/22 09:22:06 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2006/04/23 00:12:36 jlam Exp $ # DISTNAME= ircu2.10.11.07 @@ -43,8 +43,12 @@ RCD_SCRIPTS= ircd FILES_SUBST+= IRCD_USER=${IRCD_USER:Q} MESSAGE_SUBST+= IRCD_USER=${IRCD_USER} MESSAGE_SUBST+= IRCD_GROUP=${IRCD_GROUP} + PKG_GROUPS= ${IRCD_GROUP} -PKG_USERS= ${IRCD_USER}:${IRCD_GROUP}::IRC\ server\ user:/nonexistant:${SH} +PKG_USERS= ${IRCD_USER}:${IRCD_GROUP} + +PKG_GECOS.${IRCD_USER}= IRC server user +PKG_SHELL.${IRCD_USER}= ${SH} SUBST_CLASSES+= paths SUBST_STAGE.paths= post-patch diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index 7253c871a86..569f6f1046f 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:03 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/04/23 00:12:36 jlam Exp $ # DISTNAME= jabber-1.4.2 @@ -37,7 +37,7 @@ BUILD_DEFS+= JABBERD_USER JABBERD_GROUP \ JABBERD_PIDDIR PKG_GROUPS= ${JABBERD_GROUP} -PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\ user +PKG_USERS= ${JABBERD_USER}:${JABBERD_GROUP} FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q} FILES_SUBST+= JABBERD_GROUP=${JABBERD_GROUP:Q} diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 5bfd69d8d50..335ff5515f0 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2006/04/23 00:12:36 jlam Exp $ # DISTNAME= silc-server-1.0.2 @@ -23,7 +23,7 @@ SHLIBTOOL_OVERRIDE= libtool */*/*/libtool SILCD_USER?= silcd SILCD_GROUP?= silcd PKG_GROUPS= ${SILCD_GROUP} -PKG_USERS= ${SILCD_USER}:${SILCD_GROUP}::SILC\ Server\ user +PKG_USERS= ${SILCD_USER}:${SILCD_GROUP} PKG_SYSCONFSUBDIR?= ${PKGBASE} diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile index 87f1aeefdf0..c8602a7150f 100644 --- a/chat/unrealircd/Makefile +++ b/chat/unrealircd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/06 06:21:39 reed Exp $ +# $NetBSD: Makefile,v 1.13 2006/04/23 00:12:36 jlam Exp $ DISTNAME= Unreal3.2.4 PKGNAME= unrealircd-3.2.4 @@ -75,8 +75,12 @@ CONF_FILES_PERMS= ${IRCD_EG:Q}/example.conf \ ${UIRCD_HOME:Q}/unrealircd.conf \ ${UIRCD_USER} ${UIRCD_GROUP} 0660 -PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q}::UnrealIRCD\ user:${UIRCD_HOME:Q}:${NOLOGIN:Q} PKG_GROUPS= ${UIRCD_GROUP:Q} +PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q} + +PKG_GECOS.${UIRCD_USER}= UnrealIRCD user +PKG_HOME.${UIRCD_USER}= ${UIRCD_HOME} + RCD_SCRIPTS= unrealircd MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index f1410f9ef71..4b7c3bb533c 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/13 18:36:58 mjl Exp $ +# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:36 jlam Exp $ DISTNAME= asterisk-1.2.7.1 CATEGORIES= comms net audio @@ -20,7 +20,7 @@ INSTALL_TARGET= install samples #ASTERISK_USER?= asterisk #ASTERISK_GROUP?= asterisk #PKG_GROUPS= ${ASTERISK_GROUP} -#PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP}::Asterisk\\ user +#PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP} # Various path settings for Asterisk PKG_SYSCONFSUBDIR?= asterisk diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index a7dbac643d9..b37d37e1010 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/03/22 22:50:31 tv Exp $ +# $NetBSD: Makefile,v 1.54 2006/04/23 00:12:36 jlam Exp $ # DISTNAME= fidogate-4.4.10 @@ -19,8 +19,10 @@ CONF_FILES= ${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf RCD_SCRIPTS= fidogate INFO_FILES= # PLIST -PKG_USERS= news:news::Network\ News:/var/spool/news:${NOLOGIN} PKG_GROUPS= news +PKG_USERS= news:news +PKG_GECOS.news= Network News +PKG_HOME.news= /var/spool/news NO_CONFIGURE= yes diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 4a382b01544..cca949d49ad 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/03/30 03:44:41 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/04/23 00:12:36 jlam Exp $ DISTNAME= gnats-4.1.0 PKGREVISION= 2 @@ -31,7 +31,12 @@ GNATS_USER?= gnats GNATS_GROUP?= daemon GNATS_SERVICE?= support GNATS_HOME?= ${VARBASE}/db/gnats -PKG_USERS= ${GNATS_USER}:${GNATS_GROUP}::GNATS\ database\ owner:${GNATS_HOME}:${SH} +PKG_GROUPS= ${GNATS_GROUP} +PKG_USERS= ${GNATS_USER}:${GNATS_GROUP} + +PKG_GECOS.${GNATS_USER}= GNATS database owner +PKG_HOME.${GNATS_USER}= ${GNATS_HOME} +PKG_SHELL.${GNATS_USER}= ${SH} GNATS_USER_FILE?= ${PKG_SYSCONFDIR}/gnatsd.user_access GNATS_HOST_FILE?= ${PKG_SYSCONFDIR}/gnatsd.host_access diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 8072e41831c..92bb48cfb90 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/04/23 00:12:36 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -19,8 +19,13 @@ CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads -PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH} PKG_GROUPS= ${MYSQL_GROUP} +PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} + +PKG_GECOS.${MYSQL_USER}= MySQL database administrator +PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} +PKG_SHELL.${MYSQL_USER}= ${SH} + RCD_SCRIPTS= mysqld FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index f39ee2b601d..56dbbb8da1e 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/17 11:21:41 tron Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:37 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -18,8 +18,13 @@ CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads -PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH} PKG_GROUPS= ${MYSQL_GROUP} +PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} + +PKG_GECOS.${MYSQL_USER}= MySQL database administrator +PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} +PKG_SHELL.${MYSQL_USER}= ${SH} + RCD_SCRIPTS= mysqld FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 61f43421b61..f115dd66ab8 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/04/23 00:12:37 jlam Exp $ PKGNAME= postgresql73-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -43,8 +43,11 @@ FILES_SUBST+= PGGROUP=${PGGROUP:Q} FILES_SUBST+= PGHOME=${PGHOME:Q} BUILD_DEFS+= PGUSER PGGROUP PGHOME -PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} PKG_GROUPS= ${PGGROUP} +PKG_USERS= ${PGUSER}:${PGGROUP} +PKG_GECOS.${PGUSER}= PostgreSQL database administrator +PKG_HOME.${PGUSER}= ${PGHOME} +PKG_SHELL.${PGUSER}= ${SH} RCD_SCRIPTS= pgsql diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 79b10c8929d..a890abe4534 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/04/23 00:12:37 jlam Exp $ PKGNAME= postgresql74-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -44,8 +44,11 @@ FILES_SUBST+= PGGROUP=${PGGROUP:Q} FILES_SUBST+= PGHOME=${PGHOME:Q} BUILD_DEFS+= PGUSER PGGROUP PGHOME -PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} PKG_GROUPS= ${PGGROUP} +PKG_USERS= ${PGUSER}:${PGGROUP} +PKG_GECOS.${PGUSER}= PostgreSQL database administrator +PKG_HOME.${PGUSER}= ${PGHOME} +PKG_SHELL.${PGUSER}= ${SH} RCD_SCRIPTS= pgsql diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index e6aa9cdbcdf..5f04b56a27c 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:37 jlam Exp $ PKGNAME= postgresql80-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -59,8 +59,11 @@ FILES_SUBST+= PGGROUP=${PGGROUP:Q} FILES_SUBST+= PGHOME=${PGHOME:Q} BUILD_DEFS+= PGUSER PGGROUP PGHOME -PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} PKG_GROUPS= ${PGGROUP} +PKG_USERS= ${PGUSER}:${PGGROUP} +PKG_GECOS.${PGUSER}= PostgreSQL database administrator +PKG_HOME.${PGUSER}= ${PGHOME} +PKG_SHELL.${PGUSER}= ${SH} RCD_SCRIPTS= pgsql diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index eb00bd4e4f9..576d8f7dd28 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/03/28 19:48:22 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/04/23 00:12:37 jlam Exp $ PKGNAME= postgresql81-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -59,8 +59,11 @@ FILES_SUBST+= PGGROUP=${PGGROUP} FILES_SUBST+= PGHOME=${PGHOME} BUILD_DEFS+= PGUSER PGGROUP PGHOME -PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} PKG_GROUPS= ${PGGROUP} +PKG_USERS= ${PGUSER}:${PGGROUP} +PKG_GECOS.${PGUSER}= PostgreSQL database administrator +PKG_HOME.${PGUSER}= ${PGHOME} +PKG_SHELL.${PGUSER}= ${SH} RCD_SCRIPTS= pgsql diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index 1d02816b0ce..11e80218306 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/02/17 07:38:45 martti Exp $ +# $NetBSD: Makefile,v 1.29 2006/04/23 00:12:37 jlam Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 2 @@ -14,7 +14,7 @@ RCD_SCRIPTS= distccd DISTCC_USER?= distcc DISTCC_GROUP?= distcc PKG_GROUPS= ${DISTCC_GROUP} -PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q}::Distccd\ user +PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q} DISTCC_PIDDIR?= ${VARBASE}/run/distccd OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER:Q} ${DISTCC_GROUP:Q} 0750 diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile index 5cbf0d6f560..1df2ecac6dd 100644 --- a/devel/monotone-server/Makefile +++ b/devel/monotone-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/04/22 09:22:07 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2006/04/23 00:12:37 jlam Exp $ # DISTNAME= monotone-server-0.26 @@ -39,8 +39,12 @@ CONF_FILES_PERMS+= ${EXAMPLEDIR}/write-permissions \ ${PKG_SYSCONFDIR}/write-permissions \ ${MONOTONE_USER} ${MONOTONE_GROUP} 600 -PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}::Monotone\ dedicated\ server:${VARBASE}/monotone:${SH} PKG_GROUPS= ${MONOTONE_GROUP} +PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP} + +PKG_GECOS.${MONOTONE_USER}= Monotone dedicated server +PKG_HOME.${MONOTONE_USER}= ${VARBASE}/monotone +PKG_SHELL.${MONOTONE_USER}= ${SH} SUBST_CLASSES+= vars SUBST_STAGE.vars= do-configure diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile index 5bf9cf8cb31..f27a8366559 100644 --- a/devel/p4d/Makefile +++ b/devel/p4d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:37 jlam Exp $ # DISTNAME= p4d @@ -18,7 +18,10 @@ FILES_SUBST+= P4LOG=${P4LOG:Q} FILES_SUBST+= P4JOURNAL=${P4JOURNAL:Q} PKG_GROUPS?= ${P4GROUP} -PKG_USERS?= ${P4USER}:${P4GROUP}::Perforce\ Server:${P4ROOT} +PKG_USERS?= ${P4USER}:${P4GROUP} + +PKG_GECOS.${P4USER}?= Perforce Server +PKG_HOME.${P4USER}?= ${P4ROOT} OWN_DIRS_PERMS= ${P4ROOT} ${P4USER} ${P4GROUP} 750 diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile index da381c0c0e4..32dd7b6fa0d 100644 --- a/inputmethod/canna-server/Makefile +++ b/inputmethod/canna-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:29 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/04/23 00:12:37 jlam Exp $ # .include "../../inputmethod/canna/Makefile.common" @@ -15,7 +15,7 @@ MESSAGE_SUBST+= CANNA_USER="${CANNA_USER}" MESSAGE_SUBST+= CANNA_GROUP="${CANNA_GROUP}" PKG_GROUPS= ${CANNA_GROUP} -PKG_USERS= ${CANNA_USER}:${CANNA_GROUP}::Canna\ user +PKG_USERS= ${CANNA_USER}:${CANNA_GROUP} OWN_DIRS_PERMS= ${CANNA_SPOOL} ${CANNA_USER} ${CANNA_GROUP} ${CANNA_MODE} diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile index 29c2607e464..72edda86d23 100644 --- a/inputmethod/ja-freewnn-server-bin/Makefile +++ b/inputmethod/ja-freewnn-server-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/04/23 00:12:37 jlam Exp $ # PKGNAME= ja-FreeWnn-server-bin-1.10 @@ -27,7 +27,7 @@ FREEWNN_GROUP?= jserver BUILD_DEFS+= FREEWNN_USER FREEWNN_GROUP PKG_GROUPS= ${FREEWNN_GROUP} -PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP}::Freewnn\ user +PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP} .include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" .include "../../inputmethod/ja-freewnn-lib/Makefile.common" diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index ccfee36a876..c3bb71b3f25 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2006/04/07 11:20:37 grant Exp $ +# $NetBSD: Makefile,v 1.57 2006/04/23 00:12:38 jlam Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -32,7 +32,7 @@ MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} RCD_SCRIPTS= clamd freshclamd PKG_GROUPS+= ${CLAMAV_GROUP} -PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User +PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP} VIRUSDBDIR= ${VARBASE}/clamav EGDIR= ${PREFIX}/share/examples/clamav diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 5a2ed2b61cc..e0de0d8f43f 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/04/14 19:01:53 ghen Exp $ +# $NetBSD: Makefile,v 1.50 2006/04/23 00:12:38 jlam Exp $ DISTNAME= dovecot-1.0.beta7 PKGNAME= ${DISTNAME:S/.beta/beta/} @@ -26,7 +26,9 @@ RCD_SCRIPTS= dovecot DOVECOT_USER?= dovecot DOVECOT_GROUP?= dovecot PKG_GROUPS= ${DOVECOT_GROUP} -PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\ IMAP/POP3\ user +PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP} + +PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user EGDIR= ${PREFIX}/share/examples/dovecot CONF_FILES= ${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 5727340cc7f..e3b0f9bd45c 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2006/01/08 18:35:09 xtraeme Exp $ +# $NetBSD: Makefile,v 1.75 2006/04/23 00:12:38 jlam Exp $ DISTNAME= exim-4.54 PKGREVISION= 2 @@ -26,7 +26,11 @@ MAKE_FLAGS+= FULLECHO='' BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB PKG_GROUPS= ${EXIM_GROUP} -PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:${VARBASE}/mail:${NOLOGIN} +PKG_USERS= ${EXIM_USER}:${EXIM_GROUP} + +PKG_GECOS.${EXIM_USER}= Exim mail server user +PKG_HOME.${EXIM_USER}= ${VARBASE}/mail +PKG_SHELL.${EXIM_USER}= ${NOLOGIN} PKG_SYSCONFSUBDIR?= exim EXAMPLESDIR= ${PREFIX}/share/examples/exim diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index e55ee200920..23719ebd51d 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/03/06 22:49:16 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/04/23 00:12:38 jlam Exp $ DISTNAME= exim-3.36 PKGREVISION= 7 @@ -28,8 +28,13 @@ RCD_SCRIPTS= exim OWN_DIRS_PERMS= /var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750 OWN_DIRS_PERMS+= /var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750 -PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}:8:Exim\ mail\ server\ user:/var/mail:${NOLOGIN} PKG_GROUPS= ${EXIM_GROUP} +PKG_USERS= ${EXIM_USER}:${EXIM_GROUP} + +PKG_UID.${EXIM_USER}?= 8 +PKG_GECOS.${EXIM_USER}= Exim mail server user +PKG_HOME.${EXIM_USER}= ${VARBASE}/mail +PKG_SHELL.${EXIM_USER}= ${NOLOGIN} .include "../../mk/bsd.prefs.mk" diff --git a/mail/gld/Makefile b/mail/gld/Makefile index 3589560c41d..b67ebce36a1 100644 --- a/mail/gld/Makefile +++ b/mail/gld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:00 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/04/23 00:12:38 jlam Exp $ # DISTNAME= gld-1.6 @@ -20,7 +20,8 @@ RCD_SCRIPTS= gld GLD_USER?= gld GLD_GROUP?= gld PKG_GROUPS= ${GLD_GROUP} -PKG_USERS= ${GLD_USER}:${GLD_GROUP}::Greylisting\ Daemon\ user +PKG_USERS= ${GLD_USER}:${GLD_GROUP} +PKG_GECOS.${GLD_USER}= Greylisting Daemon user SUBST_CLASSES+= gld users SUBST_STAGE.gld= post-patch diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index e185da36d4b..2ee80d3ad0e 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/04/13 18:27:24 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2006/04/23 00:12:38 jlam Exp $ DISTNAME= mailman-2.1.8rc1 CATEGORIES= mail www @@ -35,7 +35,10 @@ PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} PLIST_SUBST+= MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//} PKG_GROUPS= ${MAILMAN_GROUP} -PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP}::Mailman\ user::${SH} +PKG_USERS= ${MAILMAN_USER}:${MAILMAN_GROUP} + +PKG_GECOS.${MAILMAN_USER}= Mailman user +PKG_SHELL.${MAILMAN_USER}= ${SH} REQD_DIRS_PERMS+= ${EXECDIR} root ${MAILMAN_GROUP} 775 OWN_DIRS_PERMS+= ${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 775 diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index b88ea2a8d2f..7060843ab4d 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/11 23:14:15 seb Exp $ +# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:38 jlam Exp $ DISTNAME= milter-greylist-2.1.2 PKGREVISION= 2 @@ -17,8 +17,10 @@ CONFIGURE_ARGS+=--with-libspf_alt=${PREFIX:Q} CONFIGURE_ARGS+=--prefix=${PREFIX:Q} BUILD_TARGET= milter-greylist -PKG_GROUPS= smmsp -PKG_USERS= smmsp:smmsp::Sendmail\ Message\ Submission\ Program +PKG_GROUPS= smmsp +PKG_USERS= smmsp:smmsp +PKG_GECOS.smmsp= Sendmail Message Submission Program + RCD_SCRIPTS= milter-greylist post-install: diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile index 5dbfca40f9d..ee0c71c1e4c 100644 --- a/mail/milter-regex/Makefile +++ b/mail/milter-regex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/08 22:01:21 tron Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:38 jlam Exp $ DISTNAME= milter-regex-1.6 CATEGORIES= mail @@ -10,8 +10,10 @@ COMMENT= Milter enabling regular expression filtering INSTALLATION_DIRS= man/man8 sbin -PKG_GROUPS= smmsp -PKG_USERS= smmsp:smmsp::Sendmail\ Message\ Submission\ Program +PKG_GROUPS= smmsp +PKG_USERS= smmsp:smmsp +PKG_GECOS.smmsp= Sendmail Message Submission Program + RCD_SCRIPTS= milter-regex SUBST_CLASSES+= etc diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 3f38d43d3ed..f53569de975 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2006/04/07 09:26:43 martti Exp $ +# $NetBSD: Makefile,v 1.62 2006/04/23 00:12:38 jlam Exp $ DISTNAME= postfix-2.3-20060405 #PKGREVISION= 1 @@ -93,7 +93,9 @@ OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc MAKE_DIRS+= ${PKG_SYSCONFDIR} PKG_GROUPS?= postfix maildrop -PKG_USERS?= postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR} +PKG_USERS?= postfix:postfix +PKG_GECOS.postfix= Postfix User +PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR} CONF_FILES= # empty .for _file_ in main.cf master.cf postfix-files diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index b61f5b0a41c..25021991a1e 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.179 2006/04/07 09:08:29 martti Exp $ +# $NetBSD: Makefile,v 1.180 2006/04/23 00:12:38 jlam Exp $ DISTNAME= postfix-2.2.10 #PKGREVISION= 1 @@ -92,7 +92,9 @@ OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc MAKE_DIRS+= ${PKG_SYSCONFDIR} PKG_GROUPS?= postfix maildrop -PKG_USERS?= postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR} +PKG_USERS?= postfix:postfix +PKG_GECOS.postfix= Postfix User +PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR} CONF_FILES= # empty .for _file_ in main.cf master.cf postfix-files diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile index 996197b8164..bc21c6ac72b 100644 --- a/mail/postgrey/Makefile +++ b/mail/postgrey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/30 09:06:16 is Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:38 jlam Exp $ # DISTNAME= postgrey-1.24 @@ -30,7 +30,9 @@ EGDIR= share/examples/${PKGBASE} RCD_SCRIPTS= postgrey PKG_GROUPS= ${POSTGREY_GROUP} -PKG_USERS= ${POSTGREY_USER}:${POSTGREY_GROUP}::Postgrey\ Daemon +PKG_USERS= ${POSTGREY_USER}:${POSTGREY_GROUP} + +PKG_GECOS.${POSTGREY_USER}= Postgrey Daemon User .for i in postgrey_whitelist_clients postgrey_whitelist_recipients CONF_FILES+= ${PREFIX}/${EGDIR}/${i} \ diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile index b53c81bdf48..f61f45cf446 100644 --- a/mail/qmail-users/Makefile +++ b/mail/qmail-users/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:38 jlam Exp $ # DISTNAME= qmail-users-1.0 @@ -15,13 +15,19 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_GROUPS= qmail nofiles -PKG_USERS+= alias:nofiles::alias:${QMAILDIR}/alias -PKG_USERS+= qmaill:nofiles::qmaill:${QMAILDIR} -PKG_USERS+= qmaild:nofiles::qmaild:${QMAILDIR} -PKG_USERS+= qmailp:nofiles::qmailp:${QMAILDIR} -PKG_USERS+= qmailq:qmail::qmailq:${QMAILDIR} -PKG_USERS+= qmailr:qmail::qmailr:${QMAILDIR} -PKG_USERS+= qmails:qmail::qmails:${QMAILDIR} +PKG_USERS+= alias:nofiles +PKG_USERS+= qmaill:nofiles +PKG_USERS+= qmaild:nofiles +PKG_USERS+= qmailp:nofiles +PKG_USERS+= qmailq:qmail +PKG_USERS+= qmailr:qmail +PKG_USERS+= qmails:qmail + +.for user in ${PKG_USERS:C/\:.*//} +PKG_GECOS.${user}= qmail ${user} pseudo-user +PKG_HOME.${user}= ${QMAILDIR} +.endfor +PKG_HOME.alias= ${QMAILDIR}/alias WRKSRC= ${WRKDIR} NO_BUILD= YES diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 108a61e152b..e81cd6b285f 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2006/03/22 19:56:36 adrianp Exp $ +# $NetBSD: Makefile,v 1.85 2006/04/23 00:12:39 jlam Exp $ .include "../../mail/sendmail/Makefile.common" @@ -88,8 +88,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail -PKG_GROUPS= smmsp -PKG_USERS= smmsp:smmsp::Sendmail\ Message\ Submission\ Program +PKG_GROUPS= smmsp +PKG_USERS= smmsp:smmsp +PKG_GECOS.smmsp= Sendmail Message Submission Program .include "../../mk/bsd.pkg.mk" diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile index 2849997eb0a..b597f3bdac7 100644 --- a/mail/sendmail812/Makefile +++ b/mail/sendmail812/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/22 21:19:06 tv Exp $ +# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $ .include "options.mk" .include "../../mail/sendmail812/Makefile.common" @@ -12,8 +12,9 @@ CONFLICTS+= postfix-[0-9]* fastforward>=0.51nb2 MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC PLIST_SRC= ${WRKDIR}/.PLIST_SRC -PKG_GROUPS= smmsp -PKG_USERS= smmsp:smmsp::Sendmail\ Message\ Submission\ Program +PKG_GROUPS= smmsp +PKG_USERS= smmsp:smmsp +PKG_GECOS.smmsp= Sendmail Message Submission Program post-patch: make-sendmail-siteconfig .if !empty(PKG_OPTIONS:Mtcpwrappers) diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile index 77013a46b7e..83ac64b99c3 100644 --- a/mail/spamd/Makefile +++ b/mail/spamd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/04/01 12:14:27 peter Exp $ +# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $ DISTNAME= spamd-20060330 CATEGORIES= mail @@ -20,8 +20,10 @@ CPPFLAGS+= -DPATH_SPAMD_DB=\"${VARBASE}/db/spamd\" CPPFLAGS+= -DPATH_PFCTL=\"${PFCTL}\" CPPFLAGS+= -DPATH_SPAMD_CONF=\"${SPAMD_CONF}\" -PKG_USERS= _spamd:_spamd::Spam\ Daemon:${SPAMD_HOME}:/sbin/nologin PKG_GROUPS= _spamd +PKG_USERS= _spamd:_spamd +PKG_GECOS._spamd= Spam Daemon User +PKG_HOME._spamd= ${SPAMD_HOME} RCD_SCRIPTS= pfspamd diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index cf31e4627d7..3bbd87b9220 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:02 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/04/23 00:12:39 jlam Exp $ # DISTNAME= sympa-4.1.2 @@ -84,7 +84,9 @@ SYMPA_SPOOL= ${SYMPA_VARBASE}/spool SYMPA_BIN= ${SYMPA_PREFIX}/bin PKG_GROUPS= ${SYMPA_GROUP} -PKG_USERS= ${SYMPA_USER}:${SYMPA_GROUP}::Sympa\ user:${SYMPA_VARBASE} +PKG_USERS= ${SYMPA_USER}:${SYMPA_GROUP} + +PKG_HOME.${SYMPA_USER}= ${SYMPA_VARBASE} .for d in sympa sympa/create_list_templates sympa/general_task_models \ sympa/scenari sympa/task_models sympa/templates sympa/wws_templates diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index 7be510429b7..56903714ab6 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/02/05 23:09:59 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2006/04/23 00:12:39 jlam Exp $ # DISTNAME= tmda-1.0.3 @@ -18,8 +18,9 @@ PKG_SYSCONFSUBDIR= ${PKGBASE} PYTHON_VERSIONS_ACCEPTED= 24 23 22 -PKG_GROUPS= tofmipd -PKG_USERS= tofmipd:tofmipd::TMDA\ ofmipd\ User +PKG_GROUPS= tofmipd +PKG_USERS= tofmipd:tofmipd +PKG_GECOS.tofmipd= TMDA ofmipd User RCD_SCRIPTS= tofmipd FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} diff --git a/net/bind9/Makefile b/net/bind9/Makefile index 8226bdb3d68..af845a079f4 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2005/12/29 06:21:57 jlam Exp $ +# $NetBSD: Makefile,v 1.76 2006/04/23 00:12:39 jlam Exp $ DISTNAME= bind-${BIND_VERSION} CATEGORIES= net @@ -26,8 +26,11 @@ CONFIGURE_ARGS+=--with-libtool=yes \ # include at the bottom to use OpenSSL shipped with BIND9. CONFIGURE_ARGS+=--with-openssl=${SSLBASE:Q} -PKG_USERS= ${BIND_USER}:${BIND_GROUP}::Named\ pseudo-user:${BIND_DIR}:${NOLOGIN} PKG_GROUPS= ${BIND_GROUP} +PKG_USERS= ${BIND_USER}:${BIND_GROUP} + +PKG_GECOS.${BIND_USER}= Named pseudo-user +PKG_HOME.${BIND_USER}= ${BIND_DIR} PTHREAD_OPTS+= native diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile index 9e94e3e9367..c24f27d0e72 100644 --- a/net/djbdns-run/Makefile +++ b/net/djbdns-run/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $ # DISTNAME= djbdns-run-20050415 @@ -26,14 +26,18 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/servers MAKE_DIRS+= ${PKG_SYSCONFDIR}/rbldns MAKE_DIRS+= ${PKG_SYSCONFDIR}/tinydns PKG_GROUPS= djbdns -PKG_USERS+= dnslog:djbdns::dnslog -PKG_USERS+= axfrdns:djbdns::axfrdns -PKG_USERS+= dnscache:djbdns::dnscache -PKG_USERS+= rbldns:djbdns::rbldns -PKG_USERS+= tinydns:djbdns::tinydns +PKG_USERS+= dnslog:djbdns +PKG_USERS+= axfrdns:djbdns +PKG_USERS+= dnscache:djbdns +PKG_USERS+= rbldns:djbdns +PKG_USERS+= tinydns:djbdns RCD_SCRIPTS= axfrdns djbdns dnscache rbldns tinydns FILES_SUBST+= PKGNAME=${PKGNAME:Q} +.for user in ${PKG_USERS:C/\:.*//} +PKG_GECOS.${user}= djbdns ${user} pseudo-user +.endfor + INSTALLATION_DIRS= bin share/doc/djbdns-run .include "../../mk/bsd.prefs.mk" diff --git a/net/gofish/Makefile b/net/gofish/Makefile index 88bb3fcf64a..35123e1a2ae 100644 --- a/net/gofish/Makefile +++ b/net/gofish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:59 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2006/04/23 00:12:39 jlam Exp $ DISTNAME= gofish-1.1 PKGREVISION= 1 @@ -23,8 +23,12 @@ GOPHER_USER= gopher GOPHER_GROUP= gopher GOPHER_UID= 30 GOPHER_GID= 30 -PKG_GROUPS= ${GOPHER_GROUP}:${GOPHER_GID} -PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP}:${GOPHER_UID} + +PKG_GROUPS= ${GOPHER_GROUP} +PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP} +PKG_GID.${GOPHER_GROUP}= ${GOPHER_GID} +PKG_UID.${GOPHER_USER}= ${GOPHER_UID} + OWN_DIRS_PERMS= ${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750 RCD_SCRIPTS= gopherd diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile index d57c156261a..236de5e80b9 100644 --- a/net/hobbitmon/Makefile +++ b/net/hobbitmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:43 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $ # DISTNAME= hobbit-4.0-beta6 @@ -28,7 +28,10 @@ BBCGIURL?= /cgi-bin BBHOSTIP?= 127.0.0.1 PKG_GROUPS= ${BBGROUP} -PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q}::Hobbit\ monitor:${BBTOPDIR:Q} +PKG_USERS= ${BBUSER:Q}:${BBGROUP:Q} + +PKG_GECOS.${BBUSER}= Hobbit monitor +PKG_HOME.${BBUSER}= ${BBTOPDIR} CONFIGURE_ENV+= TARGET=hobbit CONFIGURE_ENV+= FPING=${PREFIX:Q}/sbin/fping diff --git a/net/howl/Makefile b/net/howl/Makefile index 4ac6106efd6..69834a1732c 100644 --- a/net/howl/Makefile +++ b/net/howl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/12 05:26:39 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $ DISTNAME= howl-1.0.0 CATEGORIES= net @@ -15,7 +15,8 @@ PTHREAD_AUTO_VARS= yes RCD_SCRIPTS= howl PKG_GROUPS+= ${HOWL_GROUP} -PKG_USERS+= ${HOWL_USER:Q}:${HOWL_GROUP:Q}::Zeroconf\ user +PKG_USERS+= ${HOWL_USER:Q}:${HOWL_GROUP:Q} +PKG_GECOS.${HOWL_USER}= Zeroconf user BUILD_DEFS+= HOWL_GROUP HOWL_USER diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index 804ebe373d2..02314e48995 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2006/04/23 00:12:39 jlam Exp $ DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} @@ -122,7 +122,9 @@ OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500 RCD_SCRIPTS= samba nmbd smbd winbindd PKG_GROUPS= ${SAMBA_GROUP} -PKG_USERS= ${SAMBA_USER}:${SAMBA_GROUP}::Samba\ pseudo-user +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}\"' diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile index 6040c0305bf..403242a3977 100644 --- a/net/lambdamoo/Makefile +++ b/net/lambdamoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/04/23 00:12:39 jlam Exp $ DISTNAME= LambdaMOO-1.8.1 PKGNAME= lambdamoo-1.8.1 @@ -20,8 +20,9 @@ LAMBDAMOO_HOME?= ${PREFIX}/share/${LAMBDAMOO_USER} PKG_GROUPS= ${LAMBDAMOO_GROUP} PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP} -_PKG_USER_HOME= ${LAMBDAMOO_HOME} -_PKG_USER_SHELL= ${SH} + +PKG_HOME.${LAMBDAMOO_USER}= ${LAMBDAMOO_HOME} +PKG_SHELL.${LAMBDAMOO_USER}= ${SH} FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q} diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile index 7313f4967d0..705ca4cbaf4 100644 --- a/net/mldonkey/Makefile +++ b/net/mldonkey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/04/17 14:52:11 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2006/04/23 00:12:39 jlam Exp $ # .include "Makefile.common" @@ -11,7 +11,11 @@ BUILD_DEFS+= MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 PKG_GROUPS= ${MLDONKEY_GROUP} -PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP}::Dedicated\ mldonkey\ server:${MLDONKEY_HOME}:${SH} +PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP} + +PKG_GECOS.${MLDONKEY_USER}= Dedicated mldonkey server +PKG_HOME.${MLDONKEY_USER}= ${MLDONKEY_HOME} +PKG_SHELL.${MLDONKEY_USER}= ${SH} FILES_SUBST+= MLDONKEY_GROUP=${MLDONKEY_GROUP:Q} FILES_SUBST+= MLDONKEY_HOME=${MLDONKEY_HOME:Q} diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common index 261ab9dc0db..488fbe81029 100644 --- a/net/mydns-pgsql/Makefile.common +++ b/net/mydns-pgsql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2006/03/05 16:27:27 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2006/04/23 00:12:39 jlam Exp $ DISTNAME= mydns-1.1.0 CATEGORIES= net @@ -31,7 +31,7 @@ CONF_FILES_PERMS= ${EGDIR}/mydns.conf ${PKG_SYSCONFDIR}/mydns.conf ${MYDNS_PERMS RCD_SCRIPTS= mydns PKG_GROUPS= ${MYDNS_GROUP} -PKG_USERS= ${MYDNS_USER}:${MYDNS_GROUP}::MyDNS\ user +PKG_USERS= ${MYDNS_USER}:${MYDNS_GROUP} post-install: ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile index 68640b8010f..a968349b3c2 100644 --- a/net/nagios-base/Makefile +++ b/net/nagios-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:44 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2006/04/23 00:12:40 jlam Exp $ # DISTNAME= nagios-2.0 @@ -34,8 +34,13 @@ INSTALL_TARGET= install install-config PKG_GROUPS+= ${NAGIOS_GROUP} PKG_GROUPS+= ${NAGIOSADM_GROUP} -PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}::Nagios\ Runtime\ User -PKG_USERS+= ${NAGIOSADM_USER}:${NAGIOSADM_GROUP}::Nagios\ Administrator:${PREFIX}/etc/nagios:${SH} +PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP} +PKG_USERS+= ${NAGIOSADM_USER}:${NAGIOSADM_GROUP} + +PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User +PKG_GECOS.${NAGIOSADM_USER}= Nagios Administrator +PKG_HOME.${NAGIOSADM_USER}= ${PKG_SYSCONFDIR} +PKG_SHELL.${NAGIOSADM_USER}= ${SH} EGDIR= ${PREFIX}/share/examples/nagios EGFILES= cgi.cfg checkcommands.cfg contactgroups.cfg contacts.cfg \ diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile index b8a1567e60c..a9a6cc8d0dc 100644 --- a/net/netdisco/Makefile +++ b/net/netdisco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/04/23 00:12:40 jlam Exp $ # DISTNAME= netdisco-0.94_with_mibs @@ -80,8 +80,12 @@ NETDISCOUSER?= netdisco NETDISCOGROUP?= netdisco BUILD_DEFS+= NETDISCOUSER NETDISCOGROUP -PKG_USERS= ${NETDISCOUSER:Q}:${NETDISCOGROUP:Q}::Netdisco\ administrator:${PREFIX:Q}/netdisco:${SH:Q} PKG_GROUPS= ${NETDISCOGROUP} +PKG_USERS= ${NETDISCOUSER:Q}:${NETDISCOGROUP:Q} + +PKG_GECOS.${NETDISCOUSER}= Netdisco administrator +PKG_HOME.${NETDISCOUSER}= ${PREFIX}/netdisco +PKG_SHELL.${NETDISCOUSER}= ${SH} PKG_SYSCONFVAR= netdisco PKG_SYSCONFDIR.netdisco= ${PREFIX}/netdisco diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common index 0cd9ce8fd31..b35f944cfd5 100644 --- a/net/netsaint-base/Makefile.common +++ b/net/netsaint-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2005/12/05 23:55:14 rillig Exp $ +# $NetBSD: Makefile.common,v 1.12 2006/04/23 00:12:40 jlam Exp $ # CATEGORIES= net sysutils @@ -12,8 +12,13 @@ NETSTADM_GROUP?= ${NETSTADM_USER} PKG_GROUPS+= ${NETSAINT_GROUP} PKG_GROUPS+= ${NETSTADM_GROUP} -PKG_USERS+= ${NETSAINT_USER}:${NETSAINT_GROUP}::NetSaint\ Runtime\ User -PKG_USERS+= ${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\ Administrator:${PREFIX}/etc/netsaint:${SH} +PKG_USERS+= ${NETSAINT_USER}:${NETSAINT_GROUP} +PKG_USERS+= ${NETSTADM_USER}:${NETSTADM_GROUP} + +PKG_GECOS.${NETSAINT_USER}= NetSaint Runtime User +PKG_GECOS.${NETSTADM_USER}= NetSaint Administrator +PKG_HOME.${NETSTADM_USER}= ${PKG_SYSCONFDIR} +PKG_SHELL.${NETSTADM_USER}= ${SH} GNU_CONFIGURE= YES USE_TOOLS+= gmake perl:run diff --git a/net/nsd/Makefile b/net/nsd/Makefile index aa1b4e7c22f..11f7ce50512 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:34 reed Exp $ +# $NetBSD: Makefile,v 1.36 2006/04/23 00:12:40 jlam Exp $ DISTNAME= nsd-2.3.3 CATEGORIES= net @@ -29,11 +29,11 @@ CONFIGURE_ARGS+=--with-dbfile=${VARBASE}/db/nsd.db RCD_SCRIPTS= nsd FILES_SUBST+= NSDDB=${VARBASE}/db/nsd.db -PKG_GROUPS?= nsd -PKG_USERS?= nsd:nsd::nsd\ pseudo-user +PKG_GROUPS?= nsd +PKG_USERS?= nsd:nsd .for _file_ in nsd.zones nsdc.conf -CONF_FILES+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/nsd/${_file_} +CONF_FILES+= ${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/nsd/${_file_} .endfor post-install: diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 523357c5652..cc5ff012b36 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:01 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/04/23 00:12:40 jlam Exp $ DISTNAME= openntpd-3.7p1 CATEGORIES= net @@ -22,8 +22,9 @@ EGDIR= ${PREFIX}/share/examples/openntpd CONF_FILES= ${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf RCD_SCRIPTS= openntpd -PKG_USERS= _ntp:_ntp::ntpd\ pseudo-user:${VARBASE}/chroot/ntpd:${NOLOGIN} PKG_GROUPS= _ntp +PKG_USERS= _ntp:_ntp +PKG_HOME._ntp= ${VARBASE}/chroot/ntpd OWN_DIRS= ${VARBASE}/chroot/ntpd INSTALLATION_DIRS= man/man5 man/man8 sbin diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common index 49f1059a30b..b641b8e08fc 100644 --- a/net/snort/Makefile.common +++ b/net/snort/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2006/04/18 22:39:32 adrianp Exp $ +# $NetBSD: Makefile.common,v 1.34 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= snort-2.4.4 @@ -23,7 +23,7 @@ RCD_SCRIPTS= snort SNORT_USER?= snort SNORT_GROUP?= snort PKG_GROUPS= ${SNORT_GROUP} -PKG_USERS= ${SNORT_USER}:${SNORT_GROUP}::Snort\ user +PKG_USERS= ${SNORT_USER}:${SNORT_GROUP} FILES_SUBST+= SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q} OWN_DIRS_PERMS= ${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700 diff --git a/net/tor/Makefile b/net/tor/Makefile index 6e9aaa686b3..25852588cdb 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:35 reed Exp $ +# $NetBSD: Makefile,v 1.28 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= tor-0.1.0.17 @@ -20,7 +20,9 @@ PKG_HOME?= /var/chroot/tor RCD_SCRIPTS= tor PKG_GROUPS= ${TOR_GROUP} -PKG_USERS= ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME} +PKG_USERS= ${TOR_USER}:${TOR_GROUP} +PKG_GECOS.${TOR_USER}= Torifier +PKG_HOME.${TOR_USER}= ${PKG_HOME} USER_GROUP= ${TOR_USER} ${TOR_GROUP} OWN_DIR_PERMS+= ${PKG_HOME} ${USER_GROUP} 0755 diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index 20805845710..b7c567b7e12 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:25 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= vsftpd-2.0.4 @@ -18,7 +18,7 @@ RCD_SCRIPTS= vsftpd VSFTPD_USER?= vsftpd VSFTPD_GROUP?= vsftpd PKG_GROUPS= ${VSFTPD_GROUP} -PKG_USERS= ${VSFTPD_USER}:${VSFTPD_GROUP}::vsftpd\ user +PKG_USERS= ${VSFTPD_USER}:${VSFTPD_GROUP} DOCDIR= ${PREFIX}/share/doc/vsftpd EGDIR= ${PREFIX}/share/examples/vsftpd diff --git a/news/inn/Makefile b/news/inn/Makefile index eafa9307cf1..50e054df8ba 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2006/04/10 16:27:02 joerg Exp $ +# $NetBSD: Makefile,v 1.81 2006/04/23 00:12:41 jlam Exp $ DISTNAME= inn-2.4.3 PKGREVISION= 1 @@ -42,8 +42,11 @@ 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_USERS= ${INN_USER}:${INN_GROUP}::Internet\ News:${INN_DATA_DIR}:${SH} PKG_GROUPS= ${INN_GROUP} +PKG_USERS= ${INN_USER}:${INN_GROUP} +PKG_GECOS.${INN_USER}= Internet\ News +PKG_HOME.${INN_USER}= ${INN_DATA_DIR} +PKG_SHELL.${INN_USER}= ${SH} PKG_SYSCONFDIR.inn= ${INN_DATA_DIR}/etc EXAMPLEDIR= ${PREFIX}/share/examples/inn diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 515fef4f2de..4a893c902b4 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/04/08 06:56:05 heinz Exp $ +# $NetBSD: Makefile,v 1.34 2006/04/23 00:12:41 jlam Exp $ DISTNAME= leafnode-1.11.3.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -22,10 +22,14 @@ 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 -PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP}::Internet\ News:${LEAFNODE_DATA_DIR}:${SH} PKG_GROUPS= ${LEAFNODE_GROUP} +PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP} LEAFNODE_HOME?= ${INN_DATA_DIR} +PKG_GECOS.${LEAFNODE_USER}= Internet News +PKG_HOME.${LEAFNODE_USER}= ${LEAFNODE_DATA_DIR} +PKG_SHELL.${LEAFNODE_USER}= ${SH} + BUILD_DEFS+= USE_INET6 FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q} diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index 310a00b5217..d902d11d9b5 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:27 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= sge-5.3p6 @@ -26,7 +26,8 @@ MAKE_ENV+= PERL5=${PERL5:Q} SGE_USER?= sgeadmin SGE_GROUP?= sgeadmin PKG_GROUPS= ${SGE_GROUP} -PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator +PKG_USERS= ${SGE_USER}:${SGE_GROUP} +PKG_GECOS.${SGE_USER}= Sun Grid Engine Administrator EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl diff --git a/print/cups/Makefile b/print/cups/Makefile index a65a0a21997..25912674c60 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2006/04/19 17:01:34 wiz Exp $ +# $NetBSD: Makefile,v 1.111 2006/04/23 00:12:41 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: @@ -86,7 +86,9 @@ CUPS_LOGDIR= /var/log/cups CUPS_REQUESTS= /var/spool/cups PKG_GROUPS= ${CUPS_GROUP} -PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\ UNIX\ Printing\ System\ user::${SH} +PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} +PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user +PKG_SHELL.${CUPS_USER}= ${SH} SPECIAL_PERMS= ${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4755 CONF_FILES= ${EGDIR}/client.conf ${CUPS_CONFDIR}/client.conf diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 584842e2255..fc2b089b9aa 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:41 jlam Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -56,7 +56,12 @@ FILES_SUBST+= AMAVIS_DIR=${AMAVIS_DIR:Q} FILES_SUBST+= AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE:Q} PKG_GROUPS= ${AMAVIS_GROUP} -PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\ Scanning\ Account:${AMAVIS_DIR}:${SH} +PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP} + +PKG_GECOS.${AMAVIS_USER}= AMaViS Virus Scanning Account +PKG_HOME.${AMAVIS_USER}= ${AMAVIS_DIR} +PKG_SHELL.${AMAVIS_USER}= ${SH} + RCD_SCRIPTS= amavisd CONF_FILES= ${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common index 20df1bed0a7..f58800bec5e 100644 --- a/security/courier-authlib/Makefile.common +++ b/security/courier-authlib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2005/12/29 06:22:09 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8 2006/04/23 00:12:41 jlam Exp $ COURIER_USER?= courier COURIER_GROUP?= mail @@ -6,7 +6,7 @@ FILES_SUBST+= COURIER_USER=${COURIER_USER:Q} FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP:Q} PKG_GROUPS= ${COURIER_GROUP} -PKG_USERS= ${COURIER_USER}:${COURIER_GROUP}::Courier\ user +PKG_USERS= ${COURIER_USER}:${COURIER_GROUP} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER:Q} diff --git a/security/cvm/Makefile b/security/cvm/Makefile index b17ade0d815..cae4ee11e1b 100644 --- a/security/cvm/Makefile +++ b/security/cvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/04/22 09:22:14 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= cvm-0.76 @@ -22,7 +22,7 @@ SUBST_MESSAGE.paths= Fixing paths. RCD_SCRIPTS= cvm PKG_GROUPS+= cvmlog -PKG_USERS+= cvmlog:cvmlog::cvmlog +PKG_USERS+= cvmlog:cvmlog DJB_CONFIG_CMDS= \ ${ECHO} ${DJB_CONFIG_PREFIX}/include > conf-include; \ diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 6efb9de59fa..97a9bcce839 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2006/04/18 17:41:30 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2006/04/23 00:12:41 jlam Exp $ .include "Makefile.common" @@ -57,7 +57,8 @@ FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} BUILD_DEFS+= CYRUS_USER CYRUS_GROUP PKG_GROUPS= ${CYRUS_GROUP} -PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH} +PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP} +PKG_SHELL.${CYRUS_USER}=${SH} MESSAGE_SUBST+= PLUGINDIR=${PLUGINDIR:Q} diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 4607fb0e64b..daa8e5e612b 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/31 23:56:29 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= dirmngr-0.9.3 @@ -17,7 +17,9 @@ COMMENT= X509 certificate and CRL downloader DIRMNGR_USER?= dirmngr DIRMNGR_GROUP?= dirmngr PKG_GROUPS= ${DIRMNGR_GROUP} -PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\ user:${VARBASE}/dirmngr: +PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP} + +PKG_SHELL.${DIRMNGR_USER}= ${VARBASE}/dirmngr GNU_CONFIGURE= yes USE_TOOLS+= gawk diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index 090c38704d6..25e924752c4 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/04/12 19:40:51 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:41 jlam Exp $ # DISTNAME= libprelude-0.9.7 PKGREVISION= 1 @@ -26,8 +26,12 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude PRELUDE_HOME?= ${VARBASE:Q}/spool/prelude -PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS:${PRELUDE_HOME}:${NOLOGIN} + PKG_GROUPS= ${PRELUDE_GROUP} +PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP} + +PKG_GECOS.${PRELUDE_USER}= Prelude IDS +PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME} CONF_FILES+= ${PREFIX}/share/examples/libprelude/client.conf ${PKG_SYSCONFDIR}/client.conf CONF_FILES+= ${PREFIX}/share/examples/libprelude/global.conf ${PKG_SYSCONFDIR}/global.conf diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 18d8ca28244..8392a6350a4 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:33 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2006/04/23 00:12:41 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,8 +44,13 @@ INSTALL_TARGET= install-nokeys PLIST_SRC= # empty MESSAGE_SRC= ${.CURDIR}/MESSAGE -PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\ privsep:${OPENSSH_CHROOT}:${NOLOGIN} -PKG_GROUPS= ${OPENSSH_GROUP}:${OPENSSH_GID} +PKG_GROUPS= ${OPENSSH_GROUP}:${OPENSSH_GID} +PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP} + +PKG_GID.${OPENSSH_GROUP}= ${OPENSSH_GID} +PKG_UID.${OPENSSH_USER}= ${OPENSSH_UID} +PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user +PKG_HOME.${OPENSSH_USER}= ${OPENSSH_CHROOT} SSH_PID_DIR= /var/run # default directory for PID files diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 326339771fa..7afbd784bf7 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.166 2006/03/14 01:14:33 jlam Exp $ +# $NetBSD: Makefile,v 1.167 2006/04/23 00:12:41 jlam Exp $ DISTNAME= openssh-4.3p1 PKGNAME= openssh-4.3.1 @@ -48,8 +48,13 @@ LIBS+= -lbind -ldb -lcrypt .else # not Interix -PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\ privsep:${OPENSSH_CHROOT}:${NOLOGIN} PKG_GROUPS= ${OPENSSH_GROUP}:${OPENSSH_GID} +PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP} + +PKG_GID.${OPENSSH_GROUP}= ${OPENSSH_GID} +PKG_UID.${OPENSSH_USER}= ${OPENSSH_UID} +PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user +PKG_HOME.${OPENSSH_USER}= ${OPENSSH_CHROOT} .endif diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile index ffc47bc560c..da45f073768 100644 --- a/security/pflkm/Makefile +++ b/security/pflkm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/20 23:03:56 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:42 jlam Exp $ DISTNAME= pflkm-20050511 PKGREVISION= 1 @@ -13,7 +13,10 @@ ONLY_FOR_PLATFORM= NetBSD-2.[0-9]*-* NO_CONFIGURE= yes -PKG_USERS= _pflogd:nogroup::pflogd\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLOGIN} +PKG_GROUPS= nogroup +PKG_USERS= _pflogd:nogroup +PKG_GECOS._pflogd= pflogd pseudo-user +PKG_HOME._pflogd= ${VARBASE}/chroot/pflogd RCD_SCRIPTS= pf pflogd PKG_SYSCONFSUBDIR= pf diff --git a/security/pks/Makefile b/security/pks/Makefile index 1e4837f3284..0b9b5238d01 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:14 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:42 jlam Exp $ DISTNAME= pks-0.9.4 PKGREVISION= 3 @@ -23,8 +23,11 @@ PKS_GROUP= pks PKS_SERVER?= localhost PKS_HOME= ${VARBASE}/pks -PKG_USERS= ${PKS_USER}:${PKS_GROUP}::PGP\ Key\ Server:${PKS_HOME}:${NOLOGIN} PKG_GROUPS= ${PKS_GROUP} +PKG_USERS= ${PKS_USER}:${PKS_GROUP} + +PKG_GECOS.${PKS_USER}= PGP Key Server +PKG_HOME.${PKS_USER}= ${PKS_HOME} BDB_ACCEPTED= db2 diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index 588ee286c87..deb415e7b2a 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/10 22:49:37 shannonjr Exp $ +# $NetBSD: Makefile,v 1.6 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= prelude-lml-0.9.4 @@ -27,8 +27,13 @@ PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude PRELUDE_LML_PID_DIR= ${VARBASE:Q}/run/prelude-lml PRELUDE_HOME= ${VARBASE:Q}/prelude-lml -PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS:${PRELUDE_HOME}:${NOLOGIN} + PKG_GROUPS= ${PRELUDE_GROUP} +PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP} + +PKG_GECOS.${PRELUDE_USER}= Prelude IDS +PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME} + FILES_SUBST+= PRELUDE_LML_PID_DIR=${PRELUDE_LML_PID_DIR:Q} FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q} FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_GROUP:Q} diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 1fc4a660fd4..81400ab957e 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/03/06 00:18:22 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= prelude-manager-0.9.3 @@ -24,8 +24,13 @@ PRELUDE_MANAGER_PID_DIR= ${VARBASE}/run/prelude-manager PRELUDE_USER?= _prelude PRELUDE_GROUP?= _prelude PRELUDE_HOME?= /var/spool/prelude-manager -PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS\ manager:${PRELUDE_HOME}:${NOLOGIN} + PKG_GROUPS= ${PRELUDE_GROUP} +PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP} + +PKG_GECOS.${PRELUDE_USER}= Prelude IDS manager +PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME} + FILES_SUBST+= PRELUDE_MANAGER_PID_DIR=${PRELUDE_MANAGER_PID_DIR:Q} FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q} FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q} diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index 95085ee7af0..68c6ef3622e 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/03/06 00:18:22 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= prewikka-0.9.3 @@ -21,8 +21,11 @@ PREWIKKA_GROUP?= prewikka PREWIKKA_HOME= /nonexistent RCD_SCRIPTS= prewikka -PKG_USERS= ${PREWIKKA_USER}:${PREWIKKA_GROUP}::Prelude\-IDS\ console:${PREWIKKA_HOME}:${NOLOGIN} PKG_GROUPS= ${PREWIKKA_GROUP} +PKG_USERS= ${PREWIKKA_USER}:${PREWIKKA_GROUP} + +PKG_GECOS.${PREWIKKA_USER}= Prelude-IDS console +PKG_HOME.${PREWIKKA_USER}= ${PREWIKKA_HOME} SUBST_CLASSES+= code SUBST_STAGE.code= post-patch diff --git a/security/sfs/Makefile b/security/sfs/Makefile index 1c052e87885..8da6d55d54f 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/07 15:28:49 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= sfs-0.7.2 @@ -25,9 +25,10 @@ GCC_REQD+= 2.95.3 INFO_FILES= # PLIST -PKG_USERS= sfs:sfs::Self-certifying\ file\ system:/ -PKG_GROUPS= sfs PKG_SYSCONFSUBDIR= sfs +PKG_GROUPS= sfs +PKG_USERS= sfs:sfs +PKG_GECOS.sfs= Self-certifying file system pseudo-user RCD_SCRIPTS= sfscd sfssd diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index 15a6adbdf87..0b9193b9c5d 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/02/05 23:10:48 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2006/04/23 00:12:42 jlam Exp $ PKGNAME= amanda-common-${VERS} PKGREVISION= 3 @@ -27,7 +27,10 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no CONFIGURE_ENV+= ac_cv_lib_readline_readline=no PKG_GROUPS= ${AMANDA_GROUP} -PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\ user::${SH} +PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} + +PKG_GECOS.${AMANDA_USER}= Amanda psuedo-user +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 diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index 62b42c33cd8..d9baa35c254 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,11 +1,15 @@ -# $NetBSD: Makefile,v 1.11 2006/04/02 18:20:53 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:42 jlam Exp $ # .include "Makefile.common" PKGREVISION= 1 -PKG_USERS= messagebus:messagebus::System\ message\ bus:${VARBASE}/run/dbus:${NOLOGIN} + PKG_GROUPS= messagebus +PKG_USERS= messagebus:messagebus + +PKG_GECOS.messagebus= System message bus +PKG_HOME.messagebus= ${VARBASE}/run/dbus MAKE_DIRS= ${PKG_SYSCONFDIR}/event.d MAKE_DIRS+= ${PKG_SYSCONFDIR}/system.d diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index ebca9fbdc18..5a0e08f05ca 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2006/04/22 07:32:24 lukem Exp $ +# $NetBSD: Makefile,v 1.42 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= nut-2.0.3 @@ -40,7 +40,9 @@ MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR} MESSAGE_SUBST+= NUT_DOCDIR=${NUT_DOCDIR} PKG_GROUPS= ${NUT_GROUP} -PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\ UPS\ Tools::${SH} +PKG_USERS= ${NUT_USER}:${NUT_GROUP} +PKG_GECOS.${NUT_USER}= Network UPS Tools +PKG_SHELL.${NUT_USER}= ${SH} CONF_FILES= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \ diff --git a/www/apache/Makefile b/www/apache/Makefile index 68a13e13149..defb9c1d94a 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2006/03/04 21:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.185 2006/04/23 00:12:42 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). @@ -165,7 +165,7 @@ SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g' SUBST_STAGE.paths= post-patch PKG_GROUPS= ${APACHE_GROUP} -PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\ user +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} XARGS=${XARGS:Q} MAKE_ENV+= FIND=${FIND:Q} CHGRP=${CHGRP:Q} diff --git a/www/apache2/Makefile b/www/apache2/Makefile index a375a408677..fa6ad497682 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile,v 1.98 2006/04/23 00:12:42 jlam Exp $ .include "Makefile.common" @@ -67,7 +67,7 @@ BUILD_DEFS+= APACHE_MODULES APACHE_USER?= www APACHE_GROUP?= www PKG_GROUPS= ${APACHE_GROUP} -PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\ user +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} PKG_SYSCONFVAR= apache PKG_SYSCONFSUBDIR?= httpd diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 0adff984f81..927f9fb01b0 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:34 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -21,7 +21,7 @@ PKG_SYSCONFSUBDIR?= privoxy RCD_SCRIPTS= privoxy PKG_GROUPS= ${PRIVOXY_GROUP} -PKG_USERS= ${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\ user +PKG_USERS= ${PRIVOXY_USER}:${PRIVOXY_GROUP} EGDIR= ${PREFIX}/share/examples/privoxy diff --git a/www/squid/Makefile b/www/squid/Makefile index c4fd3c756a4..3ecd9297e3d 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.174 2006/03/12 12:12:19 taca Exp $ +# $NetBSD: Makefile,v 1.175 2006/04/23 00:12:42 jlam Exp $ DISTNAME= squid-2.5.STABLE13 PKGNAME= squid-2.5.13 @@ -36,7 +36,10 @@ PLIST_SRC= ${WRKDIR}/PLIST RCD_SCRIPTS= squid PKG_GROUPS= ${SQUID_GROUP} -PKG_USERS= ${SQUID_USER}:${SQUID_GROUP}::Squid\ Web-Cache\ pseudo-user +PKG_USERS= ${SQUID_USER}:${SQUID_GROUP} + +PKG_GECOS.${SQUID_USER}= Squid Web-Cache pseudo-user + CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf CONF_FILES+= ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf CONF_FILES+= ${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index 75e50529b3b..96ff2ea6f36 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:04 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= tinyproxy-1.6.2 @@ -18,7 +18,7 @@ PKG_SYSCONFSUBDIR= tinyproxy TINYPROXY_USER?= tinyproxy TINYPROXY_GROUP?= tinyproxy PKG_GROUPS= ${TINYPROXY_GROUP} -PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP}::Tinyproxy\ user +PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP} FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q} FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q} diff --git a/www/zope3/Makefile b/www/zope3/Makefile index c5a4ccbc78b..dbc7f112062 100644 --- a/www/zope3/Makefile +++ b/www/zope3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:30 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= Zope-3.2.0 @@ -32,6 +32,8 @@ RCD_SCRIPTS= zope3 zss3 PKG_GROUPS= ${ZOPE3_GROUP} PKG_USERS= ${ZOPE3_USER}:${ZOPE3_GROUP}::Zope3\ user +PKG_GECOS.${ZOPE3_USER}= Zope3 user + MESSAGE_SUBST+= ZOPE3_USER=${ZOPE3_USER:Q} \ ZOPE3_GROUP=${ZOPE3_GROUP:Q} \ VARBASE=${VARBASE:Q} |