[pkgsrc/trunk]: pkgsrc Introduce and use two new variables:

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b802b08e9e9
branches:  trunk
changeset: 475659:1b802b08e9e9
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sat May 22 18:58:29 2004 +0000

description:
Introduce and use two new variables:
INN_USER and INN_GROUP, specifying the username and groupname to be used
by inn, defaulting to 'news'.
Noted by Georg Schwarz in mail to tech-pkg.

diffstat:

 mk/bsd.pkg.defaults.mk |  12 +++++++++++-
 news/inn/Makefile      |  36 +++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diffs (101 lines):

diff -r a12fae174977 -r 1b802b08e9e9 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Sat May 22 18:12:40 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Sat May 22 18:58:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.239 2004/05/15 09:44:00 grant Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.240 2004/05/22 18:58:29 jschauma Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1060,6 +1060,16 @@
 # Possible: any path you like
 # Default: /var/news
 
+INN_USER?=     news
+# Used by inn to specify the username 
+# Possible: any valid username 
+# Default: news
+
+INN_GROUP?=    news
+# Used by inn to specify the groupname
+# Possible: any valid groupname
+# Default: news
+
 IRCD_HYBRID_SMALL_NET?=                YES
 # Used by ircd-hybrid to tune various ircd paramaters when running
 # small IRC networks so the daemon does not use much resources.
diff -r a12fae174977 -r 1b802b08e9e9 news/inn/Makefile
--- a/news/inn/Makefile Sat May 22 18:12:40 2004 +0000
+++ b/news/inn/Makefile Sat May 22 18:58:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/04/11 17:33:47 snj Exp $
+# $NetBSD: Makefile,v 1.55 2004/05/22 18:58:29 jschauma Exp $
 
 DISTNAME=              inn-${INN_VERSION}
 PKGREVISION=           1
@@ -19,26 +19,28 @@
 
 INN_VERSION=           2.3.5
 .include "Makefile.common"
-BUILD_DEFS+=           INN_DATA_DIR
+BUILD_DEFS+=           INN_DATA_DIR INN_USER INN_GROUP
 FILES_SUBST+=          INN_DATA_DIR=${INN_DATA_DIR}
 
 USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 GNU_CONFIGURE=         YES
 GNU_CONFIGURE_PREFIX=  ${INN_PREFIX}
-CONFIGURE_ARGS+=       --enable-setgid-inews \
-                       --enable-uucp-rnews \
-                       --mandir=${PREFIX}/man \
-                       --with-perl --with-tmp-path=${INN_DATA_DIR}/tmp \
-                       --with-db-dir=${INN_DATA_DIR}/db \
-                       --with-etc-dir=${INN_DATA_DIR}/etc \
-                       --with-log-dir=${INN_DATA_DIR}/log \
-                       --with-run-dir=${INN_DATA_DIR}/run \
-                       --with-spool-dir=${INN_SPOOL}
+CONFIGURE_ARGS+=       --enable-setgid-inews                           \
+                       --enable-uucp-rnews                             \
+                       --mandir=${PREFIX}/man                          \
+                       --with-perl --with-tmp-path=${INN_DATA_DIR}/tmp \
+                       --with-db-dir=${INN_DATA_DIR}/db                \
+                       --with-etc-dir=${INN_DATA_DIR}/etc              \
+                       --with-log-dir=${INN_DATA_DIR}/log              \
+                       --with-run-dir=${INN_DATA_DIR}/run              \
+                       --with-spool-dir=${INN_SPOOL}                   \
+                       --with-news-user=${INN_USER}                    \
+                       --with-news-group=${INN_GROUP}
 CONFIGURE_ENV+=                _PATH_PERL=${PERL5}
 
-PKG_USERS=             news:news::Internet\\ News:${INN_DATA_DIR}:${SH}
-PKG_GROUPS=            news
+PKG_USERS=             ${INN_USER}:${INN_GROUP}::Internet\\ News:${INN_DATA_DIR}:${SH}
+PKG_GROUPS=            ${INN_GROUP}
 
 PKG_SYSCONFDIR.inn=    ${INN_DATA_DIR}/etc
 EXAMPLEDIR=            ${PREFIX}/share/examples/inn
@@ -47,12 +49,12 @@
                        outgoing uniover innfeed
 
 OWN_DIRS=              ${PREFIX}/etc/nntp
-OWN_DIRS_PERMS=                ${INN_DATA_DIR}                 news news 0775
+OWN_DIRS_PERMS=                ${INN_DATA_DIR}                 ${INN_USER} ${INN_GROUP} 0775
 .for DIR in ${INN_DATADIRS}
-MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/${DIR}          news news 0775
+MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/${DIR}          ${INN_USER} ${INN_GROUP} 0775
 .endfor
 .for DIR in ${INN_SPOOLDIRS}
-MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/spool/${DIR}    news news 0775
+MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/spool/${DIR}    ${INN_USER} ${INN_GROUP} 0775
 .endfor
 
 CFILES=                        actsync.cfg actsync.ign buffindexed.conf \
@@ -64,7 +66,7 @@
                        radius.conf readers.conf sasl.conf storage.conf
 .for FILE in ${CFILES}
 CONF_FILES_PERMS+=     ${EXAMPLEDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} \
-                       news news 0664
+                       ${INN_USER} ${INN_GROUP} 0664
 .endfor
 
 RCD_SCRIPTS=           innd