From owner-svn-src-vendor@freebsd.org  Wed Nov  1 23:20:05 2017
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 CCE6BE66B12;
 Wed,  1 Nov 2017 23:20:05 +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 9A80B2E03;
 Wed,  1 Nov 2017 23:20:05 +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 vA1NK4Nk074541;
 Wed, 1 Nov 2017 23:20:04 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1NK4JF074540;
 Wed, 1 Nov 2017 23:20:04 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201711012320.vA1NK4JF074540@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: Wed, 1 Nov 2017 23:20:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r325302 - vendor/NetBSD/bmake
X-SVN-Group: vendor
X-SVN-Commit-Author: sjg
X-SVN-Commit-Paths: vendor/NetBSD/bmake
X-SVN-Commit-Revision: 325302
X-SVN-Commit-Repository: base
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.23
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: Wed, 01 Nov 2017 23:20:05 -0000

Author: sjg
Date: Wed Nov  1 23:20:04 2017
New Revision: 325302
URL: https://svnweb.freebsd.org/changeset/base/325302

Log:
  We get VERSION from bmake/VERSION now

Modified:
  vendor/NetBSD/bmake/import.sh

Modified: vendor/NetBSD/bmake/import.sh
==============================================================================
--- vendor/NetBSD/bmake/import.sh	Wed Nov  1 23:17:47 2017	(r325301)
+++ vendor/NetBSD/bmake/import.sh	Wed Nov  1 23:20:04 2017	(r325302)
@@ -33,7 +33,7 @@ option_parsing() {
 		-r) REVIEWER=$2; shift 2;;
 		-u) url=$2; shift 2;;
 		-h) echo "Usage:";
-     echo "  "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]'
+                    echo "  "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]'
 			echo "  "$0 '-a <filename>	  # (a)rchive'
 			echo "  "$0 '-h			  # print usage'
 			echo "  "$0 '-n			  # do not import, check only.'
@@ -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/VERSION | sed 's,.*=[[:space:]]*,,'`
 rm -rf bmake/missing
 
 # the rest should be common