From owner-svn-src-vendor@freebsd.org  Fri Mar 18 17:32:21 2016
Return-Path: <owner-svn-src-vendor@freebsd.org>
Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E838AD5F0D;
 Fri, 18 Mar 2016 17:32:21 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 1FA891877;
 Fri, 18 Mar 2016 17:32:21 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2IHWK9g023197;
 Fri, 18 Mar 2016 17:32:20 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2IHWKI0023196;
 Fri, 18 Mar 2016 17:32:20 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201603181732.u2IHWKI0023196@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 18 Mar 2016 17:32:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r297034 - vendor/NetBSD/bmake
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-vendor>, 
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2016 17:32:21 -0000

Author: sjg
Date: Fri Mar 18 17:32:20 2016
New Revision: 297034
URL: https://svnweb.freebsd.org/changeset/base/297034

Log:
  Adapt to _MAKE_VERSION

Modified:
  vendor/NetBSD/bmake/import.sh

Modified: vendor/NetBSD/bmake/import.sh
==============================================================================
--- vendor/NetBSD/bmake/import.sh	Fri Mar 18 17:31:42 2016	(r297033)
+++ vendor/NetBSD/bmake/import.sh	Fri Mar 18 17:32:20 2016	(r297034)
@@ -64,7 +64,7 @@ rm -rf $thing
 tar zxf $TARBALL
 
 # steps unique to bmake
-VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'`
+VERSION=`grep '^_MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'`
 rm -rf bmake/missing
 
 # the rest should be common
@@ -81,6 +81,6 @@ test -s $TF.addlist && xargs $SVN --pare
 )
 
 url=`$SVN info | sed -n '/^URL:/s,URL: ,,p'`
-echo After committing dist... run tag.sh
-echo "$SVN cp $url/dist $url/$VERSION" > tag.sh
+echo "After committing dist... run; sh ./tag.sh"
+echo "$SVN cp -m 'tag $thing-$VERSION' $url/dist $url/$VERSION" > tag.sh