aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff
Commit message (Collapse)AuthorAgeFilesLines
* Replace again GNU diff with BSD diffBaptiste Daroussin2017-04-204-81/+0
| | | | | | | | | | After a firts failed attempt, BSD diff is now good enough to replace GNU diff. Relnotes: yes Notes: svn path=/head/; revision=317209
* Temporary readd GNU diffBaptiste Daroussin2017-03-194-0/+81
| | | | | | | | 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
* Import diff from OpenBSD and remove GNU diffBaptiste Daroussin2017-03-114-81/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installedEnji Cooper2016-05-041-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* MFHGlen Barber2016-03-101-0/+11
|\ | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=296625
| * DIRDEPS_BUILD: Connect MK_TESTS.Bryan Drewery2016-03-091-0/+11
| | | | | | | | | | | | | | Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=296587
* | More 'tests' packaging fixes.Glen Barber2016-02-031-0/+4
|/ | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=295216
* META MODE: Update dependencies with 'the-lot' and add missing directories.Bryan Drewery2015-12-011-4/+2
| | | | | | | | | | | | | | | | | 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
* Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) andEnji Cooper2015-10-121-7/+4
| | | | | | | | | | | | | | | 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
* META_MODE: Remove DEP_MACHINE from Makefile.depend files.Bryan Drewery2015-09-251-2/+0
| | | | | | | | | This has not been needed since r246865 in projects/bmake. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=288228
* META_MODE: Remove DEP_RELDIR from Makefile.depend files.Bryan Drewery2015-09-251-2/+0
| | | | | | | | | This has not been needed since r284171 in projects/bmake. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=288226
* Add META_MODE support.Simon J. Gerraty2015-06-131-0/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge sync of headSimon J. Gerraty2015-05-272-13/+4
| |\ | |/ |/| | | Notes: svn path=/projects/bmake/; revision=283595
| * Merge from head@274682Simon J. Gerraty2014-11-192-0/+23
| |\ | | | | | | | | | Notes: svn path=/projects/bmake/; revision=274683
| * \ Merge from headSimon J. Gerraty2013-09-051-1/+1
| |\ \ | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=255263
| * \ \ Sync from headSimon J. Gerraty2012-11-043-85/+0
| |\ \ \ | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=242545
| * | | | Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar2012-08-221-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by: Simon Gerraty <sjg@juniper.net> Notes: svn path=/projects/bmake/; revision=239572
* | | | | Install old texinfo pages in the form of mdoc(7) pagesBaptiste Daroussin2015-03-021-1/+4
| | | | | | | | | | | | | | | | | | | | Notes: svn path=/head/; revision=279520
* | | | | Remove gnu/ info pages to unbreak the build with MK_GCC != no, etcEnji Cooper2015-01-022-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by: Ivan Klymenko <fidaj@ukr.net> Reviewed by: bapt Differential Revision: D1412 Notes: svn path=/head/; revision=276565
* | | | | Convert to LIBADDBaptiste Daroussin2014-11-251-2/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Reduce overlinking Notes: svn path=/head/; revision=275077
* | | | Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/testsEnji Cooper2014-10-092-0/+23
| |_|/ |/| | | | | | | | | | | | | | | | | Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=272787
* | | Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note thisJung-uk Kim2013-06-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | actually reverts r250860 and r250861. Reported by: gjb, tinderbox Notes: svn path=/head/; revision=251468
* | | Connect libgnuregex 2.17 to the build.Jung-uk Kim2013-06-051-1/+2
| | | | | | | | | | | | Notes: svn path=/head/; revision=251438
* | | Don't look for headers outside of the source or object directories. InMarcel Moolenaar2013-05-211-1/+1
| |/ |/| | | | | | | | | | | | | | | | | 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
* | Catch up with the subversion conversion and apply these build-time patches.David E. O'Brien2012-08-173-85/+0
|/ | | | Notes: svn path=/head/; revision=239360
* Change all our own code to use st_*tim instead of st_*timespec.Ed Schouten2010-03-282-19/+1
| | | | | | | Also remove some local patches to diff(1) which are now unneeded. Notes: svn path=/head/; revision=205793
* POSIX patch(1) would treat -b as different meaning (the functionalityXin LI2010-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. Notes: svn path=/head/; revision=204227
* style.Makefile(5)David E. O'Brien2007-10-121-2/+2
| | | | Notes: svn path=/head/; revision=172593
* Fix build on arm: time_t on arm is 64 bits while long isXin LI2007-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 Notes: svn path=/head/; revision=170857
* Update build skeleton after diffutils 2.8.7 update.Xin LI2007-06-155-514/+110
| | | | Notes: svn path=/head/; revision=170758
* Suggest the user to use 'diff -urN' instead of 'diff -crN'.Xin LI2005-11-031-1/+1
| | | | | | | | Submitted by: Jimmie James <jimmiejaz@gmail.com> PR: docs/88427 Notes: svn path=/head/; revision=151992
* Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnuAndrey A. Chernov2004-02-171-1/+1
| | | | Notes: svn path=/head/; revision=125931
* Remove files no longer neededAndrey A. Chernov2004-02-161-2/+3
| | | | | | | Switch back to regex.h Notes: svn path=/head/; revision=125895
* Fixed style of DPADD and LDADD assignments as per style.Makefile(5).Ruslan Ermilov2004-02-051-2/+2
| | | | Notes: svn path=/head/; revision=125503
* Add a section documenting the return values from diff.Ceri Davies2004-02-011-0/+5
| | | | | | | | | PR: docs/59991 Submitted by: keramida,Erik Greenwald <erik@smluc.org> MFC After: 1 week Notes: svn path=/head/; revision=125306
* Document -p option of diff.Giorgos Keramidas2002-08-261-0/+3
| | | | | | | | PR: docs/41887 Submitted by: tobez Notes: svn path=/head/; revision=102425
* Add note about the info documentation of diff(1).Giorgos Keramidas2002-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> Notes: svn path=/head/; revision=99815
* s/dir.h/dir.c/Poul-Henning Kamp1999-11-261-1/+1
| | | | Notes: svn path=/head/; revision=53715
* Style changes -- whitespace and sorting.David E. O'Brien1999-11-261-6/+6
| | | | Notes: svn path=/head/; revision=53704
* * Support the environtmental var "DIFF_OPTIONS". Which can hold a set ofDavid E. O'Brien1999-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. Notes: svn path=/head/; revision=53703
* $Id$ -> $FreeBSD$Peter Wemm1999-08-272-2/+2
| | | | Notes: svn path=/head/; revision=50472
* Clarify that "-w" ignores horizontal white space changes.David E. O'Brien1999-08-011-1/+1
| | | | Notes: svn path=/head/; revision=49349
* Add an example for folks who can never remember how to generate aSheldon Hearn1999-07-291-0/+14
| | | | | | | | | | recursive diff for use with send-pr(1). PR: 12440 Requested by: David Kelly <dkelly@hiwaay.net> Notes: svn path=/head/; revision=49224
* Define PR_PROGRAM properlyAndrey A. Chernov1997-10-291-0/+1
| | | | Notes: svn path=/head/; revision=30846
* Switch to contrib versionAndrey A. Chernov1997-10-2927-14601/+11
| | | | Notes: svn path=/head/; revision=30842
* Add (unsigned char) cast to ctype macrosAndrey A. Chernov1997-10-231-5/+5
| | | | Notes: svn path=/head/; revision=30658
* Revert $FreeBSD$ to $Id$Peter Wemm1997-02-222-2/+2
| | | | Notes: svn path=/head/; revision=22996
* Make the long-awaited change from $Id$ to $FreeBSD$Jordan K. Hubbard1997-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. Notes: svn path=/head/; revision=21673
* Make this (hopefully) build now. There was no dir entry.Peter Wemm1997-01-121-2/+4
| | | | Notes: svn path=/head/; revision=21591
* Pick collate info fo rangesAndrey A. Chernov1996-08-201-2/+2
| | | | Notes: svn path=/head/; revision=17709
generated by cgit v1.3 (git 2.53.0) at 2026-03-11 12:43:04 +0000