From owner-svn-src-head@FreeBSD.ORG  Mon Dec  2 19:02:59 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 576DF8AF;
 Mon,  2 Dec 2013 19:02:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4286D1CCD;
 Mon,  2 Dec 2013 19:02:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB2J2xT3032334;
 Mon, 2 Dec 2013 19:02:59 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB2J2x0o032333;
 Mon, 2 Dec 2013 19:02:59 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312021902.rB2J2x0o032333@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 2 Dec 2013 19:02:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258854 - head/usr.sbin/bsdconfig/share
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Dec 2013 19:02:59 -0000

Author: gjb
Date: Mon Dec  2 19:02:58 2013
New Revision: 258854
URL: http://svnweb.freebsd.org/changeset/base/258854

Log:
  Fix PKG_ABI detection in bsdconfig(8) after pkg-1.2 is released, since
  the format of 'pkg -vv' output has changed.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.sbin/bsdconfig/share/common.subr

Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr	Mon Dec  2 18:47:57 2013	(r258853)
+++ head/usr.sbin/bsdconfig/share/common.subr	Mon Dec  2 19:02:58 2013	(r258854)
@@ -65,7 +65,7 @@ export UNAME_R="$(uname -r)" # Release L
 if [ ! "${PKG_ABI+set}" ]; then
 	export PKG_ABI="$(
 		ASSUME_ALWAYS_YES=1 pkg -vv |
-			awk '$1=="ABI:"{print $2;exit}' 2> /dev/null
+			awk '$1=="ABI"{print $3;exit}' 2> /dev/null
 	)"
 fi