head	1.14;
access;
symbols
	RELENG_8_4:1.13.0.2
	RELENG_9_1_0_RELEASE:1.12.4.1.4.2
	RELENG_9_1:1.12.4.1.0.4
	RELENG_9_1_BP:1.12.4.1
	RELENG_8_3_0_RELEASE:1.12.2.1.8.1
	RELENG_8_3:1.12.2.1.0.8
	RELENG_8_3_BP:1.12.2.1
	RELENG_9_0_0_RELEASE:1.12.4.1.2.1
	RELENG_9_0:1.12.4.1.0.2
	RELENG_9_0_BP:1.12.4.1
	RELENG_9:1.12.0.4
	RELENG_9_BP:1.12
	RELENG_7_4_0_RELEASE:1.11.18.1.8.1
	RELENG_8_2_0_RELEASE:1.12.2.1.6.1
	RELENG_7_4:1.11.18.1.0.8
	RELENG_7_4_BP:1.11.18.1
	RELENG_8_2:1.12.2.1.0.6
	RELENG_8_2_BP:1.12.2.1
	RELENG_8_1_0_RELEASE:1.12.2.1.4.1
	RELENG_8_1:1.12.2.1.0.4
	RELENG_8_1_BP:1.12.2.1
	RELENG_7_3_0_RELEASE:1.11.18.1.6.1
	RELENG_7_3:1.11.18.1.0.6
	RELENG_7_3_BP:1.11.18.1
	RELENG_8_0_0_RELEASE:1.12.2.1.2.1
	RELENG_8_0:1.12.2.1.0.2
	RELENG_8_0_BP:1.12.2.1
	RELENG_8:1.12.0.2
	RELENG_8_BP:1.12
	RELENG_7_2_0_RELEASE:1.11.18.1.4.1
	RELENG_7_2:1.11.18.1.0.4
	RELENG_7_2_BP:1.11.18.1
	RELENG_7_1_0_RELEASE:1.11.18.1.2.1
	RELENG_6_4_0_RELEASE:1.11.24.1
	RELENG_7_1:1.11.18.1.0.2
	RELENG_7_1_BP:1.11.18.1
	RELENG_6_4:1.11.0.24
	RELENG_6_4_BP:1.11
	RELENG_7_0_0_RELEASE:1.11
	RELENG_6_3_0_RELEASE:1.11
	PRE_1_11_22:1.11
	RELENG_7_0:1.11.0.22
	RELENG_7_0_BP:1.11
	RELENG_6_3:1.11.0.20
	RELENG_6_3_BP:1.11
	RELENG_7:1.11.0.18
	RELENG_7_BP:1.11
	RELENG_6_2_0_RELEASE:1.11
	RELENG_6_2:1.11.0.16
	RELENG_6_2_BP:1.11
	RELENG_5_5_0_RELEASE:1.11
	RELENG_5_5:1.11.0.14
	RELENG_5_5_BP:1.11
	RELENG_6_1_0_RELEASE:1.11
	RELENG_6_1:1.11.0.12
	RELENG_6_1_BP:1.11
	RELENG_6_0_0_RELEASE:1.11
	RELENG_6_0:1.11.0.10
	RELENG_6_0_BP:1.11
	RELENG_6:1.11.0.8
	RELENG_6_BP:1.11
	RELENG_5_4_0_RELEASE:1.11
	RELENG_5_4:1.11.0.6
	RELENG_5_4_BP:1.11
	RELENG_4_11_0_RELEASE:1.7.2.5
	RELENG_4_11:1.7.2.5.0.2
	RELENG_4_11_BP:1.7.2.5
	RELENG_5_3_0_RELEASE:1.11
	RELENG_5_3:1.11.0.4
	RELENG_5_3_BP:1.11
	RELENG_5:1.11.0.2
	RELENG_5_BP:1.11
	RELENG_4_10_0_RELEASE:1.7.2.4
	RELENG_4_10:1.7.2.4.0.6
	RELENG_4_10_BP:1.7.2.4
	RELENG_5_2_1_RELEASE:1.10
	RELENG_5_2_0_RELEASE:1.10
	RELENG_5_2:1.10.0.6
	RELENG_5_2_BP:1.10
	RELENG_4_9_0_RELEASE:1.7.2.4
	RELENG_4_9:1.7.2.4.0.4
	RELENG_4_9_BP:1.7.2.4
	RELENG_5_1_0_RELEASE:1.10
	RELENG_5_1:1.10.0.4
	RELENG_5_1_BP:1.10
	RELENG_4_8_0_RELEASE:1.7.2.4
	RELENG_4_8:1.7.2.4.0.2
	RELENG_4_8_BP:1.7.2.4
	RELENG_5_0_0_RELEASE:1.10
	RELENG_5_0:1.10.0.2
	RELENG_5_0_BP:1.10
	RELENG_4_7_0_RELEASE:1.7.2.2
	RELENG_4_7:1.7.2.2.0.6
	RELENG_4_7_BP:1.7.2.2
	RELENG_4_6_2_RELEASE:1.7.2.2
	RELENG_4_6_1_RELEASE:1.7.2.2
	RELENG_4_6_0_RELEASE:1.7.2.2
	RELENG_4_6:1.7.2.2.0.4
	RELENG_4_6_BP:1.7.2.2
	RELENG_4_5_0_RELEASE:1.7.2.2
	RELENG_4_5:1.7.2.2.0.2
	RELENG_4_5_BP:1.7.2.2
	RELENG_4_4_0_RELEASE:1.7.2.1
	RELENG_4_4:1.7.2.1.0.4
	RELENG_4_4_BP:1.7.2.1
	RELENG_4_3_0_RELEASE:1.7.2.1
	RELENG_4_3:1.7.2.1.0.2
	RELENG_4_3_BP:1.7.2.1
	RELENG_4_2_0_RELEASE:1.7.2.1
	RELENG_4_1_1_RELEASE:1.7
	PRE_SMPNG:1.7
	RELENG_4_1_0_RELEASE:1.7
	RELENG_3_5_0_RELEASE:1.5.2.1
	RELENG_4_0_0_RELEASE:1.7
	RELENG_4:1.7.0.2
	RELENG_4_BP:1.7
	RELENG_3_4_0_RELEASE:1.5.2.1
	RELENG_3_3_0_RELEASE:1.5
	RELENG_3_2_PAO:1.5.0.4
	RELENG_3_2_PAO_BP:1.5
	RELENG_3_2_0_RELEASE:1.5
	RELENG_3_1_0_RELEASE:1.5
	RELENG_3:1.5.0.2
	RELENG_3_BP:1.5
	RELENG_2_2_8_RELEASE:1.4.2.2
	RELENG_3_0_0_RELEASE:1.5
	RELENG_2_2_7_RELEASE:1.4.2.2
	RELENG_2_2_6_RELEASE:1.4.2.1
	RELENG_2_2_5_RELEASE:1.4.2.1
	RELENG_2_2:1.4.0.2;
locks; strict;
comment	@# @;


1.14
date	2013.06.16.00.38.19;	author svnexp;	state dead;
branches;
next	1.13;

1.13
date	2012.11.17.01.48.42;	author svnexp;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2008.01.13.06.35.22;	author obrien;	state Exp;
branches
	1.12.2.1
	1.12.4.1;
next	1.11;

1.11
date	2004.06.09.20.51.26;	author des;	state Exp;
branches
	1.11.8.1
	1.11.18.1
	1.11.24.1;
next	1.10;

1.10
date	2002.09.02.05.58.30;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	2001.08.10.09.53.53;	author peter;	state Exp;
branches;
next	1.8;

1.8
date	2000.10.02.06.43.54;	author peter;	state Exp;
branches;
next	1.7;

1.7
date	99.12.11.13.11.47;	author peter;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	99.12.08.16.49.38;	author peter;	state Exp;
branches;
next	1.5;

1.5
date	98.01.30.15.09.55;	author peter;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	97.06.22.11.06.30;	author peter;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	97.05.23.14.55.31;	author peter;	state Exp;
branches;
next	1.2;

1.2
date	97.05.15.23.10.27;	author peter;	state Exp;
branches;
next	1.1;

1.1
date	97.04.03.10.45.08;	author obrien;	state Exp;
branches;
next	;

1.13.2.1
date	2012.11.17.01.48.42;	author svnexp;	state dead;
branches;
next	1.13.2.2;

1.13.2.2
date	2013.03.28.13.00.40;	author svnexp;	state Exp;
branches;
next	;

1.12.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.12.2.1.2.1
	1.12.2.1.4.1
	1.12.2.1.6.1
	1.12.2.1.8.1;
next	1.12.2.2;

1.12.2.2
date	2012.11.17.10.35.50;	author svnexp;	state Exp;
branches;
next	;

1.12.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.12.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.12.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.12.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.12.2.1.8.2;

1.12.2.1.8.2
date	2012.11.17.08.24.32;	author svnexp;	state Exp;
branches;
next	;

1.12.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.12.4.1.2.1
	1.12.4.1.4.1;
next	1.12.4.2;

1.12.4.2
date	2012.11.17.11.36.05;	author svnexp;	state Exp;
branches;
next	;

1.12.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.12.4.1.2.2;

1.12.4.1.2.2
date	2012.11.17.08.36.06;	author svnexp;	state Exp;
branches;
next	;

1.12.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.12.4.1.4.2;

1.12.4.1.4.2
date	2012.11.17.08.46.55;	author svnexp;	state Exp;
branches;
next	;

1.11.8.1
date	2012.11.17.07.38.43;	author svnexp;	state Exp;
branches;
next	;

1.11.18.1
date	2008.07.28.16.52.28;	author obrien;	state Exp;
branches
	1.11.18.1.2.1
	1.11.18.1.4.1
	1.11.18.1.6.1
	1.11.18.1.8.1;
next	1.11.18.2;

1.11.18.2
date	2012.11.17.08.00.56;	author svnexp;	state Exp;
branches;
next	;

1.11.18.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.11.18.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.11.18.1.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.11.18.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.11.18.1.8.2;

1.11.18.1.8.2
date	2012.11.17.08.16.33;	author svnexp;	state Exp;
branches;
next	;

1.11.24.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1
date	2000.10.31.09.37.43;	author obrien;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	2001.10.28.21.31.58;	author peter;	state Exp;
branches;
next	1.7.2.3;

1.7.2.3
date	2002.10.15.20.24.31;	author peter;	state Exp;
branches;
next	1.7.2.4;

1.7.2.4
date	2002.12.19.21.17.51;	author peter;	state Exp;
branches;
next	1.7.2.5;

1.7.2.5
date	2004.06.29.16.10.44;	author des;	state Exp;
branches;
next	1.7.2.6;

1.7.2.6
date	2012.11.17.07.22.11;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	99.12.13.20.56.22;	author peter;	state Exp;
branches;
next	;

1.4.2.1
date	97.06.28.03.21.21;	author peter;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	98.04.05.03.27.17;	author peter;	state Exp;
branches;
next	;


desc
@@


1.14
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251794
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@$FreeBSD: head/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $

MAINTAINER=	peter@@FreeBSD.org

This directory contains the virgin CVS source on the vendor branch.  Do
not under any circumstances commit new versions onto the mainline, new
versions or official-patch versions must be imported.

To prepare a new cvs dist for import, extract it into a fresh directory;
then delete the files and directories listed in FREEBSD-Xlist.

CVS is imported from its top level directory something like this:
  cvs -n import src/contrib/cvs CVSHOME v<version>

The -n option is "don't do anything" so you can see what is about to happen
first.  Remove it when it looks ok.

The initial import was done with:
  cvs import src/contrib/cvs CVSHOME v1_11_22

When new versions are imported, cvs will give instructions on how to merge
the local and vendor changes when/if conflicts arise.

The developers can be reached at:  <devel-cvs@@nongnu.org>.  Local changes
that are suitable for public consumption should be submitted for inclusion
in future releases.

peter@@freebsd.org - 20 Aug 1996
obrien@@freebsd.org - 12 Jan 2008

Current local changes:
  - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the
    magic branch number.  (for CVSup local-commit support)
  - CVSREADONLYFS environment variable and global option -R to enable
    no-locking readonly mode (eg: cvs repo is a cdrom or mirror)
  - the verify message script can edit the submitted log message.
  - CVSROOT/options file
  - Variable keyword expansion controls including custom keywords.
  - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off.
  - 'CVS_OPTIONS' environmental variable support.
  - Allow -D with -r on checkout.
  - Support for "diff -j", allowing tag:date based diffs.
  - iso8601 option keyword.
  - Comprehensive "-T" CVS/Template support.
  - We use the cvs.1 manpage from man/, not the offical one in doc/
@


1.13
log
@Switching exporter and resync
@
text
@@


1.13.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_8_4 on 2013-03-28 13:00:40 +0000
@
text
@d1 45
@


1.13.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 45
$FreeBSD: releng/8.4/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $

MAINTAINER=	peter@@FreeBSD.org

This directory contains the virgin CVS source on the vendor branch.  Do
not under any circumstances commit new versions onto the mainline, new
versions or official-patch versions must be imported.

To prepare a new cvs dist for import, extract it into a fresh directory;
then delete the files and directories listed in FREEBSD-Xlist.

CVS is imported from its top level directory something like this:
  cvs -n import src/contrib/cvs CVSHOME v<version>

The -n option is "don't do anything" so you can see what is about to happen
first.  Remove it when it looks ok.

The initial import was done with:
  cvs import src/contrib/cvs CVSHOME v1_11_22

When new versions are imported, cvs will give instructions on how to merge
the local and vendor changes when/if conflicts arise.

The developers can be reached at:  <devel-cvs@@nongnu.org>.  Local changes
that are suitable for public consumption should be submitted for inclusion
in future releases.

peter@@freebsd.org - 20 Aug 1996
obrien@@freebsd.org - 12 Jan 2008

Current local changes:
  - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the
    magic branch number.  (for CVSup local-commit support)
  - CVSREADONLYFS environment variable and global option -R to enable
    no-locking readonly mode (eg: cvs repo is a cdrom or mirror)
  - the verify message script can edit the submitted log message.
  - CVSROOT/options file
  - Variable keyword expansion controls including custom keywords.
  - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off.
  - 'CVS_OPTIONS' environmental variable support.
  - Allow -D with -r on checkout.
  - Support for "diff -j", allowing tag:date based diffs.
  - iso8601 option keyword.
  - Comprehensive "-T" CVS/Template support.
  - We use the cvs.1 manpage from man/, not the offical one in doc/
@


1.12
log
@Update for the 1.11.22 import.

Reviewed/begged-for by: peter
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $
@


1.12.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@d1 1
a1 1
$FreeBSD$
@


1.12.4.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/9/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $
@


1.12.4.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.12.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.1/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $
@


1.12.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.12.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.0/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $
@


1.12.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@d1 1
a1 1
$FreeBSD$
@


1.12.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/8/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $
@


1.12.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.12.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/8.3/contrib/cvs/FREEBSD-upgrade 175285 2008-01-13 06:35:22Z obrien $
@


1.12.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.12.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.12.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.11
log
@The list of files / directories to remove has moved to FREEBSD-Xlist.
@
text
@d1 1
a1 1
$FreeBSD$
d19 1
a19 1
  cvs import src/contrib/cvs CVSHOME v1_8_1
d24 1
a24 1
The developers can be reached at:  <devel-cvs@@cyclic.com>.  Local changes
d29 1
d40 6
@


1.11.8.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/contrib/cvs/FREEBSD-upgrade 147906 2005-07-11 04:14:43Z cvs2svn $
@


1.11.24.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.11.18.1
log
@SVN rev 180918 on 2008-07-28 16:52:28Z by obrien

MFC: CVS version 1.11.22.1 (almost 1.11.23).
@
text
@d19 1
a19 1
  cvs import src/contrib/cvs CVSHOME v1_11_22
d24 1
a24 1
The developers can be reached at:  <devel-cvs@@nongnu.org>.  Local changes
a28 1
obrien@@freebsd.org - 12 Jan 2008
a38 6
  - 'CVS_OPTIONS' environmental variable support.
  - Allow -D with -r on checkout.
  - Support for "diff -j", allowing tag:date based diffs.
  - iso8601 option keyword.
  - Comprehensive "-T" CVS/Template support.
  - We use the cvs.1 manpage from man/, not the offical one in doc/
@


1.11.18.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/7/contrib/cvs/FREEBSD-upgrade 180918 2008-07-28 16:52:28Z obrien $
@


1.11.18.1.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.11.18.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/7.4/contrib/cvs/FREEBSD-upgrade 180918 2008-07-28 16:52:28Z obrien $
@


1.11.18.1.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.11.18.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.11.18.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.10
log
@Minor updates after 1.11.2 import
@
text
@d10 1
d12 1
a12 22
The following generated files were deleted:
doc/*.ps
doc/*.info*
doc/texinfo.tex
lib/getdate.c
cvsnt.*
cvs.spec*
build.com
*/*.com
*/*.dsp
*/.cvsignore
.cvsignore
README.VMS

The following non-freebsd-specific directories were deleted:
os2
emx
windows-NT
vms
zlib

It is imported from it's top level directory something like this:
d15 1
a15 1
The -n option is "dont do anything" so you can see what is about to happen
d22 1
a22 1
the local and vendor changes when/if conflicts arise..
@


1.9
log
@Tweak for 1.11.1p1
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.8 2000/10/02 06:43:54 peter Exp $
a13 2
doc/*.aux*
doc/CVSvn.texi
d22 1
d33 1
a33 1
  cvs -n import src/contrib/cvs CYCLIC v<version>
d39 1
a39 1
  cvs import src/contrib/cvs CYCLIC v1_8_1
@


1.8
log
@Merge changes from 1.10.7 -> 1.11 into mainline.  Note that the old
anoncvs no-password hack is gone and is replaced by the official version.
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.7 1999/12/11 13:11:47 peter Exp $
d16 1
d19 1
a19 1
cvs.spec
a22 1
.cvsignore
@


1.7
log
@Update for 1.10.7 update.
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.6 1999/12/08 16:49:38 peter Exp $
a56 1
  - if pserver username is "anoncvs", implicitly use a password of "anoncvs".
@


1.7.2.1
log
@MFC: update to `cvs' version 1.11.

Approved by:	peter
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.7 1999/12/11 13:11:47 peter Exp $
d57 1
@


1.7.2.2
log
@MFC: cvs-1.11.1-p1
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.9 2001/08/10 09:53:53 peter Exp $
a15 1
doc/texinfo.tex
d18 1
a18 1
cvs.spec*
d22 1
@


1.7.2.3
log
@MFC: cvs-1.11.2, plus client.c rev 1.7 (missing client upload)
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.10 2002/09/02 05:58:30 peter Exp $
d14 2
a23 1
.cvsignore
d34 1
a34 1
  cvs -n import src/contrib/cvs CVSHOME v<version>
d40 1
a40 1
  cvs import src/contrib/cvs CVSHOME v1_8_1
@


1.7.2.4
log
@MFC: 1.11.2.1-20021201  (this has been running on key cluster machines
for a while, including the repository server)
@
text
@@


1.7.2.5
log
@MFC: upgrade to 1.11.17.

Approved by:	peter
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.7.2.4 2002/12/19 21:17:51 peter Exp $
a9 1
then delete the files and directories listed in FREEBSD-Xlist.
d11 22
a32 1
CVS is imported from its top level directory something like this:
d35 1
a35 1
The -n option is "don't do anything" so you can see what is about to happen
d42 1
a42 1
the local and vendor changes when/if conflicts arise.
@


1.7.2.6
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/4/contrib/cvs/FREEBSD-upgrade 131273 2004-06-29 16:10:53Z des $
@


1.6
log
@Add maintainer tag, and add a description of a few more things we've
added/changed locally for FreeBSD.
@
text
@d1 1
a1 1
$FreeBSD$
a16 3
tools/pcl-cvs/*.ps
tools/pcl-cvs/*.aux
tools/pcl-cvs/texinfo.tex
d20 4
a23 3
src/build_src.com
lib/build_lib.com
diff/build_diff.com
a26 1
macintosh
a30 1
contrib/elib	(this has a .tar.Z in it)
a32 2
CVS has RCS Id, Name and Header tags. It needs to be imported with -ko.

d34 1
a34 1
  cvs -n import -ko src/contrib/cvs CYCLIC v<version>
d40 1
a40 1
  cvs import -ko src/contrib/cvs CYCLIC v1_8_1
@


1.5
log
@Update import instructions from last time.
@
text
@d1 4
d60 7
@


1.5.2.1
log
@MFC: cvs 1.10.7, as we run on freefall.

Approved by:	jkh
@
text
@a0 4
$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.7 1999/12/11 13:11:47 peter Exp $

MAINTAINER=	peter@@FreeBSD.org

d13 3
d19 3
a21 4
*/*.com
*/*.dsp
.cvsignore
*/.cvsignore
d25 1
d30 1
d33 2
d36 1
a36 1
  cvs -n import src/contrib/cvs CYCLIC v<version>
d42 1
a42 1
  cvs import src/contrib/cvs CYCLIC v1_8_1
a55 7
  - CVSREADONLYFS environment variable and global option -R to enable
    no-locking readonly mode (eg: cvs repo is a cdrom or mirror)
  - the verify message script can edit the submitted log message.
  - if pserver username is "anoncvs", implicitly use a password of "anoncvs".
  - CVSROOT/options file
  - Variable keyword expansion controls including custom keywords.
  - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off.
@


1.4
log
@update the 'zapped files' list
@
text
@d16 1
a16 1
cvsnt.mak
d21 1
@


1.4.2.1
log
@Update 2.2 to cvs-1.9.10 from -current (fixes a security problem with
pserver mode)
@
text
@@


1.4.2.2
log
@Merge cvs from HEAD.
@
text
@d16 1
a16 1
cvsnt.*
a20 1
diff/build_diff.com
@


1.3
log
@forgot to mention that the vms source was pruned
@
text
@a22 1

d26 1
@


1.2
log
@Update
@
text
@d28 1
@


1.1
log
@FreeBSD specific readme for contributed source.

(FREEBSD-upgrade is now the "accpeted" filename for this).
@
text
@d17 6
d29 1
@
