From owner-svn-src-head@FreeBSD.ORG  Mon Nov 18 20:01:53 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 2042C712;
 Mon, 18 Nov 2013 20:01:53 +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 0FA2823F0;
 Mon, 18 Nov 2013 20:01:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIK1q6v040764;
 Mon, 18 Nov 2013 20:01:52 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIK1qNe040752;
 Mon, 18 Nov 2013 20:01:52 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201311182001.rAIK1qNe040752@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 18 Nov 2013 20:01:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258320 - in head/release: amd64 i386
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.16
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, 18 Nov 2013 20:01:53 -0000

Author: gjb
Date: Mon Nov 18 20:01:52 2013
New Revision: 258320
URL: http://svnweb.freebsd.org/changeset/base/258320

Log:
  Simplify PKG_ABI for pkg-stage.sh.
  
  Submitted by:	hrs
  MFC after:	3 days
  X-MFC-With:	r258310
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/amd64/pkg-stage.conf
  head/release/i386/pkg-stage.conf

Modified: head/release/amd64/pkg-stage.conf
==============================================================================
--- head/release/amd64/pkg-stage.conf	Mon Nov 18 19:57:11 2013	(r258319)
+++ head/release/amd64/pkg-stage.conf	Mon Nov 18 20:01:52 2013	(r258320)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[0-9]//'):x86:64"
+export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:64"
 export ASSUME_ALWAYS_YES=1
 export __PKG_CONF="/etc/pkg/FreeBSD.conf"
 export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"

Modified: head/release/i386/pkg-stage.conf
==============================================================================
--- head/release/i386/pkg-stage.conf	Mon Nov 18 19:57:11 2013	(r258319)
+++ head/release/i386/pkg-stage.conf	Mon Nov 18 20:01:52 2013	(r258320)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[0-9]//'):x86:32"
+export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:32"
 export ASSUME_ALWAYS_YES=1
 export __PKG_CONF="/etc/pkg/FreeBSD.conf"
 export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"