From e7fe02e33c402c818cb69cc8fa554c23adc2cb5a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 1 Jun 2017 02:15:10 +0000
Subject: Provide switch to activate new frameworks to replace "pkginstall".

If ${_USE_NEW_PKGINSTALL} is "yes", then use the new "pkgtasks",
"init", and "pkgformat/pkg"-scripts frameworks instead of the
existing "pkginstall" framework.
---
 mk/build/bsd.build.mk | 6 +++++-
 mk/build/build.mk     | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'mk/build')

diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index 7a647a5ae4a..d9a4cb5f34b 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.11 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: bsd.build.mk,v 1.12 2017/06/01 02:15:10 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to building sources for a package.
@@ -36,7 +36,11 @@ _COOKIE.test=	${WRKDIR}/.test_done
 build:
 	@${DO_NADA}
 .  elif defined(_PKGSRC_BARRIER)
+.    if ${_USE_NEW_PKGINSTALL:Uno} != "no"
+build: configure build-cookie
+.    else
 build: configure build-cookie pkginstall
+.    endif
 .  else
 build: barrier
 .  endif
diff --git a/mk/build/build.mk b/mk/build/build.mk
index 5366b97c3bc..4fc61febebe 100644
--- a/mk/build/build.mk
+++ b/mk/build/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.21 2012/05/27 14:32:29 cheusov Exp $
+# $NetBSD: build.mk,v 1.22 2017/06/01 02:15:10 jlam Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -67,7 +67,9 @@ _BUILD_TARGETS+=	configure
 _BUILD_TARGETS+=	acquire-build-lock
 _BUILD_TARGETS+=	${_COOKIE.build}
 _BUILD_TARGETS+=	release-build-lock
+.if ${_USE_NEW_PKGINSTALL:Uno} == "no"
 _BUILD_TARGETS+=	pkginstall
+.endif
 
 .PHONY: build
 .if !target(build)
-- 
cgit v1.2.3