git: b6cde3ca5dbf - stable/15 - release: split up Oracle Cloudware tools

The branch stable/15 has been updated by dch:

URL: https://cgit.FreeBSD.org/src/commit/?id=b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d

commit b6cde3ca5dbfe6168f41ffb1cf4f90fb38961b3d
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2025-10-20 09:35:37 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2025-10-22 08:17:48 +0000

    release: split up  Oracle Cloudware tools
    
    Sometimes one or the other but not both tools are present; this ensures
    that all cases are correctly handled.
    
    Reported by:    cperciva
    Approved by:    cperciva (re)
    Sponsored by:   SkunkWerks, GmbH
    
    Reviewed by:    cperciva
    Differential Revision:  https://reviews.freebsd.org/D53186
    
    MFC after:      2 days
    
    (cherry picked from commit 81d807a90611a4980cae843b404d99c27edc1893)
---
 release/Makefile.oracle | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/release/Makefile.oracle b/release/Makefile.oracle
index 3573f29b96c1..6d792cc9fd30 100644
--- a/release/Makefile.oracle
+++ b/release/Makefile.oracle
@@ -24,21 +24,28 @@
 # Syncing to all sites should take 2-3 hours after this final step.
 
 ORACLE_BASENAME=	${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/}
-ORACLE_PORTS_LIST=	ftp/curl emulators/qemu@tools
 CLEANFILES+=	cw-oracle-portinstall
 
 cw-oracle-portinstall: .PHONY
-.if !exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)
-. if !exists(${PORTSDIR}/Makefile)
-.  if !exists(/usr/local/sbin/pkg-static)
+.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile)
+. if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
-.  endif
-	env ASSUME_ALWAYS_YES=yes pkg install -y ${ORACLE_PORTS_LIST}
+. endif
+.endif
+.if !exists(/usr/local/bin/curl)
+. if !exists(${PORTSDIR}/Makefile)
+	env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl
 . else
 	env UNAME_r=${UNAME_r} make -C \
 		${PORTSDIR}/ftp/curl \
 		BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \
 		all install clean
+. endif
+.endif
+.if !exists(/usr/local/bin/qemu-img)
+. if !exists(${PORTSDIR}/Makefile)
+	env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools
+. else
 	env UNAME_r=${UNAME_r} FLAVOR=tools make -C \
 		${PORTSDIR}/emulators/qemu \
 		BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \