From owner-svn-src-all@FreeBSD.ORG  Tue May 26 20:51:44 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB3C3F49;
 Tue, 26 May 2015 20:51:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 C998F785;
 Tue, 26 May 2015 20:51:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4QKpiTV078144;
 Tue, 26 May 2015 20:51:44 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4QKpiK3078143;
 Tue, 26 May 2015 20:51:44 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505262051.t4QKpiK3078143@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 26 May 2015 20:51:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283580 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 May 2015 20:51:45 -0000

Author: gjb
Date: Tue May 26 20:51:44 2015
New Revision: 283580
URL: https://svnweb.freebsd.org/changeset/base/283580

Log:
  Use SVNREVISION and BUILDDATE if passed into the make(1)
  environment, fallback to trying to figure it out otherwise.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.mirrors

Modified: head/release/Makefile.mirrors
==============================================================================
--- head/release/Makefile.mirrors	Tue May 26 20:32:14 2015	(r283579)
+++ head/release/Makefile.mirrors	Tue May 26 20:51:44 2015	(r283580)
@@ -30,24 +30,26 @@ EMBEDDED=		1
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
 SNAPSHOT=		1
 TLD?=			${FTPDIR}/snapshots
-. for _D in /usr/bin /usr/local/bin
-.  for _S in svnversion svnliteversion
-.   if exists(${_D}/${_S})
+. if !defined(SVNREVISION) || empty(SVNREVISION)
+.  for _D in /usr/bin /usr/local/bin
+.   for _S in svnversion svnliteversion
+.    if exists(${_D}/${_S})
 SVNVERSION?=		${_D}/${_S}
-.   endif
+.    endif
+.   endfor
 .  endfor
-. endfor
-. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh)
+.  if exists(${SVNVERSION}) && !empty(SVNVERSION)
+SVNREVISION!=		${SVNVERSION} ${WORLDDIR}/Makefile
+.  endif
+. endif # !defined(SVNERVISION)
+. if !defined(BUILDDATE) || empty(BUILDDATE)
+.  if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh)
 BUILDDATE!=		cd ${.CURDIR} && date -j -f '%s' $$(stat -f "%c" ${.OBJDIR}/dist/base/bin/sh) +%Y%m%d
-. else
+.  else
 BUILDDATE!=		date +%Y%m%d
+.  endif
 . endif
-. if exists(${SVNVERSION}) && !empty(SVNVERSION)
-SVNREVISION!=		${SVNVERSION} ${WORLDDIR}/Makefile
 _SNAP_SUFFIX:=		-r${SVNREVISION}-${BUILDDATE}
-. else
-_SNAP_SUFFIX:=		-${BUILDDATE}
-. endif
 .else
 # release
 SNAPSHOT=