svn commit: r240545 - in stable/9/share/examples: . cvsup etc

Thu Jan 24 00:42:53 UTC 2013

FYI, this commit entirely missed the merge to make.conf.5 ...

Glen

On Sun, Sep 16, 2012 at 12:35:09AM +0000, Eitan Adler wrote:
> Author: eadler
> Date: Sun Sep 16 00:35:09 2012
> New Revision: 240545
> URL: http://svn.freebsd.org/changeset/base/240545
> 
> Log:
>   MFC r240252,r240253:
>   	Remove documentation and www cvsup files as they are no longer useful
>   	with the switch to subversion.
>   	Specifically document that an incomplete ports tree is not supported.
>   	Remove useless comment about sendmail.
>   
>   Approved by:	cperciva (implicit)
> 
> Deleted:
>   stable/9/share/examples/cvsup/doc-supfile
>   stable/9/share/examples/cvsup/www-supfile
> Modified:
>   stable/9/share/examples/Makefile
>   stable/9/share/examples/cvsup/cvs-supfile
>   stable/9/share/examples/cvsup/refuse
>   stable/9/share/examples/cvsup/refuse.README
>   stable/9/share/examples/cvsup/stable-supfile
>   stable/9/share/examples/etc/make.conf
> Directory Properties:
>   stable/9/share/examples/   (props changed)
>   stable/9/share/examples/cvsup/   (props changed)
>   stable/9/share/examples/etc/   (props changed)
>   stable/9/share/man/man5/   (props changed)
> 
> Modified: stable/9/share/examples/Makefile
> ==============================================================================
> --- stable/9/share/examples/Makefile	Sun Sep 16 00:35:09 2012	(r240544)
> +++ stable/9/share/examples/Makefile	Sun Sep 16 00:35:09 2012	(r240545)
> @@ -53,14 +53,12 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
>  	csh/dot.cshrc \
>  	cvsup/README \
>  	cvsup/cvs-supfile \
> -	cvsup/doc-supfile \
>  	cvsup/gnats-supfile \
>  	cvsup/ports-supfile \
>  	cvsup/refuse \
>  	cvsup/refuse.README \
>  	cvsup/stable-supfile \
>  	cvsup/standard-supfile \
> -	cvsup/www-supfile \
>  	diskless/ME \
>  	diskless/README.BOOTP \
>  	diskless/README.TEMPLATING \
> 
> Modified: stable/9/share/examples/cvsup/cvs-supfile
> ==============================================================================
> --- stable/9/share/examples/cvsup/cvs-supfile	Sun Sep 16 00:35:09 2012	(r240544)
> +++ stable/9/share/examples/cvsup/cvs-supfile	Sun Sep 16 00:35:09 2012	(r240545)
> @@ -169,19 +169,6 @@ ports-all
>  #ports-x11-toolkits
>  #ports-x11-wm
>  
> -## Documentation
> -#
> -# The easiest way to get the doc tree is to use the "doc-all"
> -# mega-collection.  It includes all of the individual "doc-*"
> -# collections,
> -doc-all
> -
> -## Website
> -#
> -# This collection retrieves the www tree of the FreeBSD
> -# repository
> -www
> -
>  ## Projects
>  #
>  # This collection retrieves the projects tree of the FreeBSD
> @@ -200,4 +187,3 @@ cvsroot-all
>  #cvsroot-common
>  #cvsroot-src
>  #cvsroot-ports
> -#cvsroot-doc
> 
> Modified: stable/9/share/examples/cvsup/refuse
> ==============================================================================
> --- stable/9/share/examples/cvsup/refuse	Sun Sep 16 00:35:09 2012	(r240544)
> +++ stable/9/share/examples/cvsup/refuse	Sun Sep 16 00:35:09 2012	(r240545)
> @@ -1,23 +1,3 @@
> -doc/bn_*
> -doc/da_*
> -doc/de_*
> -doc/el_*
> -doc/es_*
> -doc/fr_*
> -doc/hu_*
> -doc/id_*
> -doc/it_*
> -doc/ja_*
> -doc/mn_*
> -doc/nl_*
> -doc/no_*
> -doc/pl_*
> -doc/pt_*
> -doc/ro_*
> -doc/ru_*
> -doc/sr_*
> -doc/tr_*
> -doc/zh_*
>  ports/arabic
>  ports/chinese
>  ports/french
> 
> Modified: stable/9/share/examples/cvsup/refuse.README
> ==============================================================================
> --- stable/9/share/examples/cvsup/refuse.README	Sun Sep 16 00:35:09 2012	(r240544)
> +++ stable/9/share/examples/cvsup/refuse.README	Sun Sep 16 00:35:09 2012	(r240545)
> @@ -16,33 +16,9 @@ CVSup's base directory to "/var/db".  Th
>  directory; i.e., it is "/var/db/sup".  If you have changed your base
>  directory, your sup directory is /path/to/base/sup.
>  
> -This file used to contain /usr/src/etc/sendmail/freebsd.mc in case
> -you modified that file.  However, this was removed as it can break
> -buildworld.  Modify /etc/mail/`hostname`.mc instead.
> -
>  If you are an English speaker and don't wish to receive the
> -foreign-language documentation or ports, use the following patterns:
> +non-English ports, use the following patterns:
>  
> -    doc/bn_*
> -    doc/da_*
> -    doc/de_*
> -    doc/el_*
> -    doc/es_*
> -    doc/fr_*
> -    doc/hu_*
> -    doc/id_*
> -    doc/it_*
> -    doc/ja_*
> -    doc/mn_*
> -    doc/nl_*
> -    doc/no_*
> -    doc/pl_*
> -    doc/pt_*
> -    doc/ro_*
> -    doc/ru_*
> -    doc/sr_*
> -    doc/tr_*
> -    doc/zh_*
>      ports/arabic
>      ports/chinese
>      ports/french
> @@ -57,6 +33,9 @@ foreign-language documentation or ports,
>      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.
>  
> 
> Modified: stable/9/share/examples/cvsup/stable-supfile
> ==============================================================================
> --- stable/9/share/examples/cvsup/stable-supfile	Sun Sep 16 00:35:09 2012	(r240544)
> +++ stable/9/share/examples/cvsup/stable-supfile	Sun Sep 16 00:35:09 2012	(r240545)
> @@ -43,14 +43,13 @@
>  #
>  # DANGER!  WARNING!  LOOK OUT!  VORSICHT!
>  #
> -# If you add any of the ports or doc collections to this file, be sure to
> +# 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=.
> -#   doc-all tag=.
>  #
>  # If you leave out the "tag=." portion, CVSup will delete all of
> -# the files in your ports or doc tree.  That is because the ports and doc
> +# 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.
>  #
> 
> Modified: stable/9/share/examples/etc/make.conf
> ==============================================================================
> --- stable/9/share/examples/etc/make.conf	Sun Sep 16 00:35:09 2012	(r240544)
> +++ stable/9/share/examples/etc/make.conf	Sun Sep 16 00:35:09 2012	(r240545)
> @@ -187,8 +187,6 @@
>  #SUPHOST=        cvsup.uk.FreeBSD.org
>  #SUPFILE=        /usr/share/examples/cvsup/standard-supfile
>  #PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
> -#DOCSUPFILE=     /usr/share/examples/cvsup/doc-supfile
> -#WWWSUPFILE=     /usr/share/examples/cvsup/www-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
> _______________________________________________
> svn-src-stable-9 at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
> To unsubscribe, send any mail to "svn-src-stable-9-unsubscribe at freebsd.org"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20130123/9530dbfd/attachment.sig>