From 1656073469d4a32f3f37b45fd0e302004c1c45c2 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 11 Mar 2013 10:48:26 +0000 Subject: [PATCH] Ports are no more exported via cvsup, remove cvsup examples and documentation refering to ports MFC after: 2 days --- ObsoleteFiles.inc | 4 ++ share/examples/cvsup/README | 4 +- share/examples/cvsup/cvs-supfile | 12 +---- share/examples/cvsup/ports-supfile | 74 ----------------------------- share/examples/cvsup/refuse | 13 ----- share/examples/cvsup/refuse.README | 44 ----------------- share/examples/cvsup/stable-supfile | 15 ------ 7 files changed, 7 insertions(+), 159 deletions(-) delete mode 100644 share/examples/cvsup/ports-supfile delete mode 100644 share/examples/cvsup/refuse delete mode 100644 share/examples/cvsup/refuse.README diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a3c293a5aca5..59ac7aedf89b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20130311: Ports are no more available via cvsup +OLD_FILES+=usr/share/examples/cvsup/ports-supfile +OLD_FILES+=usr/share/examples/cvsup/refuse +OLD_FILES+=usr/share/examples/cvsup/refuse.README # 20130309: NWFS and NCP supports removed OLD_FILES+=usr/bin/ncplist OLD_FILES+=usr/bin/ncplogin diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README index 19ae27066d42..0bf29327c959 100644 --- a/share/examples/cvsup/README +++ b/share/examples/cvsup/README @@ -19,8 +19,6 @@ To maintain the sources for the FreeBSD-current release, use: standard-supfile Main source tree - ports-supfile Ports collection - To maintain the sources for the FreeBSD-stable release, use: stable-supfile Main source tree @@ -28,7 +26,7 @@ To maintain the sources for the FreeBSD-stable release, use: To maintain a copy of the CVS repository containing all versions of FreeBSD, use: - cvs-supfile Main source tree and ports collection + cvs-supfile Main source tree collection IMPORTANT: Before you use any of the supfiles in this directory, you will need to edit in an appropriate "host" setting. See: diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile index f46d0514ec59..b501272a56cb 100644 --- a/share/examples/cvsup/cvs-supfile +++ b/share/examples/cvsup/cvs-supfile @@ -43,9 +43,8 @@ # prefix=/home/ncvs # This specifies where to place the requested files. A # setting of "/home/ncvs" will place all of the files -# requested in /home/ncvs (e.g., "/home/ncvs/src/bin", -# "/home/ncvs/ports/archivers"). The prefix directory -# must exist in order to run CVSup. +# requested in /home/ncvs (e.g., "/home/ncvs/src/bin"). +# The prefix directory must exist in order to run CVSup. # Defaults that apply to all the collections # @@ -68,13 +67,6 @@ # mega-collection. It includes all of the individual "src-*" collections. src-all -## Ports Collection. -# -# The easiest way to get the ports tree is to use the "ports-all" -# mega-collection. It includes all of the individual "ports-*" -# collections, -ports-all - ## Projects # # This collection retrieves the projects tree of the FreeBSD diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile deleted file mode 100644 index f37af414bc16..000000000000 --- a/share/examples/cvsup/ports-supfile +++ /dev/null @@ -1,74 +0,0 @@ -# $FreeBSD$ -# -# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project. -# -# The primary development work happens in Subversion and is temporarily -# exported to the legacy CVS system with significant time delays. -# -# You should NOT set up a new consumer of FreeBSD source code via CVS. -# Please see: -# http://www.freebsd.org/doc/handbook/svn.html -# http://www.freebsd.org/doc/handbook/svn-mirrors.html -# -# csup (CVS Update Protocol) allows you to download the latest CVS -# tree (or any branch of development therefrom) to your system easily -# and efficiently -# _ -# __ ____ _ _ __ _ __ (_)_ __ __ _ -# \ \ /\ / / _` | '__| '_ \| | '_ \ / _` | -# \ V V / (_| | | | | | | | | | | (_| | -# \_/\_/ \__,_|_| |_| |_|_|_| |_|\__, | -# |___/ -# cvsup for ports is being phased out as of 28 February 2013 and its -# use is discouraged. Users are advised to migrate to portsnap -# or svn directly. -# -# Note that this only updates the tree contents and does not -# update what is actually installed. -# -# You may wish to change some of the settings in this file to better -# suit your system: -# -# host=CHANGE_THIS.FreeBSD.org -# This specifies the server host which will supply the -# file updates. You must change it to one of the CVSup -# mirror sites listed in the FreeBSD Handbook at -# http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS. -# You can override this setting on the command line -# with cvsup's "-h host" option. -# -# base=/var/db -# This specifies the root where csup will store information -# about the collections you have transferred to your system. -# A setting of "/var/db" will generate this information in -# /var/db/sup. 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/ports" (e.g., "/usr/ports/devel", "/usr/ports/lang"). -# The prefix directory must exist in order to run CVSup. - -# Defaults that apply to all the collections -# -# IMPORTANT: Change the next line to use one of the CVSup mirror sites -# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS. -*default host=CHANGE_THIS.FreeBSD.org -*default base=/var/db -*default prefix=/usr -*default release=cvs tag=. -*default delete use-rel-suffix - -# If you seem to be limited by CPU rather than network or disk bandwidth, try -# commenting out the following line. (Normally, today's CPUs are fast enough -# that you want to run compression.) -*default compress - -## Ports Collection. -# -# The easiest way to get the ports tree is to use the "ports-all" -# mega-collection. It includes all of the individual "ports-*" -# collections, -ports-all diff --git a/share/examples/cvsup/refuse b/share/examples/cvsup/refuse deleted file mode 100644 index c257f71bfaec..000000000000 --- a/share/examples/cvsup/refuse +++ /dev/null @@ -1,13 +0,0 @@ -ports/arabic -ports/chinese -ports/french -ports/german -ports/hebrew -ports/hungarian -ports/japanese -ports/korean -ports/polish -ports/portuguese -ports/russian -ports/ukrainian -ports/vietnamese diff --git a/share/examples/cvsup/refuse.README b/share/examples/cvsup/refuse.README deleted file mode 100644 index 4b909624bd17..000000000000 --- a/share/examples/cvsup/refuse.README +++ /dev/null @@ -1,44 +0,0 @@ -$FreeBSD$ - -This describes the "refuse" file found in this directory. The -explanation cannot be put inside the file itself because: - - COMMENTS ARE NOT ALLOWED IN refuse FILES! - -Each line of the refuse file contains one or more filename patterns -separated by white space. Everything matched by a pattern will be -left untouched by CVSup. If a pattern matches a directory, then -everything beneath that directory will be left alone. - -You can copy "refuse" to your sup directory and add or remove -whatever you like. The example supfiles in this directory set -CVSup's base directory to "/var/db". The sup directory is in the base -directory; i.e., it is "/var/db/sup". If you have changed your base -directory, your sup directory is /path/to/base/sup. - -If you are an English speaker and don't wish to receive the -non-English ports, use the following patterns: - - ports/arabic - ports/chinese - ports/french - ports/german - ports/hebrew - ports/hungarian - ports/japanese - ports/korean - ports/polish - ports/portuguese - ports/russian - ports/ukrainian - ports/vietnamese - -Note that this is *not* a supported configuration and may result -in ports builds breaking. - -Use refuse files with care. Some parts of the src distribution -depend on files in completely different parts. - -For more information about refuse files see cvsup(1), which is -installed by the "cvsup" and "cvsup-bin" ports. See also the CVSup -FAQ at . diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile index 54f6e8958b3f..b520f8d41945 100644 --- a/share/examples/cvsup/stable-supfile +++ b/share/examples/cvsup/stable-supfile @@ -46,21 +46,6 @@ # in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib"). # The prefix directory must exist in order to run CVSup. # -############################################################################### -# -# DANGER! WARNING! LOOK OUT! VORSICHT! -# -# If you add any of the ports collections to this file, be sure to -# specify them with a "tag" value set to ".", like this: -# -# ports-all tag=. -# -# If you leave out the "tag=." portion, CVSup will delete all of -# the files in your ports. That is because the ports -# collections do not use the same tags as the main part of the FreeBSD -# source tree. -# -############################################################################### # Defaults that apply to all the collections #