src/gnu, branch main FreeBSD source tree Retire GNU diff3 2026-02-22T01:53:19+00:00 Ed Maste emaste@FreeBSD.org 2024-10-02T16:30:57+00:00 9a44e42a2b8f5f78695016344e760d72ad0b1220 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 
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 warning 2026-02-13T20:19:58+00:00 Ed Maste emaste@FreeBSD.org 2025-11-18T13:21:03+00:00 fd52a9becc62f721ad6a61c7301559afaedee010 And bump WARNS to 2 
And bump WARNS to 2
diff3: Move to own package 2025-10-01T13:23:40+00:00 Ed Maste emaste@FreeBSD.org 2025-10-01T09:28:56+00:00 e7258c42520c18c034f644b97377d8d2a0ad8b7c 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 
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
build: remove the last vestiges of lint support 2025-06-05T23:55:34+00:00 Brooks Davis brooks@FreeBSD.org 2025-06-05T23:55:34+00:00 8e35800732573de6c4bc1dd3ac420447fca96231 Commit 1cbb58886a47 (shipped in 12.0.0) removed all lint infrastructure. A bunch of NO_LINT definitions remained (perhaps as a bootstrapping measture). Remove them. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50704 
Commit 1cbb58886a47 (shipped in 12.0.0) removed all lint infrastructure.
A bunch of NO_LINT definitions remained (perhaps as a bootstrapping
measture).  Remove them.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D50704
Remove residual blank line at start of Makefile 2024-07-15T22:43:39+00:00 Warner Losh imp@FreeBSD.org 2024-07-15T04:46:32+00:00 e9ac41698b2f322d55ccf9da50a3596edb2c1800 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 
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
misc: Remove ancient SCCS tags. 2023-11-27T05:23:27+00:00 Warner Losh imp@FreeBSD.org 2023-11-23T17:21:37+00:00 e717cb04bec1a0a911dee2fbbef6079f7107adc5 Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. This is for the misfits that have only a few: COPYRIGHT, gnu, tools, rescue, and etc. Sponsored by: Netflix 
Remove ancient SCCS tags from the tree, automated scripting, with two
minor fixup to keep things compiling. All the common forms in the tree
were removed with a perl script.

This is for the misfits that have only a few: COPYRIGHT, gnu, tools,
rescue, and etc.

Sponsored by:		Netflix
Remove $FreeBSD$: one-line sh pattern 2023-08-16T17:55:03+00:00 Warner Losh imp@FreeBSD.org 2023-08-16T17:55:03+00:00 d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ 
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
Remove $FreeBSD$: two-line .h pattern 2023-08-16T17:54:16+00:00 Warner Losh imp@FreeBSD.org 2023-08-16T17:54:16+00:00 b3e7694832e81d7a904a10f525f8797b753bf0d3 Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/ 
Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/
Update/fix Makefile.depend for userland 2023-04-19T00:14:23+00:00 Simon J. Gerraty sjg@FreeBSD.org 2023-04-19T00:14:23+00:00 d9a42747950146bf03cda7f6e25d219253f8a57a 






gnu diff3: apply patch to committed src, rather than at build time
2022-11-14T02:33:40+00:00

Ed Maste
emaste@FreeBSD.org

2022-11-11T19:48:40+00:00

3a13b5ac83a100ebb5a0da0579e418f19b3b630b

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





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