From f7dc3ae900867455f16be4290606564aad50c457 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Tue, 17 Dec 2013 04:16:20 +0000
Subject: MFC r258770 (hrs):   Add NOPKG to disable pkg-stage.

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

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index f025cc7..f6af5dc 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -16,6 +16,7 @@
 #            (by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
+#  NOPKG:    if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
@@ -221,7 +222,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	touch ${.TARGET}
 
 pkg-stage:
-.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
+.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
 	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
 		${REVISION}
 .endif
-- 
cgit v1.1