From owner-freebsd-current  Thu Feb  6 01:26:15 1997
Return-Path: <owner-current>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id BAA27226
          for current-outgoing; Thu, 6 Feb 1997 01:26:15 -0800 (PST)
Received: from dfw-ix1.ix.netcom.com (dfw-ix1.ix.netcom.com [206.214.98.1])
          by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id BAA27204
          for <current@freebsd.org>; Thu, 6 Feb 1997 01:26:10 -0800 (PST)
Received: from silvia.HIP.Berkeley.EDU (wck-ca13-15.ix.netcom.com [204.31.231.207]) by dfw-ix1.ix.netcom.com (8.6.13/8.6.12) with ESMTP id BAA08834; Thu, 6 Feb 1997 01:25:30 -0800
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.5/8.6.9) id BAA22067; Thu, 6 Feb 1997 01:25:25 -0800 (PST)
Date: Thu, 6 Feb 1997 01:25:25 -0800 (PST)
Message-Id: <199702060925.BAA22067@silvia.HIP.Berkeley.EDU>
To: gjennejohn@frt.dec.com
CC: current@freebsd.org
In-reply-to: <9702051033.AA17951@cssmuc.frt.dec.com> (garyj@frt.dec.com)
Subject: Re: conditionally including <sys/param.h>
From: asami@vader.cs.berkeley.edu (Satoshi Asami)
Sender: owner-current@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

 * From: garyj@frt.dec.com

 * what I'd lioke to see in -current (aka 3.0) is __FreeBSD__=3 instead of
 * __FreeBSD__=2. This would make it easier to differentiate between 2.2 and

I agree with this.

Also, I would like to propose to have osreldate updated in a way that
all 2.1*s come before all 2.2*s and they come before all 3.*s.  As
seen in the recent top port debacle, simply using the release
year/month is bound to utter confusion.

Right now we have (from the handbook):

===
2.0-RELEASE:                    199411
2.1-current's:                  199501, 199503
2.0.5-RELEASE:                  199504
2.2-current before 2.1:         199508
2.1.0-RELEASE:                  199511
2.2-current before 2.1.5:       199512
2.1.5-RELEASE:                  199607
2.2-current before 2.1.6:       199608
2.1.6-RELEASE:                  199612
2.2-RELEASE:                    199701
3.0-current as of Feb 1997:     199702  (will certainly be bumped)
===

Obviously everything up to 2.1.6R can't be changed, but the last two
are still salvagable.  Let's say we make them

===
2.2-RELEASE:                    199707
3.0-current as of Feb 1997:     199801
===

so we have more space to squeeze in 2.1.7R and 2.2.5R and such without
sacrificing the linear ordering.

Satoshi