summaryrefslogtreecommitdiff
path: root/mk/bsd.prefs.mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2014-08-14 11:08:37 +0000
committerjperkin <jperkin@pkgsrc.org>2014-08-14 11:08:37 +0000
commit5bd36ef02eb73c198cb6d125d92778a7aa63f867 (patch)
treef23e5d416d66ce5bfa2479e555297d1b1238d838 /mk/bsd.prefs.mk
parentc3767ce1abf94975f3e1e84944d54d546077b9d9 (diff)
downloadpkgsrc-5bd36ef02eb73c198cb6d125d92778a7aa63f867.tar.gz
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.
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r--mk/bsd.prefs.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index caa89395490..ad9d4e5f16e 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.347 2014/05/06 14:48:06 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.348 2014/08/14 11:08:37 jperkin Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -762,9 +762,6 @@ 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