From owner-svn-src-all@FreeBSD.ORG  Sat Mar  3 05:46:25 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 34BF61065670;
	Sat,  3 Mar 2012 05:46:25 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 231938FC0A;
	Sat,  3 Mar 2012 05:46:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q235kO38065800;
	Sat, 3 Mar 2012 05:46:24 GMT (envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q235kOXe065798;
	Sat, 3 Mar 2012 05:46:24 GMT (envelope-from kensmith@svn.freebsd.org)
Message-Id: <201203030546.q235kOXe065798@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Sat, 3 Mar 2012 05:46:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232437 - stable/8/usr.sbin/pkg_install/add
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 05:46:25 -0000

Author: kensmith
Date: Sat Mar  3 05:46:24 2012
New Revision: 232437
URL: http://svn.freebsd.org/changeset/base/232437

Log:
  Merge r229304,r229748,r229751,r232436
  
  Catch up to head and stable/9 for what combination of __FreeBSD_version
  values map to package directories.
  
  Approved by:	re (implicit)

Modified:
  stable/8/usr.sbin/pkg_install/add/main.c
Directory Properties:
  stable/8/usr.sbin/pkg_install/add/   (props changed)

Modified: stable/8/usr.sbin/pkg_install/add/main.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/add/main.c	Sat Mar  3 05:14:37 2012	(r232436)
+++ stable/8/usr.sbin/pkg_install/add/main.c	Sat Mar  3 05:46:24 2012	(r232437)
@@ -87,6 +87,8 @@ struct {
 	{ 800000, 800499, "/packages-8.0-release" },
 	{ 801000, 801499, "/packages-8.1-release" },
 	{ 802000, 802499, "/packages-8.2-release" },
+	{ 803000, 803499, "/packages-8.3-release" },
+	{ 900000, 900499, "/packages-9.0-release" },
 	{ 300000, 399000, "/packages-3-stable" },
 	{ 400000, 499000, "/packages-4-stable" },
 	{ 502100, 502128, "/packages-5-current" },
@@ -94,7 +96,8 @@ struct {
 	{ 600100, 699000, "/packages-6-stable" },
 	{ 700100, 799000, "/packages-7-stable" },
 	{ 800500, 899000, "/packages-8-stable" },
-	{ 900000, 999000, "/packages-9-current" },
+	{ 900500, 999000, "/packages-9-stable" },
+	{ 1000000, 1099000, "/packages-10-current" },
 	{ 0, 9999999, "/packages-current" },
 	{ 0, 0, NULL }
 };