svn commit: r320753 - in stable: 10/release 11/release

[Glen Barber]

Author: gjb
Date: Thu Jul  6 18:46:33 2017
New Revision: 320753
URL: https://svnweb.freebsd.org/changeset/base/320753

Log:
  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, insta-MFC)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/Makefile
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/release/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/release/Makefile
==============================================================================
--- stable/11/release/Makefile	Thu Jul  6 18:33:33 2017	(r320752)
+++ stable/11/release/Makefile	Thu Jul  6 18:46:33 2017	(r320753)
@@ -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/