From owner-svn-src-projects@FreeBSD.ORG  Tue Feb 26 05:44:12 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A4D25F0B;
 Tue, 26 Feb 2013 05:44:12 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9886DE50;
 Tue, 26 Feb 2013 05:44:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1Q5iCjZ081720;
 Tue, 26 Feb 2013 05:44:12 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1Q5iC2s081719;
 Tue, 26 Feb 2013 05:44:12 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201302260544.r1Q5iC2s081719@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Tue, 26 Feb 2013 05:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247307 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Feb 2013 05:44:12 -0000

Author: sjg
Date: Tue Feb 26 05:44:12 2013
New Revision: 247307
URL: http://svnweb.freebsd.org/changeset/base/247307

Log:
  Simplify handling of chmod

Modified:
  projects/bmake/share/mk/meta.stage.mk

Modified: projects/bmake/share/mk/meta.stage.mk
==============================================================================
--- projects/bmake/share/mk/meta.stage.mk	Tue Feb 26 05:27:02 2013	(r247306)
+++ projects/bmake/share/mk/meta.stage.mk	Tue Feb 26 05:44:12 2013	(r247307)
@@ -1,4 +1,4 @@
-# $Id: meta.stage.mk,v 1.15 2012/10/14 02:50:38 sjg Exp $
+# $Id: meta.stage.mk,v 1.18 2013/02/26 05:40:49 sjg Exp $
 #
 #	@(#) Copyright (c) 2011, Simon J. Gerraty
 #
@@ -74,7 +74,7 @@ STAGE_FILE_SCRIPT = ${STAGE_DIRDEP_SCRIP
 	rm -f $$t; \
 	{ ln $$f $$t 2> /dev/null || \
 	cp -p $$f $$t; }; \
-	$${mode:+chmod $$mode $$t}; \
+	[ -z "$$mode" ] || chmod $$mode $$t; \
   done; :; }
 
 STAGE_LINKS_SCRIPT = ${STAGE_DIRDEP_SCRIPT}; StageLinks() { \
@@ -106,7 +106,7 @@ STAGE_AS_SCRIPT = ${STAGE_DIRDEP_SCRIPT}
 	rm -f $$t; \
 	{ ln $$s $$t 2> /dev/null || \
 	cp -p $$s $$t; }; \
-	$${mode:+chmod $$mode $$t}; \
+	[ -z "$$mode" ] || chmod $$mode $$t; \
   done; :; }
 
 # this is simple, a list of the "staged" files depends on this,
@@ -152,7 +152,6 @@ STAGE_SYMLINKS ?= ${.ALLSRC:T:N.dirdep:N
 .endif
 
 .if !empty(STAGE_SETS)
-
 CLEANFILES += ${STAGE_SETS:@s@stage*$s@}
 
 # some makefiles need to populate multiple directories
@@ -193,7 +192,6 @@ stage_symlinks:	.dirdep
 .endif
 
 .if !empty(STAGE_AS_SETS)
-
 CLEANFILES += ${STAGE_AS_SETS:@s@stage*$s@}
 
 # sometimes things need to be renamed as they are staged