Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Nov 2017 23:20:04 +0000 (UTC)
From:      "Simon J. Gerraty" <sjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r325302 - vendor/NetBSD/bmake
Message-ID:  <201711012320.vA1NK4JF074540@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711012320.vA1NK4JF074540>