CVS commit: src/external/gpl2/grep

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Jan 10 22:16:40 UTC 2016

Modified Files:
        src/external/gpl2/grep/dist/doc: grep.1 grep.texi
        src/external/gpl2/grep/dist/lib: getopt.c hard-locale.c regex.c
            savedir.c
        src/external/gpl2/grep/dist/src: ansi2knr.c dfa.c grep.c search.c
Added Files:
        src/external/gpl2/grep: Makefile Makefile.inc grep2netbsd
        src/external/gpl2/grep/bin: Makefile
        src/external/gpl2/grep/include: config.h
        src/external/gpl2/grep/lib: Makefile
        src/external/gpl2/grep/po: cs.gmo de.gmo el.gmo eo.gmo es.gmo et.gmo
            fr.gmo gl.gmo hr.gmo id.gmo it.gmo ja.gmo ko.gmo nl.gmo no.gmo
            pl.gmo pt_BR.gmo ru.gmo sl.gmo sv.gmo

Log Message:
- merge conflicts, enable wide char support.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl2/grep/Makefile \
    src/external/gpl2/grep/Makefile.inc src/external/gpl2/grep/grep2netbsd
cvs rdiff -u -r0 -r1.1 src/external/gpl2/grep/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/grep/dist/doc/grep.1 \
    src/external/gpl2/grep/dist/doc/grep.texi
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/grep/dist/lib/getopt.c \
    src/external/gpl2/grep/dist/lib/hard-locale.c \
    src/external/gpl2/grep/dist/lib/regex.c \
    src/external/gpl2/grep/dist/lib/savedir.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/grep/dist/src/ansi2knr.c \
    src/external/gpl2/grep/dist/src/dfa.c \
    src/external/gpl2/grep/dist/src/grep.c \
    src/external/gpl2/grep/dist/src/search.c
cvs rdiff -u -r0 -r1.1 src/external/gpl2/grep/include/config.h
cvs rdiff -u -r0 -r1.1 src/external/gpl2/grep/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/grep/po/cs.gmo \
    src/external/gpl2/grep/po/de.gmo src/external/gpl2/grep/po/el.gmo \
    src/external/gpl2/grep/po/eo.gmo src/external/gpl2/grep/po/es.gmo \
    src/external/gpl2/grep/po/et.gmo src/external/gpl2/grep/po/fr.gmo \
    src/external/gpl2/grep/po/gl.gmo src/external/gpl2/grep/po/hr.gmo \
    src/external/gpl2/grep/po/id.gmo src/external/gpl2/grep/po/it.gmo \
    src/external/gpl2/grep/po/ja.gmo src/external/gpl2/grep/po/ko.gmo \
    src/external/gpl2/grep/po/nl.gmo src/external/gpl2/grep/po/no.gmo \
    src/external/gpl2/grep/po/pl.gmo src/external/gpl2/grep/po/pt_BR.gmo \
    src/external/gpl2/grep/po/ru.gmo src/external/gpl2/grep/po/sl.gmo \
    src/external/gpl2/grep/po/sv.gmo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.