svn commit: r269928 - in stable/10: . etc/mtree share/examples share/examples/cvsup

[Gavin Atkinson]

Author: gavin
Date: Wed Aug 13 12:32:52 2014
New Revision: 269928
URL: http://svnweb.freebsd.org/changeset/base/269928

Log:
  Merge r267867 from head:
  
    Remove example cvsup config files.

Deleted:
  stable/10/share/examples/cvsup/
Modified:
  stable/10/ObsoleteFiles.inc
  stable/10/etc/mtree/BSD.usr.dist
  stable/10/share/examples/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Wed Aug 13 12:31:36 2014	(r269927)
+++ stable/10/ObsoleteFiles.inc	Wed Aug 13 12:32:52 2014	(r269928)
@@ -45,6 +45,11 @@ OLD_FILES+=usr/share/examples/libusb20/a
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
+OLD_FILES+=usr/share/examples/cvsup/README
+OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
+OLD_FILES+=usr/share/examples/cvsup/stable-supfile
+OLD_FILES+=usr/share/examples/cvsup/standard-supfile
+OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=etc/gnats/freefall

Modified: stable/10/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/10/etc/mtree/BSD.usr.dist	Wed Aug 13 12:31:36 2014	(r269927)
+++ stable/10/etc/mtree/BSD.usr.dist	Wed Aug 13 12:32:52 2014	(r269928)
@@ -301,8 +301,6 @@
             ..
             csh
             ..
-            cvsup
-            ..
             diskless
             ..
             drivers

Modified: stable/10/share/examples/Makefile
==============================================================================
--- stable/10/share/examples/Makefile	Wed Aug 13 12:31:36 2014	(r269927)
+++ stable/10/share/examples/Makefile	Wed Aug 13 12:32:52 2014	(r269928)
@@ -10,7 +10,6 @@ LDIRS=	BSD_daemon \
 	bhyve \
 	bootforth \
 	csh \
-	cvsup \
 	diskless \
 	drivers \
 	etc \
@@ -52,10 +51,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	bootforth/menuconf.4th \
 	bootforth/screen.4th \
 	csh/dot.cshrc \
-	cvsup/README \
-	cvsup/cvs-supfile \
-	cvsup/stable-supfile \
-	cvsup/standard-supfile \
 	diskless/ME \
 	diskless/README.BOOTP \
 	diskless/README.TEMPLATING \