From owner-svn-src-head@FreeBSD.ORG Wed Dec 4 09:12:54 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF1C6218; Wed, 4 Dec 2013 09:12:54 +0000 (UTC) Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com [IPv6:2a00:1450:400c:c05::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12E311039; Wed, 4 Dec 2013 09:12:53 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id en1so7877279wid.5 for ; Wed, 04 Dec 2013 01:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Pfhf7uI4LvGIk9ihblnbU0KFoTq9p20g5WqJiGTApd8=; b=loXgXLZYGL3UzYran2S2Zfn173tZM8NJtjidZb3FH07fNzHDa52g3eag5voOjqwZMO MM9TxZMlWJLEu1xSpTdPLI3gEeZMy+7Vkl4NToDU53ZU0l0TwFGexkgzGI18xN4vY7y9 WaKvf5jbgnz+JqOkWdyS1rOT6On+ITJH3w7bIceQjyo43FWN+xOFepoVW/2/6pUH7Khh rJL2ebL82gTGuCx65xzZyc9TjW5ViI/j7q3n8T4HT86q/UiIHL9RB2e5AE4sr6U262j7 4faS8sClEUP0j1itzFDtLMda2rN5jwWppWFA1uVRhKpHgKm3j2SCzkdCQ/LPMJzx0ZPi Dvnw== X-Received: by 10.180.13.142 with SMTP id h14mr6294813wic.3.1386148372478; Wed, 04 Dec 2013 01:12:52 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id dj8sm5098181wid.2.2013.12.04.01.12.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 04 Dec 2013 01:12:51 -0800 (PST) Sender: Baptiste Daroussin Date: Wed, 4 Dec 2013 10:12:48 +0100 From: Baptiste Daroussin To: Glen Barber Subject: Re: svn commit: r258854 - head/usr.sbin/bsdconfig/share Message-ID: <20131204091248.GQ27759@ithaqua.etoilebsd.net> References: <201312021902.rB2J2x0o032333@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wc6dtGz1CZgs+5WP" Content-Disposition: inline In-Reply-To: <201312021902.rB2J2x0o032333@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2013 09:12:55 -0000 --wc6dtGz1CZgs+5WP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 02, 2013 at 07:02:59PM +0000, Glen Barber wrote: > Author: gjb > Date: Mon Dec 2 19:02:58 2013 > New Revision: 258854 > URL: http://svnweb.freebsd.org/changeset/base/258854 >=20 > Log: > Fix PKG_ABI detection in bsdconfig(8) after pkg-1.2 is released, since > the format of 'pkg -vv' output has changed. > =20 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation >=20 > Modified: > head/usr.sbin/bsdconfig/share/common.subr >=20 > Modified: head/usr.sbin/bsdconfig/share/common.subr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/bsdconfig/share/common.subr Mon Dec 2 18:47:57 2013 (r= 258853) > +++ head/usr.sbin/bsdconfig/share/common.subr Mon Dec 2 19:02:58 2013 (r= 258854) > @@ -65,7 +65,7 @@ export UNAME_R=3D"$(uname -r)" # Release L > if [ ! "${PKG_ABI+set}" ]; then > export PKG_ABI=3D"$( > ASSUME_ALWAYS_YES=3D1 pkg -vv | > - awk '$1=3D=3D"ABI:"{print $2;exit}' 2> /dev/null > + awk '$1=3D=3D"ABI"{print $3;exit}' 2> /dev/null > )" > fi You have: "pkg config abi" now :) that should allow you do avoid the awk :) regards, Bapt --wc6dtGz1CZgs+5WP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlKe8hAACgkQ8kTtMUmk6ExYtACeIVIR/Ojuq8So1dpaGMFxcN7a 0tMAoJGpb7fVmgL2YMRl/VuoL5Efk9hM =6Khw -----END PGP SIGNATURE----- --wc6dtGz1CZgs+5WP--