[pkgsrc/trunk]: pkgsrc/mk Move INIT_SYSTEM to bsd.prefs.mk, allowing it to be...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0fbc29334a9
branches:  trunk
changeset: 634018:c0fbc29334a9
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 06 14:48:06 2014 +0000

description:
Move INIT_SYSTEM to bsd.prefs.mk, allowing it to be tested in
package Makefiles when packages perform custom rc.d handling.

diffstat:

 mk/bsd.pkg.mk   |  10 +---------
 mk/bsd.prefs.mk |  10 +++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 0c226f208dbf -r c0fbc29334a9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue May 06 14:00:18 2014 +0000
+++ b/mk/bsd.pkg.mk     Tue May 06 14:48:06 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1998 2014/04/15 18:55:18 wiz Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1999 2014/05/06 14:48:06 jperkin Exp $
 #
 # This file is in the public domain.
 #
@@ -315,14 +315,6 @@
 #
 .include "alternatives.mk"
 
-# Support alternative init systems.
-#
-INIT_SYSTEM?=          rc.d
-.if ${INIT_SYSTEM} == "smf"
-.  include "smf.mk"
-.endif
-_BUILD_DEFS+=          INIT_SYSTEM
-
 # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree
 # of dependencies for building, and the current target.
 _PKGSRC_IN?=           ===${SMART_MESSAGES:D> ${.TARGET} [${PKGNAME}${_PKGSRC_DEPS}] ===}
diff -r 0c226f208dbf -r c0fbc29334a9 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue May 06 14:00:18 2014 +0000
+++ b/mk/bsd.prefs.mk   Tue May 06 14:48:06 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.346 2014/05/05 21:26:31 ryoon Exp $
+# $NetBSD: bsd.prefs.mk,v 1.347 2014/05/06 14:48:06 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -759,6 +759,14 @@
 .endif
 PREPEND_PATH+=         ${LOCALBASE}/bin
 
+# Support alternative init systems.
+#
+INIT_SYSTEM?=          rc.d
+.if ${INIT_SYSTEM} == "smf"
+.  include "smf.mk"
+.endif
+_BUILD_DEFS+=          INIT_SYSTEM
+
 # Wrapper framework definitions
 .include "wrapper/wrapper-defs.mk"