summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3/Makefile
AgeCommit message (Collapse)Author
2025-10-01diff3: Move to own packageEd Maste
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
2024-07-15Remove residual blank line at start of MakefileWarner Losh
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
2023-08-16Remove $FreeBSD$: one-line sh patternWarner Losh
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
2022-11-13gnu diff3: apply patch to committed src, rather than at build timeEd Maste
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
2020-09-18build: provide a default WARNS for all in-tree buildsKyle Evans
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
2017-03-12Convert gnu to using SRCTOPWarner Losh
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
2010-02-22POSIX patch(1) would treat -b as different meaning (the functionalityXin LI
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
2007-06-15Update build skeleton after diffutils 2.8.7 update.Xin LI
Notes: svn path=/head/; revision=170758
2004-02-17Remove getopt*.c, we already have compatible getopt_long() in libcAndrey A. Chernov
Notes: svn path=/head/; revision=125910
1999-08-27$Id$ -> $FreeBSD$Peter Wemm
Notes: svn path=/head/; revision=50472
1997-10-29Switch to contrib versionAndrey A. Chernov
Notes: svn path=/head/; revision=30843
1993-11-12Updated to GNU diffutils 2.6Nate Williams
Notes: svn path=/head/; revision=753
1993-11-08From: Larry Jones <scjones@thor.sdrc.com>Nate Williams
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
1993-07-09Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofJ.T. Conklin
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
1993-06-29GNU3 Diff 2.3Nate Williams
Notes: svn path=/vendor/misc-GNU/dist2/; revision=70