From 14f57afb852ddac57d3a277aef375cda5666c620 Mon Sep 17 00:00:00 2001
From: Lexi Winter <ivy@FreeBSD.org>
Date: Sun, 27 Jul 2025 12:24:33 +0100
Subject: [PATCH] bmake: Add a package for bmake and share/mk

bmake along with /usr/share/mk seems to meet the criteria for being in
its own package: it's self-contained and the majority of users (who are
using binary packages) don't need to install it, so it doesn't belong in
FreeBSD-utilities.  Instead, put it in its own package.

Add a dependency on the new package from:

- sendmail (uses make to build its configuration)
- NIS (uses make to build the database).

But not from examples, because while some of the examples do require
make, they are intended as examples rather than something to be used
directly.

Reviewed by:	manu, sjg
Differential Revision:	https://reviews.freebsd.org/D50149
---
 UPDATING                           | 5 +++++
 release/packages/ucl/bmake-all.ucl | 5 +++++
 release/packages/ucl/sendmail.ucl  | 7 +++++++
 release/packages/ucl/yp.ucl        | 7 +++++++
 share/mk/Makefile                  | 1 +
 usr.bin/bmake/Makefile.inc         | 2 ++
 6 files changed, 27 insertions(+)
 create mode 100644 release/packages/ucl/bmake-all.ucl
 create mode 100644 release/packages/ucl/sendmail.ucl
 create mode 100644 release/packages/ucl/yp.ucl

diff --git a/UPDATING b/UPDATING
index 611bb62eefcc..5fb9574dfb0f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20250727:
+	bmake (i.e., /usr/bin/make and /usr/share/mk) has moved to a new
+	package, FreeBSD-bmake.  If you use pkgbase and you need make, you
+	should install this package.
+
 20250727:
 	LLVM's debugging assertions are now disabled in main by default.
 	The WITH_LLVM_ASSERTIONS src.conf(5) knob should be used to
diff --git a/release/packages/ucl/bmake-all.ucl b/release/packages/ucl/bmake-all.ucl
new file mode 100644
index 000000000000..ee8175d1dd8a
--- /dev/null
+++ b/release/packages/ucl/bmake-all.ucl
@@ -0,0 +1,5 @@
+comment = "Program maintenance utility"
+desc = <<EOD
+make(1) allows programs to be built from source files based on a specification
+of the program's dependencies called a Makefile.
+EOD
diff --git a/release/packages/ucl/sendmail.ucl b/release/packages/ucl/sendmail.ucl
new file mode 100644
index 000000000000..c79775eb8af4
--- /dev/null
+++ b/release/packages/ucl/sendmail.ucl
@@ -0,0 +1,7 @@
+deps {
+	# sendmail requires make to build its configuration file.
+	"bmake": {
+		version = "${VERSION}"
+		origin = "base"
+	}
+}
diff --git a/release/packages/ucl/yp.ucl b/release/packages/ucl/yp.ucl
new file mode 100644
index 000000000000..14b2327e56d1
--- /dev/null
+++ b/release/packages/ucl/yp.ucl
@@ -0,0 +1,7 @@
+deps {
+	# YP requires bmake to rebuild the database.
+	"bmake": {
+		version = "${VERSION}"
+		origin = "base"
+	}
+}
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 837f7da68b4b..4ab5c8cc314b 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -10,6 +10,7 @@ UPDATE_DEPENDFILE= no
 
 .include <src.opts.mk>
 
+PACKAGE= bmake
 FILES=	\
 	auto.obj.mk \
 	bsd.README \
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index 5140bd18bb37..a064563a2283 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -3,6 +3,8 @@ MK_host_egacy= no
 
 .sinclude <src.opts.mk>
 
+PACKAGE?= bmake
+
 .if defined(.PARSEDIR)
 # make sure this is available to unit-tests/Makefile
 .export SRCTOP