Index: contrib/cvs/man/Makefile.am (deleted) =================================================================== Index: contrib/cvs/man/cvs.1 (deleted) =================================================================== Index: contrib/cvs/man/cvs.5 (deleted) =================================================================== Index: contrib/cvs/man/cvsbug.8 (deleted) =================================================================== Index: contrib/cvs/man/Makefile.in (deleted) =================================================================== Index: contrib/cvs/man/ChangeLog (deleted) =================================================================== Index: contrib/cvs/NEWS (deleted) =================================================================== Index: contrib/cvs/mkinstalldirs (deleted) =================================================================== Index: contrib/cvs/MINOR-BUGS (deleted) =================================================================== Index: contrib/cvs/configure.in (deleted) =================================================================== Index: contrib/cvs/ChangeLog (deleted) =================================================================== Index: contrib/cvs/DEVEL-CVS (deleted) =================================================================== Index: contrib/cvs/PROJECTS (deleted) =================================================================== Index: contrib/cvs/README (deleted) =================================================================== Index: contrib/cvs/FREEBSD-upgrade (deleted) =================================================================== Index: contrib/cvs/config.h.in (deleted) =================================================================== Index: contrib/cvs/contrib/rcs-to-cvs.sh (deleted) =================================================================== Index: contrib/cvs/contrib/Makefile.am (deleted) =================================================================== Index: contrib/cvs/contrib/pvcs2rcs.in (deleted) =================================================================== Index: contrib/cvs/contrib/descend.sh (deleted) =================================================================== Index: contrib/cvs/contrib/cvshelp.man (deleted) =================================================================== Index: contrib/cvs/contrib/descend.man (deleted) =================================================================== Index: contrib/cvs/contrib/dirfns.shar (deleted) =================================================================== Index: contrib/cvs/contrib/Makefile.in (deleted) =================================================================== Index: contrib/cvs/contrib/clmerge.in (deleted) =================================================================== Index: contrib/cvs/contrib/commit_prep.in (deleted) =================================================================== Index: contrib/cvs/contrib/rcs2log.sh (deleted) =================================================================== Index: contrib/cvs/contrib/mfpipe.in (deleted) =================================================================== Index: contrib/cvs/contrib/log.in (deleted) =================================================================== Index: contrib/cvs/contrib/ChangeLog (deleted) =================================================================== Index: contrib/cvs/contrib/sccs2rcs.in (deleted) =================================================================== Index: contrib/cvs/contrib/README (deleted) =================================================================== Index: contrib/cvs/contrib/check_cvs.in (deleted) =================================================================== Index: contrib/cvs/contrib/debug_check_log.sh (deleted) =================================================================== Index: contrib/cvs/contrib/rcs2sccs.sh (deleted) =================================================================== Index: contrib/cvs/contrib/log_accum.in (deleted) =================================================================== Index: contrib/cvs/contrib/intro.doc (deleted) =================================================================== Index: contrib/cvs/contrib/cvs_acls.html (deleted) =================================================================== Index: contrib/cvs/contrib/cvs_acls.in (deleted) =================================================================== Index: contrib/cvs/contrib/cvscheck.sh (deleted) =================================================================== Index: contrib/cvs/contrib/cvscheck.man (deleted) =================================================================== Index: contrib/cvs/contrib/cvs2vendor.sh (deleted) =================================================================== Index: contrib/cvs/contrib/rcslock.in (deleted) =================================================================== Index: contrib/cvs/contrib/cln_hist.in (deleted) =================================================================== Index: contrib/cvs/TESTS (deleted) =================================================================== Index: contrib/cvs/HACKING (deleted) =================================================================== Index: contrib/cvs/TODO (deleted) =================================================================== Index: contrib/cvs/mktemp.sh (deleted) =================================================================== Index: contrib/cvs/acinclude.m4 (deleted) =================================================================== Index: contrib/cvs/FAQ (deleted) =================================================================== Index: contrib/cvs/missing (deleted) =================================================================== Index: contrib/cvs/Makefile.am (deleted) =================================================================== Index: contrib/cvs/FREEBSD-Xlist (deleted) =================================================================== Index: contrib/cvs/COPYING.LIB (deleted) =================================================================== Index: contrib/cvs/aclocal.m4 (deleted) =================================================================== Index: contrib/cvs/install-sh (deleted) =================================================================== Index: contrib/cvs/cvs-format.el (deleted) =================================================================== Index: contrib/cvs/configure (deleted) =================================================================== Index: contrib/cvs/Makefile.in (deleted) =================================================================== Index: contrib/cvs/AUTHORS (deleted) =================================================================== Index: contrib/cvs/src/error.h (deleted) =================================================================== Index: contrib/cvs/src/patch.c (deleted) =================================================================== Index: contrib/cvs/src/cvs.h (deleted) =================================================================== Index: contrib/cvs/src/mkmodules.c (deleted) =================================================================== Index: contrib/cvs/src/zlib.c (deleted) =================================================================== Index: contrib/cvs/src/ChangeLog-96 (deleted) =================================================================== Index: contrib/cvs/src/ChangeLog-97 (deleted) =================================================================== Index: contrib/cvs/src/checkin.c (deleted) =================================================================== Index: contrib/cvs/src/ChangeLog (deleted) =================================================================== Index: contrib/cvs/src/modules.c (deleted) =================================================================== Index: contrib/cvs/src/login.c (deleted) =================================================================== Index: contrib/cvs/src/diff.c (deleted) =================================================================== Index: contrib/cvs/src/tag.c (deleted) =================================================================== Index: contrib/cvs/src/subr.c (deleted) =================================================================== Index: contrib/cvs/src/wrapper.c (deleted) =================================================================== Index: contrib/cvs/src/ignore.c (deleted) =================================================================== Index: contrib/cvs/src/version.c (deleted) =================================================================== Index: contrib/cvs/src/myndbm.c (deleted) =================================================================== Index: contrib/cvs/src/parseinfo.c (deleted) =================================================================== Index: contrib/cvs/src/commit.c (deleted) =================================================================== Index: contrib/cvs/src/myndbm.h (deleted) =================================================================== Index: contrib/cvs/src/expand_path.c (deleted) =================================================================== Index: contrib/cvs/src/rcscmds.c (deleted) =================================================================== Index: contrib/cvs/src/no_diff.c (deleted) =================================================================== Index: contrib/cvs/src/import.c (deleted) =================================================================== Index: contrib/cvs/src/fileattr.c (deleted) =================================================================== Index: contrib/cvs/src/filesubr.c (deleted) =================================================================== Index: contrib/cvs/src/client.c (deleted) =================================================================== Index: contrib/cvs/src/fileattr.h (deleted) =================================================================== Index: contrib/cvs/src/status.c (deleted) =================================================================== Index: contrib/cvs/src/client.h (deleted) =================================================================== Index: contrib/cvs/src/vers_ts.c (deleted) =================================================================== Index: contrib/cvs/src/scramble.c (deleted) =================================================================== Index: contrib/cvs/src/lock.c (deleted) =================================================================== Index: contrib/cvs/src/logmsg.c (deleted) =================================================================== Index: contrib/cvs/src/hardlink.c (deleted) =================================================================== Index: contrib/cvs/src/sanity.sh (deleted) =================================================================== Index: contrib/cvs/src/hardlink.h (deleted) =================================================================== Index: contrib/cvs/src/checkout.c (deleted) =================================================================== Index: contrib/cvs/src/watch.c (deleted) =================================================================== Index: contrib/cvs/src/server.c (deleted) =================================================================== Index: contrib/cvs/src/recurse.c (deleted) =================================================================== Index: contrib/cvs/src/entries.c (deleted) =================================================================== Index: contrib/cvs/src/buffer.c (deleted) =================================================================== Index: contrib/cvs/src/ChangeLog-9194 (deleted) =================================================================== Index: contrib/cvs/src/watch.h (deleted) =================================================================== Index: contrib/cvs/src/server.h (deleted) =================================================================== Index: contrib/cvs/src/ChangeLog-9395 (deleted) =================================================================== Index: contrib/cvs/src/buffer.h (deleted) =================================================================== Index: contrib/cvs/src/cvsrc.c (deleted) =================================================================== Index: contrib/cvs/src/log.c (deleted) =================================================================== Index: contrib/cvs/src/update.c (deleted) =================================================================== Index: contrib/cvs/src/root.c (deleted) =================================================================== Index: contrib/cvs/src/main.c (deleted) =================================================================== Index: contrib/cvs/src/create_adm.c (deleted) =================================================================== Index: contrib/cvs/src/edit.c (deleted) =================================================================== Index: contrib/cvs/src/rcs.c (deleted) =================================================================== Index: contrib/cvs/src/update.h (deleted) =================================================================== Index: contrib/cvs/src/root.h (deleted) =================================================================== Index: contrib/cvs/src/add.c (deleted) =================================================================== Index: contrib/cvs/src/Makefile.am (deleted) =================================================================== Index: contrib/cvs/src/admin.c (deleted) =================================================================== Index: contrib/cvs/src/repos.c (deleted) =================================================================== Index: contrib/cvs/src/edit.h (deleted) =================================================================== Index: contrib/cvs/src/rcs.h (deleted) =================================================================== Index: contrib/cvs/src/remove.c (deleted) =================================================================== Index: contrib/cvs/src/history.c (deleted) =================================================================== Index: contrib/cvs/src/Makefile.in (deleted) =================================================================== Index: contrib/cvs/src/find_names.c (deleted) =================================================================== Index: contrib/cvs/src/run.c (deleted) =================================================================== Index: contrib/cvs/src/stack.c (deleted) =================================================================== Index: contrib/cvs/src/history.h (deleted) =================================================================== Index: contrib/cvs/src/annotate.c (deleted) =================================================================== Index: contrib/cvs/src/stack.h (deleted) =================================================================== Index: contrib/cvs/src/classify.c (deleted) =================================================================== Index: contrib/cvs/src/cvsbug.in (deleted) =================================================================== Index: contrib/cvs/src/release.c (deleted) =================================================================== Index: contrib/cvs/src/hash.c (deleted) =================================================================== Index: contrib/cvs/src/hash.h (deleted) =================================================================== Index: contrib/cvs/src/error.c (deleted) =================================================================== Index: contrib/cvs/depcomp (deleted) =================================================================== Index: contrib/cvs/compile (deleted) =================================================================== Index: contrib/cvs/ChangeLog.zoo (deleted) =================================================================== Index: contrib/cvs/tools/Makefile.in (deleted) =================================================================== Index: contrib/cvs/tools/ChangeLog (deleted) =================================================================== Index: contrib/cvs/tools/Makefile.am (deleted) =================================================================== Index: contrib/cvs/tools/README (deleted) =================================================================== Index: contrib/cvs/BUGS (deleted) =================================================================== Index: contrib/cvs/mdate-sh (deleted) =================================================================== Index: contrib/cvs/doc/cvs.texinfo (deleted) =================================================================== Index: contrib/cvs/doc/version-client.texi (deleted) =================================================================== Index: contrib/cvs/doc/Makefile.am (deleted) =================================================================== Index: contrib/cvs/doc/RCSFILES (deleted) =================================================================== Index: contrib/cvs/doc/mkman.pl (deleted) =================================================================== Index: contrib/cvs/doc/cvs-paper.ms (deleted) =================================================================== Index: contrib/cvs/doc/Makefile.in (deleted) =================================================================== Index: contrib/cvs/doc/stamp-1 (deleted) =================================================================== Index: contrib/cvs/doc/stamp-vti (deleted) =================================================================== Index: contrib/cvs/doc/ChangeLog (deleted) =================================================================== Index: contrib/cvs/doc/cvs.1 (deleted) =================================================================== Index: contrib/cvs/doc/HACKING.DOCS (deleted) =================================================================== Index: contrib/cvs/doc/cvs.man.header (deleted) =================================================================== Index: contrib/cvs/doc/version.texi (deleted) =================================================================== Index: contrib/cvs/doc/cvs.man.footer (deleted) =================================================================== Index: contrib/cvs/doc/cvsclient.texi (deleted) =================================================================== Index: contrib/cvs/doc/mdate-sh (deleted) =================================================================== Index: contrib/cvs/doc/ChangeLog.fsf (deleted) =================================================================== Index: contrib/cvs/lib/xselect.h (deleted) =================================================================== Index: contrib/cvs/lib/strtoul.c (deleted) =================================================================== Index: contrib/cvs/lib/getpagesize.h (deleted) =================================================================== Index: contrib/cvs/lib/gethostname.c (deleted) =================================================================== Index: contrib/cvs/lib/valloc.c (deleted) =================================================================== Index: contrib/cvs/lib/xgssapi.h (deleted) =================================================================== Index: contrib/cvs/lib/getopt1.c (deleted) =================================================================== Index: contrib/cvs/lib/md5.c (deleted) =================================================================== Index: contrib/cvs/lib/getline.c (deleted) =================================================================== Index: contrib/cvs/lib/fnmatch.h.in (deleted) =================================================================== Index: contrib/cvs/lib/md5.h (deleted) =================================================================== Index: contrib/cvs/lib/xtime.h (deleted) =================================================================== Index: contrib/cvs/lib/ftruncate.c (deleted) =================================================================== Index: contrib/cvs/lib/getline.h (deleted) =================================================================== Index: contrib/cvs/lib/savecwd.c (deleted) =================================================================== Index: contrib/cvs/lib/yesno.c (deleted) =================================================================== Index: contrib/cvs/lib/sighandle.c (deleted) =================================================================== Index: contrib/cvs/lib/fncase.c (deleted) =================================================================== Index: contrib/cvs/lib/savecwd.h (deleted) =================================================================== Index: contrib/cvs/lib/getopt.c (deleted) =================================================================== Index: contrib/cvs/lib/getdate.y (deleted) =================================================================== Index: contrib/cvs/lib/ChangeLog (deleted) =================================================================== Index: contrib/cvs/lib/mkdir.c (deleted) =================================================================== Index: contrib/cvs/lib/xsize.h (deleted) =================================================================== Index: contrib/cvs/lib/getopt.h (deleted) =================================================================== Index: contrib/cvs/lib/wait.h (deleted) =================================================================== Index: contrib/cvs/lib/regex.c (deleted) =================================================================== Index: contrib/cvs/lib/dup2.c (deleted) =================================================================== Index: contrib/cvs/lib/regex.h (deleted) =================================================================== Index: contrib/cvs/lib/fnmatch.c (deleted) =================================================================== Index: contrib/cvs/lib/test-getdate.sh (deleted) =================================================================== Index: contrib/cvs/lib/strerror.c (deleted) =================================================================== Index: contrib/cvs/lib/ChangeLog.fsf (deleted) =================================================================== Index: contrib/cvs/lib/argmatch.c (deleted) =================================================================== Index: contrib/cvs/lib/Makefile.am (deleted) =================================================================== Index: contrib/cvs/lib/system.h (deleted) =================================================================== Index: contrib/cvs/lib/stripslash.c (deleted) =================================================================== Index: contrib/cvs/lib/waitpid.c (deleted) =================================================================== Index: contrib/cvs/lib/Makefile.in (deleted) =================================================================== Index: contrib/cvs/lib/strstr.c (deleted) =================================================================== Index: contrib/cvs/lib/xgetwd.c (deleted) =================================================================== Index: contrib/cvs/lib/memmove.c (deleted) =================================================================== Index: contrib/cvs/lib/getpass.c (deleted) =================================================================== Index: contrib/cvs/lib/rename.c (deleted) =================================================================== Index: contrib/cvs/INSTALL (deleted) =================================================================== Index: contrib/cvs/diff/Makefile.in (deleted) =================================================================== Index: contrib/cvs/diff/diffrun.h (deleted) =================================================================== Index: contrib/cvs/diff/analyze.c (deleted) =================================================================== Index: contrib/cvs/diff/ChangeLog (deleted) =================================================================== Index: contrib/cvs/diff/io.c (deleted) =================================================================== Index: contrib/cvs/diff/diff.c (deleted) =================================================================== Index: contrib/cvs/diff/cmpbuf.c (deleted) =================================================================== Index: contrib/cvs/diff/util.c (deleted) =================================================================== Index: contrib/cvs/diff/diff.h (deleted) =================================================================== Index: contrib/cvs/diff/ifdef.c (deleted) =================================================================== Index: contrib/cvs/diff/dir.c (deleted) =================================================================== Index: contrib/cvs/diff/cmpbuf.h (deleted) =================================================================== Index: contrib/cvs/diff/side.c (deleted) =================================================================== Index: contrib/cvs/diff/context.c (deleted) =================================================================== Index: contrib/cvs/diff/version.c (deleted) =================================================================== Index: contrib/cvs/diff/Makefile.am (deleted) =================================================================== Index: contrib/cvs/diff/ed.c (deleted) =================================================================== Index: contrib/cvs/diff/normal.c (deleted) =================================================================== Index: contrib/cvs/diff/system.h (deleted) =================================================================== Index: contrib/cvs/diff/diff3.c (deleted) =================================================================== Index: contrib/cvs/FREEBSD-vendstock (deleted) =================================================================== Index: contrib/cvs/COPYING (deleted) =================================================================== Index: Makefile.inc1 =================================================================== --- Makefile.inc1 (revision 240470) +++ Makefile.inc1 (working copy) @@ -113,8 +113,6 @@ BUILDENV_SHELL?=/bin/sh -CVS?= cvs -CVSFLAGS?= -A -P -d -I! SVN?= svn SVNFLAGS?= -r HEAD SUP?= /usr/bin/csup @@ -960,16 +958,6 @@ @${SUP} ${SUPFLAGS} ${WWWSUPFILE} .endif .endif -.if defined(CVS_UPDATE) - @cd ${.CURDIR} ; \ - if [ -d CVS ] ; then \ - echo "--------------------------------------------------------------" ; \ - echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ - echo "--------------------------------------------------------------" ; \ - echo ${CVS} -R -q update ${CVSFLAGS} ; \ - ${CVS} -R -q update ${CVSFLAGS} ; \ - fi -.endif .if defined(SVN_UPDATE) @cd ${.CURDIR} ; \ if [ -d .svn ] ; then \ Index: ObsoleteFiles.inc =================================================================== --- ObsoleteFiles.inc (revision 240470) +++ ObsoleteFiles.inc (working copy) @@ -38,6 +38,33 @@ # xargs -n1 | sort | uniq -d; # done +# 20120909: remove cvs from base +OLD_FILES+=usr/bin/cvs +OLD_FILES+=usr/bin/cvsbug +OLD_FILES+=usr/share/examples/cvs/contrib/README +OLD_FILES+=usr/share/examples/cvs/contrib/clmerge +OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist +OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep +OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor +OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls +OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck +OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man +OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man +OLD_FILES+=usr/share/examples/cvs/contrib/descend.man +OLD_FILES+=usr/share/examples/cvs/contrib/easy-import +OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc +OLD_FILES+=usr/share/examples/cvs/contrib/log +OLD_FILES+=usr/share/examples/cvs/contrib/log_accum +OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe +OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs +OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log +OLD_FILES+=usr/share/examples/cvs/contrib/rcslock +OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs +OLD_FILES+=usr/share/info/cvs.info.gz +OLD_FILES+=usr/share/info/cvsclient.info.gz +OLD_FILES+=usr/share/man/man1/cvs.1.gz +OLD_FILES+=usr/share/man/man5/cvs.5.gz +OLD_FILES+=usr/share/man/man8/cvsbug.8.gz # 20120908: pf cleanup OLD_FILES+=usr/include/net/if_pflow.h # 20120816: new clang import which bumps version from 3.1 to 3.2 Index: MAINTAINERS =================================================================== --- MAINTAINERS (revision 240470) +++ MAINTAINERS (working copy) @@ -64,7 +64,6 @@ lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. -cvs peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. Index: etc/inetd.conf =================================================================== --- etc/inetd.conf (revision 240470) +++ etc/inetd.conf (working copy) @@ -58,8 +58,8 @@ # --allow-root path correctly or you open a trivial to exploit but # deadly security hole. # -#cvspserver stream tcp nowait root /usr/bin/cvs cvs --allow-root=/your/cvsroot/here pserver -#cvspserver stream tcp nowait root /usr/bin/cvs cvs --allow-root=/your/cvsroot/here kserver +#cvspserver stream tcp nowait root /usr/local/bin/cvs cvs --allow-root=/your/cvsroot/here pserver +#cvspserver stream tcp nowait root /usr/local/bin/cvs cvs --allow-root=/your/cvsroot/here kserver # # RPC based services (you MUST have rpcbind running to use these) # Index: sys/sys/param.h =================================================================== --- sys/sys/param.h (revision 240470) +++ sys/sys/param.h (working copy) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000018 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000019 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Index: gnu/usr.bin/Makefile =================================================================== --- gnu/usr.bin/Makefile (revision 240470) +++ gnu/usr.bin/Makefile (working copy) @@ -4,7 +4,6 @@ SUBDIR= ${_binutils} \ ${_cc} \ - ${_cvs} \ dialog \ diff \ diff3 \ @@ -27,10 +26,6 @@ .endif .endif -.if ${MK_CVS} != "no" -_cvs= cvs -.endif - .if ${MK_FDT} != "no" _dtc= dtc .endif Index: gnu/usr.bin/cvs/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/libdiff/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/contrib/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/contrib/easy-import.pl (deleted) =================================================================== Index: gnu/usr.bin/cvs/doc/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/Makefile.inc (deleted) =================================================================== Index: gnu/usr.bin/cvs/lib/config.h.proto (deleted) =================================================================== Index: gnu/usr.bin/cvs/lib/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/cvsbug/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/cvs/prepend_args.c (deleted) =================================================================== Index: gnu/usr.bin/cvs/cvs/Makefile (deleted) =================================================================== Index: gnu/usr.bin/cvs/cvs/prepend_args.h (deleted) =================================================================== Index: tools/build/mk/OptionalObsoleteFiles.inc =================================================================== --- tools/build/mk/OptionalObsoleteFiles.inc (revision 240470) +++ tools/build/mk/OptionalObsoleteFiles.inc (working copy) @@ -781,35 +781,6 @@ OLD_FILES+=usr/share/man/man5/ctm.5.gz .endif -.if ${MK_CVS} == no -OLD_FILES+=usr/bin/cvs -OLD_FILES+=usr/bin/cvsbug -OLD_FILES+=usr/share/examples/cvs/contrib/README -OLD_FILES+=usr/share/examples/cvs/contrib/clmerge -OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist -OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep -OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor -OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls -OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck -OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man -OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man -OLD_FILES+=usr/share/examples/cvs/contrib/descend.man -OLD_FILES+=usr/share/examples/cvs/contrib/easy-import -OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc -OLD_FILES+=usr/share/examples/cvs/contrib/log -OLD_FILES+=usr/share/examples/cvs/contrib/log_accum -OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe -OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs -OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log -OLD_FILES+=usr/share/examples/cvs/contrib/rcslock -OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs -OLD_FILES+=usr/share/info/cvs.info.gz -OLD_FILES+=usr/share/info/cvsclient.info.gz -OLD_FILES+=usr/share/man/man1/cvs.1.gz -OLD_FILES+=usr/share/man/man5/cvs.5.gz -OLD_FILES+=usr/share/man/man8/cvsbug.8.gz -.endif - # devd(8) and gperf(1) not listed here on purpose .if ${MK_CXX} == no OLD_FILES+=usr/bin/CC Index: tools/build/options/WITHOUT_CVS (deleted) =================================================================== Index: tools/tools/nanobsd/gateworks/common =================================================================== --- tools/tools/nanobsd/gateworks/common (revision 240470) +++ tools/tools/nanobsd/gateworks/common (working copy) @@ -113,7 +113,6 @@ WITHOUT_CALENDAR=true WITHOUT_CDDL=true WITHOUT_CTM=true -WITHOUT_CVS=true WITHOUT_DICT=true WITHOUT_EXAMPLES=true WITHOUT_FLOPPY=true Index: share/doc/psd/28.cvs/Makefile (deleted) =================================================================== Index: share/doc/psd/Makefile =================================================================== --- share/doc/psd/Makefile (revision 240470) +++ share/doc/psd/Makefile (working copy) @@ -35,7 +35,6 @@ 24.xdr \ 25.xdrrfc \ 26.rpcrfc \ - 27.nfsrpc \ - 28.cvs + 27.nfsrpc .include Index: share/man/man5/make.conf.5 =================================================================== --- share/man/man5/make.conf.5 (revision 240470) +++ share/man/man5/make.conf.5 (working copy) @@ -177,16 +177,6 @@ for a list of recognized .Va CPUTYPE options. -.It Va CVS_UPDATE -.Pq Vt bool -Set this to use -.Xr cvs 1 -to update your -.Pa src , ports -and -.Pa doc -trees with -.Dq Li "make update" . .It Va CXXFLAGS .Pq Vt str Controls the compiler settings when compiling C++ code. Index: share/man/man5/src.conf.5 =================================================================== --- share/man/man5/src.conf.5 (revision 240470) +++ share/man/man5/src.conf.5 (working copy) @@ -336,9 +336,6 @@ Set to not build .Xr ctm 1 and related utilities. -.It Va WITHOUT_CVS -.\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 07:50:50Z ru -Set to not build CVS. .It Va WITHOUT_CXX .\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220402 2011-04-06 20:19:07Z uqs Set to not build Index: UPDATING =================================================================== --- UPDATING (revision 240470) +++ UPDATING (working copy) @@ -24,6 +24,10 @@ disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20120909: + CVS has been removed from the base system and can now be found + in the ports in devel/cvs. + 20120908: The pf(4) packet filter ABI has been changed. pfctl(8) and snmp_pf module need to be recompiled to work with new kernel.