git: 43d9a1336dde - main - */*: convert to cmake:indirect
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Apr 2024 09:20:06 UTC
The branch main has been updated by makc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=43d9a1336ddec3ddb059a4c78b33888272692c36
commit 43d9a1336ddec3ddb059a4c78b33888272692c36
Author: Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2024-04-11 09:14:35 +0000
Commit: Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2024-04-11 09:16:53 +0000
*/*: convert to cmake:indirect
Convert bunch of ports to USES=cmake:indirect
---
astro/siril/Makefile | 3 +--
audio/guidoar/Makefile | 3 +--
cad/sweethome3d/Makefile | 4 +++-
databases/pecl-couchbase/Makefile | 4 +---
devel/jiri/Makefile | 3 +--
devel/py-keystone-engine/Makefile | 4 +---
devel/py-lief/Makefile | 3 +--
devel/rubygem-aws-crt/Makefile | 3 +--
devel/tinygo/Makefile | 3 +--
devel/tomlplusplus/Makefile | 3 +--
graphics/waffle/Makefile | 4 +---
java/openjfx14/Makefile | 3 +--
lang/rust/Makefile | 3 +--
math/py-z3-solver/Makefile | 4 +---
multimedia/py-opentimelineio/Makefile | 3 +--
multimedia/wlrobs/Makefile | 3 +--
print/paps/Makefile | 3 +--
science/PETSc/Makefile | 3 +--
science/nwchem/Makefile | 3 +--
science/py-dlib/Makefile | 3 +--
security/tfhe/Makefile | 3 +--
security/wazuh-agent/Makefile | 3 +--
textproc/py-cchardet/Makefile | 4 +---
textproc/uim-qt5/Makefile | 3 +--
x11/virglrenderer/Makefile | 3 +--
25 files changed, 27 insertions(+), 54 deletions(-)
diff --git a/astro/siril/Makefile b/astro/siril/Makefile
index de10cc9424b7..3fd1eed7c49b 100644
--- a/astro/siril/Makefile
+++ b/astro/siril/Makefile
@@ -16,7 +16,6 @@ BROKEN_i386= undefined reference to `__atomic_load' and `__atomic_compare_exchan
BROKEN= requires OpenMP support that is missing on this architecture
.endif
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libcfitsio.so:astro/cfitsio \
libconfig.so:devel/libconfig \
@@ -37,7 +36,7 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libwcs.so:astro/wcslib
LIB_DEPENDS+= libopencv_photo.so:graphics/opencv # for some reason, configure fails without opencv, but executable only links to opencv-core
-USES= compiler:c++11-lang desktop-file-utils gettext \
+USES= cmake:indirect compiler:c++11-lang desktop-file-utils gettext \
gnome meson pkgconfig jpeg shared-mime-info tar:bz2
USE_GNOME= atk cairo gdkpixbuf2 gtk30 intltool pango
diff --git a/audio/guidoar/Makefile b/audio/guidoar/Makefile
index a6a86f79a540..c2af3b7d08bf 100644
--- a/audio/guidoar/Makefile
+++ b/audio/guidoar/Makefile
@@ -8,9 +8,8 @@ WWW= https://github.com/grame-cncm/guidoar
LICENSE= MPL20
-BUILD_DEPENDS= cmake:devel/cmake-core
-USES= gmake
+USES= cmake:indirect gmake
USE_LDCONFIG= yes
USE_GITHUB= yes
diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index dafcc580f3ee..bbfd5d9cb16e 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -12,9 +12,11 @@ WWW= https://www.sweethome3d.com/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.TXT
-BUILD_DEPENDS= cmake:devel/cmake-core java3d>=0:java/java3d
+BUILD_DEPENDS= java3d>=0:java/java3d
RUN_DEPENDS= java3d>=0:java/java3d
+USES= cmake:indirect
+
USE_ANT= yes
USE_JAVA= 8
diff --git a/databases/pecl-couchbase/Makefile b/databases/pecl-couchbase/Makefile
index 4d3fb26b1b0b..e9b2de931bd6 100644
--- a/databases/pecl-couchbase/Makefile
+++ b/databases/pecl-couchbase/Makefile
@@ -10,9 +10,7 @@ WWW= https://pecl.php.net/package/couchbase \
LICENSE= APACHE20
-BUILD_DEPENDS= cmake:devel/cmake-core
-
-USES= compiler:c++17-lang php:build,pecl
+USES= cmake:indirect compiler:c++17-lang php:build,pecl
CONFIGURE_ARGS= COUCHBASE_CMAKE_EXTRA="-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE=OFF"
diff --git a/devel/jiri/Makefile b/devel/jiri/Makefile
index 413ad8c4840a..93ca580ccd46 100644
--- a/devel/jiri/Makefile
+++ b/devel/jiri/Makefile
@@ -13,10 +13,9 @@ WWW= https://fuchsia.googlesource.com/jiri
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cmake:devel/cmake-core
RUN_DEPENDS= git:devel/git
-USES= go:modules ninja:build
+USES= cmake:indirect go:modules ninja:build
GITHASH= 1eee1043d12d1baabae7f2466cc0b1646395e32c
TIMESTAMP= 2020-08-28T00:00:00.000000
diff --git a/devel/py-keystone-engine/Makefile b/devel/py-keystone-engine/Makefile
index 11356d245488..961f86376252 100644
--- a/devel/py-keystone-engine/Makefile
+++ b/devel/py-keystone-engine/Makefile
@@ -11,9 +11,7 @@ WWW= https://www.keystone-engine.org/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
-BUILD_DEPENDS= cmake:devel/cmake-core
-
-USES= pkgconfig python
+USES= cmake:indirect pkgconfig python
USE_PYTHON= distutils autoplist
# setup.py loses track of its cwd when it switches over to the CMake build
diff --git a/devel/py-lief/Makefile b/devel/py-lief/Makefile
index 533a44a4d024..f848e0e0a02b 100644
--- a/devel/py-lief/Makefile
+++ b/devel/py-lief/Makefile
@@ -12,9 +12,8 @@ LICENSE= APACHE20
# Note: cmake is needed to build, but distutils is used directly.
# If USES= cmake is set, the build will not work.
-BUILD_DEPENDS= cmake:devel/cmake-core
-USES= python zip
+USES= cmake:indirect python zip
USE_PYTHON= concurrent distutils
PY_VER= ${PYTHON_VER:S/.//}
diff --git a/devel/rubygem-aws-crt/Makefile b/devel/rubygem-aws-crt/Makefile
index 65e63bc0df42..229a612a3bc1 100644
--- a/devel/rubygem-aws-crt/Makefile
+++ b/devel/rubygem-aws-crt/Makefile
@@ -10,10 +10,9 @@ WWW= https://github.com/awslabs/aws-crt-ruby
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= cmake:devel/cmake-core
RUN_DEPENDS= rubygem-ffi>=0:devel/rubygem-ffi
-USES= gem python:env shebangfix
+USES= cmake:indirect gem python:env shebangfix
SHEBANG_GLOB= *.py *.sh
diff --git a/devel/tinygo/Makefile b/devel/tinygo/Makefile
index a393cbcda437..ab69000c4194 100644
--- a/devel/tinygo/Makefile
+++ b/devel/tinygo/Makefile
@@ -11,10 +11,9 @@ WWW= https://tinygo.org/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cmake:devel/cmake-core
TEST_DEPENDS= qemu-system-arm:emulators/qemu
-USES= gmake go:modules,run ninja:build python:build
+USES= cmake:indirect gmake go:modules,run ninja:build python:build
USE_GITHUB= yes
GH_ACCOUNT= tinygo-org
diff --git a/devel/tomlplusplus/Makefile b/devel/tomlplusplus/Makefile
index b9c79dfd0b03..96154aef1615 100644
--- a/devel/tomlplusplus/Makefile
+++ b/devel/tomlplusplus/Makefile
@@ -10,10 +10,9 @@ WWW= https://marzer.github.io/tomlplusplus/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cmake:devel/cmake-core
TEST_DEPENDS= catch>0:devel/catch
-USES= compiler:c++17-lang meson pkgconfig
+USES= cmake:indirect compiler:c++17-lang meson pkgconfig
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= marzer
diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile
index c3c65d3d1c4d..c778ea06a157 100644
--- a/graphics/waffle/Makefile
+++ b/graphics/waffle/Makefile
@@ -16,9 +16,7 @@ WWW= https://www.waffle-gl.org/
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= cmake:devel/cmake-core
-
-USES= compiler:c11 gl localbase meson pkgconfig python:build
+USES= cmake:indirect compiler:c11 gl localbase meson pkgconfig python:build
USE_GITLAB= yes
GL_SITE= https://gitlab.freedesktop.org
GL_ACCOUNT= mesa
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
index 35add470069a..cb61a0f8389f 100644
--- a/java/openjfx14/Makefile
+++ b/java/openjfx14/Makefile
@@ -33,7 +33,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
+USES= cmake:indirect gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
sqlite xorg
USE_GITHUB= yes
@@ -72,7 +72,6 @@ TEST_VARS= AWT_TEST=true FULL_TEST=true
# Gradle calls CMake during the build
WEBKIT_IMPLIES= MEDIA
-WEBKIT_BUILD_DEPENDS= cmake:devel/cmake-core
WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu
WEBKIT_USES= bison gmake gperf perl5 python:build ruby:build
WEBKIT_USE= GNOME=libxslt,libxml2 \
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index d7568c882d81..568ec5e938a1 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -26,10 +26,9 @@ ONLY_FOR_ARCHS?= aarch64 amd64 armv7 i386 powerpc64 powerpc64le powerpc \
riscv64
ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap compiler
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libcurl.so:ftp/curl
-USES= cpe ninja:build pkgconfig python:build ssl tar:xz
+USES= cmake:indirect cpe ninja:build pkgconfig python:build ssl tar:xz
CPE_VENDOR= rust-lang
diff --git a/math/py-z3-solver/Makefile b/math/py-z3-solver/Makefile
index 846b2a1d1877..35c5a153dff6 100644
--- a/math/py-z3-solver/Makefile
+++ b/math/py-z3-solver/Makefile
@@ -15,9 +15,7 @@ LICENSE_FILE= ${WRKSRC}/../../../LICENSE.txt
BROKEN_armv7= fails to compile on 13.1 and 14: clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268009
BROKEN_riscv64= fails to configure, see https://github.com/Z3Prover/z3/issues/6183
-BUILD_DEPENDS= cmake:devel/cmake-core
-
-USES= compiler:c++11-lang python
+USES= cmake:indirect compiler:c++11-lang python
USE_PYTHON= distutils autoplist
USE_GITHUB= yes
diff --git a/multimedia/py-opentimelineio/Makefile b/multimedia/py-opentimelineio/Makefile
index 4f4e7f321e8e..feea202aa04b 100644
--- a/multimedia/py-opentimelineio/Makefile
+++ b/multimedia/py-opentimelineio/Makefile
@@ -11,11 +11,10 @@ WWW= https://github.com/PixarAnimationStudios/OpenTimelineIO
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libImath-3_1.so:math/Imath
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
-USES= compiler:c++14-lang python
+USES= cmake:indirect compiler:c++14-lang python
USE_PYTHON= distutils concurrent # autoplist is broken, see https://github.com/PixarAnimationStudios/OpenTimelineIO/issues/1205
USE_GITHUB= yes
diff --git a/multimedia/wlrobs/Makefile b/multimedia/wlrobs/Makefile
index ae8abf8cce69..6ea8d8d3c8a0 100644
--- a/multimedia/wlrobs/Makefile
+++ b/multimedia/wlrobs/Makefile
@@ -12,11 +12,10 @@ WWW= https://hg.sr.ht/~scoopta/wlrobs
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING.md
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libobs.so:multimedia/obs-studio
-USES= compiler:c11 meson pkgconfig
+USES= cmake:indirect compiler:c11 meson pkgconfig
DATADIR= ${PREFIX}/lib/obs-plugins
PORTDATA= lib${PORTNAME}.so
diff --git a/print/paps/Makefile b/print/paps/Makefile
index 3009f948d559..56765eb3b298 100644
--- a/print/paps/Makefile
+++ b/print/paps/Makefile
@@ -11,10 +11,9 @@ WWW= https://paps.sourceforge.net/
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libfmt.so:devel/libfmt
-USES= compiler:c++17-lang meson gnome pkgconfig python:env shebangfix
+USES= cmake:indirect compiler:c++17-lang meson gnome pkgconfig python:env shebangfix
USE_CXXSTD= c++17
USE_GITHUB= yes
GH_ACCOUNT= dov
diff --git a/science/PETSc/Makefile b/science/PETSc/Makefile
index fc90a8d2ed33..17133cc86e4f 100644
--- a/science/PETSc/Makefile
+++ b/science/PETSc/Makefile
@@ -11,11 +11,10 @@ WWW= https://www.mcs.anl.gov/petsc
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libblis.so:math/blis \
libmpich.so:net/mpich
-USES= blaslapack fortran gmake python shebangfix xorg
+USES= blaslapack cmake:indirect fortran gmake python shebangfix xorg
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-shared-libraries=1 \
--with-mpi-dir=${LOCALBASE} \
diff --git a/science/nwchem/Makefile b/science/nwchem/Makefile
index 72a5f433ce63..30056991fd8f 100644
--- a/science/nwchem/Makefile
+++ b/science/nwchem/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS= libblas.so:math/blas \
RUN_DEPENDS= nwchem-data>0:science/nwchem-data
TEST_DEPENDS= bash:shells/bash
-USES= fortran gettext-runtime gmake perl5 pkgconfig
+USES= cmake:indirect fortran gettext-runtime gmake perl5 pkgconfig
USE_PERL5= build
USE_GITHUB= yes
@@ -78,7 +78,6 @@ OPENMPI_RUN_DEPENDS= openmpi>0:net/openmpi
OPENMPI_VARS= CONFLICTS_BUILD=mpich
LIBXC_DESC= Use libxc
-LIBXC_BUILD_DEPENDS= cmake:devel/cmake-core
LIBXC_MAKE_ENV= USE_LIBXC=Y
PYTHON_DESC= Enable Python syntax in input files
diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
index fbc5dab5d8d1..aa3922ad7b3c 100644
--- a/science/py-dlib/Makefile
+++ b/science/py-dlib/Makefile
@@ -11,11 +11,10 @@ WWW= http://dlib.net
LICENSE= BSL
LICENSE_FILE= ${WRKSRC}/dlib/LICENSE.txt
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= ${PY_BOOST} \
libpng.so:graphics/png
-USES= compiler:c++11-lang pkgconfig python shebangfix
+USES= cmake:indirect compiler:c++11-lang pkgconfig python shebangfix
USE_PYTHON= autoplist distutils
SHEBANG_FILES= python_examples/*.py
diff --git a/security/tfhe/Makefile b/security/tfhe/Makefile
index 7bd115693b20..fed4e788f2d9 100644
--- a/security/tfhe/Makefile
+++ b/security/tfhe/Makefile
@@ -13,11 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64 # because of arch-specific assembly
-BUILD_DEPENDS= cmake:devel/cmake-core
TEST_DEPENDS= fftw3>0:math/fftw3 \
googletest>0:devel/googletest
-USES= compiler:c++11-lang gmake localbase:ldflags
+USES= cmake:indirect compiler:c++11-lang gmake localbase:ldflags
USE_GITHUB= yes
USE_LDCONFIG= yes
diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile
index 26ca01925fb7..bcc8ce7f7ce5 100644
--- a/security/wazuh-agent/Makefile
+++ b/security/wazuh-agent/Makefile
@@ -15,10 +15,9 @@ WWW= https://github.com/wazuh/wazuh
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libnghttp2.so:www/libnghttp2
-USES= cpe gmake perl5 readline shebangfix sqlite:3 uidfix
+USES= cmake:indirect cpe gmake perl5 readline shebangfix sqlite:3 uidfix
USE_GITHUB= yes
GH_TUPLE= alonsobsd:wazuh-freebsd:${WAZUH_EXTRAFILE_TAGNAME}:wazuh
diff --git a/textproc/py-cchardet/Makefile b/textproc/py-cchardet/Makefile
index c24256ffd8b5..1597be57e53a 100644
--- a/textproc/py-cchardet/Makefile
+++ b/textproc/py-cchardet/Makefile
@@ -13,9 +13,7 @@ LICENSE= GPLv2 LGPL21 MPL11
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= cmake:devel/cmake-core
-
-USES= python
+USES= cmake:indirect python
USE_PYTHON= autoplist concurrent distutils
post-install:
diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile
index 960eddcfb23d..ed798cd19212 100644
--- a/textproc/uim-qt5/Makefile
+++ b/textproc/uim-qt5/Makefile
@@ -2,10 +2,9 @@ PKGNAMESUFFIX= -qt5
COMMENT= Qt5 modules of uim input method
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libuim.so:textproc/uim
-USES= compiler:c++11-lang gl iconv kde:5 libtool qt:5
+USES= cmake:indirect compiler:c++11-lang gl iconv kde:5 libtool qt:5
USE_GL= gl
USE_KDE= plasma-framework \
ecm:build
diff --git a/x11/virglrenderer/Makefile b/x11/virglrenderer/Makefile
index 3372b0b9301c..bca55d489ecc 100644
--- a/x11/virglrenderer/Makefile
+++ b/x11/virglrenderer/Makefile
@@ -12,11 +12,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_riscv64= fails to build: ../src/gallium/include/pipe/p_config.h:171:2: Unknown Endianness
-BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libdrm.so:graphics/libdrm \
libepoxy.so:graphics/libepoxy
-USES= compiler:c++11-lang cpe gl meson pkgconfig python
+USES= cmake:indirect compiler:c++11-lang cpe gl meson pkgconfig python
CPE_VENDOR= ${PORTNAME}_project
USE_GITLAB= yes
USE_GL= gbm