From owner-freebsd-questions Fri Jun 2 12: 4: 0 2000 Delivered-To: freebsd-questions@freebsd.org Received: from mta01-svc.server.ntlworld.com (mta01-svc.ntlworld.com [62.253.162.41]) by hub.freebsd.org (Postfix) with ESMTP id 3CA2837B63A for ; Fri, 2 Jun 2000 12:03:57 -0700 (PDT) (envelope-from mark@ukug.uk.freebsd.org) Received: from parish.my.domain ([62.253.86.204]) by mta01-svc.server.ntlworld.com (InterMail vM.4.01.02.27 201-229-119-110) with ESMTP id <20000602190352.FMJS381.mta01-svc.server.ntlworld.com@parish.my.domain>; Fri, 2 Jun 2000 20:03:52 +0100 Received: (from mark@localhost) by parish.my.domain (8.9.3/8.9.3) id UAA01458; Fri, 2 Jun 2000 20:03:50 +0100 (BST) (envelope-from mark) Date: Fri, 2 Jun 2000 20:03:50 +0100 From: Mark Ovens To: Eric Ogren Cc: questions@freebsd.org Subject: Re: Questions about the gnu/contrib source tree Message-ID: <20000602200350.C1146@parish> References: <20000601201916.C232@parish> <20000601193110.B375@earthlink.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: <20000601193110.B375@earthlink.net>; from eogren@earthlink.net on Thu, Jun 01, 2000 at 07:31:10PM -0400 Organization: Total lack of Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, Jun 01, 2000 at 07:31:10PM -0400, Eric Ogren wrote: > 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. > Thanks for the explanation, but, based on what you said, why does the sdiff(1) source not exist in /usr/src/contrib/ as well as in /usr/src/gnu/usr.bin/ ? > 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 -- ...and on the eighth day God created UNIX ________________________________________________________________ FreeBSD - The Power To Serve http://www.freebsd.org My Webpage http://ukug.uk.freebsd.org/~mark/ mailto:mark@ukug.uk.freebsd.org http://www.radan.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message