[pkgsrc/trunk]: pkgsrc Extract user and group default to mk/defaults/mk.conf.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7a3c9683092
branches:  trunk
changeset: 365825:c7a3c9683092
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jul 27 04:10:30 2017 +0000

description:
Extract user and group default to mk/defaults/mk.conf.

diffstat:

 mk/defaults/mk.conf               |  12 +++++++++++-
 sysutils/daemontools-run/Makefile |   8 ++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r b49e56c930c6 -r c7a3c9683092 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Thu Jul 27 04:06:26 2017 +0000
+++ b/mk/defaults/mk.conf       Thu Jul 27 04:10:30 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.278 2017/07/09 14:30:07 khorben Exp $
+# $NetBSD: mk.conf,v 1.279 2017/07/27 04:10:30 schmonz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -832,6 +832,16 @@
 # Possible: any user name
 # Default: cyrus
 
+DAEMONTOOLS_LOG_USER?= multilog
+# System user for daemontools logger.
+# Possible: any user name
+# Default: multilog
+
+DAEMONTOOLS_GROUP?=    svscan
+# System group for daemontools-related programs.
+# Possible: any group name
+# Default: svscan
+
 DBUS_GROUP?=   dbus
 # Used in the dbus package to specify the group to run dbus as
 # Possible: any group name
diff -r b49e56c930c6 -r c7a3c9683092 sysutils/daemontools-run/Makefile
--- a/sysutils/daemontools-run/Makefile Thu Jul 27 04:06:26 2017 +0000
+++ b/sysutils/daemontools-run/Makefile Thu Jul 27 04:10:30 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/07/27 04:05:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/27 04:10:30 schmonz Exp $
 #
 
 DISTNAME=              daemontools-run-20170727
@@ -17,10 +17,6 @@
 NO_BUILD=              yes
 NO_CHECKSUM=           yes
 
-# XXX
-DAEMONTOOLS_LOG_USER?= multilog
-DAEMONTOOLS_GROUP?=    svscan
-
 MAKE_DIRS+=            ${VARBASE}/service
 PKG_GROUPS_VARS+=      DAEMONTOOLS_GROUP
 PKG_USERS_VARS+=       DAEMONTOOLS_LOG_USER
@@ -32,7 +28,7 @@
 FILES_SUBST+=          PKGNAME=${PKGNAME:Q}
 
 INSTALLATION_DIRS=     share/doc/${PKGBASE}
-BUILD_DEFS+=           VARBASE DAEMONTOOLS_LOG_USER # XXX_GROUP
+BUILD_DEFS+=           VARBASE DAEMONTOOLS_LOG_USER
 
 .include "../../mk/bsd.prefs.mk"