From b4ac31f414af87bd7b25a6ec2656804426f2f450 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 1 Dec 2008 00:21:58 +0100 Subject: [PATCH] Axe various remains from the CVS era. * DragonFly supfiles in share/examples/cvsup (those for other BSDs remain). * 'make update' target and associated variables. More will follow. --- Makefile.inc1 | 39 ----------- Makefile_upgrade.inc | 10 +++ etc/defaults/make.conf | 11 ---- share/examples/cvsup/DragonFly-cvs-supfile | 51 --------------- .../examples/cvsup/DragonFly-preview-supfile | 47 -------------- .../cvsup/DragonFly-release1_10-supfile | 49 -------------- .../cvsup/DragonFly-release1_12-supfile | 49 -------------- .../cvsup/DragonFly-release1_2-supfile | 49 -------------- .../cvsup/DragonFly-release1_4-supfile | 49 -------------- .../cvsup/DragonFly-release1_6-supfile | 49 -------------- .../cvsup/DragonFly-release1_8-supfile | 49 -------------- .../cvsup/DragonFly-release2_0-supfile | 49 -------------- share/examples/cvsup/DragonFly-src-supfile | 45 ------------- share/examples/cvsup/README | 22 +------ share/man/man5/make.conf.5 | 64 +------------------ 15 files changed, 13 insertions(+), 619 deletions(-) delete mode 100644 share/examples/cvsup/DragonFly-cvs-supfile delete mode 100644 share/examples/cvsup/DragonFly-preview-supfile delete mode 100644 share/examples/cvsup/DragonFly-release1_10-supfile delete mode 100644 share/examples/cvsup/DragonFly-release1_12-supfile delete mode 100644 share/examples/cvsup/DragonFly-release1_2-supfile delete mode 100644 share/examples/cvsup/DragonFly-release1_4-supfile delete mode 100644 share/examples/cvsup/DragonFly-release1_6-supfile delete mode 100644 share/examples/cvsup/DragonFly-release1_8-supfile delete mode 100644 share/examples/cvsup/DragonFly-release2_0-supfile delete mode 100644 share/examples/cvsup/DragonFly-src-supfile diff --git a/Makefile.inc1 b/Makefile.inc1 index 522ff76501..0e35c04fab 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -11,7 +11,6 @@ # realquickworld - skip the glue and depend stages and just build the meat # crossworld - only build the glue (particularly the cross-build environment) # installworld- install everything built by "buildworld" -# update - convenient way to update your source tree (eg: sup/cvs) # most - build user commands, no libraries or include files # installmost - install user commands, no libraries or include files # @@ -105,12 +104,6 @@ CLEANDIR= clean cleandepend CLEANDIR= cleandir .endif -SUP?= /usr/local/bin/cvsup -SUPFLAGS?= -g -L 2 -P - -.if defined(SUPHOST) -SUPFLAGS+= -h ${SUPHOST} -.endif - .if defined(NO_CLEAN) NOCLEAN= # defined .endif @@ -697,38 +690,6 @@ installkernel reinstallkernel: ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} .endif -# -# update -# -# Update the source tree, by running sup and/or running cvs to update to the -# latest copy. -# -update: -.if defined(SUP_UPDATE) - @echo "--------------------------------------------------------------" - @echo ">>> Running ${SUP}" - @echo "--------------------------------------------------------------" -.if defined(SUPFILE) - @${SUP} ${SUPFLAGS} ${SUPFILE} -.endif -.if defined(SUPFILE1) - @${SUP} ${SUPFLAGS} ${SUPFILE1} -.endif -.if defined(SUPFILE2) - @${SUP} ${SUPFLAGS} ${SUPFILE2} -.endif -.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE) - @${SUP} ${SUPFLAGS} ${DOCSUPFILE} -.endif -.endif -.if defined(CVS_UPDATE) - @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} from cvs repository `cat ${.CURDIR}/CVS/Root`" - @echo "--------------------------------------------------------------" - @sleep 2 - cd ${.CURDIR}; cvs -q update -P -d -.endif - # # most # diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index f99a9abd99..7a155cb1fe 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -985,3 +985,13 @@ TO_REMOVE+=/usr/share/man/cat8/dhcrelay.8.gz TO_REMOVE+=/usr/share/man/man8/dhcrelay.8.gz TO_REMOVE+=/usr/include/machine/pci_cfgreg.h TO_REMOVE+=/usr/include/libusbhid.h +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-cvs-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-preview-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_2-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_4-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_6-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_8-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_10-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_12-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release2_0-supfile +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-src-supfile diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index c2ba27b416..af0cce9831 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -181,17 +181,6 @@ THREAD_LIB?= thread_xu # set-user-ID. #ENABLE_SUID_K5SU= yes # -# CVSup update flags. Edit SUPFILE settings to reflect whichever distribution -# file(s) you use on your site (see /usr/share/examples/cvsup/README for more -# information on CVSup and these files). To use, do "make update" in /usr/src. -# -#SUP_UPDATE= yes -#SUP= /usr/local/bin/cvsup -#SUPFLAGS= -g -L 2 -#SUPHOST= cvsup.dragonflybsd.org -#SUPFILE= /usr/share/examples/cvsup/DragonFly-src-supfile -#DOCSUPFILE= /usr/share/examples/cvsup/doc-supfile -# # top(1) uses a hash table for the user names. The size of this hash # can be tuned to match the number of local users. The table size should # be a prime number approximately twice as large as the number of lines in diff --git a/share/examples/cvsup/DragonFly-cvs-supfile b/share/examples/cvsup/DragonFly-cvs-supfile deleted file mode 100644 index 30fe2ca14c..0000000000 --- a/share/examples/cvsup/DragonFly-cvs-supfile +++ /dev/null @@ -1,51 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-cvs-supfile,v 1.7 2007/04/01 12:20:50 swildner Exp $ -# -# DRAGONFLY-CVS-SUPFILE -# -# This file will by default maintain a copy of the DragonFly BSD CVS tree -# in /home/dcvs. -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 2 DragonFly-cvs-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/home/dcvs -# This specifies where to place the requested files. A -# setting of "/home/dcvs" will place all of the files -# requested in /home/dcvs (e.g., "/home/dcvs/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# If you want to use a 'checked out' copy of the DragonFly source tree, use -# one of the other DragonFly supfiles. -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/home/dcvs -#*default prefix=/usr -*default release=cvs -#*default release=cvs tag=. -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-root -dragonfly-cvs-src -#dragonfly-cvs-site -#dragonfly-cvs-doc diff --git a/share/examples/cvsup/DragonFly-preview-supfile b/share/examples/cvsup/DragonFly-preview-supfile deleted file mode 100644 index 6e8211565b..0000000000 --- a/share/examples/cvsup/DragonFly-preview-supfile +++ /dev/null @@ -1,47 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-preview-supfile,v 1.4 2007/04/01 12:20:50 swildner Exp $ -# -# DRAGONFLY-PREVIEW-SUPFILE -# -# This file will by default maintain the DragonFly source code in /usr/src/ -# by tracking the DragonFly_Preview tag. This tag represents a recent snapshot -# of the current development tree that is likely to compile and install -# without too much trouble. Note, however, that we *are* talking about the -# current development tree here. -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 2 DragonFly-preview-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_Preview -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release1_10-supfile b/share/examples/cvsup/DragonFly-release1_10-supfile deleted file mode 100644 index 8964e044e5..0000000000 --- a/share/examples/cvsup/DragonFly-release1_10-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release1_10-supfile,v 1.1 2007/07/24 20:16:37 dillon Exp $ -# -# DRAGONFLY-RELEASE1_10-SUPFILE -# -# This file will by default maintain the DragonFly 1.10 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_1_10_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 1.10 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 4 DragonFly-release1_10-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_1_10_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release1_12-supfile b/share/examples/cvsup/DragonFly-release1_12-supfile deleted file mode 100644 index 9d3e16024c..0000000000 --- a/share/examples/cvsup/DragonFly-release1_12-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release1_12-supfile,v 1.1 2008/02/12 02:12:18 dillon Exp $ -# -# DRAGONFLY-RELEASE1_12-SUPFILE -# -# This file will by default maintain the DragonFly 1.12 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_1_12_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 1.12 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 4 DragonFly-release1_12-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_1_12_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release1_2-supfile b/share/examples/cvsup/DragonFly-release1_2-supfile deleted file mode 100644 index 52f1b0090b..0000000000 --- a/share/examples/cvsup/DragonFly-release1_2-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release1_2-supfile,v 1.5 2007/05/17 08:19:01 swildner Exp $ -# -# DRAGONFLY-RELEASE1_2-SUPFILE -# -# This file will by default maintain the DragonFly 1.2 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_1_2_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 1.2 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 2 DragonFly-release1_2-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_1_2_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release1_4-supfile b/share/examples/cvsup/DragonFly-release1_4-supfile deleted file mode 100644 index 907942b2a6..0000000000 --- a/share/examples/cvsup/DragonFly-release1_4-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release1_4-supfile,v 1.4 2007/05/17 08:19:01 swildner Exp $ -# -# DRAGONFLY-RELEASE1_4-SUPFILE -# -# This file will by default maintain the DragonFly 1.4 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_1_4_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 1.4 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 4 DragonFly-release1_4-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_1_4_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release1_6-supfile b/share/examples/cvsup/DragonFly-release1_6-supfile deleted file mode 100644 index 6157434274..0000000000 --- a/share/examples/cvsup/DragonFly-release1_6-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release1_6-supfile,v 1.3 2007/05/17 08:19:01 swildner Exp $ -# -# DRAGONFLY-RELEASE1_6-SUPFILE -# -# This file will by default maintain the DragonFly 1.6 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_1_6_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 1.6 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 4 DragonFly-release1_6-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_1_6_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release1_8-supfile b/share/examples/cvsup/DragonFly-release1_8-supfile deleted file mode 100644 index ff4eb26eb2..0000000000 --- a/share/examples/cvsup/DragonFly-release1_8-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release1_8-supfile,v 1.3 2007/05/17 08:19:01 swildner Exp $ -# -# DRAGONFLY-RELEASE1_8-SUPFILE -# -# This file will by default maintain the DragonFly 1.8 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_1_8_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 1.8 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 4 DragonFly-release1_8-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_1_8_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-release2_0-supfile b/share/examples/cvsup/DragonFly-release2_0-supfile deleted file mode 100644 index 50d4b31e55..0000000000 --- a/share/examples/cvsup/DragonFly-release2_0-supfile +++ /dev/null @@ -1,49 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-release2_0-supfile,v 1.1 2008/07/14 03:50:00 dillon Exp $ -# -# DRAGONFLY-RELEASE2_0-SUPFILE -# -# This file will by default maintain the DragonFly 2.0 release source code -# in /usr/src/ by tracking the DragonFly_RELEASE_2_0_Slip tag in the CVS tree. -# This tag represents the maintenance arm of the DragonFly 2.0 release. -# -# (The '_Slip' part is a slip tag that tracks changes along with the correct -# subversion. If you do not use this tag your subversion may be out of -# whack with the actual code you get). -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 4 DragonFly-release2_0-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=DragonFly_RELEASE_2_0_Slip -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/DragonFly-src-supfile b/share/examples/cvsup/DragonFly-src-supfile deleted file mode 100644 index cafeb3ba06..0000000000 --- a/share/examples/cvsup/DragonFly-src-supfile +++ /dev/null @@ -1,45 +0,0 @@ -# $DragonFly: src/share/examples/cvsup/DragonFly-src-supfile,v 1.6 2007/04/01 12:20:50 swildner Exp $ -# -# DRAGONFLY-SRC-SUPFILE -# -# This file will by default maintain the absolute latest DragonFly -# source code in /usr/src/ by tracking the HEAD of the CVS tree. This tag -# represents a current development snapshot and the code might not be stable. -# -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: -# -# cvsup -g -L 2 DragonFly-src-supfile -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host= -# This specifies the server host which will supply the -# file updates. -# -# base=/usr -# This specifies the root where CVSup will store information -# about the collections you have transferred to your system. -# A setting of "/usr" will generate this information in -# /usr/sup. Even if you are CVSupping a large number of -# collections, you will be hard pressed to generate more than -# ~1MB of data in this directory. You can override the -# "base" setting on the command line with cvsup's "-b base" -# option. This directory must exist in order to run CVSup. -# -# prefix=/usr -# This specifies where to place the requested files. A -# setting of "/usr" will place all of the files -# requested in /usr (e.g., "/usr/src/bin"). -# The prefix directory must exist in order to run CVSup. -# -# -*default host=cvsup.dragonflybsd.org -*default base=/usr -*default prefix=/usr -*default release=cvs tag=. -*default delete use-rel-suffix -*default compress - -dragonfly-cvs-src diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README index 4eae3a389d..df3247abef 100644 --- a/share/examples/cvsup/README +++ b/share/examples/cvsup/README @@ -2,28 +2,10 @@ # $DragonFly: src/share/examples/cvsup/README,v 1.9 2008/07/08 11:59:15 thomas Exp $ This directory contains sample "supfiles" for obtaining and updating -DragonFly and the various BSDs via the Internet. These supfiles will -work with CVSup version 14.0 or later. For general information on CVSup +the various BSDs via the Internet. These supfiles will work with +CVSup version 14.0 or later. For general information on CVSup itself, please see http://wiki.dragonflybsd.org/index.cgi/cvsup.html -To maintain the sources for DragonFlyBSD, use one of: - - DragonFly-cvs-supfile Main CVS repository for DragonFly BSD - - DragonFly-src-supfile The source tree for HEAD, the bleeding - edge of DragonFly development. - - DragonFly-preview-supfile A recent development snapshot of the - DragonFly source tree. - - DragonFly-releaseX_Y-supfile The source tree for release X.Y of - DragonFly. - - A list of mirrors is maintained at: - - http://www.dragonflybsd.org/community/download.shtml - - To maintain the sources for FreeBSD, use: FreeBSD-supfile Main source tree for FreeBSD diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 45c5bf836e..aebd6cbcdb 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -25,7 +25,7 @@ .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ .\" $DragonFly: src/share/man/man5/make.conf.5,v 1.38 2008/11/03 00:25:45 pavalos Exp $ .\" -.Dd July 12, 2008 +.Dd December 1, 2008 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -145,12 +145,6 @@ Setting this variable will prevent CPU specific compiler flags from being automatically added to .Va CFLAGS during compile time. -.It Va CVS_UPDATE -.Pq Vt bool -Set this to use -.Xr cvs 1 -to update your source tree as the final step when doing a -.Dq Li "make update" . .It Va CXXFLAGS .Pq Vt str Controls the compiler settings when compiling C++ code. @@ -198,10 +192,6 @@ Set this to to cause .Xr mtree 8 to follow symlinks. -.It Va NO_DOCUPDATE -.Pq Vt bool -Set this to not update the doc tree during -.Dq Li "make update" . .It Va STRIP .Pq Vt str Set this to the flag to pass the @@ -209,58 +199,6 @@ Set this to the flag to pass the command. If set to a blank value, components will be installed with debugging symbols. -.It Va SUP_UPDATE -.Pq Vt bool -Set this to use -.Xr cvsup 1 -to update your source tree with -.Dq Li "make update" . -See also -.Va CVS_UPDATE . -.It Va SUP -.Pq Vt str -The location of the -.Xr cvsup 1 -command for -.Dq Li "make update" . -This defaults to -.Pa /usr/local/bin/cvsup . -.It Va SUPFLAGS -.Pq Vt str -The flag for the -.Xr cvsup 1 -command when doing -.Dq Li "make update" . -This defaults to -.Dq Fl g L Ar 2 Fl P Ar - . -.It Va SUPHOST -.Pq Vt str -The hostname of the sup server to use when doing -.Dq Li "make update" . -.It Va SUPFILE -.Pq Vt str -The first -.Ar supfile -to use when doing a -.Dq Li "make update" . -.It Va SUPFILE1 -.Pq Vt str -The second -.Ar supfile -to use when doing a -.Dq Li "make update" . -.It Va SUPFILE2 -.Pq Vt str -The third -.Ar supfile -to use when doing a -.Dq Li "make update" . -.It Va DOCSUPFILE -.Pq Vt str -The documentation -.Ar supfile -to use when doing a -.Dq Li "make update" . .It Va WITH_GCPIO .Pq Vt bool Set this to use -- 2.41.0