summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff
AgeCommit message (Collapse)Author
2017-04-20Replace again GNU diff with BSD diffBaptiste Daroussin
After a firts failed attempt, BSD diff is now good enough to replace GNU diff. Relnotes: yes Notes: svn path=/head/; revision=317209
2017-03-19Temporary readd GNU diffBaptiste Daroussin
etcupdate requires --change-group-format it is not easy to implement in bsd diff so for now readd GNU diff Notes: svn path=/head/; revision=315565
2017-03-11Import diff from OpenBSD and remove GNU diffBaptiste Daroussin
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 Notes: svn path=/head/; revision=315051
2016-05-04Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installedEnji Cooper
after r298107 Summary of changes: - Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that namespacing is kept with FILES appropriately, and that this shouldn't need to be repeated if the namespace changes -- only the definition of PACKAGE needs to be changed - Allow PACKAGE to be overridden by callers instead of forcing it to always be `tests`. In the event we get to the point where things can be split up enough in the base system, it would make more sense to group the tests with the blocks they're a part of, e.g. byacc with byacc-tests, etc - Remove PACKAGE definitions where possible, i.e. where FILES wasn't used previously. - Remove unnecessary TESTSPACKAGE definitions; this has been elided into bsd.tests.mk - Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES; ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk. - Fix installation of files under data/ subdirectories in lib/libc/tests/hash and lib/libc/tests/net/getaddrinfo - Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup) Document the proposed changes in share/examples/tests/tests/... via examples so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of replacing FILES. share/mk/bsd.README didn't seem like the appropriate method of communicating that info. MFC after: never probably X-MFC with: r298107 PR: 209114 Relnotes: yes Tested with: buildworld, installworld, checkworld; buildworld, packageworld Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=299094
2016-03-10MFHGlen Barber
Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=296625
2016-03-09DIRDEPS_BUILD: Connect MK_TESTS.Bryan Drewery
Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=296587
2016-02-03More 'tests' packaging fixes.Glen Barber
Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=295216
2015-12-01META MODE: Update dependencies with 'the-lot' and add missing directories.Bryan Drewery
This is not properly respecting WITHOUT or ARCH dependencies in target/. Doing so requires a massive effort to rework targets/ to do so. A better approach will be to either include the SUBDIR Makefiles directly and map to DIRDEPS or just dynamically lookup the SUBDIR. These lose the benefit of having a userland/lib, userland/libexec, etc, though and results in a massive package. The current implementation of targets/ is very unmaintainable. Currently rescue/rescue and sys/modules are still not connected. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=291563
2015-10-12Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) andEnji Cooper
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 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Divison Notes: svn path=/head/; revision=289172
2015-09-25META_MODE: Remove DEP_MACHINE from Makefile.depend files.Bryan Drewery
This has not been needed since r246865 in projects/bmake. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=288228
2015-09-25META_MODE: Remove DEP_RELDIR from Makefile.depend files.Bryan Drewery
This has not been needed since r284171 in projects/bmake. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=288226
2015-06-13Add META_MODE support.Simon J. Gerraty
Off by default, build behaves normally. WITH_META_MODE we get auto objdir creation, the ability to start build from anywhere in the tree. Still need to add real targets under targets/ to build packages. Differential Revision: D2796 Reviewed by: brooks imp Notes: svn path=/head/; revision=284345
2015-05-27Merge sync of headSimon J. Gerraty
Notes: svn path=/projects/bmake/; revision=283595
2015-03-02Install old texinfo pages in the form of mdoc(7) pagesBaptiste Daroussin
Notes: svn path=/head/; revision=279520
2015-01-02Remove gnu/ info pages to unbreak the build with MK_GCC != no, etcEnji Cooper
Reported by: Ivan Klymenko <fidaj@ukr.net> Reviewed by: bapt Differential Revision: D1412 Notes: svn path=/head/; revision=276565
2014-11-25Convert to LIBADDBaptiste Daroussin
Reduce overlinking Notes: svn path=/head/; revision=275077
2014-11-19Merge from head@274682Simon J. Gerraty
Notes: svn path=/projects/bmake/; revision=274683
2014-10-09Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/testsEnji Cooper
Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=272787
2013-09-05Merge from headSimon J. Gerraty
Notes: svn path=/projects/bmake/; revision=255263
2013-06-06Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note thisJung-uk Kim
actually reverts r250860 and r250861. Reported by: gjb, tinderbox Notes: svn path=/head/; revision=251468
2013-06-05Connect libgnuregex 2.17 to the build.Jung-uk Kim
Notes: svn path=/head/; revision=251438
2013-05-21Don't look for headers outside of the source or object directories. InMarcel Moolenaar
particular, don't use DESTDIR. Such creates an unnecessary dependency on the build machine. Obtained from: Juniper Networks, Inc. Notes: svn path=/head/; revision=250860
2012-11-04Sync from headSimon J. Gerraty
Notes: svn path=/projects/bmake/; revision=242545
2012-08-22Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar
Requested by: Simon Gerraty <sjg@juniper.net> Notes: svn path=/projects/bmake/; revision=239572
2012-08-17Catch up with the subversion conversion and apply these build-time patches.David E. O'Brien
Notes: svn path=/head/; revision=239360
2010-03-28Change all our own code to use st_*tim instead of st_*timespec.Ed Schouten
Also remove some local patches to diff(1) which are now unneeded. Notes: svn path=/head/; revision=205793
2010-02-22POSIX patch(1) would treat -b as different meaning (the functionalityXin LI
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. Notes: svn path=/head/; revision=204227
2007-10-12style.Makefile(5)David E. O'Brien
Notes: svn path=/head/; revision=172593
2007-06-17Fix build on arm: time_t on arm is 64 bits while long isXin LI
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 Notes: svn path=/head/; revision=170857
2007-06-15Update build skeleton after diffutils 2.8.7 update.Xin LI
Notes: svn path=/head/; revision=170758
2005-11-03Suggest the user to use 'diff -urN' instead of 'diff -crN'.Xin LI
Submitted by: Jimmie James <jimmiejaz@gmail.com> PR: docs/88427 Notes: svn path=/head/; revision=151992
2004-02-17Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnuAndrey A. Chernov
Notes: svn path=/head/; revision=125931
2004-02-16Remove files no longer neededAndrey A. Chernov
Switch back to regex.h Notes: svn path=/head/; revision=125895
2004-02-05Fixed style of DPADD and LDADD assignments as per style.Makefile(5).Ruslan Ermilov
Notes: svn path=/head/; revision=125503
2004-02-01Add a section documenting the return values from diff.Ceri Davies
PR: docs/59991 Submitted by: keramida,Erik Greenwald <erik@smluc.org> MFC After: 1 week Notes: svn path=/head/; revision=125306
2002-08-26Document -p option of diff.Giorgos Keramidas
PR: docs/41887 Submitted by: tobez Notes: svn path=/head/; revision=102425
2002-07-11Add note about the info documentation of diff(1).Giorgos Keramidas
It contains a detailed description of the =format option part. PR: docs/36464 Submitted by: Gary W. Swearingen <swear@blarg.net> Notes: svn path=/head/; revision=99815
1999-11-26s/dir.h/dir.c/Poul-Henning Kamp
Notes: svn path=/head/; revision=53715
1999-11-26Style changes -- whitespace and sorting.David E. O'Brien
Notes: svn path=/head/; revision=53704
1999-11-26* Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofDavid E. O'Brien
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. Notes: svn path=/head/; revision=53703
1999-08-27$Id$ -> $FreeBSD$Peter Wemm
Notes: svn path=/head/; revision=50472
1999-08-01Clarify that "-w" ignores horizontal white space changes.David E. O'Brien
Notes: svn path=/head/; revision=49349
1999-07-29Add an example for folks who can never remember how to generate aSheldon Hearn
recursive diff for use with send-pr(1). PR: 12440 Requested by: David Kelly <dkelly@hiwaay.net> Notes: svn path=/head/; revision=49224
1997-10-29Define PR_PROGRAM properlyAndrey A. Chernov
Notes: svn path=/head/; revision=30846
1997-10-29Switch to contrib versionAndrey A. Chernov
Notes: svn path=/head/; revision=30842
1997-10-23Add (unsigned char) cast to ctype macrosAndrey A. Chernov
Notes: svn path=/head/; revision=30658
1997-02-22Revert $FreeBSD$ to $Id$Peter Wemm
Notes: svn path=/head/; revision=22996
1997-01-14Make the long-awaited change from $Id$ to $FreeBSD$Jordan K. Hubbard
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. Notes: svn path=/head/; revision=21673
1997-01-12Make this (hopefully) build now. There was no dir entry.Peter Wemm
Notes: svn path=/head/; revision=21591
1996-08-20Pick collate info fo rangesAndrey A. Chernov
Notes: svn path=/head/; revision=17709
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-25 09:01:07 +0000