From owner-freebsd-hackers  Sun Dec  8 05:46:31 1996
Return-Path: <owner-hackers>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id FAA09504
          for hackers-outgoing; Sun, 8 Dec 1996 05:46:31 -0800 (PST)
Received: from squirrel.tgsoft.com (sdts3-10.znet.com [207.167.65.10])
          by freefall.freebsd.org (8.8.4/8.8.4) with ESMTP id FAA09481
          for <freebsd-hackers@freebsd.org>; Sun, 8 Dec 1996 05:46:02 -0800 (PST)
Received: (from thompson@localhost) by squirrel.tgsoft.com (8.8.3/8.6.12) id FAA24231; Sun, 8 Dec 1996 05:42:38 -0800 (PST)
Date: Sun, 8 Dec 1996 05:42:38 -0800 (PST)
Message-Id: <199612081342.FAA24231@squirrel.tgsoft.com>
From: mark thompson <thompson@tgsoft.com>
To: joerg_wunsch@uriah.heep.sax.de
CC: freebsd-hackers@freebsd.org
In-reply-to: <199612072204.XAA23284@uriah.heep.sax.de> (message from J Wunsch
	on Sat, 7 Dec 1996 23:04:18 +0100 (MET))
Subject: Re: trying to upgrade to 2.2
Reply-to: thompson@znet.com
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

   From: J Wunsch <j@uriah.heep.sax.de>
   Date: Sat, 7 Dec 1996 23:04:18 +0100 (MET)
   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/<something> stuff in the real Makefiles.

Ah. Well, that clears it right up. contrib was not in my cvsup file. Is
there an 'official' or 'sample' cvsup file for boneheads like me
somewhere, and I simply didn't find it? Or is creating one a sort of
intelligence test (obviously, i got only partial credit)?

-mark

p.s. I do like the 'contrib' idea. I just wish that it was clearer what
has to be done to upgrade.