diff options
| author | jschauma <jschauma@pkgsrc.org> | 2004-05-23 16:01:49 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2004-05-23 16:01:49 +0000 |
| commit | f59839502bd51c3d7335d833e9912cbf25e317b6 (patch) | |
| tree | ff6e72a98d05c5ff29c53186d10aa262d189c66f | |
| parent | ab369beb4f86166e2039fd9f12aecf1cab12a5d7 (diff) | |
| download | pkgsrc-f59839502bd51c3d7335d833e9912cbf25e317b6.tar.gz | |
Introduce and use three new variables:
LEAFNODE_DATA_DIR, LEAFNODE_USER and LEAFNODE_GROUP, to be used by leafnode
to specify the data dir, the user and the group, defaulting to 'news'.
Note: the default is the same as for inn.
Pointed out by Georg Schwarz in mail to tech-pkg.
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 20 | ||||
| -rw-r--r-- | news/leafnode/Makefile | 12 |
2 files changed, 26 insertions, 6 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index fbbf7969d65..90e5c26be17 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.241 2004/05/22 19:09:53 cl Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.242 2004/05/23 16:01:49 jschauma Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1375,6 +1375,24 @@ KERBEROS_PREFIX_CMDS?= no # Possible: a URL prefix # Default: none +LEAFNODE_DATA_DIR?= /var/news +# Used by leafnode to specify the data directory. +# Possible: any path you like +# Default: /var/news +# Note: default is the same as INN_DATA_DIR + +LEAFNODE_USER?= news +# Used by leafnode to specify the username +# Possible: any valid username +# Default: news +# Note: default is the same as INN_USER + +LEAFNODE_GROUP?= news +# Used by leafnode to specify the groupname +# Possible: any valid groupname +# Default: news +# Note: default is the same as INN_GROUP + LINUX_LOCALES?= \ af ar bg br ca cs cy da de el en eo es et eu fi fo fr ga gl \ he hr hu hy id is it ja ka kl ko lo lt lv nl no oc pl pt ro \ diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 3a901dd8a60..1a6abc60cb6 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/05/05 15:25:40 cjep Exp $ +# $NetBSD: Makefile,v 1.18 2004/05/23 16:01:49 jschauma Exp $ DISTNAME= leafnode-1.9.52.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -20,11 +20,11 @@ LEAFNODE_SPOOL?= /var/spool/leafnode LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode -# Use news login and be compatible with inn package +# Default data dir, login and group are the same as used by inn # -BUILD_DEFS+= INN_DATA_DIR -PKG_USERS= news:news::Internet\\ News:${INN_DATA_DIR}:${SH} -PKG_GROUPS= news +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} LEAFNODE_HOME?= ${INN_DATA_DIR} FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL} @@ -37,6 +37,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-spooldir=${LEAFNODE_SPOOL} CONFIGURE_ARGS+= --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck CONFIGURE_ARGS+= --sysconfdir=${LEAFNODE_CONFDIR} +CONFIGURE_ARGS+= --with-user=${LEAFNODE_USER} +CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP} USE_GNU_TOOLS+= make .include "../../mk/bsd.prefs.mk" |