From owner-freebsd-hackers Sat Dec 7 14:25:15 1996 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id OAA12884 for hackers-outgoing; Sat, 7 Dec 1996 14:25:15 -0800 (PST) Received: from irz301.inf.tu-dresden.de (irz301.inf.tu-dresden.de [141.76.1.11]) by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id OAA12877 for ; Sat, 7 Dec 1996 14:25:09 -0800 (PST) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by irz301.inf.tu-dresden.de (8.6.12/8.6.12-s1) with ESMTP id XAA20051; Sat, 7 Dec 1996 23:24:42 +0100 Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id XAA25156; Sat, 7 Dec 1996 23:24:36 +0100 Received: (from j@localhost) by uriah.heep.sax.de (8.8.2/8.6.9) id XAA23284; Sat, 7 Dec 1996 23:04:18 +0100 (MET) From: J Wunsch Message-Id: <199612072204.XAA23284@uriah.heep.sax.de> Subject: Re: trying to upgrade to 2.2 To: freebsd-hackers@freebsd.org (FreeBSD hackers) Date: Sat, 7 Dec 1996 23:04:18 +0100 (MET) Cc: thompson@znet.com Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) In-Reply-To: <199612062129.NAA01673@squirrel.tgsoft.com> from mark thompson at "Dec 6, 96 01:29:59 pm" X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E X-Mailer: ELM [version 2.4ME+ PL17 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-hackers@freebsd.org X-Loop: FreeBSD.org Precedence: bulk As mark thompson wrote: > My question is: > 1) is '../../contrib' a new idea in 2.2? Yes. Basically, /usr/src/contrib contains the unmodified original distribution files (mostly), while local changes are maintained where they belong to. The make process never descends into the `contrib' directory, but the files there are rather being used by .PATH and -I../../contrib/ stuff in the real Makefiles. > 2) is something supposed to override these and it isn't being set up? I cannot parse this, sorry. > 3) is something faulty with my procedure? Probably. :) > ================= > 4) I notice that in /usr/src/gnu/usr.bin/cvs just about all of the > source has been moved to Attic, and are not tagged for 2.2. Are the > gnu things being moved out to ports? They have been moved to `contrib': j@uriah 1529% ls $CVSROOT/src/contrib/ /home/ncvs/src/contrib: bind/ gcc/ groff/ libpcap/ tcpdump/ bison/ gdb/ libg++/ nvi/ traceroute/ cvs/ gperf/ libgmp/ tcl/ ^^^^ Of course, not exactly _all_ of /usr/src/gnu/usr/bin has been moved out into the Attic. The Makefile skeleton remains: j@uriah 1530% ls /usr/src/gnu/usr.bin/cvs /usr/src/gnu/usr.bin/cvs: contrib/ cvs/ doc/ Makefile tools/ CVS/ cvsbug/ lib/ Makefile.inc That's the part that finally uses the source code from contrib/cvs. -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-)