From 8f229143b1dfc0dcbd15128ac3c4656a070bfc21 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 6 Jul 2017 17:54:03 +0000
Subject: [PATCH] Allow passing NOPKG= to make(1) to prevent the pkg-stage
 target from getting executed.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/Makefile b/release/Makefile
index 9be38fe6a5e2..3cd6b7c0ffca 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -269,7 +269,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	touch ${.TARGET}
 
 pkg-stage:
-.if !defined(NOPKG)
+.if !defined(NOPKG) || empty(NOPKG)
 	env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \
 		sh ${.CURDIR}/scripts/pkg-stage.sh
 	mkdir -p ${.OBJDIR}/dvd/packages/repos/