From e9e6ce55a057ce72f26a8176a6d26482ebbd183f Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Sun, 4 May 2025 18:11:00 +0100 Subject: do not commit - 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. my intent with this diff is to get consensus in favour of this change from the pkgbase side, then upstream this and have the new upstream bmake and the local changes (share/mk/Makefile, generate-ucl.sh) committed at the same time. so, this diff is not intended to be committed as-is. --- contrib/bmake/bsd.after-import.mk | 3 ++- release/packages/generate-ucl.sh | 8 ++++++++ share/mk/Makefile | 1 + usr.bin/bmake/Makefile | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/contrib/bmake/bsd.after-import.mk b/contrib/bmake/bsd.after-import.mk index 74811e98f979..52c893ac84fd 100644 --- a/contrib/bmake/bsd.after-import.mk +++ b/contrib/bmake/bsd.after-import.mk @@ -118,7 +118,8 @@ _makefile: echo 'CFLAGS${.space}+= -I$${.CURDIR}'; echo; \ echo '# for after-import'; \ echo 'CLEANDIRS${.space}+= ${HOST_OS}'; \ - echo 'CLEANFILES${.space}+= bootstrap'; echo; \ + echo 'CLEANFILES${.space}+= bootstrap'; \ + echo 'PACKAGE${.space}= bmake'; echo; \ ${MAKEFILE_SED} \ ${1 2:L:@n@-e '/start-delete$n/,/end-delete$n/d'@} \ ${BMAKE_SRC}/Makefile; \ diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index b7d6875b3eb1..2798753e7651 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -43,6 +43,14 @@ main() { periodic) pkgdeps="cron" ;; + sendmail) + # requires make to rebuild its configuration file + pkgdeps="bmake" + ;; + yp) + # requires make to rebuild the NIS database + pkgdeps="bmake" + ;; # -dev packages that have no corresponding non-dev package # as a dependency. diff --git a/share/mk/Makefile b/share/mk/Makefile index 29de04f89670..bd4067cd8a14 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -10,6 +10,7 @@ UPDATE_DEPENDFILE= no .include +PACKAGE= bmake FILES= \ auto.obj.mk \ bsd.README \ diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index a8bcdfd9f859..304c78302a1c 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -10,6 +10,7 @@ CFLAGS+= -I${.CURDIR} # for after-import CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap +PACKAGE= bmake # $Id: Makefile,v 1.133 2025/03/08 20:12:56 sjg Exp $ -- cgit v1.2.3