From owner-svn-src-head@FreeBSD.ORG  Tue Mar  5 14:08:36 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])
 by hub.freebsd.org (Postfix) with ESMTP id EF9748EE;
 Tue,  5 Mar 2013 14:08:36 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D73FB15F;
 Tue,  5 Mar 2013 14:08:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r25E8aj5099755;
 Tue, 5 Mar 2013 14:08:36 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r25E8awl099754;
 Tue, 5 Mar 2013 14:08:36 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303051408.r25E8awl099754@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 5 Mar 2013 14:08:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247843 - head/usr.sbin/pkg
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.14
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: Tue, 05 Mar 2013 14:08:37 -0000

Author: bapt
Date: Tue Mar  5 14:08:36 2013
New Revision: 247843
URL: http://svnweb.freebsd.org/changeset/base/247843

Log:
  choose in priority the allocated ABI if any to do the ${ABI} substitution in PACKAGESITE
  
  Reviewed by:	bdrewery

Modified:
  head/usr.sbin/pkg/config.c

Modified: head/usr.sbin/pkg/config.c
==============================================================================
--- head/usr.sbin/pkg/config.c	Tue Mar  5 13:38:45 2013	(r247842)
+++ head/usr.sbin/pkg/config.c	Tue Mar  5 14:08:36 2013	(r247843)
@@ -376,7 +376,7 @@ finalize:
 		c[ABI].val = abi;
 	}
 
-	subst_packagesite(c[ABI].val);
+	subst_packagesite(c[ABI].value != NULL ? c[ABI].value : c[ABI].val);
 
 	return (0);
 }