From cb3d8d8d6f845a554cc5087a8682700db4f8a936 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 7 Jul 2017 15:00:25 +0000
Subject: [PATCH] MFS11 r320753:  MFC r320748:  Allow passing NOPKG= to make(1)
 to enable the pkg-stage target  from getting executed when NOPKG is defined
 but empty.

Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation
---
 release/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/Makefile b/release/Makefile
index 6c2818ac1d2..12bd53f5a0f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -265,7 +265,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/
-- 
2.45.0