svn commit: r258314 - in head/release: amd64 i386

[Glen Barber]

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

Log:
  Fix how ABI is evaluated so it matches more than a dot-zero
  case.
  
  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 17:06:33 2013	(r258313)
+++ head/release/amd64/pkg-stage.conf	Mon Nov 18 17:52:18 2013	(r258314)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-export PKG_ABI="freebsd:$(echo ${REVISION} | tr -d '.0'):x86:64"
+export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[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 17:06:33 2013	(r258313)
+++ head/release/i386/pkg-stage.conf	Mon Nov 18 17:52:18 2013	(r258314)
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-export PKG_ABI="freebsd:$(echo ${REVISION} | tr -d '.0'):x86:32"
+export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[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"