CVS commit: src/external/gpl2/diffutils

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

Module Name:    src
Committed By:   christos
Date:           Wed Jan 13 03:39:28 UTC 2016

Modified Files:
        src/external/gpl2/diffutils/dist/lib: xmalloc.c
        src/external/gpl2/diffutils/dist/src: context.c diff.c diff3.c sdiff.c
            system.h
Added Files:
        src/external/gpl2/diffutils: Makefile Makefile.inc diffutils2netbsd
        src/external/gpl2/diffutils/bin: Makefile Makefile.inc
        src/external/gpl2/diffutils/bin/cmp: Makefile
        src/external/gpl2/diffutils/bin/diff: Makefile
        src/external/gpl2/diffutils/bin/diff3: Makefile
        src/external/gpl2/diffutils/bin/sdiff: Makefile
        src/external/gpl2/diffutils/include: config.h fnmatch.h regex.h
        src/external/gpl2/diffutils/lib: Makefile

Log Message:
merge conflicts, new reach-over Makefiles


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/Makefile \
    src/external/gpl2/diffutils/Makefile.inc \
    src/external/gpl2/diffutils/diffutils2netbsd
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/bin/Makefile \
    src/external/gpl2/diffutils/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/bin/cmp/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/bin/diff/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/bin/diff3/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/bin/sdiff/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/diffutils/dist/lib/xmalloc.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/diffutils/dist/src/context.c \
    src/external/gpl2/diffutils/dist/src/diff.c \
    src/external/gpl2/diffutils/dist/src/diff3.c \
    src/external/gpl2/diffutils/dist/src/sdiff.c \
    src/external/gpl2/diffutils/dist/src/system.h
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/include/config.h \
    src/external/gpl2/diffutils/include/fnmatch.h \
    src/external/gpl2/diffutils/include/regex.h
cvs rdiff -u -r0 -r1.1 src/external/gpl2/diffutils/lib/Makefile

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