pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Modify packages that set PKG_USERS and PKG_GROUPS to f...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fe67766d4d0
branches:  trunk
changeset: 511820:6fe67766d4d0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Apr 23 00:12:35 2006 +0000

description:
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.

diffstat:

 audio/icecast/Makefile                     |   4 ++--
 chat/bitlbee/Makefile                      |   5 +++--
 chat/ircd-hybrid/Makefile                  |   4 ++--
 chat/ircu/Makefile                         |   8 ++++++--
 chat/jabberd/Makefile                      |   4 ++--
 chat/silc-server/Makefile                  |   4 ++--
 chat/unrealircd/Makefile                   |   8 ++++++--
 comms/asterisk/Makefile                    |   4 ++--
 comms/fidogate/Makefile                    |   6 ++++--
 databases/gnats/Makefile                   |   9 +++++++--
 databases/mysql4-server/Makefile           |   9 +++++++--
 databases/mysql5-server/Makefile           |   9 +++++++--
 databases/postgresql73-server/Makefile     |   7 +++++--
 databases/postgresql74-server/Makefile     |   7 +++++--
 databases/postgresql80-server/Makefile     |   7 +++++--
 databases/postgresql81-server/Makefile     |   7 +++++--
 devel/distcc/Makefile                      |   4 ++--
 devel/monotone-server/Makefile             |   8 ++++++--
 devel/p4d/Makefile                         |   7 +++++--
 inputmethod/canna-server/Makefile          |   4 ++--
 inputmethod/ja-freewnn-server-bin/Makefile |   4 ++--
 mail/clamav/Makefile                       |   4 ++--
 mail/dovecot/Makefile                      |   6 ++++--
 mail/exim/Makefile                         |   8 ++++++--
 mail/exim3/Makefile                        |   9 +++++++--
 mail/gld/Makefile                          |   5 +++--
 mail/mailman/Makefile                      |   7 +++++--
 mail/milter-greylist/Makefile              |   8 +++++---
 mail/milter-regex/Makefile                 |   8 +++++---
 mail/postfix-current/Makefile              |   6 ++++--
 mail/postfix/Makefile                      |   6 ++++--
 mail/postgrey/Makefile                     |   6 ++++--
 mail/qmail-users/Makefile                  |  22 ++++++++++++++--------
 mail/sendmail/Makefile                     |   7 ++++---
 mail/sendmail812/Makefile                  |   7 ++++---
 mail/spamd/Makefile                        |   6 ++++--
 mail/sympa/Makefile                        |   6 ++++--
 mail/tmda/Makefile                         |   7 ++++---
 net/bind9/Makefile                         |   7 +++++--
 net/djbdns-run/Makefile                    |  16 ++++++++++------
 net/gofish/Makefile                        |  10 +++++++---
 net/hobbitmon/Makefile                     |   7 +++++--
 net/howl/Makefile                          |   5 +++--
 net/ja-samba/Makefile                      |   6 ++++--
 net/lambdamoo/Makefile                     |   7 ++++---
 net/mldonkey/Makefile                      |   8 ++++++--
 net/mydns-pgsql/Makefile.common            |   4 ++--
 net/nagios-base/Makefile                   |  11 ++++++++---
 net/netdisco/Makefile                      |   8 ++++++--
 net/netsaint-base/Makefile.common          |  11 ++++++++---
 net/nsd/Makefile                           |   8 ++++----
 net/openntpd/Makefile                      |   5 +++--
 net/snort/Makefile.common                  |   4 ++--
 net/tor/Makefile                           |   6 ++++--
 net/vsftpd/Makefile                        |   4 ++--
 news/inn/Makefile                          |   7 +++++--
 news/leafnode/Makefile                     |   8 ++++++--
 parallel/sge/Makefile                      |   5 +++--
 print/cups/Makefile                        |   6 ++++--
 security/amavisd-new/Makefile              |   9 +++++++--
 security/courier-authlib/Makefile.common   |   4 ++--
 security/cvm/Makefile                      |   4 ++--
 security/cyrus-sasl/Makefile               |   5 +++--
 security/dirmngr/Makefile                  |   6 ++++--
 security/libprelude/Makefile               |   8 ++++++--
 security/openssh+gssapi/Makefile           |  11 ++++++++---
 security/openssh/Makefile                  |   9 +++++++--
 security/pflkm/Makefile                    |   7 +++++--
 security/pks/Makefile                      |   7 +++++--
 security/prelude-lml/Makefile              |   9 +++++++--
 security/prelude-manager/Makefile          |   9 +++++++--
 security/py-prewikka/Makefile              |   7 +++++--
 security/sfs/Makefile                      |   7 ++++---
 sysutils/amanda-common/Makefile            |   7 +++++--
 sysutils/dbus/Makefile                     |   8 ++++++--
 sysutils/ups-nut/Makefile                  |   6 ++++--
 www/apache/Makefile                        |   4 ++--
 www/apache2/Makefile                       |   4 ++--
 www/privoxy/Makefile                       |   4 ++--
 www/squid/Makefile                         |   7 +++++--
 www/tinyproxy/Makefile                     |   4 ++--
 www/zope3/Makefile                         |   4 +++-
 82 files changed, 374 insertions(+), 186 deletions(-)

diffs (truncated from 1739 to 300 lines):

diff -r 8606102002f6 -r 6fe67766d4d0 audio/icecast/Makefile
--- a/audio/icecast/Makefile    Sun Apr 23 00:00:43 2006 +0000
+++ b/audio/icecast/Makefile    Sun Apr 23 00:12:35 2006 +0000
@@ -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_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 -r 8606102002f6 -r 6fe67766d4d0 chat/bitlbee/Makefile
--- a/chat/bitlbee/Makefile     Sun Apr 23 00:00:43 2006 +0000
+++ b/chat/bitlbee/Makefile     Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 
 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 -r 8606102002f6 -r 6fe67766d4d0 chat/ircd-hybrid/Makefile
--- a/chat/ircd-hybrid/Makefile Sun Apr 23 00:00:43 2006 +0000
+++ b/chat/ircd-hybrid/Makefile Sun Apr 23 00:12:35 2006 +0000
@@ -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_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 -r 8606102002f6 -r 6fe67766d4d0 chat/ircu/Makefile
--- a/chat/ircu/Makefile        Sun Apr 23 00:00:43 2006 +0000
+++ b/chat/ircu/Makefile        Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 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 -r 8606102002f6 -r 6fe67766d4d0 chat/jabberd/Makefile
--- a/chat/jabberd/Makefile     Sun Apr 23 00:00:43 2006 +0000
+++ b/chat/jabberd/Makefile     Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
                        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 -r 8606102002f6 -r 6fe67766d4d0 chat/silc-server/Makefile
--- a/chat/silc-server/Makefile Sun Apr 23 00:00:43 2006 +0000
+++ b/chat/silc-server/Makefile Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 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 -r 8606102002f6 -r 6fe67766d4d0 chat/unrealircd/Makefile
--- a/chat/unrealircd/Makefile  Sun Apr 23 00:00:43 2006 +0000
+++ b/chat/unrealircd/Makefile  Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
                        ${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 -r 8606102002f6 -r 6fe67766d4d0 comms/asterisk/Makefile
--- a/comms/asterisk/Makefile   Sun Apr 23 00:00:43 2006 +0000
+++ b/comms/asterisk/Makefile   Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 #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 -r 8606102002f6 -r 6fe67766d4d0 comms/fidogate/Makefile
--- a/comms/fidogate/Makefile   Sun Apr 23 00:00:43 2006 +0000
+++ b/comms/fidogate/Makefile   Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 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 -r 8606102002f6 -r 6fe67766d4d0 databases/gnats/Makefile
--- a/databases/gnats/Makefile  Sun Apr 23 00:00:43 2006 +0000
+++ b/databases/gnats/Makefile  Sun Apr 23 00:12:35 2006 +0000
@@ -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_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 -r 8606102002f6 -r 6fe67766d4d0 databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Sun Apr 23 00:00:43 2006 +0000
+++ b/databases/mysql4-server/Makefile  Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 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 -r 8606102002f6 -r 6fe67766d4d0 databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Sun Apr 23 00:00:43 2006 +0000
+++ b/databases/mysql5-server/Makefile  Sun Apr 23 00:12:35 2006 +0000
@@ -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 @@
 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 -r 8606102002f6 -r 6fe67766d4d0 databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile    Sun Apr 23 00:00:43 2006 +0000
+++ b/databases/postgresql73-server/Makefile    Sun Apr 23 00:12:35 2006 +0000
@@ -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+=          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 -r 8606102002f6 -r 6fe67766d4d0 databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile    Sun Apr 23 00:00:43 2006 +0000
+++ b/databases/postgresql74-server/Makefile    Sun Apr 23 00:12:35 2006 +0000
@@ -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+=          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 -r 8606102002f6 -r 6fe67766d4d0 databases/postgresql80-server/Makefile
--- a/databases/postgresql80-server/Makefile    Sun Apr 23 00:00:43 2006 +0000
+++ b/databases/postgresql80-server/Makefile    Sun Apr 23 00:12:35 2006 +0000
@@ -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}



Home | Main Index | Thread Index | Old Index