Adjust some more stuff for the CVS->git switch.

diff --git a/games/fortune/datfiles/dragonfly-tips b/games/fortune/datfiles/dragonfly-tips
index 2f27b3d..c5a3e33 100644 (file)
--- a/games/fortune/datfiles/dragonfly-tips
+++ b/games/fortune/datfiles/dragonfly-tips
@@ -506,21 +506,15 @@ If you want to update your pkgsrc installation issue:
        cd /usr
        make pkgsrc-update
 %
-To download the DragonFly BSD cvs repository into /home/dcvs issue:
+To download the DragonFly BSD git repository into /usr/src, issue:
 
        cd /usr
-       make cvs-cvsup
+       make git-clone
 
-To download the latest DragonFly BSD release cvs repository, issue:
+To update the DragonFly BSD git repository in /usr/src, issue:
 
        cd /usr
-       make release-src-cvsup
-
-The following target will first synchronize /home/dcvs then issue an
-update into /usr/src.
-
-       cd /usr
-       make head-src-cvsup
+       make git-update
 %
 Getting the latest pkgsrc WIP tree in DragonFly BSD is fairly simple:
 

diff --git a/nrelease/root/cpignore b/nrelease/root/cpignore
index 5556b90..fc353aa 100644 (file)
--- a/nrelease/root/cpignore
+++ b/nrelease/root/cpignore
@@ -1,3 +1,2 @@
 # $DragonFly: src/nrelease/root/cpignore,v 1.1 2003/12/01 09:59:44 dillon Exp $
 cpignore
-CVS

diff --git a/share/examples/Makefile b/share/examples/Makefile
index 2ff00b0..73f9b20 100644 (file)
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -4,8 +4,7 @@
 # Doing a make install builds /usr/share/examples
 
 DIRS!= for i in *; do \
-           if test -d $$i -a $$i != CVS -a \
-               $$i != ipfilter -a $$i != smbfs; then \
+           if test -d $$i -a $$i != ipfilter -a $$i != smbfs; then \
                echo $$i; \
             fi; \
        done
@@ -24,7 +23,7 @@ all clean cleandir depend lint tags:
 beforeinstall: etc-examples ${SHARED}
 
 .for dir in ${DIRS}
-FILES!=        find -L ${dir} \( -name CVS -prune \) -o -type f -print
+FILES!=        find -L ${dir} -type f -print
 .for file in ${FILES}
 copies::
        ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${file} ${DDIR}/${file}

diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index 22036a5..04263a2 100644 (file)
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -5,8 +5,8 @@
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.14
 CFDIR= cf
-CFDIRS!=       (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print)
-CFFILES!=      (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print)
+CFDIRS!=       (cd ${SENDMAIL_DIR}; find -L ${CFDIR} -type d -print)
+CFFILES!=      (cd ${SENDMAIL_DIR}; find -L ${CFDIR} -type f -print)
 
 DDIR=  ${DESTDIR}/usr/share/sendmail
 

diff --git a/tools/tools/kerninclude/kerninclude.sh b/tools/tools/kerninclude/kerninclude.sh
index 050209a..abb529f 100644 (file)
--- a/tools/tools/kerninclude/kerninclude.sh
+++ b/tools/tools/kerninclude/kerninclude.sh
@@ -41,7 +41,7 @@ if $init ; then
        (
        echo "Cleaning compile"
        cd compile
-       ls | grep -v CVS | xargs rm -rf
+       ls | xargs rm -rf *
        )
 fi
 
@@ -101,7 +101,7 @@ make > x.0 2>&1
 cd modules
 for i in *
 do
-       if [ -d $i -a $i != CVS ] ; then
+       if [ -d $i ] ; then
                ( cd $i ; ls *.o 2>/dev/null || true)
        fi
 done

diff --git a/tools/tools/splitpatch/splitpatch.py b/tools/tools/splitpatch/splitpatch.py
index 7f3dc39..58eb8eb 100644 (file)
--- a/tools/tools/splitpatch/splitpatch.py
+++ b/tools/tools/splitpatch/splitpatch.py
@@ -53,7 +53,7 @@ def directory_save(filename, patch, suffix = None, root = None, forceful = False
        f.write(patch)
        f.close()
 
-def splitpatch(source, output = directory_save, quiet = False, tag = False):
+def splitpatch(source, output = directory_save, quiet = False):
        """
        Split the patch in source into independent pieces
        and call output on the result with the guessed filename
@@ -63,8 +63,6 @@ def splitpatch(source, output = directory_save, quiet = False, tag = False):
        """
        diff_line = { " ": True, "+": True, "-": True, "@": True, "!": True, '*': True }
        buf = []
-       if tag:
-               buf.append('$''DragonFly$\n')
        filename = None
        for line in source:
                if not filename:
@@ -88,8 +86,6 @@ def splitpatch(source, output = directory_save, quiet = False, tag = False):
 
                        filename = None
                        buf = []
-                       if tag:
-                               buf.append('$''DragonFly$\n')
 
        if filename:
                output(filename, "".join(buf))
@@ -102,7 +98,6 @@ def main():
        parser.add_option("-f", "--force", action="store_true", dest="force", help="overwrite existing patches")
        parser.add_option("-s", "--suffix", type="string", dest="suffix", help="use SUFFIX instead of .patch for the created patches")
        parser.add_option("-d", "--directory", type="string", dest="directory", help="create patches in DIRECTORY")
-       parser.add_option("-t", "--tag", action="store_true", dest="tag", help="add DragonFly CVS tag")
        (options, args) = parser.parse_args()
        if len(args) > 1:
                parser.error("incorrect number of arguments")
@@ -111,7 +106,7 @@ def main():
        else:
                source = sys.stdin
        splitpatch(source, lambda filename, patch: directory_save(filename, patch, forceful = options.force,
-                               suffix = options.suffix, root = options.directory), quiet = options.quiet, tag = options.tag)
+                               suffix = options.suffix, root = options.directory), quiet = options.quiet)
 
 if __name__ == '__main__':
        main()