Remove CVS from the base system.

Discussed with:	many
Reviewed by:	peter, zi
Approved by:	core

13 files changed, 0 insertions, 1264 deletions

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 386c957..cfb9a21 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -4,7 +4,6 @@
 
 SUBDIR= ${_binutils} \
 	${_cc} \
-	${_cvs} \
 	dialog \
 	diff \
 	diff3 \
@@ -26,10 +25,6 @@ _groff=		groff
 .endif
 .endif
 
-.if ${MK_CVS} != "no"
-_cvs=		cvs
-.endif
-
 .if ${MK_GPL_DTC} != "no"
 _dtc=		dtc
 .endif
diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
deleted file mode 100644
index dc41a73..0000000
--- a/gnu/usr.bin/cvs/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR = lib libdiff cvs contrib cvsbug doc
-
-.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
deleted file mode 100644
index 4acfa0b..0000000
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.if !defined(CVSDIR)
-
-CVSDIR=		$(.CURDIR)/../../../../contrib/cvs
-
-LIBCVSDIR=	${.OBJDIR}/../lib
-LIBCVS=		${LIBCVSDIR}/libcvs.a
-
-LIBDIFFDIR=	${.OBJDIR}/../libdiff
-LIBDIFF=	${LIBDIFFDIR}/libdiff.a
-
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
-
-.endif
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
deleted file mode 100644
index 2ac3618..0000000
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc"
-
-.PATH:	${CVSDIR}/contrib
-.PATH:	${CVSDIR}/man
-
-SCRIPTS= clmerge cln_hist commit_prep cvs2vendor cvs_acls cvscheck \
-	 log log_accum mfpipe rcs-to-cvs rcs2log rcslock sccs2rcs \
-	 easy-import
-
-FILES=	 README cvscheck.man cvshelp.man descend.man intro.doc
-
-EXAMPDIR=	${SHAREDIR}/examples/cvs
-FILESDIR=	${EXAMPDIR}/contrib
-SCRIPTSDIR=	${FILESDIR}
-PERLPATH=	/usr/bin/perl
-CLEANFILES+=	$(SCRIPTS)
-
-.SUFFIXES: .sh .pl .in
-
-# Prevent Makefile.in from overwriting Makefile through the suffix rules.
-Makefile:
-	@:
-
-.sh:
-	cp -f ${.IMPSRC} ${.TARGET}
-
-.pl:
-	sed -e 's,xPERL_PATHx,$(PERLPATH),' ${.IMPSRC} > ${.TARGET}
-
-.in:
-	sed -e 's,@CSH@,/bin/csh,' -e 's,@PERL@,$(PERLPATH),' ${.IMPSRC} > ${.TARGET}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl
deleted file mode 100644
index d266957..0000000
--- a/gnu/usr.bin/cvs/contrib/easy-import.pl
+++ /dev/null
@@ -1,403 +0,0 @@
-#! xPERL_PATHx
-#
-# Support for importing a source collection into CVS.
-# Tries to prevent the user from the most common pitfalls (like creating
-# new top-level repositories or second-level areas accidentally), and
-# cares to do some of the `dirty' work like maintaining the modules
-# database accordingly.
-#
-# Written by Jörg Wunsch, 95/03/07, and placed in the public domain.
-#
-# $FreeBSD$
-
-require "complete.pl";
-require "getopts.pl";
-
-
-sub scan_opts
-{
-    local($status);
-
-    $status = &Getopts("nv");
-
-    $dont_do_it = "-n" if $opt_n;
-    if($opt_v) {
-	print STDERR '$FreeBSD$' . "\n"; # 'emacs kludge
-	exit 0;
-    }
-    die "usage: $0 [-v] [-n] [moduledir]\n" .
-	"       -n: don't do any commit, show only\n" .
-	"       -v: show program version\n"
-	    unless $status && $#ARGV <= 0;
-
-    if($#ARGV == 0) {
-	$moduledir = $ARGV[0];
-	shift;
-    }
-}
-
-sub lsdir
-{
-    # find all subdirectories under @_
-    # ignore all CVS entries, dot entries, and non-directories
-
-    local($base) = @_;
-    local(@ls, @rv, $fname);
-
-    opendir(DIR, $base) || die "Cannot find dir $base.\n";
-
-    @ls = readdir(DIR);
-    closedir(DIR);
-
-    @rv = ();
-
-    foreach $fname (@ls) {
-	next if $fname =~ /^CVS/ || $fname eq "Attic"
-	    || $fname =~ /^\./ || ! -d "$base/$fname";
-	@rv = (@rv, $fname);
-    }
-
-    return sort(@rv);
-}
-
-
-sub contains
-{
-    # look if the first parameter is contained in the list following it
-    local($item, @list) = @_;
-    local($found, $i);
-
-    $found = 0;
-    foreach $i (@list) {
-	return 1 if $i eq $item;
-    }
-    return 0;
-}
-
-
-
-sub term_init
-{
-    # first, get some terminal attributes
-
-    # try bold mode first
-    $so = `tput md`; $se = `tput me`;
-
-    # if no bold mode available, use standout mode
-    if ($so eq "") {
-	$so = `tput so`; $se = `tput se`;
-    }
-
-    # try if we can underscore
-    $us = `tput us`; $ue = `tput ue`;
-    # if we don't have it available, or same as bold/standout, disable it
-    if ($us eq "" || $us eq $so) {
-	$us = $ue = "";
-    }
-
-    # look how many columns we've got
-    if($ENV{'COLUMNS'} ne "") {
-	$columns = $ENV{'COLUMNS'};
-    } elsif(-t STDIN) {		# if we operate on a terminal...
-	local($word, $tmp);
-
-	open(STTY, "stty -a|");
-	$_ = <STTY>;		# try getting the tty win structure value
-	close(STTY);
-	chop;
-	$columns = 0;
-	foreach $word (split) {
-	    $columns = $tmp if $word eq "columns;"; # the number preceding
-	    $tmp = $word;
-	}
-    } else {
-	$columns = 80;
-    }
-    # sanity
-    $columns = 80 unless $columns >= 5;
-}
-
-
-sub list
-{
-    # pretty-print a list
-    # imports: global variable $columns
-    local(@items) = @_;
-    local($longest,$i,$item,$cols,$width);
-
-    # find the longest item
-    $longest = 0;
-    foreach $item (@items) {
-	$i = length($item);
-	$longest = $i if $longest < $i;
-    }
-    $width = $longest + 1;
-    $cols = int($columns / $width);
-
-    $i = 0;
-    foreach $item (@items) {
-	print $item;
-	if(++$i == $cols) {
-	    $i = 0; print "\n";
-	} else {
-	    print ' ' x ($width - length($item));
-	}
-    }
-    print "\n" unless $i == 0;
-}
-
-sub cvs_init
-{
-    # get the CVS repository(s)
-
-    die "You need to have the \$CVSROOT variable set.\n"
-	unless $ENV{'CVSROOT'} ne "";
-
-    # get the list of available repositories
-    $cvsroot = $ENV{'CVSROOT'};
-    $cvsroot = (split(/:/, $cvsroot, 2))[1] if $cvsroot =~ /:/;
-    @reps = &lsdir($cvsroot);
-}
-
-
-sub lsmodules
-{
-    # list all known CVS modules
-    local(%rv, $mname, $mpath, $_);
-
-    %rv = ();
-
-    open(CVS, "cvs co -c|");
-    while($_ = <CVS>) {
-	chop;
-	($mname,$mpath) = split;
-	next if $mname eq "";
-	$rv{$mname} = $mpath;
-    }
-    close(CVS);
-
-    return %rv;
-}
-
-
-sub checktag
-{
-    # check a given string for tag rules
-    local($s, $name) = @_;
-    local($regexp);
-
-    if($name eq "vendor") { $regexp = '^[A-Z][A-Z0-9_]*$'; }
-    elsif($name eq "release") { $regexp = '^[a-z][a-z0-9_]*$'; }
-    else {
-	print STDERR "Internal error: unknown tag name $name\n";
-	exit(2);
-    }
-
-    if($s !~ /$regexp/) {
-	print "\a${us}Valid $name tags must match the regexp " .
-	    "$regexp.${ue}\n";
-	return 0;
-    }
-    if($s =~ /^RELENG/) {
-	print "\a${us}Tags must not start with the word \"RELENG\".${ue}\n";
-	return 0;
-    }
-
-    return 1;
-}
-
-
-&scan_opts;
-&term_init;
-&cvs_init;
-
-if(! $moduledir) {
-    @dirs = &lsdir(".");
-    print "${so}Import from which directory?${se}\n";
-    @dirs = (@dirs, ".");
-    &list(@dirs);
-    $moduledir = &Complete("Which? [.]: ", @dirs);
-    $moduledir = "." unless $moduledir ne "";
-}
-
-chdir $moduledir || die "Cannot chdir to $moduledir\n";
-
-print "${so}Available repositories:${se}\n";
-&list(@reps);
-
-# the following kludge prevents the Complete package from starting
-# over with the string just selected; Complete should better provide
-# some reinitialize method
-$Complete'return = "";   $Complete'r = 0;
-
-$selected =
-    &Complete("Enter repository (<TAB>=complete, ^D=show): ",
-	      @reps);
-
-die "\aYou cannot create new repositories with this script.\n"
-    unless &contains($selected, @reps);
-
-$rep = $selected;
-
-print "\n${so}Selected repository:${se} ${us}$rep${ue}\n";
-
-
-@areas = &lsdir("$cvsroot/$rep");
-
-print "${so}Existent areas in this repository:${se}\n";
-&list(@areas);
-
-$Complete'return = "";   $Complete'r = 0;
-
-$selected =
-    &Complete("Enter area name (<TAB>=complete, ^D=show): ",
-	      @areas);
-
-print "\a${us}Warning: this will create a new area.${ue}\n"
-    unless &contains($selected, @areas);
-
-$area = "$rep/$selected";
-
-print "\n${so}[Working on:${se} ${us}$area${ue}${so}]${se}\n";
-
-%cvsmods = &lsmodules();
-
-for(;;) {
-    $| = 1;
-    print "${so}Gimme the module name:${se} ";
-    $| = 0;
-    $modname = <>;
-    chop $modname;
-    if ($modname eq "") {
-	print "\a${us}You cannot use an empty module name.${ue}\n";
-	next;
-    }
-    last if !$cvsmods{$modname};
-    print "\a${us}This module name does already exist; do you intend to\n" .
-	"perform a vendor-branch import to the existing sources?${ue}: ";
-    $rep = <>;
-    if ($rep =~ /\s*[yY]/) {
-	($area,$modpath) = split(/\//,$cvsmods{$modname},2);
-	$branchimport = 1;
-	last;
-    }
-    print "${us}Choose another name.${ue}\n";
-}
-
-
-if(!$branchimport) {
-    for(;;) {
-	$| = 1;
-	print "${so}Enter the module path:${se} $area/";
-	$| = 0;
-	$modpath = <>;
-	chop $modpath;
-	if ($modpath eq "") {
-	    print "\a${us}You cannot use an empty module path.${ue}\n";
-	    next;
-	}
-	last if ! -d "$cvsroot/$area/$modpath";
-	print "\a${us}This module path does already exist; " .
-	    "choose another one.${ue}\n";
-    }
-
-
-    @newdirs = ();
-    $dir1 = "$cvsroot/$area";
-    $dir2 = "$area";
-
-    @newdirs = (@newdirs, "$dir2") if ! -d $dir1;
-
-    foreach $ele (split(/\//, $modpath)) {
-	$dir1 = "$dir1/$ele";
-	$dir2 = "$dir2/$ele";
-	@newdirs = (@newdirs, "$dir2") if ! -d $dir1;
-    }
-
-    print "${so}You're going to create the following new directories:${se}\n";
-
-    &list(@newdirs);
-}
-
-for(;;) {
-    $| = 1;
-    print "${so}Enter a \`vendor\' tag (e. g. the authors ID):${se} ";
-    $| = 0;
-    $vtag = <>;
-    chop $vtag;
-    last if &checktag($vtag, "vendor");
-}
-
-for(;;) {
-    $| = 1;
-    print "${so}Enter a \`release\' tag (e. g. the version #):${se} ";
-    $| = 0;
-    $rtag = <>;
-    chop $rtag;
-    last if &checktag($rtag, "release");
-}
-
-
-$| = 1;
-print "${so}This is your last chance to interrupt, " .
-    "hit <return> to go on:${se} ";
-$| = 0;
-<>;
-
-if (!$branchimport) {
-    $mod = "";
-    foreach $tmp (sort(keys(%cvsmods))) {
-	if($tmp gt $modname) {
-	    $mod = $tmp;
-	    last;
-	}
-    }
-    if($mod eq "") {
-	# we are going to append our module
-	$cmd = "\$\na\n";
-    } else {
-	# we can insert it
-	$cmd = "/^${mod}[ \t]/\ni\n";
-    }
-
-    print "${so}Checking out the modules database...${se}\n";
-    system("cvs co modules") && die "${us}failed.\n${ue}";
-
-    print "${so}Inserting new module...${se}\n";
-    open(ED, "|ed modules/modules") || die "${us}Cannot start ed${ue}\n";
-    print(ED "${cmd}${modname} " . ' ' x (15 - length($modname)) .
-	  "$area/${modpath}\n.\nw\nq\n");
-    close(ED);
-
-    print "${so}Commiting new modules database...${se}\n";
-    system("cvs $dont_do_it commit -m \"  " .
-	   "${modname} --> $area/${modpath}\" modules")
-	&& die "Commit failed\n";
-
-    # we always release "modules" to prevent duplicate
-    system("cvs -Q release -d modules");
-}
-
-print "${so}Importing source.  Enter a commit message in the editor.${se}\n";
-
-system("cvs $dont_do_it import $area/$modpath $vtag $rtag");
-
-print "${so}You are done now.  Go to a different directory, perform a${se}\n".
-    "${us}cvs co ${modname}${ue} ${so}command, and see if your new module" .
-    " builds ok.${se}\n";
-
-print "\nPlease don't forget to edit the parent Makefile to add what you\n".
-    "just imported.\n";
-
-if($dont_do_it) {
-print <<END
-
-
-${so}Since you did not allow to commit anything, you'll have${se}
-${so}to remove the edited modules' database yourself.${se}
-${so}To do this, perform a${se}
-${us}cd ${moduledir}; cvs -Q release -d modules${ue}
-${so}command.${se}
-END
-;
-}
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
deleted file mode 100644
index f2b1666..0000000
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-.include "${.CURDIR}/../Makefile.inc"
-
-.PATH:	${CVSDIR}/src
-.PATH:	${CVSDIR}/lib
-.PATH:	${CVSDIR}/man
-.PATH:	${CVSDIR}
-
-PROG=	cvs
-MAN=	cvs.1 cvs.5
-
-SRCS=	add.c admin.c annotate.c buffer.c \
-	checkin.c checkout.c classify.c client.c \
-	commit.c create_adm.c cvsrc.c diff.c edit.c entries.c error.c \
-	expand_path.c fileattr.c filesubr.c find_names.c \
-	hardlink.c hash.c history.c \
-	ignore.c import.c lock.c log.c login.c logmsg.c main.c mkmodules.c \
-	modules.c myndbm.c no_diff.c parseinfo.c patch.c prepend_args.c \
-	rcs.c rcscmds.c \
-	recurse.c release.c remove.c repos.c root.c run.c scramble.c \
-	server.c stack.c status.c subr.c \
-	tag.c update.c vers_ts.c version.c watch.c \
-	wrapper.c zlib.c
-
-# gnu must be before lib to pick correct regex.h
-CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
-	 -I${DESTDIR}/usr/include/gnu \
-	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
-
-DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
-
-.if ${MK_KERBEROS_SUPPORT} != "no"
-CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
-LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
-DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
-.endif
-
-#
-# Regression test support
-#
-CLEANDIRS+=cvs-sanity
-.ifmake regress
-USERID!=id -u
-regress:
-	mkdir -p ${.OBJDIR}/cvs-sanity/tmp ${.OBJDIR}/cvs-sanity/work
-.if ${USERID} == "0"
-	chown -R nobody ${.OBJDIR}/cvs-sanity
-	(TESTDIR=`sh -c 'cd ${.OBJDIR}/cvs-sanity/tmp && /bin/pwd'`;\
-	        export TESTDIR;\
-		cd ${.OBJDIR}/cvs-sanity/work;\
-		su -m nobody -c "sh ${CVSDIR}/src/sanity.sh ${.OBJDIR}/cvs")
-.else
-	(TESTDIR=`sh -c 'cd ${.OBJDIR}/cvs-sanity/tmp && /bin/pwd'`;\
-		export TESTDIR;\
-		cd ${.OBJDIR}/cvs-sanity/work;\
-		sh ${CVSDIR}/src/sanity.sh ${.OBJDIR}/cvs)
-.endif
-.endif
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.c b/gnu/usr.bin/cvs/cvs/prepend_args.c
deleted file mode 100644
index 12322ce..0000000
--- a/gnu/usr.bin/cvs/cvs/prepend_args.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* prepend_args.c - utilility programs for manpiulating argv[]
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-/* $FreeBSD$ */
-
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include "cvs.h"
-#include "prepend_args.h"
-
-
-/* Find the white-space-separated options specified by OPTIONS, and
-   using BUF to store copies of these options, set ARGV[0], ARGV[1],
-   etc. to the option copies.  Return the number N of options found.
-   Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
-   etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
-prepend_args (options, buf, argv)
-     char const *options;
-     char *buf;
-     char **argv;
-{
-  char const *o = options;
-  char *b = buf;
-  int n = 0;
-
-  for (;;)
-    {
-      while (isspace ((unsigned char) *o))
-	o++;
-      if (!*o)
-	return n;
-      if (argv)
-	argv[n] = b;
-      n++;
-
-      do
-	if ((*b++ = *o++) == '\\' && *o)
-	  b[-1] = *o++;
-      while (*o && ! isspace ((unsigned char) *o));
-
-      *b++ = '\0';
-    }
-}
-
-/* Prepend the whitespace-separated options in OPTIONS to the argument
-   vector of a main program with argument count *PARGC and argument
-   vector *PARGV.  */
-void
-prepend_default_options (options, pargc, pargv)
-     char const *options;
-     int *pargc;
-     char ***pargv;
-{
-  if (options)
-    {
-      char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
-      int argc = *pargc;
-      char * const *argv = *pargv;
-      char **pp = (char **) xmalloc ((prepended + argc + 1) * sizeof *pp);
-      *pargc = prepended + argc;
-      *pargv = pp;
-      *pp++ = *argv++;
-      pp += prepend_args (options, buf, pp);
-      while ((*pp++ = *argv++))
-	continue;
-    }
-}
diff --git a/gnu/usr.bin/cvs/cvs/prepend_args.h b/gnu/usr.bin/cvs/cvs/prepend_args.h
deleted file mode 100644
index 6708442..0000000
--- a/gnu/usr.bin/cvs/cvs/prepend_args.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* prepend_args.h - utilility programs for manpiulating argv[]
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-/* $FreeBSD$ */
-
-/* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
-   current GNU coding standards requires.  Older GNU code used the "PROTO"
-   macro, before the GNU coding standards replaced it.  We use the older
-   form here to keep from having to include another file in cvs/src/main.c.  */
-
-void prepend_default_options PROTO ((char const *, int *, char ***));
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
deleted file mode 100644
index ad07f39..0000000
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../Makefile.inc"
-
-.PATH:	${CVSDIR}/src
-.PATH:	${CVSDIR}/man
-.PATH:	${CVSDIR}
-
-SCRIPTS=	cvsbug
-MAN=		cvsbug.8
-
-CLEANFILES+=    cvsbug
-
-cvsbug: cvsbug.in
-	version=`sed < ${CVSDIR}/configure \
-	    -e '/^[     ]*VERSION=/!d' -e 's/.*=["'\'']\{0,1\}\([^"'\'']*\)["'\'']\{0,1\}/\1/' -e q`; \
-	sed -e "s,@VERSION@,$${version}-FreeBSD,g" \
-	    -e "s,@MKTEMP@,/usr/bin/mktemp,g" \
-	    -e "s,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g" \
-	    -e "s,@SENDMAIL@,/usr/sbin/sendmail,g" \
-	    -e "s,@MKTEMP_FUNCTION@,," \
-	    -e "s,@MKTEMP_SH_FUNCTION@,," \
-	    ${.ALLSRC} > ${.TARGET}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
deleted file mode 100644
index ade0e8b..0000000
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../Makefile.inc"
-
-SRCDIR= ${CVSDIR}/doc
-
-INFO=	cvs cvsclient
-INFOSECTION= "Programming & development tools."
-INFOENTRY_cvs= "* CVS: (cvs).			CVS Reference Manual."
-INFOENTRY_cvsclient= "* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual."
-
-.include <bsd.info.mk>
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
deleted file mode 100644
index 54a727d..0000000
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../Makefile.inc"
-
-.PATH: ${CVSDIR}/src
-.PATH: ${CVSDIR}/lib
-.PATH: ${CVSDIR}/man
-
-LIB=		cvs
-INTERNALLIB=
-
-# gnu must be before lib to pick correct regex.h
-CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \
-	 -I${CVSDIR}/lib
-CFLAGS+= -DHAVE_CONFIG_H
-YFLAGS=
-CLEANFILES+=	config.h
-
-CVS_UMASK_DFLT?=	002
-CVS_ADMIN_GROUP?=	cvsadmin
-CVS_TMPDIR_DFLT?=	/tmp
-
-SRCS=	config.h argmatch.c getdate.y getline.c \
-	getopt.c getopt1.c savecwd.c \
-	sighandle.c stripslash.c \
-	xgetwd.c yesno.c
-
-config.h: config.h.proto ${CVSDIR}/configure
-	version=`sed < ${CVSDIR}/configure \
-	    -e '/^[     ]*VERSION=/!d' -e 's/.*=["'\'']\{0,1\}\([^"'\'']*\)["'\'']\{0,1\}/\1/' -e q`; \
-	sed -e "s,@VERSION@,$${version}-20080310-FreeBSD,g" \
-	    -e "s,@UMASK_DFLT@,${CVS_UMASK_DFLT},g" \
-	    -e "s,@TMPDIR_DFLT@,${CVS_TMPDIR_DFLT},g" \
-	    -e "s,@CVS_ADMIN_GROUP@,${CVS_ADMIN_GROUP},g" \
-	    ${.ALLSRC:M*config.h.proto} > ${.TARGET}
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
deleted file mode 100644
index 30a4f00..0000000
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ /dev/null
@@ -1,532 +0,0 @@
-/* $FreeBSD$ */
-
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Enable AUTH_CLIENT_SUPPORT to enable pserver as a remote access method in
-   the CVS client (default) */
-#define AUTH_CLIENT_SUPPORT 1
-
-/* Define if you want to use the password authenticated server. */
-#define AUTH_SERVER_SUPPORT 1
-
-/* Define if you want CVS to be able to be a remote repository client. */
-#define CLIENT_SUPPORT 1
-
-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-/* #undef CLOSEDIR_VOID */
-
-/* The CVS admin command is restricted to the members of the group
-   CVS_ADMIN_GROUP. If this group does not exist, all users are allowed to run
-   CVS admin. To disable the CVS admin command for all users, create an empty
-   CVS_ADMIN_GROUP by running configure with the --with-cvs-admin-group=
-   option. To disable access control for CVS admin, run configure with the
-   --without-cvs-admin-group option in order to comment out the define below.
-   */
-#define CVS_ADMIN_GROUP "@CVS_ADMIN_GROUP@"
-
-/* When committing a permanent change, CVS and RCS make a log entry of who
-   committed the change. If you are committing the change logged in as "root"
-   (not under "su" or other root-priv giving program), CVS/RCS cannot
-   determine who is actually making the change. As such, by default, CVS
-   prohibits changes committed by users logged in as "root". You can disable
-   checking by passing the "--enable-rootcommit" option to configure or by
-   commenting out the lines below. */
-#define CVS_BADROOT 1
-
-/* The default editor to use, if one does not specify the "-e" option to cvs,
-   or does not have an EDITOR environment variable. If this is not set to an
-   absolute path to an executable, use the shell to find where the editor
-   actually is. This allows sites with /usr/bin/vi or /usr/ucb/vi to work
-   equally well (assuming that their PATH is reasonable). */
-#ifndef EDITOR_DFLT
-#define EDITOR_DFLT "vi"
-#endif
-
-/* Define to enable encryption support. */
-/* #undef ENCRYPTION */
-
-/* Define if this executable will be running on case insensitive file systems.
-   In the client case, this means that it will request that the server pretend
-   to be case insensitive if it isn't already. */
-/* #undef FILENAMES_CASE_INSENSITIVE */
-
-/* When committing or importing files, you must enter a log message. Normally,
-   you can do this either via the -m flag on the command line, the -F flag on
-   the command line, or an editor will be started for you. If you like to use
-   logging templates (the rcsinfo file within the $CVSROOT/CVSROOT directory),
-   you might want to force people to use the editor even if they specify a
-   message with -m or -F. Enabling FORCE_USE_EDITOR will cause the -m or -F
-   message to be appended to the temp file when the editor is started. */
-/* #undef FORCE_USE_EDITOR */
-
-/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
-   in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only
-   relevant when using GSSAPI. */
-/* #undef GSS_C_NT_HOSTBASED_SERVICE */
-
-/* Define if you have the connect function. */
-#define HAVE_CONNECT 1
-
-/* Define if you have the crypt function. */
-#define HAVE_CRYPT 1
-
-/* Define to 1 if you have the <direct.h> header file. */
-/* #undef HAVE_DIRECT_H */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the `dup2' function. */
-#define HAVE_DUP2 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fchdir' function. */
-#define HAVE_FCHDIR 1
-
-/* Define to 1 if you have the `fchmod' function. */
-#define HAVE_FCHMOD 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if your system has a working POSIX `fnmatch' function. */
-#define HAVE_FNMATCH 1
-
-/* Define to 1 if you have the <fnmatch.h> header file. */
-#define HAVE_FNMATCH_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have the `fsync' function. */
-#define HAVE_FSYNC 1
-
-/* Define to 1 if you have the `ftime' function. */
-/* #undef HAVE_FTIME */
-
-/* Define to 1 if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgroups' function. */
-#define HAVE_GETGROUPS 1
-
-/* Define to 1 if you have the `gethostname' function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the `getopt' function. */
-#define HAVE_GETOPT 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getpassphrase' function. */
-/* #undef HAVE_GETPASSPHRASE */
-
-/* Define to 1 if you have the `getpassphrase' function. */
-/* #undef HAVE_GETPASSPHRASE */
-
-/* Define if you have the getspnam function. */
-/* #undef HAVE_GETSPNAM */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if you have GSSAPI with Kerberos version 5 available. */
-/* #undef HAVE_GSSAPI */
-
-/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
-/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-
-/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
-/* #undef HAVE_GSSAPI_GSSAPI_H */
-
-/* Define to 1 if you have the <gssapi.h> header file. */
-/* #undef HAVE_GSSAPI_H */
-
-/* Define to 1 if you have the `initgroups' function. */
-#define HAVE_INITGROUPS 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define if you have MIT Kerberos version 4 available. */
-/* #undef HAVE_KERBEROS */
-
-/* Define to 1 if you have the <krb5.h> header file. */
-/* #undef HAVE_KRB5_H */
-
-/* Define to 1 if you have the `krb_get_err_text' function. */
-/* #undef HAVE_KRB_GET_ERR_TEXT */
-
-/* Define to 1 if you have the `krb' library (-lkrb). */
-/* #undef HAVE_LIBKRB */
-
-/* Define to 1 if you have the `krb4' library (-lkrb4). */
-/* #undef HAVE_LIBKRB4 */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the `login' function. */
-/* #undef HAVE_LOGIN */
-
-/* Define to 1 if you have the `logout' function. */
-/* #undef HAVE_LOGOUT */
-
-/* Define to 1 if you support file names longer than 14 characters. */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define if you have memchr (always for CVS). */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkdir' function. */
-#define HAVE_MKDIR 1
-
-/* Define to 1 if you have the `mknod' function. */
-#define HAVE_MKNOD 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have the `mktemp' function. */
-#define HAVE_MKTEMP 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `nanosleep' function. */
-#define HAVE_NANOSLEEP 1
-
-/* Define to 1 if you have the <ndbm.h> header file. */
-#define HAVE_NDBM_H 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the `readlink' function. */
-#define HAVE_READLINK 1
-
-/* Define to 1 if you have the `regcomp' function. */
-#define HAVE_REGCOMP 1
-
-/* Define to 1 if you have the `regerror' function. */
-#define HAVE_REGERROR 1
-
-/* Define to 1 if you have the `regexec' function. */
-#define HAVE_REGEXEC 1
-
-/* Define to 1 if you have the `regfree' function. */
-#define HAVE_REGFREE 1
-
-/* Define to 1 if you have the `rename' function. */
-#define HAVE_RENAME 1
-
-/* Define to 1 if you have the `select' function. */
-/* #undef HAVE_SELECT */
-
-/* Define if the diff library should use setmode for binary files. */
-/* #undef HAVE_SETMODE */
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if you have the `sigblock' function. */
-#define HAVE_SIGBLOCK 1
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#define HAVE_SIGPROCMASK 1
-
-/* Define to 1 if you have the `sigsetmask' function. */
-#define HAVE_SIGSETMASK 1
-
-/* Define to 1 if you have the `sigvec' function. */
-#define HAVE_SIGVEC 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have strchr (always for CVS). */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#define HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/bsdtypes.h> header file. */
-/* #undef HAVE_SYS_BSDTYPES_H */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#define HAVE_SYS_FILE_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-/* #undef HAVE_SYS_TIMEB_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define to 1 if you have the `tempnam' function. */
-#define HAVE_TEMPNAM 1
-
-/* Define to 1 if you have the `timezone' function. */
-#define HAVE_TIMEZONE 1
-
-/* Define to 1 if you have the `tzset' function. */
-#define HAVE_TZSET 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `usleep' function. */
-/* #undef HAVE_USLEEP */
-
-/* Define to 1 if you have the <utime.h> header file. */
-#define HAVE_UTIME_H 1
-
-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
-#define HAVE_UTIME_NULL 1
-
-/* Define to 1 if you have the `valloc' function. */
-#define HAVE_VALLOC 1
-
-/* Define to 1 if you have the `vfork' function. */
-#define HAVE_VFORK 1
-
-/* Define to 1 if you have the <vfork.h> header file. */
-/* #undef HAVE_VFORK_H */
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define to 1 if you have the `wait3' function. */
-#define HAVE_WAIT3 1
-
-/* Define to 1 if you have the `waitpid' function. */
-#define HAVE_WAITPID 1
-
-/* Define to 1 if `fork' works. */
-#define HAVE_WORKING_FORK 1
-
-/* Define to 1 if `vfork' works. */
-#define HAVE_WORKING_VFORK 1
-
-/* By default, CVS stores its modules and other such items in flat text files
-   (MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a
-   system-supplied ndbm database library and use it instead. That may speed
-   things up, but the default setting generally works fine too. */
-#define MY_NDBM 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bug-cvs@nongnu.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Concurrent Versions System (CVS)"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Concurrent Versions System (CVS) @VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "cvs"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@VERSION@"
-
-/* Path to the pr utility */
-#define PR_PROGRAM "/usr/bin/pr"
-
-/* Define to force lib/regex.c to use malloc instead of alloca. */
-#define REGEX_MALLOC 1
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* The default remote shell to use, if one does not specify the CVS_RSH
-   environment variable. */
-/* FreeBSD.org default is to use ssh.  */
-#define RSH_DFLT "ssh"
-
-/* If you are working with a large remote repository and a 'cvs checkout' is
-   swamping your network and memory, define these to enable flow control. You
-   will end up with even less probability of a consistent checkout (see
-   Concurrency in cvs.texinfo), but CVS doesn't try to guarantee that anyway.
-   The master server process will monitor how far it is getting behind, if it
-   reaches the high water mark, it will signal the child process to stop
-   generating data when convenient (ie: no locks are held, currently at the
-   beginning of a new directory). Once the buffer has drained sufficiently to
-   reach the low water mark, it will be signalled to start again. */
-#define SERVER_FLOWCONTROL 1
-
-/* The high water mark in bytes for server flow control. Required if
-   SERVER_FLOWCONTROL is defined, and useless otherwise. */
-#define SERVER_HI_WATER (2 * 1024 * 1024)
-
-/* The low water mark in bytes for server flow control. Required if
-   SERVER_FLOWCONTROL is defined, and useless otherwise. */
-#define SERVER_LO_WATER (1 * 1024 * 1024)
-
-/* Define if you want CVS to be able to serve repositories to remote clients.
-   */
-#define SERVER_SUPPORT 1
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-/* #undef SIZE_MAX */
-
-/* The default remote shell to use, if one does not specify the CVS_SSH
-   environment variable. */
-#define SSH_DFLT "ssh"
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Directory used for storing temporary files, if not overridden by
-   environment variables or the -T global option. There should be little need
-   to change this (-T is a better mechanism if you need to use a different
-   directory for temporary files). */
-#define TMPDIR_DFLT "@TMPDIR_DFLT@"
-
-/* The default umask to use when creating or otherwise setting file or
-   directory permissions in the repository. Must be a value in the range of 0
-   through 0777. For example, a value of 002 allows group rwx access and world
-   rx access; a value of 007 allows group rwx access but no world access. This
-   value is overridden by the value of the CVSUMASK environment variable,
-   which is interpreted as an octal number. */
-#define UMASK_DFLT @UMASK_DFLT@
-
-/* Define if setmode is required when writing binary data to stdout. */
-/* #undef USE_SETMODE_STDOUT */
-
-/* Define if utime requires write access to the file (true on Windows, but not
-   Unix). */
-/* #undef UTIME_EXPECTS_WRITABLE */
-
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* # undef _ALL_SOURCE */
-#endif
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to force lib/regex.c to define re_comp et al. */
-#define _REGEX_RE_COMP 1
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* We want to always use the GNULIB version of getpass which we have in lib,
-   so define getpass to something that won't conflict with any existing system
-   declarations. */
-/* #define getpass cvs_getpass */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef mode_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* Define as `fork' if `vfork' does not work. */
-/* #undef vfork */
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
deleted file mode 100644
index 7fd67a4..0000000
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../Makefile.inc"
-
-.PATH:	${CVSDIR}/diff
-
-LIB=		diff
-INTERNALLIB=
-
-# gnu must be before lib to pick correct regex.h
-CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \
-	 -I${CVSDIR}/lib -DHAVE_CONFIG_H
-
-SRCS =	diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \
-        normal.c ifdef.c util.c dir.c version.c diff.h side.c
-
-.include <bsd.lib.mk>