From owner-svn-src-all@FreeBSD.ORG  Wed Mar 19 00:25:36 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F46780A;
 Wed, 19 Mar 2014 00:25:36 +0000 (UTC)
Received: from mail.egr.msu.edu (gribble.egr.msu.edu [35.9.37.169])
 by mx1.freebsd.org (Postfix) with ESMTP id C90013CB;
 Wed, 19 Mar 2014 00:25:35 +0000 (UTC)
Received: from gribble (localhost [127.0.0.1])
 by mail.egr.msu.edu (Postfix) with ESMTP id 48D432B0B8;
 Tue, 18 Mar 2014 20:25:29 -0400 (EDT)
X-Virus-Scanned: amavisd-new at egr.msu.edu
Received: from mail.egr.msu.edu ([127.0.0.1])
 by gribble (gribble.egr.msu.edu [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id h8A2dVBKXh3P; Tue, 18 Mar 2014 20:25:29 -0400 (EDT)
Received: from EGR authenticated sender
Message-ID: <5328E3F8.9030302@egr.msu.edu>
Date: Tue, 18 Mar 2014 20:25:28 -0400
From: Adam McDougall <mcdouga9@egr.msu.edu>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.3.0
MIME-Version: 1.0
To: svn-src-all@freebsd.org, Baptiste Daroussin <bapt@freebsd.org>
Subject: Re: svn commit: r263023 - in stable/9: etc etc/mtree etc/pkg share
 share/keys share/keys/pkg/trusted share/man/man7
References: <201403111448.s2BEmiXG029888@svn.freebsd.org>
In-Reply-To: <201403111448.s2BEmiXG029888@svn.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Wed, 19 Mar 2014 00:25:36 -0000

On 03/11/2014 10:48, Baptiste Daroussin wrote:
> Author: bapt
> Date: Tue Mar 11 14:48:44 2014
> New Revision: 263023
> URL: http://svnweb.freebsd.org/changeset/base/263023
> 
> Log:
>   MFC: r257145,r257147,r257150,r257159,r257164,r257168,r257344,r257667,r257668,
>        r258227,r260605
>   
>   Add default configuration for FreeBSD official pkg(8) repositories
>   Add fingerprint for the trusted keys
> 
> Added:
>   stable/9/etc/pkg/
>      - copied from r257145, head/etc/pkg/
>   stable/9/share/keys/
>      - copied from r257344, head/share/keys/
> Modified:
>   stable/9/etc/Makefile

<snip>

Since a bunch of pkg related changes have been merged to stable/9, would
it be possible to merge the minor changes to 3 files in r237997
or equivalent?

http://www.freebsd.org/cgi/query-pr.cgi?pr=bin%2F181475&cat=

Thanks.