CVS commit: pkgsrc/mk

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Thu Jun  1 03:41:44 UTC 2017

Modified Files:
        pkgsrc/mk: bsd.pkg.mk

Log Message:
Toggle using pkgsrc/mk/smf.mk based on ${_USE_NEW_PKGINSTALL}.

Missing change from initial commit to provide the toggle for using
the new frameworks to replace pkgsrc/mk/pkginstall.


To generate a diff of this commit:
cvs rdiff -u -r1.2025 -r1.2026 pkgsrc/mk/bsd.pkg.mk

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

Modified files:

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2025 pkgsrc/mk/bsd.pkg.mk:1.2026
--- pkgsrc/mk/bsd.pkg.mk:1.2025 Thu Jun  1 02:15:10 2017
+++ pkgsrc/mk/bsd.pkg.mk        Thu Jun  1 03:41:44 2017
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2025 2017/06/01 02:15:10 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2026 2017/06/01 03:41:44 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -309,9 +309,11 @@ OVERRIDE_DIRDEPTH?=        2
 
 # Handle alternative init systems
 #
+.if ${_USE_NEW_PKGINSTALL:Uno} == "no"
 .if ${INIT_SYSTEM} == "smf"
 .  include "smf.mk"
 .endif
+.endif
 
 # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree
 # of dependencies for building, and the current target.