From 10dd6c47df6a15c33f57880d2da88459472cca92 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 14 Aug 2014 11:08:37 +0000 Subject: Split SMF handling across bsd.pkg.mk and bsd.prefs.mk. Should fix issues with packages which include bsd.prefs.mk before setting SMF variables. --- mk/bsd.pkg.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mk/bsd.pkg.mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ee15aba97a6..0a4e70a28bf 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2000 2014/06/02 10:24:05 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2001 2014/08/14 11:08:37 jperkin Exp $ # # This file is in the public domain. # @@ -315,6 +315,12 @@ OVERRIDE_DIRDEPTH?= 2 # .include "alternatives.mk" +# Handle alternative init systems +# +.if ${INIT_SYSTEM} == "smf" +. include "smf.mk" +.endif + # 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}] ===} -- cgit v1.2.3