From owner-svn-src-stable-10@FreeBSD.ORG  Thu Dec  5 01:06:05 2013
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 CACC4744;
 Thu,  5 Dec 2013 01:06:05 +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 B6D561030;
 Thu,  5 Dec 2013 01:06:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5165cr074953;
 Thu, 5 Dec 2013 01:06:05 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5165jl074952;
 Thu, 5 Dec 2013 01:06:05 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312050106.rB5165jl074952@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 5 Dec 2013 01:06:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258953 - stable/10/usr.sbin/bsdconfig/share
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Dec 2013 01:06:05 -0000

Author: gjb
Date: Thu Dec  5 01:06:05 2013
New Revision: 258953
URL: http://svnweb.freebsd.org/changeset/base/258953

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

Modified:
  stable/10/usr.sbin/bsdconfig/share/common.subr
Directory Properties:
  stable/10/usr.sbin/bsdconfig/   (props changed)

Modified: stable/10/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- stable/10/usr.sbin/bsdconfig/share/common.subr	Thu Dec  5 00:59:29 2013	(r258952)
+++ stable/10/usr.sbin/bsdconfig/share/common.subr	Thu Dec  5 01:06:05 2013	(r258953)
@@ -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