CVS commit: pkgsrc

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jul 27 04:10:30 UTC 2017

Modified Files:
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/sysutils/daemontools-run: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/daemontools-run/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.278 pkgsrc/mk/defaults/mk.conf:1.279
--- pkgsrc/mk/defaults/mk.conf:1.278    Sun Jul  9 14:30:07 2017
+++ pkgsrc/mk/defaults/mk.conf  Thu Jul 27 04:10:30 2017
@@ -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 @@ CYRUS_USER?=       cyrus
 # 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

Index: pkgsrc/sysutils/daemontools-run/Makefile
diff -u pkgsrc/sysutils/daemontools-run/Makefile:1.1 pkgsrc/sysutils/daemontools-run/Makefile:1.2
--- pkgsrc/sysutils/daemontools-run/Makefile:1.1        Thu Jul 27 04:05:16 2017
+++ pkgsrc/sysutils/daemontools-run/Makefile    Thu Jul 27 04:10:30 2017
@@ -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 @@ WRKSRC=                      ${WRKDIR}
 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+=         DAEMONTOOLS_LOG_USER=${DA
 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"