From owner-svn-src-projects@FreeBSD.ORG  Wed Mar 18 05:25:39 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9D613460;
 Wed, 18 Mar 2015 05:25:39 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 894A2B36;
 Wed, 18 Mar 2015 05:25:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2I5Pd5I047119;
 Wed, 18 Mar 2015 05:25:39 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2I5Pd0N047118;
 Wed, 18 Mar 2015 05:25:39 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201503180525.t2I5Pd0N047118@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 18 Mar 2015 05:25:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r280205 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Mar 2015 05:25:39 -0000

Author: bapt
Date: Wed Mar 18 05:25:38 2015
New Revision: 280205
URL: https://svnweb.freebsd.org/changeset/base/280205

Log:
  Detect ABI based on what would be packaged

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Mar 18 05:05:30 2015	(r280204)
+++ projects/release-pkg/Makefile.inc1	Wed Mar 18 05:25:38 2015	(r280205)
@@ -1230,7 +1230,8 @@ create-world-packages:
 			${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \
 		awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
 			${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \
-		pkg create -m ${DESTDIR}/$${pkgname}-manifestdir \
+		pkg -o ABI_FILE=${DESTDIR}/bin/sh \
+			create -m ${DESTDIR}/$${pkgname}-manifestdir \
 			-p ${DESTDIR}/$${pkgname}.plist \
 			-r ${DESTDIR} -o ${DESTDIR} ; \
 	done