From owner-freebsd-questions  Thu Jun  1 16:30: 6 2000
Delivered-To: freebsd-questions@freebsd.org
Received: from kestrel.prod.itd.earthlink.net (kestrel.prod.itd.earthlink.net [207.217.121.155])
	by hub.freebsd.org (Postfix) with ESMTP id 0681337B6F6
	for <questions@FreeBSD.ORG>; Thu,  1 Jun 2000 16:29:59 -0700 (PDT)
	(envelope-from eogren@earthlink.net)
Received: from rod.darktech.org (ip98.cambridge2.ma.pub-ip.psi.net [38.32.112.98])
	by kestrel.prod.itd.earthlink.net (8.9.3-EL_1_3/8.9.3) with ESMTP id QAA02740;
	Thu, 1 Jun 2000 16:29:55 -0700 (PDT)
Received: (from eogren@localhost)
	by rod.darktech.org (8.10.1/8.10.1) id e51NVAZ00890;
	Thu, 1 Jun 2000 19:31:10 -0400 (EDT)
Date: Thu, 1 Jun 2000 19:31:10 -0400
From: Eric Ogren <eogren@earthlink.net>
To: Mark Ovens <mark@dogma.freebsd-uk.eu.org>
Cc: questions@FreeBSD.ORG
Subject: Re: Questions about the gnu/contrib source tree
Message-ID: <20000601193110.B375@earthlink.net>
References: <20000601201916.C232@parish>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 1.0i
In-Reply-To: <20000601201916.C232@parish>; from mark@dogma.freebsd-uk.eu.org on Sun, May 28, 2000 at 09:38:52AM +0100
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Almost. :)

Stuff in /usr/src/contrib is imported straight from GNU; in other words,
we basically FTP patch.tar.gz (or whatever the filename is) from
ftp.gnu.org, and put everything in the src/ directory into
/usr/src/contrib/patch.

Anything we modify from these sources goes into
/usr/src/gnu/usr.bin/patch, as well as the Makefile we use to build
patch. You cannot cd /usr/src/contrib/patch and run make install and
expect it to work; you must cd /usr/src/gnu/usr.bin/patch and run make
install there.

To sum it up, basically, stuff in /usr/src/contrib comes from GNU; stuff
in /usr/src/gnu/ comes from FreeBSD.

Eric

On Sun, May 28, 2000 at 09:38:52AM +0100, Mark Ovens wrote:
> Can someone explain the contrib & gnu/usr.{bin,sbin} source trees
> please?
> 
> For example, both contrib/ and gnu/usr.bin/ contain source for
> patch(1), but the sdiff(1) source is only in gnu/usr.bin. Am I correct
> in thinking that if source exists in the contrib/ branch then that is
> used to build the binary, and if not the code in gnu/usr.{bin,sbin}/
> is used instead?


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message