aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Retire GNU diff3Ed Maste2026-02-221-22/+0
| | | | | | | | | | | | We added the option to build BSD diff3 in commit 2201f7c49f11 ("Build BSD diff3 if GNU diff3 is disabled.") and made it the default in 4d5c434ed16e ("diff3: use bsd diff3 by default") after resolving deficiencies relative to GNU diff3. Thus, we can now remove the GNU diff3 build infrastructure and source. Reviewed by: bapt, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46878
* diff3: Use a format string to quiet a compiler warningEd Maste2026-02-131-1/+1
| | | | And bump WARNS to 2
* diff3: Move to own packageEd Maste2025-10-011-1/+2
| | | | | | | | | diff3 is the last remaining GPL-licensed userland component. Move it to its own package, so that it may be excluded if desired. Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52810
* Remove residual blank line at start of MakefileWarner Losh2024-07-151-1/+0
| | | | | | | This is a residual of the $FreeBSD$ removal. MFC After: 3 days (though I'll just run the command on the branches) Sponsored by: Netflix
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-161-1/+0
| | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
* gnu diff3: apply patch to committed src, rather than at build timeEd Maste2022-11-141-6/+0
| | | | | | | | This appears to be a leftover from the time we used a less-capable VCS. Reviewed by: delphij MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37368
* build: provide a default WARNS for all in-tree buildsKyle Evans2020-09-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The current default is provided in various Makefile.inc in some top-level directories and covers a good portion of the tree, but doesn't cover parts of the build a little deeper (e.g. libcasper). Provide a default in src.sys.mk and set WARNS to it in bsd.sys.mk if that variable is defined. This lets us relatively cleanly provide a default WARNS no matter where you're building in the src tree without breaking things outside of the tree. Crunchgen has been updated as a bootstrap tool to work on this change because it needs r365605 at a minimum to succeed. The cleanup necessary to successfully walk over this change on WITHOUT_CLEAN builds has been added. There is a supplemental project to this to list all of the warnings that are encountered when the environment has WARNS=6 NO_WERROR=yes: https://warns.kevans.dev -- this project will hopefully eventually go away in favor of CI doing a much better job than it. Reviewed by: emaste, brooks, ngie (all earlier version) Reviewed by: emaste, arichardson (depend-cleanup.sh change) Differential Revision: https://reviews.freebsd.org/D26455 Notes: svn path=/head/; revision=365887
* Convert gnu to using SRCTOPWarner Losh2017-03-121-6/+6
| | | | | | | | | | | | | | | Prefer SRCTOP over CURDIR/../../contrib, etc. However, retain the "up one level" instances of ../ because they are really relative to this part of the tree and not a means to find the root of the tree. As such, it's better to leave them since that further the goal of being able to move directories if watned to in the future. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice) Notes: svn path=/head/; revision=315175
* 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-151-4/+16
| | | | 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
* $Id$ -> $FreeBSD$Peter Wemm1999-08-271-1/+1
| | | | Notes: svn path=/head/; revision=50472
* Switch to contrib versionAndrey A. Chernov1997-10-291-4/+11
| | | | Notes: svn path=/head/; revision=30843
* Updated to GNU diffutils 2.6Nate Williams1993-11-121-5/+2
| | | | Notes: svn path=/head/; revision=753
* From: Larry Jones <scjones@thor.sdrc.com>Nate Williams1993-11-081-1/+1
| | | | | | | | | | 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-7/+9
| | | | | | | | | | | | 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
* GNU3 Diff 2.3Nate Williams1993-06-291-0/+9
Notes: svn path=/vendor/misc-GNU/dist2/; revision=70
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-16 21:42:11 +0000