aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/sdiff
Commit message (Collapse)AuthorAgeFilesLines
* import sdiff(1) from GSoC 2012Baptiste Daroussin2016-04-293-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import sdiff(1) from the diff version written by Raymond Lai, improved during GSoC 2012 by Jesse Hagewood. Compared to the version done in during that summer of code: - Remove the zlib frontend: zsdiff - Compatible output (column size and separators) with GNU sdiff Compared to GNU sdiff in ports: - The only difference is padding using spaces vs tabs Compared to OpenBSD and NetBSD import: - Implement missing options (including long options) from GNU sdiff - Improved support for the edition mode (signal handling) - Output visually compatible with GNU sdiff: size of columns While here import regression tests from NetBSD adapted to fit the output as expected by GNU sdiff Reviewed by: emaste (in part) Obtained from: OpenBSD, NetBSD, GSoC 2012 Relnotes: yes Differential Revision: https://reviews.freebsd.org/D5981 Differential Revision: https://reviews.freebsd.org/D6032 (diff with NetBSD version) Differential Revision: https://reviews.freebsd.org/D6033 (diff with OpenBSD version) Notes: svn path=/head/; revision=298823
* DIRDEPS_BUILD: Regenerate without local dependencies.Bryan Drewery2016-02-241-2/+0
| | | | | | | | | | | These are no longer needed after the recent 'beforebuild: depend' changes and hooking DIRDEPS_BUILD into a subset of FAST_DEPEND which supports skipping 'make depend'. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=295989
* Add META_MODE support.Simon J. Gerraty2015-06-131-0/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * dirdeps.mk now sets DEP_RELDIRSimon J. Gerraty2015-06-081-2/+0
| | | | | | | | Notes: svn path=/projects/bmake/; revision=284172
| * Updated dependenciesSimon J. Gerraty2014-05-161-1/+0
| | | | | | | | Notes: svn path=/projects/bmake/; revision=266219
| * Updated dependenciesSimon J. Gerraty2014-05-101-0/+2
| | | | | | | | Notes: svn path=/projects/bmake/; revision=265802
| * Updated dependenciesSimon J. Gerraty2013-03-111-0/+1
| | | | | | | | Notes: svn path=/projects/bmake/; revision=248169
| * Updated dependenciesSimon J. Gerraty2013-02-161-2/+0
| | | | | | | | Notes: svn path=/projects/bmake/; revision=246868
| * Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar2012-08-221-0/+21
|/ | | | | | | Requested by: Simon Gerraty <sjg@juniper.net> Notes: svn path=/projects/bmake/; revision=239572
* 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
* Update build skeleton after diffutils 2.8.7 update.Xin LI2007-06-153-209/+27
| | | | Notes: svn path=/head/; revision=170758
* Remove getopt*.c, we already have compatible getopt_long() in libcAndrey A. Chernov2004-02-171-1/+1
| | | | Notes: svn path=/head/; revision=125910
* Make minimal changes to point the users to the Texinfo documentationGiorgos Keramidas2002-12-141-0/+7
| | | | | | | | | | | for more detailed information about sdiff(1). Hopefully this will make it easier to find how `interactive merging' works with sdiff. PR: docs/30618 Submitted by: mark@summersault.com Notes: svn path=/head/; revision=107886
* $Id$ -> $FreeBSD$Peter Wemm1999-08-271-1/+1
| | | | Notes: svn path=/head/; revision=50472
* Switch to contrib versionAndrey A. Chernov1997-10-291-5/+12
| | | | Notes: svn path=/head/; revision=30844
* Update to GNU diffutils 2.6Nate Williams1993-11-121-5/+3
| | | | Notes: svn path=/head/; revision=752
* From: Larry Jones <scjones@thor.sdrc.com>Nate Williams1993-11-082-1/+199
| | | | | | | | | | 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. Notes: svn path=/head/; revision=726
* Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofJ.T. Conklin1993-07-091-0/+11
copying the same files to multiple directories. This should make things easier when it comes time to update to a newer version of diffutils. With this checkin, this brings the netbsd and freebsd diff dists into sync. Notes: svn path=/head/; revision=116