From owner-svn-src-head@freebsd.org  Wed Jan 27 00:09:54 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D47BAA4651D;
 Wed, 27 Jan 2016 00:09:54 +0000 (UTC)
 (envelope-from dteske@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 A6CE1164C;
 Wed, 27 Jan 2016 00:09:54 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0R09rNH021147;
 Wed, 27 Jan 2016 00:09:53 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R09rQF021146;
 Wed, 27 Jan 2016 00:09:53 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201601270009.u0R09rQF021146@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Wed, 27 Jan 2016 00:09:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294865 - head/usr.sbin/bsdconfig/share/packages
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 00:09:54 -0000

Author: dteske
Date: Wed Jan 27 00:09:53 2016
New Revision: 294865
URL: https://svnweb.freebsd.org/changeset/base/294865

Log:
  Fix ABI parsing

Modified:
  head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr

Modified: head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr	Wed Jan 27 00:08:23 2016	(r294864)
+++ head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr	Wed Jan 27 00:09:53 2016	(r294865)
@@ -1,6 +1,6 @@
 if [ ! "$_PACKAGES_MUSTHAVEPKG_SUBR" ]; then _PACKAGES_MUSTHAVEPKG_SUBR=1
 #
-# Copyright (c) 2014 Devin Teske
+# Copyright (c) 2014-2016 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,11 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 f_musthavepkg_init()
 {
 	local funcname=f_musthavepkg_init
-	local pkg_abi_awk='$1~/^ABI/{print $NF; exit}'
+	local pkg_abi_awk=' # BEGIN-AWK
+		$1 ~ /^ABI/ && $0 = $NF, sub(/^"/, "") && sub(/".*/, "") {
+			print; found = 1; exit
+		} END { exit ! found }
+	' # END-AWK
 
 	if [ "$PKG_ABI" ]; then # Already set
 		f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"