From owner-svn-src-stable@FreeBSD.ORG  Thu Jun 12 17:16:29 2014
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 9543A2DE;
 Thu, 12 Jun 2014 17:16:29 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 81EBC2371;
 Thu, 12 Jun 2014 17:16:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CHGT4F054127;
 Thu, 12 Jun 2014 17:16:29 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CHGTmk054126;
 Thu, 12 Jun 2014 17:16:29 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201406121716.s5CHGTmk054126@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 12 Jun 2014 17:16:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r267419 - stable/9/release
X-SVN-Group: stable-9
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.18
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: Thu, 12 Jun 2014 17:16:29 -0000

Author: gjb
Date: Thu Jun 12 17:16:29 2014
New Revision: 267419
URL: http://svnweb.freebsd.org/changeset/base/267419

Log:
  MFC r267326, r267327:
  
  r267326:
    Add empty pkg-stage file to CLEANFILES if WITH_DVD=1.
  
  r267327:
    Fix indentation level.
  
  Approved by:	re (marius)
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Thu Jun 12 17:15:56 2014	(r267418)
+++ stable/9/release/Makefile	Thu Jun 12 17:16:29 2014	(r267419)
@@ -100,6 +100,9 @@ CLEANFILES=	packagesystem *.txz MANIFEST
 CLEANFILES+=	${I}.xz
 . endfor
 .endif
+.if defined(WITH_DVD) && !empty(WITH_DVD)
+CLEANFILES+=	pkg-stage
+.endif
 CLEANDIRS=	dist ftp release bootonly dvd
 beforeclean:
 	chflags -R noschg .