Merge branch 'vendor/DIFFUTILS'
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 2 Apr 2011 21:33:20 +0000 (11:33 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 2 Apr 2011 21:35:02 +0000 (11:35 -1000)
1  2 
contrib/diffutils/README.DELETED
contrib/diffutils/README.DRAGONFLY
contrib/diffutils/config.h
contrib/diffutils/src/diff.c
contrib/diffutils/src/diff.h
gnu/usr.bin/diff/Makefile
gnu/usr.bin/diff/doc/Makefile
gnu/usr.bin/diff3/Makefile
gnu/usr.bin/sdiff/Makefile

index df9a7dc,0000000..df9a7dc
mode 100644,000000..100644
--- /dev/null
index e4cee01,0000000..e4cee01
mode 100644,000000..100644
--- /dev/null
index 6d0de7f,0000000..6d0de7f
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index ccc2b21,0000000..39375a9
mode 100644,000000..100644
--- /dev/null
@@@ -1,31 -1,0 +1,31 @@@
- .PATH: ${.CURDIR}/../../../contrib/diffutils-2.8/src \
-        ${.CURDIR}/../../../contrib/diffutils-2.8/lib \
-        ${.CURDIR}/../../../contrib/diffutils-2.8/man
 +# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.13 1999/11/26 12:29:48 phk Exp $
 +# $DragonFly: src/gnu/usr.bin/diff/Makefile,v 1.6 2007/08/05 05:47:00 pavalos Exp $
 +
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8/src
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8/lib
++.PATH: ${.CURDIR}/../../../contrib/diffutils/src \
++       ${.CURDIR}/../../../contrib/diffutils/lib \
++       ${.CURDIR}/../../../contrib/diffutils/man
 +
 +PROG= diff
 +SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
 +      normal.c side.c util.c
 +
 +SRCS+=xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \
 +      strftime.c c-stack.c basename.c exclude.c hard-locale.c \
 +      posixver.c file-type.c version-etc.c
 +
 +# Important for ctype macros!
 +CFLAGS+=-funsigned-char
 +
- CONTRIBDIR=${.CURDIR}/../../../contrib/diffutils-2.8/src
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils/src
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils/lib
 +CFLAGS+=-DHAVE_CONFIG_H
 +
 +SUBDIR+=doc
 +
 +DPADD+=       ${LIBGNUREGEX}
 +LDADD+=       -lgnuregex
 +
++CONTRIBDIR=${.CURDIR}/../../../contrib/diffutils/src
 +
 +.include <bsd.prog.mk>
index 76dd578,0000000..d7042d2
mode 100644,000000..100644
--- /dev/null
@@@ -1,10 -1,0 +1,10 @@@
- SRCDIR=${.CURDIR}/../../../../contrib/diffutils-2.8/doc
 +# $FreeBSD: src/gnu/usr.bin/diff/doc/Makefile,v 1.6 1999/08/27 23:35:33 peter Exp $
 +# $DragonFly: src/gnu/usr.bin/diff/doc/Makefile,v 1.4 2007/08/05 05:47:00 pavalos Exp $
 +
 +INFO = diff
 +
 +INFOENTRY_diff= "* DIFF: (diff).                 DIFF/PATCH Reference Manual."
 +
++SRCDIR=${.CURDIR}/../../../../contrib/diffutils/doc
 +
 +.include <bsd.info.mk>
index 6bd1f31,0000000..c40bdd2
mode 100644,000000..100644
--- /dev/null
@@@ -1,23 -1,0 +1,23 @@@
- .PATH:  ${.CURDIR}/../../../contrib/diffutils-2.8/src \
-         ${.CURDIR}/../../../contrib/diffutils-2.8/lib \
-         ${.CURDIR}/../../../contrib/diffutils-2.8/man
 +# $FreeBSD: src/gnu/usr.bin/diff3/Makefile,v 1.6 1999/08/27 23:35:34 peter Exp $
 +# $DragonFly: src/gnu/usr.bin/diff3/Makefile,v 1.4 2007/08/05 05:47:00 pavalos Exp $
 +
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8/src
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8/lib
++.PATH:  ${.CURDIR}/../../../contrib/diffutils/src \
++        ${.CURDIR}/../../../contrib/diffutils/lib \
++        ${.CURDIR}/../../../contrib/diffutils/man
 +
 +PROG=         diff3
 +SRCS+=        xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c version-etc.c
 +
 +# Important for ctype macros!
 +CFLAGS+=-funsigned-char
 +
- CONTRIBDIR=${.CURDIR}/../../../contrib/diffutils-2.8/src
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils/src
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils/lib
 +CFLAGS+=-DHAVE_CONFIG_H
 +CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
 +
++CONTRIBDIR=${.CURDIR}/../../../contrib/diffutils/src
 +SRCS+=        diff3.c.patch
 +
 +.include <bsd.prog.mk>
index f158948,0000000..71b1fa6
mode 100644,000000..100644
--- /dev/null
@@@ -1,25 -1,0 +1,25 @@@
- .PATH:  ${.CURDIR}/../../../contrib/diffutils-2.8/src \
-         ${.CURDIR}/../../../contrib/diffutils-2.8/lib \
-         ${.CURDIR}/../../../contrib/diffutils-2.8/man
 +# $FreeBSD: src/gnu/usr.bin/sdiff/Makefile,v 1.5 1999/08/27 23:37:00 peter Exp $
 +# $DragonFly: src/gnu/usr.bin/sdiff/Makefile,v 1.4 2007/08/05 05:47:00 pavalos Exp $
 +
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8/src
- CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils-2.8/lib
++.PATH:  ${.CURDIR}/../../../contrib/diffutils/src \
++        ${.CURDIR}/../../../contrib/diffutils/lib \
++        ${.CURDIR}/../../../contrib/diffutils/man
 +
 +PROG=         sdiff
 +
 +SRCS+=        error.c xmalloc.c c-stack.c basename.c strtoumax.c version-etc.c \
 +              exitfail.c
 +
 +# Important for ctype macros!
 +CFLAGS+=-funsigned-char
 +
- CONTRIBDIR=${.CURDIR}/../../../contrib/diffutils-2.8/src
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils/src
++CFLAGS+=-I${.CURDIR}/../../../contrib/diffutils/lib
 +CFLAGS+=-DHAVE_CONFIG_H
 +CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
 +
++CONTRIBDIR=${.CURDIR}/../../../contrib/diffutils/src
 +SRCS+=sdiff.c.patch
 +
 +.include <bsd.prog.mk>