Commit graph

29 commits

Author SHA1 Message Date
Baptiste Daroussin
2c5ddcf8b6 Temporary readd GNU diff
etcupdate requires --change-group-format it is not easy to implement
in bsd diff so for now readd GNU diff
2017-03-19 17:19:59 +00:00
Baptiste Daroussin
3bbe3f672e Import diff from OpenBSD and remove GNU diff
Some of the modifications from the previous summer of code has been integrated
Modification for compatibility with GNU diff output has been added

Main difference with OpenBSD:
Implement multiple GNU diff options:
* --ignore-file-name-case
* --no-ignore-file-name-case
* --normal
* --tabsize
* --strip-trailing-cr
Make diff -p compatible with GNU diff
Implement diff -l
Make diff -r compatible with GNU diff

Capsicumize diffing 2 regular files
Add a simple test suite

Approved by:	AsiaBSDcon devsummit
Obtained from:	OpenBSD, GSoC
Relnotes:	yes
2017-03-11 05:01:29 +00:00
Baptiste Daroussin
db997e07c0 Install old texinfo pages in the form of mdoc(7) pages 2015-03-02 11:49:01 +00:00
Enji Cooper
c7fab04170 Remove gnu/ info pages to unbreak the build with MK_GCC != no, etc
Reported by: Ivan Klymenko <fidaj@ukr.net>
Reviewed by: bapt
Differential Revision: D1412
2015-01-02 20:34:55 +00:00
Baptiste Daroussin
ee5a34ecba Convert to LIBADD
Reduce overlinking
2014-11-25 21:18:18 +00:00
Enji Cooper
9752f4a74f Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests
Sponsored by: EMC / Isilon Storage Division
2014-10-09 02:07:34 +00:00
Jung-uk Kim
ee852b9c75 Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this
actually reverts r250860 and r250861.

Reported by:	gjb, tinderbox
2013-06-06 11:59:38 +00:00
Jung-uk Kim
a1e98bc995 Connect libgnuregex 2.17 to the build. 2013-06-05 21:31:06 +00:00
Marcel Moolenaar
a2f3be3d7a Don't look for headers outside of the source or object directories. In
particular, don't use DESTDIR. Such creates an unnecessary dependency
on the build machine.

Obtained from:	Juniper Networks, Inc.
2013-05-21 17:28:19 +00:00
David E. O'Brien
6f5e32433e Catch up with the subversion conversion and apply these build-time patches. 2012-08-17 18:20:38 +00:00
Xin LI
aa74e2f883 POSIX patch(1) would treat -b as different meaning (the functionality
is to be provided by --suffix).  Looking at the usage here in diffutils,
it seems that we can just get rid of the -b .orig stuff.  This resolves
a problem that can triggered if we move toward to a more permissively
licensed patch(1) program.
2010-02-22 22:32:24 +00:00
David E. O'Brien
feaa2b360f style.Makefile(5) 2007-10-12 18:03:00 +00:00
Xin LI
b6ee6822f3 Update build skeleton after diffutils 2.8.7 update. 2007-06-15 07:09:34 +00:00
Andrey A. Chernov
49b4df9afb Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu 2004-02-17 05:38:45 +00:00
Andrey A. Chernov
af210d1ee6 Remove files no longer needed
Switch back to regex.h
2004-02-16 22:56:36 +00:00
Ruslan Ermilov
47d7e8a96f Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
Poul-Henning Kamp
6512591f8d s/dir.h/dir.c/ 1999-11-26 12:29:48 +00:00
David E. O'Brien
c0bc11462b Style changes -- whitespace and sorting. 1999-11-26 03:06:33 +00:00
David E. O'Brien
20ee132cae * Support the environtmental var "DIFF_OPTIONS". Which can hold a set of
default options for diff.  These options are interpreted first and can be
overwritten by explicit command line parameters.
* Add the "-o" option to specify old-traditional output style.
* Add utility functions for env vars obtained from GNU Grep 2.3h.
1999-11-26 02:51:44 +00:00
Peter Wemm
9b7a44a60e $Id$ -> $FreeBSD$ 1999-08-27 23:37:10 +00:00
Andrey A. Chernov
5a77e9d43b Define PR_PROGRAM properly 1997-10-29 17:35:54 +00:00
Andrey A. Chernov
cd56389a5d Switch to contrib version 1997-10-29 16:36:57 +00:00
Peter Wemm
fce15c9ab3 Revert $FreeBSD$ to $Id$ 1997-02-22 15:48:31 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Peter Wemm
39db722b77 Build and install diff.info..
As Bruce said, this is a little bogus, it'd be nice if bsd.prog.mk knew
about .texi in the same way as it does man pages..

Submitted by: bde
1995-10-29 09:08:35 +00:00
Andrey A. Chernov
49b95be03e Use -lgnuregex 1995-01-11 05:45:48 +00:00
Nate Williams
c7ed70b75d Updated to GNU diffutils 2.6 1993-11-12 07:05:54 +00:00
Nate Williams
c4b4b635be From: Larry Jones <scjones@thor.sdrc.com>
Subject: man pages for diff et al.

I finally got tired of not having man pages for diff and friends, so I
edited the appropriate sections of the texinfo manual into man format.
1993-11-08 01:36:04 +00:00
Nate Williams
515337cf85 GNU Diff 2.3 1993-06-29 08:13:44 +00:00