Module Name:	src
Committed By:	wiz
Date:		Sun Jan 26 23:27:54 UTC 2003

Update of /cvsroot/src/gnu/dist/grep
In directory minbar.netbsd.org:/tmp/cvs-serv6956

Log Message:
Reimport grep-2.5 with tag grep-2-5-0 with .cvsignore files removed
beforehand (grrrr, no need for them in a tarball...).


Vendor Tag:	FSF
Release Tags:	grep-2-5-0
		
U src/gnu/dist/grep/ABOUT-NLS
U src/gnu/dist/grep/AUTHORS
U src/gnu/dist/grep/ChangeLog
U src/gnu/dist/grep/Makefile.am
U src/gnu/dist/grep/Makefile.cvs
U src/gnu/dist/grep/NEWS
U src/gnu/dist/grep/README
U src/gnu/dist/grep/README-alpha
U src/gnu/dist/grep/README.DOS
U src/gnu/dist/grep/THANKS
U src/gnu/dist/grep/TODO
U src/gnu/dist/grep/autogen.sh
U src/gnu/dist/grep/configure.in
U src/gnu/dist/grep/grep.spec
C src/gnu/dist/grep/aclocal.m4
C src/gnu/dist/grep/config.hin
U src/gnu/dist/grep/install-sh
U src/gnu/dist/grep/mkinstalldirs
U src/gnu/dist/grep/missing
U src/gnu/dist/grep/config.guess
U src/gnu/dist/grep/config.sub
U src/gnu/dist/grep/INSTALL
U src/gnu/dist/grep/COPYING
C src/gnu/dist/grep/stamp-h.in
C src/gnu/dist/grep/Makefile.in
U src/gnu/dist/grep/depcomp
C src/gnu/dist/grep/configure
N src/gnu/dist/grep/bootstrap/Makefile.am
N src/gnu/dist/grep/bootstrap/Makefile.try
N src/gnu/dist/grep/bootstrap/README
N src/gnu/dist/grep/bootstrap/Makefile.in
U src/gnu/dist/grep/doc/grep.1
U src/gnu/dist/grep/doc/Makefile.am
U src/gnu/dist/grep/doc/egrep.man
U src/gnu/dist/grep/doc/fgrep.man
U src/gnu/dist/grep/doc/grep.texi
U src/gnu/dist/grep/doc/mdate-sh
U src/gnu/dist/grep/doc/texinfo.tex
C src/gnu/dist/grep/doc/Makefile.in
N src/gnu/dist/grep/intl/Makefile
U src/gnu/dist/grep/intl/dcgettext.c
U src/gnu/dist/grep/intl/ChangeLog
U src/gnu/dist/grep/intl/Makefile.in
U src/gnu/dist/grep/intl/bindtextdom.c
U src/gnu/dist/grep/intl/dgettext.c
U src/gnu/dist/grep/intl/explodename.c
U src/gnu/dist/grep/intl/finddomain.c
U src/gnu/dist/grep/intl/gettext.c
U src/gnu/dist/grep/intl/gettextP.h
U src/gnu/dist/grep/intl/hash-string.h
U src/gnu/dist/grep/intl/intl-compat.c
U src/gnu/dist/grep/intl/l10nflist.c
U src/gnu/dist/grep/intl/loadinfo.h
U src/gnu/dist/grep/intl/loadmsgcat.c
U src/gnu/dist/grep/intl/localealias.c
U src/gnu/dist/grep/intl/textdomain.c
U src/gnu/dist/grep/intl/dngettext.c
U src/gnu/dist/grep/intl/config.charset
U src/gnu/dist/grep/intl/dcigettext.c
U src/gnu/dist/grep/intl/dcngettext.c
U src/gnu/dist/grep/intl/eval-plural.h
U src/gnu/dist/grep/intl/gmo.h
U src/gnu/dist/grep/intl/libgnuintl.h
U src/gnu/dist/grep/intl/localcharset.c
U src/gnu/dist/grep/intl/libintl.glibc
U src/gnu/dist/grep/intl/localename.c
U src/gnu/dist/grep/intl/locale.alias
U src/gnu/dist/grep/intl/ngettext.c
U src/gnu/dist/grep/intl/os2compat.c
U src/gnu/dist/grep/intl/os2compat.h
U src/gnu/dist/grep/intl/osdep.c
U src/gnu/dist/grep/intl/plural-exp.c
U src/gnu/dist/grep/intl/plural-exp.h
U src/gnu/dist/grep/intl/plural.c
U src/gnu/dist/grep/intl/plural.y
U src/gnu/dist/grep/intl/ref-add.sin
U src/gnu/dist/grep/intl/ref-del.sin
U src/gnu/dist/grep/lib/alloca.c
U src/gnu/dist/grep/lib/Makefile.am
U src/gnu/dist/grep/lib/atexit.c
U src/gnu/dist/grep/lib/closeout.c
U src/gnu/dist/grep/lib/closeout.h
U src/gnu/dist/grep/lib/error.c
U src/gnu/dist/grep/lib/error.h
U src/gnu/dist/grep/lib/exclude.c
U src/gnu/dist/grep/lib/exclude.h
U src/gnu/dist/grep/lib/fnmatch.c
U src/gnu/dist/grep/lib/fnmatch.h
U src/gnu/dist/grep/lib/getopt.c
U src/gnu/dist/grep/lib/getopt.h
U src/gnu/dist/grep/lib/getopt1.c
U src/gnu/dist/grep/lib/hard-locale.c
U src/gnu/dist/grep/lib/hard-locale.h
U src/gnu/dist/grep/lib/isdir.c
U src/gnu/dist/grep/lib/malloc.c
U src/gnu/dist/grep/lib/memchr.c
U src/gnu/dist/grep/lib/obstack.c
U src/gnu/dist/grep/lib/obstack.h
U src/gnu/dist/grep/lib/quotearg.c
U src/gnu/dist/grep/lib/regex.c
U src/gnu/dist/grep/lib/quotearg.h
U src/gnu/dist/grep/lib/realloc.c
U src/gnu/dist/grep/lib/regex.h
U src/gnu/dist/grep/lib/savedir.c
U src/gnu/dist/grep/lib/savedir.h
U src/gnu/dist/grep/lib/stpcpy.c
U src/gnu/dist/grep/lib/strtol.c
U src/gnu/dist/grep/lib/strtoul.c
U src/gnu/dist/grep/lib/strtoull.c
U src/gnu/dist/grep/lib/strtoumax.c
U src/gnu/dist/grep/lib/xalloc.h
U src/gnu/dist/grep/lib/xmalloc.c
U src/gnu/dist/grep/lib/xstrtol.c
U src/gnu/dist/grep/lib/xstrtol.h
U src/gnu/dist/grep/lib/xstrtoumax.c
N src/gnu/dist/grep/lib/Makefile.in
U src/gnu/dist/grep/lib/posix/regex.h
U src/gnu/dist/grep/lib/posix/Makefile.am
N src/gnu/dist/grep/lib/posix/Makefile.in
N src/gnu/dist/grep/m4/Makefile.am
N src/gnu/dist/grep/m4/codeset.m4
N src/gnu/dist/grep/m4/decl.m4
N src/gnu/dist/grep/m4/djgpp.m4
N src/gnu/dist/grep/m4/dosfile.m4
N src/gnu/dist/grep/m4/envsep.m4
N src/gnu/dist/grep/m4/error.m4
N src/gnu/dist/grep/m4/gettext.m4
N src/gnu/dist/grep/m4/glibc.m4
N src/gnu/dist/grep/m4/glibc21.m4
N src/gnu/dist/grep/m4/header.m4
N src/gnu/dist/grep/m4/iconv.m4
N src/gnu/dist/grep/m4/init.m4
N src/gnu/dist/grep/m4/install.m4
N src/gnu/dist/grep/m4/inttypes_h.m4
N src/gnu/dist/grep/m4/isc-posix.m4
N src/gnu/dist/grep/m4/largefile.m4
N src/gnu/dist/grep/m4/lcmessage.m4
N src/gnu/dist/grep/m4/malloc.m4
N src/gnu/dist/grep/m4/mbstate_t.m4
N src/gnu/dist/grep/m4/missing.m4
N src/gnu/dist/grep/m4/progtest.m4
N src/gnu/dist/grep/m4/realloc.m4
N src/gnu/dist/grep/m4/regex.m4
N src/gnu/dist/grep/m4/sanity.m4
N src/gnu/dist/grep/m4/strerror_r.m4
N src/gnu/dist/grep/m4/uintmax_t.m4
N src/gnu/dist/grep/m4/ulonglong.m4
N src/gnu/dist/grep/m4/xstrtoumax.m4
N src/gnu/dist/grep/m4/Makefile.in
U src/gnu/dist/grep/po/sl.po
U src/gnu/dist/grep/po/ChangeLog
U src/gnu/dist/grep/po/Makefile.in.in
U src/gnu/dist/grep/po/POTFILES.in
U src/gnu/dist/grep/po/cat-id-tbl.c
U src/gnu/dist/grep/po/cs.po
U src/gnu/dist/grep/po/de.po
U src/gnu/dist/grep/po/el.po
U src/gnu/dist/grep/po/eo.po
U src/gnu/dist/grep/po/es.po
U src/gnu/dist/grep/po/et.po
U src/gnu/dist/grep/po/fr.po
U src/gnu/dist/grep/po/gl.po
U src/gnu/dist/grep/po/grep.pot
U src/gnu/dist/grep/po/hr.po
U src/gnu/dist/grep/po/id.po
U src/gnu/dist/grep/po/it.po
U src/gnu/dist/grep/po/ja.po
U src/gnu/dist/grep/po/ko.po
U src/gnu/dist/grep/po/nl.po
U src/gnu/dist/grep/po/no.po
U src/gnu/dist/grep/po/pl.po
U src/gnu/dist/grep/po/pt_BR.po
U src/gnu/dist/grep/po/ru.po
U src/gnu/dist/grep/po/sv.po
U src/gnu/dist/grep/po/bg.po
U src/gnu/dist/grep/po/ca.po
U src/gnu/dist/grep/po/da.po
U src/gnu/dist/grep/po/nb.po
U src/gnu/dist/grep/po/tr.po
U src/gnu/dist/grep/src/ansi2knr.c
U src/gnu/dist/grep/src/Makefile.am
U src/gnu/dist/grep/src/ansi2knr.1
U src/gnu/dist/grep/src/dfa.c
U src/gnu/dist/grep/src/dfa.h
U src/gnu/dist/grep/src/dosbuf.c
U src/gnu/dist/grep/src/getpagesize.h
U src/gnu/dist/grep/src/grep.c
U src/gnu/dist/grep/src/grep.h
U src/gnu/dist/grep/src/grepmat.c
U src/gnu/dist/grep/src/kwset.c
U src/gnu/dist/grep/src/kwset.h
U src/gnu/dist/grep/src/search.c
U src/gnu/dist/grep/src/system.h
U src/gnu/dist/grep/src/vms_fab.c
U src/gnu/dist/grep/src/vms_fab.h
C src/gnu/dist/grep/src/Makefile.in
N src/gnu/dist/grep/tests/Makefile.am
N src/gnu/dist/grep/tests/backref.sh
N src/gnu/dist/grep/tests/bre.awk
N src/gnu/dist/grep/tests/bre.sh
N src/gnu/dist/grep/tests/bre.tests
N src/gnu/dist/grep/tests/empty.sh
N src/gnu/dist/grep/tests/ere.awk
N src/gnu/dist/grep/tests/ere.sh
N src/gnu/dist/grep/tests/ere.tests
N src/gnu/dist/grep/tests/file.sh
N src/gnu/dist/grep/tests/formatbre.awk
N src/gnu/dist/grep/tests/formatere.awk
N src/gnu/dist/grep/tests/khadafy.lines
N src/gnu/dist/grep/tests/khadafy.regexp
N src/gnu/dist/grep/tests/khadafy.sh
N src/gnu/dist/grep/tests/options.sh
N src/gnu/dist/grep/tests/spencer1.awk
N src/gnu/dist/grep/tests/spencer1.sh
N src/gnu/dist/grep/tests/spencer1.tests
N src/gnu/dist/grep/tests/spencer2.sh
N src/gnu/dist/grep/tests/spencer2.tests
N src/gnu/dist/grep/tests/status.sh
N src/gnu/dist/grep/tests/tests
N src/gnu/dist/grep/tests/warning.sh
N src/gnu/dist/grep/tests/Makefile.in
N src/gnu/dist/grep/vms/Makefile.am
N src/gnu/dist/grep/vms/README
N src/gnu/dist/grep/vms/config_vms.h
N src/gnu/dist/grep/vms/make.com
N src/gnu/dist/grep/vms/Makefile.in
N src/gnu/dist/grep/autom4te-2.53.cache/requests
N src/gnu/dist/grep/autom4te-2.53.cache/output.0
N src/gnu/dist/grep/autom4te-2.53.cache/traces.0

7 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jFSF:yesterday -jFSF src/gnu/dist/grep