From owner-cvs-src@FreeBSD.ORG  Tue Apr 26 04:32:58 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E5D9116A4CE; Tue, 26 Apr 2005 04:32:58 +0000 (GMT)
Received: from mailout2.pacific.net.au (mailout2.pacific.net.au [61.8.0.85])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 43E8343D49; Tue, 26 Apr 2005 04:32:58 +0000 (GMT)
	(envelope-from bde@zeta.org.au)
Received: from mailproxy2.pacific.net.au (mailproxy2.pacific.net.au
	[61.8.0.87])j3Q4Wvml013058;	Tue, 26 Apr 2005 14:32:57 +1000
Received: from epsplex.bde.org (katana.zip.com.au [61.8.7.246])
	j3Q4Ws0I017154;	Tue, 26 Apr 2005 14:32:55 +1000
Date: Tue, 26 Apr 2005 14:32:10 +1000 (EST)
From: Bruce Evans <bde@zeta.org.au>
X-X-Sender: bde@epsplex.bde.org
To: Darren Reed <darrenr@hub.freebsd.org>
In-Reply-To: <20050426032556.GB14477@hub.freebsd.org>
Message-ID: <20050426141230.L1713@epsplex.bde.org>
References: <200504251820.j3PIKGY1021086@repoman.freebsd.org>
	<20050426032556.GB14477@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
cc: Darren Reed <darrenr@FreeBSD.org>
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/contrib/ipfilter INST.FreeBSD-2.2 Makefilefils.c
 inet_addr.c ip_fil_freebsd.c ip_htable.c         ip_htable.h ip_irc_pxy.c
 ip_lfil.c ip_lookup.c ip_lookup.h ...
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2005 04:32:59 -0000

On Tue, 26 Apr 2005, Darren Reed wrote:

> On Tue, Apr 26, 2005 at 12:31:35PM +1000, Bruce Evans wrote:
>>> Revision  Changes    Path
>>> 1.2       +0 -707    src/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt
>>> (dead)
>>> 1.2       +0 -82     src/contrib/ipfilter/FWTK/tproxy.diff (dead)
>>> 1.2       +0 -24     src/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4
>>> (dead)
>>> 1.2       +2 -0      src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
>>> 1.2       +2 -0      src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
>>> 1.2       +1 -1      src/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
>>> ...
>>
>> This seems to make matters much worse by taking vendor files of the vendor
>> branch.
>
> Hmmm?
>
> They shouldn't be present in future imports, either.

Most of them haven't been removed.  Changes like +1 -1 indicate non-removal.
I trimmed most of the context that has such changes.  In the above, the
change between 1.1 and 1.2 for FreeBSD-4.0/ipv6-patch-4.2 is from an
unexpanded $NetBSD$ tag to an expanded $FreeBSD$ tag.

Files in the contrib directory are supposed to have $FreeBSD$ tags if
and only if FreeBSD actually changed them, and there shouldn't be many
such files.  In my year-old copy of the contrib directory, about 4%
of the files have a $FreeBSD$ tag, and contrib/ipfilter has the same
percentage of such files.

Bruce