The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e4988ba172a84b35abab8ce065f2210dab70f148
commit e4988ba172a84b35abab8ce065f2210dab70f148
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2025-06-16 17:14:36 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2025-06-16 17:14:36 +0000
Revert "Makefile.inc1: allow real-update-packages to be called
independently"
Revert b44147bb1245. It doesn't work right since it doesn't bootstrap
things quite right. It doesn't look trivial to fix, so revert until a
proper solution is done (though maybe that solution is just do `make
update-packages` and not document/support these other targets).
Suggested by: bapt, emaste
Sponsored by: Netflix
---
Makefile.inc1 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 97bd81f3263f..ea498a8afae4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2035,8 +2035,8 @@ PKGMAKEARGS+= PKG_VERSION=${PKG_VERSION} \
packages: .PHONY
${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages
-update-packages: stage-packages .PHONY
- ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} create-packages
real-update-packages
+update-packages: .PHONY
+ ${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages
package-pkg: .PHONY
rm -rf /tmp/ports.${TARGET} || :
@@ -2048,7 +2048,8 @@ package-pkg: .PHONY
real-packages: stage-packages create-packages sign-packages .PHONY
-real-update-packages: .PHONY
+real-update-packages: stage-packages .PHONY
+ ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages
.if defined(PKG_VERSION_FROM_DIR)
@echo "==> Checking for new packages (comparing ${PKG_VERSION} to
${PKG_VERSION_FROM})"
@for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \
