summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/diff
Commit message (Collapse)AuthorAgeFilesLines
* MFC r289172,r290254:ngie2017-02-091-7/+4
| | | | | | | | | | | | | | | | r289172: Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and netbsd-tests.test.mk (r289151) - Eliminate explicit OBJTOP/SRCTOP setting - Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk - Remove unnecessary TESTSDIR setting - Use SRCTOP where possible for clarity r290254: Remove unused variable (SRCDIR)
* MFC r272777,r272779,r272780,r272781,r272782,r272783,r272784,r272787,r272788:ngie2015-01-012-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r272777: Integrate usr.sbin/nmtree/tests from NetBSD into atf/kyua In collaboration with: pho Sponsored by: EMC / Isilon Storage Division r272779: Integrate usr.sbin/basename/tests from NetBSD into atf/kyua In collaboration with: pho Sponsored by: EMC / Isilon Storage Division r272780: Integrate usr.bin/cmp/tests from NetBSD into atf/kyua In collaboration with: sjg Sponsored by: EMC / Isilon Storage Division r272781: Integrate usr.bin/dirname/tests from NetBSD into atf/kyua In collaboration with: pho, sjg Sponsored by: EMC / Isilon Storage Division r272782: Integrate bin/sleep/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division r272783: Integrate usr.bin/cut/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division r272784: Integrate usr.bin/grep/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division r272787: Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests Sponsored by: EMC / Isilon Storage Division r272788: Integrate usr.bin/gzip/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division
* Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note thisjkim2013-06-061-2/+1
| | | | | | actually reverts r250860 and r250861. Reported by: gjb, tinderbox
* Connect libgnuregex 2.17 to the build.jkim2013-06-051-1/+2
|
* Don't look for headers outside of the source or object directories. Inmarcel2013-05-211-1/+1
| | | | | | | particular, don't use DESTDIR. Such creates an unnecessary dependency on the build machine. Obtained from: Juniper Networks, Inc.
* Catch up with the subversion conversion and apply these build-time patches.obrien2012-08-173-85/+0
|
* Change all our own code to use st_*tim instead of st_*timespec.ed2010-03-282-19/+1
| | | | Also remove some local patches to diff(1) which are now unneeded.
* POSIX patch(1) would treat -b as different meaning (the functionalitydelphij2010-02-221-1/+1
| | | | | | | 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.
* style.Makefile(5)obrien2007-10-121-2/+2
|
* Fix build on arm: time_t on arm is 64 bits while long isdelphij2007-06-171-3/+10
| | | | | | | | | | | | 32 bits, so subsequent compile time assertion: sizeof inf->stat.st_mtime <= sizeof sec Would fail because of that. This change is suitable for general consumption as well, but fix it in our local patchset as we are near a code freeze. Submitted by: cognet
* Update build skeleton after diffutils 2.8.7 update.delphij2007-06-155-514/+110
|
* Suggest the user to use 'diff -urN' instead of 'diff -crN'.delphij2005-11-031-1/+1
| | | | | Submitted by: Jimmie James <jimmiejaz@gmail.com> PR: docs/88427
* Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnuache2004-02-171-1/+1
|
* Remove files no longer neededache2004-02-161-2/+3
| | | | Switch back to regex.h
* Fixed style of DPADD and LDADD assignments as per style.Makefile(5).ru2004-02-051-2/+2
|
* Add a section documenting the return values from diff.ceri2004-02-011-0/+5
| | | | | | PR: docs/59991 Submitted by: keramida,Erik Greenwald <erik@smluc.org> MFC After: 1 week
* Document -p option of diff.keramida2002-08-261-0/+3
| | | | | PR: docs/41887 Submitted by: tobez
* Add note about the info documentation of diff(1).keramida2002-07-111-0/+4
| | | | | | | It contains a detailed description of the =format option part. PR: docs/36464 Submitted by: Gary W. Swearingen <swear@blarg.net>
* s/dir.h/dir.c/phk1999-11-261-1/+1
|
* Style changes -- whitespace and sorting.obrien1999-11-261-6/+6
|
* * Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofobrien1999-11-262-1/+13
| | | | | | | 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.
* $Id$ -> $FreeBSD$peter1999-08-272-2/+2
|
* Clarify that "-w" ignores horizontal white space changes.obrien1999-08-011-1/+1
|
* Add an example for folks who can never remember how to generate asheldonh1999-07-291-0/+14
| | | | | | | recursive diff for use with send-pr(1). PR: 12440 Requested by: David Kelly <dkelly@hiwaay.net>
* Define PR_PROGRAM properlyache1997-10-291-0/+1
|
* Switch to contrib versionache1997-10-2927-14601/+11
|
* Add (unsigned char) cast to ctype macrosache1997-10-231-5/+5
|
* Revert $FreeBSD$ to $Id$peter1997-02-222-2/+2
|
* Make the long-awaited change from $Id$ to $FreeBSD$jkh1997-01-142-2/+2
| | | | | | | | 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.
* Make this (hopefully) build now. There was no dir entry.peter1997-01-121-2/+4
|
* Pick collate info fo rangesache1996-08-201-2/+2
|
* There's no -p flag to our diff.jkh1996-05-261-3/+0
|
* Fix some argument ordering and redundancy bogons.jkh1996-05-261-6/+6
|
* Correct the path used to invoke "pr" if the "-l" option to diff ismpp1996-01-101-3/+3
| | | | | | | specified. Also invoke "pr" with "-F" instead of the invalid "-f" option. Obtained from: NetBSD-bugs mailing list (PR# 1896)
* This commit was generated by cvs2svn to compensate for changes in r13122,peter1995-12-301-69/+0
| | | | which included commits to RCS files with non-trunk default branches.
* recording cvs-1.6 file deathpeter1995-12-302-5661/+0
|
* Add setlocale LC_CTYPEache1995-10-311-0/+6
|
* Build and install diff.info..peter1995-10-292-1/+10
| | | | | | | 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
* This commit was generated by cvs2svn to compensate for changes in r11905,peter1995-10-291-0/+3916
|\ | | | | | | which included commits to RCS files with non-trunk default branches.
| * Import diff-2.7's diff.texi which I left out last time.peter1995-10-291-0/+3916
| | | | | | | | Suggested by: bde
* | Merge in/out comflicts caused by Diffutils-2.7 import...peter1995-10-2816-931/+978
| | | | | | | | | | In future, it should be as easy as "update -j ....", but this time I had to go over it by hand. Not nice..
* | This commit was generated by cvs2svn to compensate for changes in r11884,peter1995-10-284-13/+436
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Import GNU diffutils 2.7peter1995-10-2822-1700/+3094
| | | | | | | | | | | | | | | | Note, this is going to be messy.. 2.3 was vendor-branch imported, while 2.6 was done as a delta. Sigh. I'm importing this on a vendor branch so that it will be easier to deal with next time.. (cvs-1.6 wants rcs-5.7, and rcs-5.7 suggests diffutils-2.7)
| * This commit was manufactured by cvs2svn to create branch 'GNU'.cvs2svn1993-11-126-0/+3271
| |
* | Remove trailing whitespace.rgrimes1995-05-306-11/+11
| |
* | Fixed non-conflict errors that occur when changes made to the local files arenate1995-02-201-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same as the changes made in the repository. This is often seen by people with remote CVS trees that have applied their local patches to the master site. a 'cvs update' will show bogus conflicts. Obtained from: CVS mailing list, Stig<stig@inse.com> In diffutils 2.6 and 2.7, diff3 -A complains about identical overlapping changes. They're different from the ancestor but not from each other... Why bother? The patch below fixes this nonsense and preserves [B]ackwards compatiblity with the -B flag (also --show-bogus-conflicts). Party on... Stig
* | Use -lgnuregexache1995-01-112-3/+5
| |
* | Update to GNU diffutils 2.6nate1993-11-123-0/+172
| | | | | | | | (Forgot to cvs add them)
* | Updated to GNU diffutils 2.6nate1993-11-1220-1606/+2495
| |
* | From: Larry Jones <scjones@thor.sdrc.com>nate1993-11-082-1/+474
| | | | | | | | | | | | | | 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.
OpenPOWER on IntegriCloud