From owner-freebsd-questions Fri Jun 2 13: 7:11 2000 Delivered-To: freebsd-questions@freebsd.org Received: from falcon.prod.itd.earthlink.net (falcon.prod.itd.earthlink.net [207.217.120.74]) by hub.freebsd.org (Postfix) with ESMTP id AC90237B55B for ; Fri, 2 Jun 2000 13:07:06 -0700 (PDT) (envelope-from eogren@earthlink.net) Received: from blue (ip126.cambridge2.ma.pub-ip.psi.net [38.32.112.126]) by falcon.prod.itd.earthlink.net (8.9.3-EL_1_3/8.9.3) with SMTP id NAA25595; Fri, 2 Jun 2000 13:06:22 -0700 (PDT) Message-ID: <001d01bfccce$33e15d40$0200000a@dinternet.dyn.ml.org> From: "Eric Ogren" To: "Mark Ovens" Cc: References: <20000601201916.C232@parish> <20000601193110.B375@earthlink.net> <20000602200350.C1146@parish> Subject: Re: Questions about the gnu/contrib source tree Date: Fri, 2 Jun 2000 16:07:11 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.00.2314.1300 X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2314.1300 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG [Sorry for the nasty formatting, I'm in Windows right now] I'm pretty sure this is because we rm the files from /usr/src/contrib once we modify them. However, I'm not positive, so I could very easily be wrong. Eric ----- Original Message ----- From: Mark Ovens To: Eric Ogren Cc: Sent: Friday, June 02, 2000 3:03 PM Subject: Re: Questions about the gnu/contrib source tree > 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 > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message