From 6d86d28981e13fa09590f7b4081d41a761946e72 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 18 Nov 2013 17:52:18 +0000
Subject: [PATCH] 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
---
 release/amd64/pkg-stage.conf | 2 +-
 release/i386/pkg-stage.conf  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/amd64/pkg-stage.conf b/release/amd64/pkg-stage.conf
index ab607afbe0e1..c62c86765b6c 100755
--- a/release/amd64/pkg-stage.conf
+++ b/release/amd64/pkg-stage.conf
@@ -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"
diff --git a/release/i386/pkg-stage.conf b/release/i386/pkg-stage.conf
index e16cb68e2df8..ad09cbf8cbf3 100755
--- a/release/i386/pkg-stage.conf
+++ b/release/i386/pkg-stage.conf
@@ -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"