From 5a3a942a1045ecd68f040f6f84e3cbfa07dd0865 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Sun, 23 May 2004 16:01:49 +0000
Subject: 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.

---
 news/leafnode/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'news/leafnode')

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"
-- 
cgit v1.2.3