From owner-svn-src-projects@freebsd.org  Tue Nov 17 21:10:17 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 22EBDA31959
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 17 Nov 2015 21:10:17 +0000 (UTC) (envelope-from brd@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 DCF5A11B5;
 Tue, 17 Nov 2015 21:10:16 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHLAFJN087886;
 Tue, 17 Nov 2015 21:10:15 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHLAFx1087885;
 Tue, 17 Nov 2015 21:10:15 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201511172110.tAHLAFx1087885@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 17 Nov 2015 21:10:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r291006 - projects/release-pkg
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.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Nov 2015 21:10:17 -0000

Author: brd (doc,ports committer)
Date: Tue Nov 17 21:10:15 2015
New Revision: 291006
URL: https://svnweb.freebsd.org/changeset/base/291006

Log:
  Don't match on "version" when found as a value.
  
  Approved by:	bapt

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Tue Nov 17 21:02:27 2015	(r291005)
+++ projects/release-pkg/Makefile.inc1	Tue Nov 17 21:10:15 2015	(r291006)
@@ -1272,8 +1272,10 @@ create-world-packages:
 			-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
 			${SRCDIR}/release/packages/$${pkgname}.ucl \
 			> ${DESTDIR}/$${pkgname}.ucl ; \
-		awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
-			${DESTDIR}/$${pkgname}.ucl ; \
+		awk -F\" ' \
+			/^name/ { printf("===> Creating %s-", $$2); next } \
+			/^version/ { print $$2; next } \
+			' ${DESTDIR}/$${pkgname}.ucl ; \
 		pkg -o ABI_FILE=${DESTDIR}/bin/sh \
 			create -M ${DESTDIR}/$${pkgname}.ucl \
 			-p ${DESTDIR}/$${pkgname}.plist \