d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
196,481 Commits 6 Branches 133 Tags 2.6 GiB
ca7fe84a61
Commit Graph

52 Commits

Author SHA1 Message Date
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
Ed Schouten
99742a231f Change all our own code to use st_*tim instead of st_*timespec. 
Also remove some local patches to diff(1) which are now unneeded.
 2010-03-28 13:16:08 +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
9ba2645aa7 Fix build on arm: time_t on arm is 64 bits while long is 
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
 2007-06-17 00:43:50 +00:00
Xin LI
b6ee6822f3 Update build skeleton after diffutils 2.8.7 update. 2007-06-15 07:09:34 +00:00
Xin LI
165edba6a7 Suggest the user to use 'diff -urN' instead of 'diff -crN'. 
Submitted by:	Jimmie James  <jimmiejaz@gmail.com>
PR:		docs/88427
 2005-11-03 03:49:57 +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
Ceri Davies
92f367e5f2 Add a section documenting the return values from diff. 
PR:		docs/59991
Submitted by:	keramida,Erik Greenwald <erik@smluc.org>
MFC After:	1 week
 2004-02-01 13:52:19 +00:00
Giorgos Keramidas
ba4be60fa0 Document -p option of diff. 
PR:		docs/41887
Submitted by:	tobez
 2002-08-26 00:13:06 +00:00
Giorgos Keramidas
1a7a931a26 Add note about the info documentation of diff(1). 
It contains a detailed description of the =format option part.

PR:		docs/36464
Submitted by:	Gary W. Swearingen <swear@blarg.net>
 2002-07-11 21:11:26 +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
David E. O'Brien
6e7b8c218d Clarify that "-w" ignores horizontal white space changes. 1999-08-01 16:07:09 +00:00
Sheldon Hearn
ae996dee37 Add an example for folks who can never remember how to generate a 
recursive diff for use with send-pr(1).

PR:	12440
Requested by:	David Kelly <dkelly@hiwaay.net>
 1999-07-29 18:57:39 +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
Andrey A. Chernov
93bb056022 Add (unsigned char) cast to ctype macros 1997-10-23 02:22:51 +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
076bf094bc Make this (hopefully) build now. There was no dir entry. 1997-01-12 07:18:05 +00:00
Andrey A. Chernov
587ad47a9b Pick collate info fo ranges 1996-08-20 14:22:57 +00:00
Jordan K. Hubbard
bdf70e6dd8 There's no -p flag to our diff. 1996-05-26 22:27:52 +00:00
Jordan K. Hubbard
cfbaf65d93 Fix some argument ordering and redundancy bogons. 1996-05-26 21:56:24 +00:00
Mike Pritchard
78f03ca729 Correct the path used to invoke "pr" if the "-l" option to diff is 
specified.  Also invoke "pr" with "-F" instead of the invalid "-f"
option.

Obtained from:  NetBSD-bugs mailing list (PR# 1896)
 1996-01-10 10:41:47 +00:00
Peter Wemm
6065a0be11 This commit was generated by cvs2svn to compensate for changes in r13122, 
which included commits to RCS files with non-trunk default branches.
 1995-12-30 19:02:48 +00:00
Peter Wemm
a5b996a7ec recording cvs-1.6 file death 1995-12-30 19:02:48 +00:00
Andrey A. Chernov
46e838403c Add setlocale LC_CTYPE 1995-10-31 08:44:21 +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
Peter Wemm
d0a68277c8 This commit was generated by cvs2svn to compensate for changes in r11905, 
which included commits to RCS files with non-trunk default branches.
 1995-10-29 08:52:27 +00:00
Peter Wemm
d4722af88f Import diff-2.7's diff.texi which I left out last time. 
Suggested by: bde
 1995-10-29 08:52:27 +00:00
Peter Wemm
efce212686 Merge in/out comflicts caused by Diffutils-2.7 import... 
In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand.  Not nice..
 1995-10-28 19:11:01 +00:00
Peter Wemm
ec9763539f Import GNU diffutils 2.7 
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)
 1995-10-28 18:51:33 +00:00
Peter Wemm
ffb120cc30 This commit was generated by cvs2svn to compensate for changes in r11884, 
which included commits to RCS files with non-trunk default branches.
 1995-10-28 18:51:33 +00:00
Rodney W. Grimes
4399be3cbd Remove trailing whitespace. 1995-05-30 05:05:38 +00:00
Nate Williams
f8972f58e8 Fixed non-conflict errors that occur when changes made to the local files are 
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
 1995-02-20 18:47:18 +00:00
Andrey A. Chernov
49b95be03e Use -lgnuregex 1995-01-11 05:45:48 +00:00
Nate Williams
45a409ee7b Update to GNU diffutils 2.6 
(Forgot to cvs add them)
 1993-11-12 07:06:35 +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