From owner-svn-src-stable@FreeBSD.ORG  Tue Dec 17 03:46:45 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 16589E1F;
 Tue, 17 Dec 2013 03:46:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0352712EC;
 Tue, 17 Dec 2013 03:46:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH3kiLm067096;
 Tue, 17 Dec 2013 03:46:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH3ki0K067095;
 Tue, 17 Dec 2013 03:46:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312170346.rBH3ki0K067095@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 17 Dec 2013 03:46:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259491 - stable/10/release/scripts
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Dec 2013 03:46:45 -0000

Author: gjb
Date: Tue Dec 17 03:46:44 2013
New Revision: 259491
URL: http://svnweb.freebsd.org/changeset/base/259491

Log:
  MFC r259246:
    Prevent release build errors found during snapshot builds where if
    NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
    WITH_DVD=1.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/scripts/pkg-stage.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/scripts/pkg-stage.sh
==============================================================================
--- stable/10/release/scripts/pkg-stage.sh	Tue Dec 17 03:38:36 2013	(r259490)
+++ stable/10/release/scripts/pkg-stage.sh	Tue Dec 17 03:46:44 2013	(r259491)
@@ -24,6 +24,11 @@ fi
 REVISION="${2}"
 . "${1}" || exit 1
 
+# If NOPORTS is set for the release, do not attempt to build pkg(8).
+if [ ! -f /usr/ports/Makefile ]; then
+	exit 0
+fi
+
 if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi