pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: replace CMAKE_ARGS with CMAKE_CONFIGURE_ARGS
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sun Aug 25 08:10:06 2024 +0200
Changeset: 7615d7f56a3d2bcefb1da80b10eb51bc6b6626c3
Modified Files:
Aseprite/Makefile
ZMusic/Makefile
actor-framework/Makefile
aldumb/Makefile
angelscript/Makefile
apache-arrow/Makefile
apache-arrow/options.mk
arx-libertatis-git/Makefile
arx-libertatis-git/options.mk
audacity-cmake/Makefile
ausweisapp2/Makefile
avida2/Makefile
avida2/options.mk
avidemux-plugins/Makefile
avidemux/options.mk
avp/Makefile
avrdude/Makefile
avrdude/options.mk
axpbox-git/Makefile
bamtools/Makefile
barony/Makefile
barony337/Makefile
beignet/Makefile
bifrost/Makefile
bkcrack/Makefile
boringssl/Makefile
brlcad/Makefile
cairo-dock/Makefile
cereal/Makefile
cgal/Makefile
clang/Makefile.common
cockatrice-server/Makefile
cockatrice/Makefile
commandergenius/Makefile
commandergenius/options.mk
compiler-rt/Makefile
conky/Makefile
coreclr-git/Makefile
corefx-git/Makefile
crosswrench-git/Makefile
csound6/Makefile
csound6/options.mk
deviceatlas-enterprise-c/Makefile
dlib-cpp/Makefile
dolfin/Makefile
ds2/Makefile
edbrowse/Makefile
eiskaltdcpp/Makefile
et/Makefile
eureka-devel/Makefile
eureka-devel/options.mk
fallout1-ce/Makefile
fallout2-ce/Makefile
flang-git/Makefile
flang/Makefile
freecad/Makefile
freefem++/options.mk
freegish-git/Makefile
freeserf/Makefile
freesynd/Makefile
fs2open/Makefile
gdcm/Makefile
geoloc/Makefile
gm2calc/Makefile
gnucash-devel/Makefile
gnucash-devel/options.mk
gnuradio-core/Makefile
gnuradio-core/Makefile.common
gnuradio-core/options.mk
gnuradio-monolithic/Makefile
gnuradio-monolithic/options.mk
gorilla-audio/Makefile
gpick/Makefile
gqrx/Makefile
gr-fcdproplus-git/Makefile
gr-fcdproplus/Makefile
greenbone-security-assistant/Makefile
gzdoom/Makefile
hiawatha/Makefile
hiawatha/options.mk
i2pd-git/Makefile
i2pd/Makefile
include-what-you-use/Makefile
inicpp/Makefile
kallisto/Makefile
kde-baseapps4/Makefile
kde-runtime4/Makefile
kde-runtime4/options.mk
kodi/Makefile
ladybird-git/Makefile
ldc/Makefile
ldc017/Makefile
ldc120/Makefile
lgogdownloader-git/Makefile
libLLVM38/Makefile
libLLVM38/options.mk
libbgcode/Makefile
libc++-abi/Makefile
libc++/Makefile
libcouchbase/Makefile
libcxx/Makefile
libcxxabi/Makefile
libharu/Makefile
libi2pd/Makefile
libi2pd/options.mk
libical2/Makefile
libjxl/Makefile
libmirisdr-git/Makefile
libmixed/Makefile
libopensync-dev/options.mk
libretro-citra/Makefile
libsquish/Makefile
libunwind-git/Makefile
libunwind/Makefile
libzippp/Makefile
lld/Makefile
lld/options.mk
lldb/Makefile
lldb/options.mk
llilc-git/Makefile
llvm/Makefile
llvm/options.mk
lua-luv/Makefile
luabind/Makefile
luv/Makefile
luv/options.mk
melonds/Makefile
miktex/options.mk
mlir/Makefile
msgpack-git/Makefile
msgpack-git/options.mk
navit-git/Makefile
navit/Makefile
neovim-qt/Makefile
neovim/Makefile
nextpnr/options.mk
nlopt/options.mk
notcurses/Makefile
nvi2-git/options.mk
occt/Makefile
occt/buildlink3.mk
occt/options.mk
oorexx-svn/Makefile
opencv-contrib-face/Makefile
opencv/Makefile.common
opencv/options.mk
openjkdf2/Makefile
openmp/Makefile
openrw-git/Makefile
opensubdiv/Makefile
opensubdiv/options.mk
opensurge/Makefile
openttd/Makefile
openvas-cli/Makefile
openvas-libraries/Makefile
openvas-manager/Makefile
openvas-scanner/Makefile
openwsman/Makefile
openxcom/Makefile
osmo-sdr-git/Makefile
overgrowth/Makefile
paraview/Makefile
pharo-vm/Makefile
pharo-vm10/Makefile
phonon-backend-xine/Makefile
piglit-git/Makefile
pioneer/Makefile
plplot/Makefile
polly/Makefile
ppsspp/Makefile
prusaslicer/Makefile
prusaslicer/options.mk
py-blosc2/Makefile
py-dlib/Makefile
py-pyside-shiboken/Makefile
py-pyside-tools/Makefile
py-pyside/Makefile
py-symbolic/Makefile
py-torch/Makefile
qgis/Makefile
qt5-libqtlua/Makefile
raze/Makefile
rdsn-git/Makefile
realm-core/Makefile
reone/Makefile
rlottie/Makefile
rmilter/Makefile
rstudio/Makefile
rtaudio/Makefile
rtaudio/options.mk
rtl-sdr-git/Makefile
rtl_433/Makefile
rtmidi/Makefile
rtmidi/options.mk
salmon/Makefile
sddm/Makefile
serious-engine-tfe-git/Makefile
serious-engine-tfe-git/Makefile.common
serious-engine-tse-git/Makefile
sipwitch/Makefile
slade/Makefile
speed-dreams/Makefile
sra-tools/Makefile
stormlib/Makefile
stratagus/Makefile
supercollider/Makefile
symphony-of-empires/Makefile
systemc/Makefile
tdlib-purple/Makefile
telegram-desktop/Makefile
telegram-desktop/options.mk
tg_owt-git/Makefile
timewarrior/Makefile
timg/Makefile
timg/options.mk
torque3d/Makefile
tuxanci-server/Makefile
tuxanci/Makefile
twinkle/Makefile
uTox-git/Makefile
ufc/Makefile
usrsctp/Makefile
vala-panel-appmenu/Makefile
vulkan-loader/Makefile
warsow/Makefile
wasi-compiler-rt/Makefile
wasi-libcxx/Makefile
webkit-gtk/Makefile
webkit-gtk/options.mk
webkit-gtk4/Makefile
webkit-gtk4/options.mk
widelands/Makefile
wsjtx/Makefile
wyrmgus/Makefile
yder/Makefile
zeek/Makefile
zig-git/Makefile
zig-git/options.mk
zoneminder/Makefile
zoneminder132/Makefile
Log Message:
*: replace CMAKE_ARGS with CMAKE_CONFIGURE_ARGS
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7615d7f56a3d2bcefb1da80b10eb51bc6b6626c3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Aseprite/Makefile | 22 ++--
ZMusic/Makefile | 4 +-
actor-framework/Makefile | 2 +-
aldumb/Makefile | 8 +-
angelscript/Makefile | 2 +-
apache-arrow/Makefile | 24 ++--
apache-arrow/options.mk | 22 ++--
arx-libertatis-git/Makefile | 10 +-
arx-libertatis-git/options.mk | 8 +-
audacity-cmake/Makefile | 64 +++++-----
ausweisapp2/Makefile | 4 +-
avida2/Makefile | 2 +-
avida2/options.mk | 14 +--
avidemux-plugins/Makefile | 4 +-
avidemux/options.mk | 60 +++++-----
avp/Makefile | 28 ++---
avrdude/Makefile | 8 +-
avrdude/options.mk | 4 +-
axpbox-git/Makefile | 8 +-
bamtools/Makefile | 2 +-
barony/Makefile | 2 +-
barony337/Makefile | 2 +-
beignet/Makefile | 4 +-
bifrost/Makefile | 2 +-
bkcrack/Makefile | 2 +-
boringssl/Makefile | 2 +-
brlcad/Makefile | 2 +-
cairo-dock/Makefile | 2 +-
cereal/Makefile | 2 +-
cgal/Makefile | 4 +-
clang/Makefile.common | 28 ++---
cockatrice-server/Makefile | 8 +-
cockatrice/Makefile | 8 +-
commandergenius/Makefile | 12 +-
commandergenius/options.mk | 4 +-
compiler-rt/Makefile | 12 +-
conky/Makefile | 4 +-
coreclr-git/Makefile | 6 +-
corefx-git/Makefile | 6 +-
crosswrench-git/Makefile | 2 +-
csound6/Makefile | 2 +-
csound6/options.mk | 20 ++--
deviceatlas-enterprise-c/Makefile | 2 +-
dlib-cpp/Makefile | 2 +-
dolfin/Makefile | 2 +-
ds2/Makefile | 10 +-
edbrowse/Makefile | 2 +-
eiskaltdcpp/Makefile | 4 +-
et/Makefile | 4 +-
eureka-devel/Makefile | 2 +-
eureka-devel/options.mk | 2 +-
fallout1-ce/Makefile | 2 +-
fallout2-ce/Makefile | 2 +-
flang-git/Makefile | 6 +-
flang/Makefile | 8 +-
freecad/Makefile | 10 +-
freefem++/options.mk | 6 +-
freegish-git/Makefile | 4 +-
freeserf/Makefile | 4 +-
freesynd/Makefile | 6 +-
fs2open/Makefile | 8 +-
gdcm/Makefile | 12 +-
geoloc/Makefile | 2 +-
gm2calc/Makefile | 2 +-
gnucash-devel/Makefile | 6 +-
gnucash-devel/options.mk | 12 +-
gnuradio-core/Makefile | 2 +-
gnuradio-core/Makefile.common | 42 +++----
gnuradio-core/options.mk | 2 +-
gnuradio-monolithic/Makefile | 54 ++++-----
gnuradio-monolithic/options.mk | 2 +-
gorilla-audio/Makefile | 2 +-
gpick/Makefile | 2 +-
gqrx/Makefile | 2 +-
gr-fcdproplus-git/Makefile | 4 +-
gr-fcdproplus/Makefile | 4 +-
greenbone-security-assistant/Makefile | 2 +-
gzdoom/Makefile | 4 +-
hiawatha/Makefile | 18 +--
hiawatha/options.mk | 8 +-
i2pd-git/Makefile | 4 +-
i2pd/Makefile | 4 +-
include-what-you-use/Makefile | 2 +-
inicpp/Makefile | 8 +-
kallisto/Makefile | 2 +-
kde-baseapps4/Makefile | 2 +-
kde-runtime4/Makefile | 22 ++--
kde-runtime4/options.mk | 8 +-
kodi/Makefile | 10 +-
ladybird-git/Makefile | 2 +-
ldc/Makefile | 6 +-
ldc017/Makefile | 2 +-
ldc120/Makefile | 4 +-
lgogdownloader-git/Makefile | 2 +-
libLLVM38/Makefile | 14 +--
libLLVM38/options.mk | 2 +-
libbgcode/Makefile | 2 +-
libc++-abi/Makefile | 10 +-
libc++/Makefile | 10 +-
libcouchbase/Makefile | 2 +-
libcxx/Makefile | 10 +-
libcxxabi/Makefile | 6 +-
libharu/Makefile | 2 +-
libi2pd/Makefile | 4 +-
libi2pd/options.mk | 12 +-
libical2/Makefile | 2 +-
libjxl/Makefile | 20 ++--
libmirisdr-git/Makefile | 2 +-
libmixed/Makefile | 6 +-
libopensync-dev/options.mk | 4 +-
libretro-citra/Makefile | 12 +-
libsquish/Makefile | 2 +-
libunwind-git/Makefile | 6 +-
libunwind/Makefile | 2 +-
libzippp/Makefile | 8 +-
lld/Makefile | 6 +-
lld/options.mk | 12 +-
lldb/Makefile | 16 +--
lldb/options.mk | 12 +-
llilc-git/Makefile | 8 +-
llvm/Makefile | 22 ++--
llvm/options.mk | 16 +--
lua-luv/Makefile | 10 +-
luabind/Makefile | 2 +-
luv/Makefile | 12 +-
luv/options.mk | 4 +-
melonds/Makefile | 4 +-
miktex/options.mk | 4 +-
mlir/Makefile | 6 +-
msgpack-git/Makefile | 4 +-
msgpack-git/options.mk | 2 +-
navit-git/Makefile | 12 +-
navit/Makefile | 12 +-
neovim-qt/Makefile | 6 +-
neovim/Makefile | 8 +-
nextpnr/options.mk | 20 ++--
nlopt/options.mk | 18 +--
notcurses/Makefile | 2 +-
nvi2-git/options.mk | 10 +-
occt/Makefile | 8 +-
occt/buildlink3.mk | 2 +-
occt/options.mk | 36 +++---
oorexx-svn/Makefile | 2 +-
opencv-contrib-face/Makefile | 90 +++++++-------
opencv/Makefile.common | 24 ++--
opencv/options.mk | 18 +--
openjkdf2/Makefile | 8 +-
openmp/Makefile | 6 +-
openrw-git/Makefile | 6 +-
opensubdiv/Makefile | 6 +-
opensubdiv/options.mk | 12 +-
opensurge/Makefile | 10 +-
openttd/Makefile | 20 ++--
openvas-cli/Makefile | 2 +-
openvas-libraries/Makefile | 2 +-
openvas-manager/Makefile | 2 +-
openvas-scanner/Makefile | 2 +-
openwsman/Makefile | 6 +-
openxcom/Makefile | 2 +-
osmo-sdr-git/Makefile | 2 +-
overgrowth/Makefile | 8 +-
paraview/Makefile | 70 +++++------
pharo-vm/Makefile | 8 +-
pharo-vm10/Makefile | 8 +-
phonon-backend-xine/Makefile | 2 +-
piglit-git/Makefile | 2 +-
pioneer/Makefile | 6 +-
plplot/Makefile | 26 ++---
polly/Makefile | 6 +-
ppsspp/Makefile | 20 ++--
prusaslicer/Makefile | 4 +-
prusaslicer/options.mk | 4 +-
py-blosc2/Makefile | 6 +-
py-dlib/Makefile | 2 +-
py-pyside-shiboken/Makefile | 4 +-
py-pyside-tools/Makefile | 4 +-
py-pyside/Makefile | 4 +-
py-symbolic/Makefile | 8 +-
py-torch/Makefile | 2 +-
qgis/Makefile | 18 +--
qt5-libqtlua/Makefile | 6 +-
raze/Makefile | 4 +-
rdsn-git/Makefile | 6 +-
realm-core/Makefile | 4 +-
reone/Makefile | 2 +-
rlottie/Makefile | 4 +-
rmilter/Makefile | 10 +-
rstudio/Makefile | 4 +-
rtaudio/Makefile | 2 +-
rtaudio/options.mk | 20 ++--
rtl-sdr-git/Makefile | 10 +-
rtl_433/Makefile | 2 +-
rtmidi/Makefile | 2 +-
rtmidi/options.mk | 12 +-
salmon/Makefile | 2 +-
sddm/Makefile | 14 +--
serious-engine-tfe-git/Makefile | 2 +-
serious-engine-tfe-git/Makefile.common | 4 +-
serious-engine-tse-git/Makefile | 2 +-
sipwitch/Makefile | 2 +-
slade/Makefile | 12 +-
speed-dreams/Makefile | 6 +-
sra-tools/Makefile | 4 +-
stormlib/Makefile | 2 +-
stratagus/Makefile | 6 +-
supercollider/Makefile | 2 +-
symphony-of-empires/Makefile | 10 +-
systemc/Makefile | 2 +-
tdlib-purple/Makefile | 8 +-
telegram-desktop/Makefile | 36 +++---
telegram-desktop/options.mk | 20 ++--
tg_owt-git/Makefile | 2 +-
timewarrior/Makefile | 8 +-
timg/Makefile | 4 +-
timg/options.mk | 16 +--
torque3d/Makefile | 2 +-
tuxanci-server/Makefile | 2 +-
tuxanci/Makefile | 2 +-
twinkle/Makefile | 6 +-
uTox-git/Makefile | 2 +-
ufc/Makefile | 2 +-
usrsctp/Makefile | 2 +-
vala-panel-appmenu/Makefile | 8 +-
vulkan-loader/Makefile | 4 +-
warsow/Makefile | 2 +-
wasi-compiler-rt/Makefile | 54 ++++-----
wasi-libcxx/Makefile | 208 ++++++++++++++++-----------------
webkit-gtk/Makefile | 34 +++---
webkit-gtk/options.mk | 24 ++--
webkit-gtk4/Makefile | 36 +++---
webkit-gtk4/options.mk | 30 ++---
widelands/Makefile | 8 +-
wsjtx/Makefile | 24 ++--
wyrmgus/Makefile | 6 +-
yder/Makefile | 2 +-
zeek/Makefile | 12 +-
zig-git/Makefile | 6 +-
zig-git/options.mk | 4 +-
zoneminder/Makefile | 46 ++++----
zoneminder132/Makefile | 44 +++----
240 files changed, 1224 insertions(+), 1224 deletions(-)
diffs:
diff --git a/Aseprite/Makefile b/Aseprite/Makefile
index 102cce94b5..ca3454a14c 100644
--- a/Aseprite/Makefile
+++ b/Aseprite/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
CONFIGURE_DIRS= build
-CMAKE_ARGS+= ..
+CMAKE_CONFIGURE_ARGS+= ..
pre-configure:
${MKDIR} ${WRKSRC}/build
@@ -47,16 +47,16 @@ PKGCONFIG_OVERRIDE+= third_party/pixman/pixman-1.pc.in
PKGCONFIG_OVERRIDE+= third_party/zlib/contrib/minizip/minizip.pc.in
PKGCONFIG_OVERRIDE+= third_party/zlib/zlib.pc.in
-CMAKE_ARGS+= -DUSE_SHARED_CMARK=ON
-CMAKE_ARGS+= -DUSE_SHARED_CURL=ON
-CMAKE_ARGS+= -DUSE_SHARED_GIFLIB=ON
-CMAKE_ARGS+= -DUSE_SHARED_JPEGLIB=ON
-CMAKE_ARGS+= -DUSE_SHARED_ZLIB=ON
-CMAKE_ARGS+= -DUSE_SHARED_LIBPNG=ON
-CMAKE_ARGS+= -DUSE_SHARED_TINYXML=ON
-CMAKE_ARGS+= -DUSE_SHARED_PIXMAN=ON
-CMAKE_ARGS+= -DUSE_SHARED_FREETYPE=ON
-CMAKE_ARGS+= -DUSE_SHARED_HARFBUZZ=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_CMARK=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_CURL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_GIFLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_JPEGLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_LIBPNG=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_TINYXML=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_PIXMAN=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_FREETYPE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_HARFBUZZ=ON
post-install:
.for i in bin/bsd* include lib share/man
diff --git a/ZMusic/Makefile b/ZMusic/Makefile
index e9f434114b..63278c3653 100644
--- a/ZMusic/Makefile
+++ b/ZMusic/Makefile
@@ -18,8 +18,8 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
USE_CMAKE= yes
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
diff --git a/actor-framework/Makefile b/actor-framework/Makefile
index 4a1f709fe3..f10111fe02 100644
--- a/actor-framework/Makefile
+++ b/actor-framework/Makefile
@@ -14,7 +14,7 @@ USE_CMAKE= yes
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-#CMAKE_ARGS+= -DCAF_ENABLE_TESTING:BOOL=OFF
+#CMAKE_CONFIGURE_ARGS+= -DCAF_ENABLE_TESTING:BOOL=OFF
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/aldumb/Makefile b/aldumb/Makefile
index bbfb95cb3d..8367016b4e 100644
--- a/aldumb/Makefile
+++ b/aldumb/Makefile
@@ -14,16 +14,16 @@ LICENSE= zlib
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DBUILD_ALLEGRO4=ON
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ALLEGRO4=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
BUILD_TARGET= aldmb
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64"
-CMAKE_ARGS+= -DUSE_SSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SSE=OFF
.endif
INSTALLATION_DIRS+= include lib
diff --git a/angelscript/Makefile b/angelscript/Makefile
index ad62197666..d650d9831c 100644
--- a/angelscript/Makefile
+++ b/angelscript/Makefile
@@ -15,6 +15,6 @@ WRKSRC= ${WRKDIR}/sdk/angelscript/projects/cmake
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
.include "../../mk/bsd.pkg.mk"
diff --git a/apache-arrow/Makefile b/apache-arrow/Makefile
index dff6c73522..f58843f0fe 100644
--- a/apache-arrow/Makefile
+++ b/apache-arrow/Makefile
@@ -32,28 +32,28 @@ USE_TOOLS= gmake install
# Needs gnu install for -v option
TOOLS_PLATFORM.install=
-CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
-CMAKE_ARGS+= -DARROW_DEPENDENCY_SOURCE=SYSTEM
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
+CMAKE_CONFIGURE_ARGS+= -DARROW_DEPENDENCY_SOURCE=SYSTEM
# Not yet for Gandiva
-CMAKE_ARGS+= -DARROW_GANDIVA=OFF
-CMAKE_ARGS+= -DARROW_CUDA=OFF
+CMAKE_CONFIGURE_ARGS+= -DARROW_GANDIVA=OFF
+CMAKE_CONFIGURE_ARGS+= -DARROW_CUDA=OFF
# These seem OK
-CMAKE_ARGS+= -DARROW_FILESYSTEM=ON
-CMAKE_ARGS+= -DARROW_BUILD_UTILITIES=ON
-CMAKE_ARGS+= -DARROW_CSV=ON
-CMAKE_ARGS+= -DARROW_ACERO=ON
-CMAKE_ARGS+= -DARROW_DATASET=ON
-CMAKE_ARGS+= -DPARQUET_BUILD_EXECUTABLES=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_FILESYSTEM=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_BUILD_UTILITIES=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_CSV=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_ACERO=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_DATASET=ON
+CMAKE_CONFIGURE_ARGS+= -DPARQUET_BUILD_EXECUTABLES=ON
# For finding deps
-CMAKE_ARGS+= -Dxsimd_SOURCE=BUNDLED
+CMAKE_CONFIGURE_ARGS+= -Dxsimd_SOURCE=BUNDLED
# Set environment variable to find the extra source packages
CONFIGURE_ENV+= ARROW_JEMALLOC_URL=/${DISTDIR}/${JEMALLOC}
CONFIGURE_ENV+= ARROW_XSIMD_URL=/${DISTDIR}/${XSIMD}
# To enable tests, devel/googletest needs -fPIE removed
-CMAKE_ARGS+= -DARROW_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DARROW_BUILD_TESTS=OFF
# Fix this version expansion as we have to
post-install:
diff --git a/apache-arrow/options.mk b/apache-arrow/options.mk
index e3233f67ea..bb24819452 100644
--- a/apache-arrow/options.mk
+++ b/apache-arrow/options.mk
@@ -6,56 +6,56 @@ PKG_SUGGESTED_OPTIONS= brotli bzip2 google-log json lz4 parquet python snappy zl
.include "../../mk/bsd.options.mk"
-# The CMAKE_ARGS are for the C++ libraries
+# The CMAKE_CONFIGURE_ARGS are for the C++ libraries
# The MAKE_ENV are for the python bindings
.if !empty(PKG_OPTIONS:Mbrotli)
.include "../../archivers/brotli/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_WITH_BROTLI=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_WITH_BROTLI=ON
.endif
.if !empty(PKG_OPTIONS:Mbzip2)
.include "../../archivers/bzip2/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_WITH_BZ2=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_WITH_BZ2=ON
.endif
.if !empty(PKG_OPTIONS:Mgoogle-log)
.include "../../devel/google-glog/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_USE_GLOG=OFF=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_USE_GLOG=OFF=ON
.endif
.if !empty(PKG_OPTIONS:Mjson)
.include "../../textproc/rapidjson/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_JSON=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_JSON=ON
.endif
.if !empty(PKG_OPTIONS:Mlz4)
.include "../../archivers/lz4/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_WITH_LZ4=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_WITH_LZ4=ON
.endif
.if !empty(PKG_OPTIONS:Mparquet)
-CMAKE_ARGS+= -DARROW_PARQUET=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_PARQUET=ON
MAKE_ENV+= PYARROW_WITH_PARQUET=1
.endif
.if !empty(PKG_OPTIONS:Mpython)
.include "../../math/py-numpy/buildlink3.mk"
.include "../../lang/python/pyversion.mk"
-CMAKE_ARGS+= -DPython3_EXECUTABLE=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPython3_EXECUTABLE=${PYTHONBIN}
.endif
.if !empty(PKG_OPTIONS:Msnappy)
.include "../../devel/snappy/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_WITH_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_WITH_SNAPPY=ON
.endif
.if !empty(PKG_OPTIONS:Mzlib)
.include "../../devel/zlib/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_WITH_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_WITH_ZLIB=ON
.endif
.if !empty(PKG_OPTIONS:Mzstd)
.include "../../archivers/zstd/buildlink3.mk"
-CMAKE_ARGS+= -DARROW_WITH_ZSTD=ON
+CMAKE_CONFIGURE_ARGS+= -DARROW_WITH_ZSTD=ON
.endif
diff --git a/arx-libertatis-git/Makefile b/arx-libertatis-git/Makefile
index eb7460cb25..0269069bb8 100644
--- a/arx-libertatis-git/Makefile
+++ b/arx-libertatis-git/Makefile
@@ -18,11 +18,11 @@ WRKSRC= ${WRKDIR}/arxlibertatis
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -D CMAKE_INSTALL_MANDIR:STRING:=${PKGMANDIR}
-CMAKE_ARGS+= -D DATA_FILES:STRING:=${WRKDIR}/arx-libertatis-data-1
-CMAKE_ARGS+= -D INSTALL_BLENDER_PLUGIN:BOOL=OFF
-CMAKE_ARGS+= -D USE_QT4:BOOL=OFF
-CMAKE_ARGS+= -D USE_QT5:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -D CMAKE_INSTALL_MANDIR:STRING:=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -D DATA_FILES:STRING:=${WRKDIR}/arx-libertatis-data-1
+CMAKE_CONFIGURE_ARGS+= -D INSTALL_BLENDER_PLUGIN:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -D USE_QT4:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -D USE_QT5:BOOL=OFF
.include "../../mk/bsd.prefs.mk"
diff --git a/arx-libertatis-git/options.mk b/arx-libertatis-git/options.mk
index 3fc5ad2f70..fa9aebca92 100644
--- a/arx-libertatis-git/options.mk
+++ b/arx-libertatis-git/options.mk
@@ -14,12 +14,12 @@ PKG_SUGGESTED_OPTIONS= epoxy sdl2
### OpenGL function wrangler
###
.if !empty(PKG_OPTIONS:Mepoxy)
-CMAKE_ARGS+= -D WITH_OPENGL:STRING=epoxy
+CMAKE_CONFIGURE_ARGS+= -D WITH_OPENGL:STRING=epoxy
.include "../../graphics/libepoxy/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mglew)
-CMAKE_ARGS+= -D WITH_OPENGL:STRING=glew
+CMAKE_CONFIGURE_ARGS+= -D WITH_OPENGL:STRING=glew
.include "../../graphics/glew/buildlink3.mk"
.endif
@@ -27,12 +27,12 @@ CMAKE_ARGS+= -D WITH_OPENGL:STRING=glew
### SDL implementation
###
.if !empty(PKG_OPTIONS:Msdl)
-CMAKE_ARGS+= -D WITH_SDL:INT=1
+CMAKE_CONFIGURE_ARGS+= -D WITH_SDL:INT=1
.include "../../devel/SDL/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msdl2)
-CMAKE_ARGS+= -D WITH_SDL:INT=2
+CMAKE_CONFIGURE_ARGS+= -D WITH_SDL:INT=2
.include "../../devel/SDL2/buildlink3.mk"
.endif
diff --git a/audacity-cmake/Makefile b/audacity-cmake/Makefile
index 934069936d..3ba03f69dc 100644
--- a/audacity-cmake/Makefile
+++ b/audacity-cmake/Makefile
@@ -25,54 +25,54 @@ GCC_REQD+= 4.9
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Debug"
-
-CMAKE_ARGS+= -DPYTHON=${PYTHONBIN}
-
-CMAKE_ARGS+= -Daudacity_use_expat=system
-CMAKE_ARGS+= -Daudacity_use_ffmpeg=linked
-CMAKE_ARGS+= -Daudacity_use_flac=system
-CMAKE_ARGS+= -Daudacity_use_id3tag=system
-CMAKE_ARGS+= -Daudacity_use_lame=system
-CMAKE_ARGS+= -Daudacity_use_lv2=system
-CMAKE_ARGS+= -Daudacity_use_mad=off
-CMAKE_ARGS+= -Daudacity_use_midi=local
-CMAKE_ARGS+= -Daudacity_use_nyquist=local
-CMAKE_ARGS+= -Daudacity_use_ogg=system
-CMAKE_ARGS+= -Daudacity_use_portaudio=system
-CMAKE_ARGS+= -Daudacity_use_portmixer=local
-CMAKE_ARGS+= -Daudacity_use_portsmf=local
-CMAKE_ARGS+= -Daudacity_use_sbsms=local
-CMAKE_ARGS+= -Daudacity_use_sndfile=system
-CMAKE_ARGS+= -Daudacity_use_soundtouch=system
-CMAKE_ARGS+= -Daudacity_use_soxr=system
-CMAKE_ARGS+= -Daudacity_use_twolame=system
-CMAKE_ARGS+= -Daudacity_use_vamp=system
-CMAKE_ARGS+= -Daudacity_use_vorbis=system
-CMAKE_ARGS+= -Daudacity_use_wxwidgets=system
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Debug"
+
+CMAKE_CONFIGURE_ARGS+= -DPYTHON=${PYTHONBIN}
+
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_expat=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_ffmpeg=linked
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_flac=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_id3tag=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_lame=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_lv2=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_mad=off
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_midi=local
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_nyquist=local
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_ogg=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_portaudio=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_portmixer=local
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_portsmf=local
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_sbsms=local
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_sndfile=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_soundtouch=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_soxr=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_twolame=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_vamp=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_vorbis=system
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_wxwidgets=system
# pre-compiled headers don't work well on some systems
-CMAKE_ARGS+= -Daudacity_use_pch=no
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_pch=no
-CMAKE_ARGS+= -DLIB_avcodec=${PREFIX}/lib/ffmpeg4/libavcodec.so
-CMAKE_ARGS+= -DLIB_avformat=${PREFIX}/lib/ffmpeg4/libavformat.so
-CMAKE_ARGS+= -DLIB_avutil=${PREFIX}/lib/ffmpeg4/libavutil.so
+CMAKE_CONFIGURE_ARGS+= -DLIB_avcodec=${PREFIX}/lib/ffmpeg4/libavcodec.so
+CMAKE_CONFIGURE_ARGS+= -DLIB_avformat=${PREFIX}/lib/ffmpeg4/libavformat.so
+CMAKE_CONFIGURE_ARGS+= -DLIB_avutil=${PREFIX}/lib/ffmpeg4/libavutil.so
CFLAGS+= -DHAVE_VISIBILITY=1 # ???
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
-CMAKE_ARGS+= -Daudacity_use_pa_oss=ON
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_pa_oss=ON
CFLAGS+= -DHAVE_SYS_SOUNDCARD_H=1
.endif
.if ${OPSYS} == "Linux"
-CMAKE_ARGS+= -Daudacity_use_pa_alsa=ON
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_pa_alsa=ON
. include "../../audio/alsa-lib/buildlink3.mk"
.endif
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -Daudacity_use_pa_coreaudio=ON
+CMAKE_CONFIGURE_ARGS+= -Daudacity_use_pa_coreaudio=ON
.endif
.if ${MACHINE_ARCH} == "i386"
diff --git a/ausweisapp2/Makefile b/ausweisapp2/Makefile
index f978c760a1..d2f7b66b6f 100644
--- a/ausweisapp2/Makefile
+++ b/ausweisapp2/Makefile
@@ -13,8 +13,8 @@ COMMENT= Authenticate with your German ID or residence permit
LICENSE= eupl-v1.2
USE_CMAKE= yes
-CMAKE_ARGS+= -DVENDOR=${PKGBASE}
-CMAKE_ARGS+= -DFORCE_SOURCE_BUILD=ON
+CMAKE_CONFIGURE_ARGS+= -DVENDOR=${PKGBASE}
+CMAKE_CONFIGURE_ARGS+= -DFORCE_SOURCE_BUILD=ON
USE_LANGUAGES= c++
diff --git a/avida2/Makefile b/avida2/Makefile
index 42c8dd371c..de90324fb6 100644
--- a/avida2/Makefile
+++ b/avida2/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DAVD_CMDLINE=ON
+CMAKE_CONFIGURE_ARGS+= -DAVD_CMDLINE=ON
.include "options.mk"
diff --git a/avida2/options.mk b/avida2/options.mk
index d1a775bfd3..9f38388285 100644
--- a/avida2/options.mk
+++ b/avida2/options.mk
@@ -7,21 +7,21 @@ PKG_SUGGESTED_OPTIONS+= ${PKG_SUPPORTED_OPTIONS} #ncurses
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
.if !empty(PKG_OPTIONS:Mncurses)
.include "../../devel/ncurses/buildlink3.mk"
-CMAKE_ARGS+= -DAVD_GUI_NCURSES=ON
-CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${BUILDLINK_PREFIX.ncurses}/include
+CMAKE_CONFIGURE_ARGS+= -DAVD_GUI_NCURSES=ON
+CMAKE_CONFIGURE_ARGS+= -DNCURSES_INCLUDE_PATH=${BUILDLINK_PREFIX.ncurses}/include
.else
-CMAKE_ARGS+= -DAVD_GUI_NCURSES=OFF
+CMAKE_CONFIGURE_ARGS+= -DAVD_GUI_NCURSES=OFF
.endif
.if !empty(PKG_OPTIONS:Mtests)
-CMAKE_ARGS+= -DAVD_UNIT_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DAVD_UNIT_TESTS=ON
.else
-CMAKE_ARGS+= -DAVD_UNIT_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DAVD_UNIT_TESTS=OFF
.endif
diff --git a/avidemux-plugins/Makefile b/avidemux-plugins/Makefile
index 3df964a22b..07c012d0df 100644
--- a/avidemux-plugins/Makefile
+++ b/avidemux-plugins/Makefile
@@ -25,8 +25,8 @@ PLUGIN_UI+= QT4
.include "../../wip/avidemux-qt/buildlink3.mk"
.endif
-CMAKE_ARGS+= -DPLUGIN_UI="${PLUGIN_UI}"
-#CMAKE_ARGS+= -DCMAKE_FIND_DEBUG_MODE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DPLUGIN_UI="${PLUGIN_UI}"
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_FIND_DEBUG_MODE:BOOL=ON
.include "../../wip/avidemux/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/avidemux/options.mk b/avidemux/options.mk
index 33cfd19981..d6464f6d1a 100644
--- a/avidemux/options.mk
+++ b/avidemux/options.mk
@@ -35,21 +35,21 @@ PKG_SUGGESTED_OPTIONS+= vaapi
PLIST.aften= yes
.include "../../audio/aften/buildlink3.mk"
.else
-CMAKE_ARGS+= -DAFTEN:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DAFTEN:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Malsa)
PLIST.alsa= yes
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DALSA:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSA:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Maom)
PLIST.aom= yes
.include "../../multimedia/libaom/buildlink3.mk"
.else
-CMAKE_ARGS+= -DAOMDEC:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DAOMDEC:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mcli)
@@ -60,14 +60,14 @@ PLIST.cli= yes
PLIST.dca= yes
.include "../../audio/libdca/buildlink3.mk"
.else
-CMAKE_ARGS+= -DLIBDCA:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBDCA:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mfaac)
PLIST.faac= yes
.include "../../audio/faac/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFAAC:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFAAC:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mfaad)
@@ -75,28 +75,28 @@ PLIST.faad= yes
.include "../../audio/faad2/buildlink3.mk"
CMAKE_PREFIX_PATH+= ${PREFIX}/${BUILDLINK_INCDIRS.faad2}
.else
-CMAKE_ARGS+= -DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mfdk-aac)
PLIST.fdk-aac= yes
.include "../../audio/fdk-aac/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFDK_AAC:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFDK_AAC:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mfontconfig)
PLIST.fontconfig= yes
.include "../../fonts/fontconfig/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFONTCONFIG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFONTCONFIG:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mfreetype)
PLIST.freetype= yes
.include "../../graphics/freetype2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFREETYPE2:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mfribidi)
@@ -106,78 +106,78 @@ PKG_OPTIONS+= fontconfig
. endif
.include "../../converters/fribidi/buildlink3.mk"
.else
-CMAKE_ARGS+= -DFRIBIDI:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DFRIBIDI:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
PLIST.jack= yes
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DJACK:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DJACK:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mlame)
PLIST.lame= yes
.include "../../audio/lame/buildlink3.mk"
.else
-CMAKE_ARGS+= -DLAME:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLAME:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mlibvpx)
PLIST.libvpx= yes
.include "../../multimedia/libvpx/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVPXDEC:BOOL=OFF -DVPXENC:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DVPXDEC:BOOL=OFF -DVPXENC:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mopencore-amr)
PLIST.opencore-amr= yes
.include "../../audio/opencore-amr/buildlink3.mk"
.else
-CMAKE_ARGS+= -DOPENCORE-AMRNB:BOOL=OFF
-CMAKE_ARGS+= -DOPENCORE-AMRWB:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENCORE-AMRNB:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENCORE-AMRWB:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mopus)
PLIST.opus= yes
.include "../../audio/libopus/buildlink3.mk"
.else
-CMAKE_ARGS+= -DOPUS:BOOL=OFF -DOPUS_ENCODER:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPUS:BOOL=OFF -DOPUS_ENCODER:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Moss)
PLIST.oss= yes
.include "../../mk/oss.buildlink3.mk"
.else
-CMAKE_ARGS+= -DOSS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DOSS:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
PLIST.pulseaudio= yes
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DPULSEAUDIO:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DPULSEAUDIO:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mqt4)
PLIST.qt4= yes
-CMAKE_ARGS+= -DENABLE_QT4:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT4:BOOL=ON
.include "../../x11/qt4-libs/buildlink3.mk"
.else
-CMAKE_ARGS+= -DQT4:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DQT4:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mqt5)
PLIST.qt5= yes
-CMAKE_ARGS+= -DENABLE_QT5:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5:BOOL=ON
.include "../../x11/qt5-qtbase/buildlink3.mk"
.else
-CMAKE_ARGS+= -DQT5:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DQT5:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mqt6)
PLIST.qt6= yes
-CMAKE_ARGS+= -DENABLE_QT6:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6:BOOL=ON
.include "../../x11/qt6-qtbase/buildlink3.mk"
.endif
@@ -185,47 +185,47 @@ CMAKE_ARGS+= -DENABLE_QT6:BOOL=ON
PLIST.twolame= yes
.include "../../audio/twolame/buildlink3.mk"
.else
-CMAKE_ARGS+= -DTWOLAME:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DTWOLAME:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mvaapi)
PLIST.vaapi= yes
.include "../../multimedia/libva/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mvdpau)
PLIST.vdpau= yes
.include "../../multimedia/libvdpau/buildlink3.mk"
.else
-CMAKE_ARGS+= -DVDPAU:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DVDPAU:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mvorbis)
PLIST.vorbis= yes
.include "../../audio/libvorbis/buildlink3.mk"
.else
-CMAKE_ARGS+= -DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mx264)
PLIST.x264= yes
.include "../../multimedia/x264/buildlink3.mk"
.else
-CMAKE_ARGS+= -DX264:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DX264:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mx265)
PLIST.x265= yes
.include "../../multimedia/x265/buildlink3.mk"
.else
-CMAKE_ARGS+= -DX265:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DX265:BOOL=OFF
.endif
.if !empty(PKG_OPTIONS:Mxvid)
PLIST.xvid= yes
.include "../../multimedia/xvidcore/buildlink3.mk"
.else
-CMAKE_ARGS+= -DXVID:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DXVID:BOOL=OFF
.endif
diff --git a/avp/Makefile b/avp/Makefile
index e43e132254..6367b71147 100644
--- a/avp/Makefile
+++ b/avp/Makefile
@@ -20,20 +20,20 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config cmake
USE_CMAKE+= yes
-CMAKE_ARGS+= -DAVCODEC_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavcodec.so
-CMAKE_ARGS+= -DSWSCALE_LIBRARIES=/usr/pkg/lib/ffmpeg4/libswscale.so
-CMAKE_ARGS+= -DAVDEVICE_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavdevice.so
-CMAKE_ARGS+= -DAVFORMAT_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavformat.so
-CMAKE_ARGS+= -DAVUTIL_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavutil.so
-CMAKE_ARGS+= -DAVRESAMPLE_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavresample.so
-CMAKE_ARGS+= -DAVFILTER_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavfilter.so
-CMAKE_ARGS+= -DAVCODEC_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavcodec
-CMAKE_ARGS+= -DSWSCALE_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libswscale
-CMAKE_ARGS+= -DAVDEVICE_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavdevice
-CMAKE_ARGS+= -DAVFORMAT_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavformat
-CMAKE_ARGS+= -DAVUTIL_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavutil
-CMAKE_ARGS+= -DAVRESAMPLE_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavresample
-CMAKE_ARGS+= -DAVFILTER_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavfilter
+CMAKE_CONFIGURE_ARGS+= -DAVCODEC_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavcodec.so
+CMAKE_CONFIGURE_ARGS+= -DSWSCALE_LIBRARIES=/usr/pkg/lib/ffmpeg4/libswscale.so
+CMAKE_CONFIGURE_ARGS+= -DAVDEVICE_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavdevice.so
+CMAKE_CONFIGURE_ARGS+= -DAVFORMAT_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavformat.so
+CMAKE_CONFIGURE_ARGS+= -DAVUTIL_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavutil.so
+CMAKE_CONFIGURE_ARGS+= -DAVRESAMPLE_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavresample.so
+CMAKE_CONFIGURE_ARGS+= -DAVFILTER_LIBRARIES=/usr/pkg/lib/ffmpeg4/libavfilter.so
+CMAKE_CONFIGURE_ARGS+= -DAVCODEC_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavcodec
+CMAKE_CONFIGURE_ARGS+= -DSWSCALE_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libswscale
+CMAKE_CONFIGURE_ARGS+= -DAVDEVICE_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavdevice
+CMAKE_CONFIGURE_ARGS+= -DAVFORMAT_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavformat
+CMAKE_CONFIGURE_ARGS+= -DAVUTIL_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavutil
+CMAKE_CONFIGURE_ARGS+= -DAVRESAMPLE_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavresample
+CMAKE_CONFIGURE_ARGS+= -DAVFILTER_INCLUDE_DIRS=/usr/pkg/include/ffmpeg4/libavfilter
INSTALLATION_DIRS+= bin
diff --git a/avrdude/Makefile b/avrdude/Makefile
index 5526005966..79b60d1cdb 100644
--- a/avrdude/Makefile
+++ b/avrdude/Makefile
@@ -16,15 +16,15 @@ USE_TOOLS+= lex yacc
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -D BUILD_SHARED_LIBS=1
+CMAKE_CONFIGURE_ARGS+= -D BUILD_SHARED_LIBS=1
.if ${OPSYS} == "DragonFly" || \
${OPSYS} == "FreeBSD" || \
${OPSYS} == "Linux" || \
${OPSYS} == "SunOS"
-CMAKE_ARGS+= -D HAVE_PARPORT=1
-CMAKE_ARGS+= -D DEFAULT_PAR_PORT=${DEFAULT_PARALLEL_DEVICE}
+CMAKE_CONFIGURE_ARGS+= -D HAVE_PARPORT=1
+CMAKE_CONFIGURE_ARGS+= -D DEFAULT_PAR_PORT=${DEFAULT_PARALLEL_DEVICE}
.endif
-CMAKE_ARGS+= -D DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE}
+CMAKE_CONFIGURE_ARGS+= -D DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE}
EGDIR= ${PREFIX}/share/examples/avrdude
CONF_FILES_PERMS= ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \
diff --git a/avrdude/options.mk b/avrdude/options.mk
index ea5fa802ae..d1261316de 100644
--- a/avrdude/options.mk
+++ b/avrdude/options.mk
@@ -20,7 +20,7 @@ TOOL_DEPENDS+= tex-texinfo-[0-9]*:../../print/tex-texinfo
. if ${OPSYS} == "DragonFly"
TOOL_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
. endif
-CMAKE_ARGS+= -D BUILD_DOC=1
+CMAKE_CONFIGURE_ARGS+= -D BUILD_DOC=1
.else
-CMAKE_ARGS+= -D BUILD_DOC=0
+CMAKE_CONFIGURE_ARGS+= -D BUILD_DOC=0
.endif
diff --git a/axpbox-git/Makefile b/axpbox-git/Makefile
index 6372a3e674..ddddd49fd1 100644
--- a/axpbox-git/Makefile
+++ b/axpbox-git/Makefile
@@ -24,10 +24,10 @@ MAKE_ENV+= prefix=${PREFIX}
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="-O3 -march=native"
-CMAKE_ARGS+= -DDEBUG=OFF
-CMAKE_ARGS+= -DFASTER=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_FLAGS="-O3 -march=native"
+CMAKE_CONFIGURE_ARGS+= -DDEBUG=OFF
+CMAKE_CONFIGURE_ARGS+= -DFASTER=OFF
INSTALLATION_DIRS+= bin
diff --git a/bamtools/Makefile b/bamtools/Makefile
index cbd1caa25c..a1a79d4354 100644
--- a/bamtools/Makefile
+++ b/bamtools/Makefile
@@ -13,7 +13,7 @@ LICENSE= mit
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
diff --git a/barony/Makefile b/barony/Makefile
index 786773a672..9e41d2adce 100644
--- a/barony/Makefile
+++ b/barony/Makefile
@@ -16,7 +16,7 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DPNG_NAMES=png16 \
+CMAKE_CONFIGURE_ARGS+= -DPNG_NAMES=png16 \
-DEDITOR_EXE_NAME=barony-editor \
-DDATA_DIR=ON -DOPENAL_ENABLED=ON
diff --git a/barony337/Makefile b/barony337/Makefile
index 6ae903090e..1a97ab580f 100644
--- a/barony337/Makefile
+++ b/barony337/Makefile
@@ -17,7 +17,7 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DPNG_NAMES=png16 \
+CMAKE_CONFIGURE_ARGS+= -DPNG_NAMES=png16 \
-DEDITOR_EXE_NAME=barony-editor \
-DDATA_DIR=ON -DOPENAL_ENABLED=ON
diff --git a/beignet/Makefile b/beignet/Makefile
index 4f4a1f062f..423d948a2e 100644
--- a/beignet/Makefile
+++ b/beignet/Makefile
@@ -16,8 +16,8 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++11
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DOCLICD_COMPAT=0
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DOCLICD_COMPAT=0
.include "../../lang/clang/buildlink3.mk"
.include "../../lang/llvm/buildlink3.mk"
diff --git a/bifrost/Makefile b/bifrost/Makefile
index 4e045cc41e..dec2314bc4 100644
--- a/bifrost/Makefile
+++ b/bifrost/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_PLATFORM= *-*-aarch64 *-*-x86_64 *-*-powerpc64 *-*-powerpc64le *-*-ris
USE_LANGUAGES= c c++
USE_TOOLS+= cmake
USE_CMAKE= yes
-CMAKE_ARGS+= -DCOMPILATION_ARCH=${CPUTYPE:UOFF}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILATION_ARCH=${CPUTYPE:UOFF}
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/bkcrack/Makefile b/bkcrack/Makefile
index c1dd123f2a..c0f37b33e9 100644
--- a/bkcrack/Makefile
+++ b/bkcrack/Makefile
@@ -13,7 +13,7 @@ LICENSE= zlib
USE_CMAKE= yes
USE_LANGUAGES= c++
-CMAKE_ARGS+= -DBKCRACK_PARALLEL_MODE:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DBKCRACK_PARALLEL_MODE:BOOL=OFF
INSTALLATION_DIRS= bin share/doc/bkcrack share/examples/bkcrack
diff --git a/boringssl/Makefile b/boringssl/Makefile
index ccaa78ef04..ac683889cb 100644
--- a/boringssl/Makefile
+++ b/boringssl/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+= cmake perl
USE_LANGUAGES+= c gnu++11
TEST_TARGET= run_tests
CMAKE_INSTALL_PREFIX= ${PREFIX}/boringssl
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
CFLAGS+= -D_XOPEN_SOURCE=600 -D_NETBSD_SOURCE
diff --git a/brlcad/Makefile b/brlcad/Makefile
index 7abc60dd79..cab50bbaa9 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++ fortran
# brlcad uses modified mundled tools and libraries (openNURBS, lemon, ...)
# tools like adaptagrams (libavoid) are unused code for years and no longer
# compatible with existing libraries
-CMAKE_ARGS+= -DBRLCAD_BUNDLED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBRLCAD_BUNDLED_LIBS=ON
# brlcad must be installed into subprefix as it has conflicting files and it
# will try overwrite them. brlcad will also blacklist existing libraries in
diff --git a/cairo-dock/Makefile b/cairo-dock/Makefile
index f7b11e7a94..b726ee5362 100644
--- a/cairo-dock/Makefile
+++ b/cairo-dock/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
WRKSRC= ${WRKDIR}/cairo-dock-core-3.4.1
diff --git a/cereal/Makefile b/cereal/Makefile
index 42406eec99..41bfb36cdc 100644
--- a/cereal/Makefile
+++ b/cereal/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= cmake
USE_CMAKE= yes
# Requires stubs-32.h on CentOS, not provided by pkgsrc
-CMAKE_ARGS+= -DSKIP_PORTABILITY_TEST=ON
+CMAKE_CONFIGURE_ARGS+= -DSKIP_PORTABILITY_TEST=ON
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cgal/Makefile b/cgal/Makefile
index b7700191ad..12c5bb0739 100644
--- a/cgal/Makefile
+++ b/cgal/Makefile
@@ -15,8 +15,8 @@ LICENSE= gnu-lgpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++14
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCGAL_INSTALL_MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCGAL_INSTALL_MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
REPLACE_SH+= scripts/cgal_create_CMakeLists
REPLACE_SH+= scripts/cgal_create_cmake_script
diff --git a/clang/Makefile.common b/clang/Makefile.common
index 36dceb5c36..dab07fbe84 100644
--- a/clang/Makefile.common
+++ b/clang/Makefile.common
@@ -20,16 +20,16 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
GCC_REQD+= 7
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
.include "../../mk/compiler.mk"
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
.if defined(OSX_SDK_PATH)
-CMAKE_ARGS.Darwin+= -DDEFAULT_SYSROOT=${OSX_SDK_PATH:Q}
+CMAKE_CONFIGURE_ARGS.Darwin+= -DDEFAULT_SYSROOT=${OSX_SDK_PATH:Q}
.endif
# NetBSD < 10 did not provide ENOTRECOVERABLE
@@ -112,7 +112,7 @@ LIBCPP_CHECK= NO
.endif
.if ${OPSYS} == "NetBSD" && ${LIBCPP_CHECK} != YES
-CMAKE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
+CMAKE_CONFIGURE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
.endif
# Enable full LLVM suite on SunOS
@@ -121,8 +121,8 @@ CMAKE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
.include "../../wip/libcxx/buildlink3.mk"
.include "../../wip/libcxxabi/buildlink3.mk"
.include "../../wip/libunwind/buildlink3.mk"
-CMAKE_ARGS+= -DCLANG_DEFAULT_RTLIB:STRING="compiler-rt"
-CMAKE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libc++"
+CMAKE_CONFIGURE_ARGS+= -DCLANG_DEFAULT_RTLIB:STRING="compiler-rt"
+CMAKE_CONFIGURE_ARGS+= -DCLANG_DEFAULT_CXX_STDLIB:STRING="libc++"
.endif
# 3.8.0 -> 3.8
@@ -147,14 +147,14 @@ PKG_SUPPORTED_OPTIONS= tests z3
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mtests)
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
-CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DCLANG_INCLUDE_TESTS=ON
TEST_TARGET= clang-test
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
. include "../../devel/googletest/buildlink3.mk"
.else
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
-CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
.endif
.include "../../wip/llvm/buildlink3.mk"
@@ -164,7 +164,7 @@ CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
PKG_FAIL_REASON+= "z3 PKG_OPTION must be enabled in lang/llvm"
. endif
. include "../../math/z3/buildlink3.mk"
-CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
.endif
post-extract:
diff --git a/cockatrice-server/Makefile b/cockatrice-server/Makefile
index 1ab2954670..f44d2f5120 100644
--- a/cockatrice-server/Makefile
+++ b/cockatrice-server/Makefile
@@ -9,10 +9,10 @@ HOMEPAGE= https://cockatrice.github.io/
COMMENT= Virtual tabletop for multiplayer card games (server only)
LICENSE= gnu-gpl-v2
-CMAKE_ARGS+= -DWITH_CLIENT=0
-CMAKE_ARGS+= -DWITH_DBCONVERTER=0
-CMAKE_ARGS+= -DWITH_ORACLE=0
-CMAKE_ARGS+= -DWITH_SERVER=1
+CMAKE_CONFIGURE_ARGS+= -DWITH_CLIENT=0
+CMAKE_CONFIGURE_ARGS+= -DWITH_DBCONVERTER=0
+CMAKE_CONFIGURE_ARGS+= -DWITH_ORACLE=0
+CMAKE_CONFIGURE_ARGS+= -DWITH_SERVER=1
.include "../../databases/mysql57-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cockatrice/Makefile b/cockatrice/Makefile
index bb449b6cf3..0d9a6bf302 100644
--- a/cockatrice/Makefile
+++ b/cockatrice/Makefile
@@ -9,10 +9,10 @@ HOMEPAGE= https://cockatrice.github.io/
COMMENT= Virtual tabletop for multiplayer card games
LICENSE= gnu-gpl-v2
-CMAKE_ARGS+= -DWITH_CLIENT=1
-CMAKE_ARGS+= -DWITH_DBCONVERTER=1
-CMAKE_ARGS+= -DWITH_ORACLE=1
-CMAKE_ARGS+= -DWITH_SERVER=0
+CMAKE_CONFIGURE_ARGS+= -DWITH_CLIENT=1
+CMAKE_CONFIGURE_ARGS+= -DWITH_DBCONVERTER=1
+CMAKE_CONFIGURE_ARGS+= -DWITH_ORACLE=1
+CMAKE_CONFIGURE_ARGS+= -DWITH_SERVER=0
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.include "../../x11/qt5-qtsvg/buildlink3.mk"
diff --git a/commandergenius/Makefile b/commandergenius/Makefile
index 31ec8c4c66..ba69e609b9 100644
--- a/commandergenius/Makefile
+++ b/commandergenius/Makefile
@@ -15,14 +15,14 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DAPPDIR=${PREFIX}/bin
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=LINUX64
-CMAKE_ARGS+= -DDOCDIR=${PREFIX}/share/doc/commandergenius
-CMAKE_ARGS+= -DGAMES_SHAREDIR=${PREFIX}/share
+CMAKE_CONFIGURE_ARGS+= -DAPPDIR=${PREFIX}/bin
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=LINUX64
+CMAKE_CONFIGURE_ARGS+= -DDOCDIR=${PREFIX}/share/doc/commandergenius
+CMAKE_CONFIGURE_ARGS+= -DGAMES_SHAREDIR=${PREFIX}/share
# segmentation fault on startup
-CMAKE_ARGS+= -DUSE_OPENGL=NO
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL=NO
# make an option for SDL1 ?
-#CMAKE_ARGS+= -DUSE_SDL2=NO
+#CMAKE_CONFIGURE_ARGS+= -DUSE_SDL2=NO
INSTALLATION_DIRS= bin share/doc/commandergenius
diff --git a/commandergenius/options.mk b/commandergenius/options.mk
index be4360ed9c..d4f428e25a 100644
--- a/commandergenius/options.mk
+++ b/commandergenius/options.mk
@@ -8,8 +8,8 @@ PKG_SUGGESTED_OPTIONS= ogg
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mogg)
-CMAKE_ARGS+= -DOGG=Yes
+CMAKE_CONFIGURE_ARGS+= -DOGG=Yes
.include "../../audio/libvorbis/buildlink3.mk"
.else
-CMAKE_ARGS+= -DOGG=No
+CMAKE_CONFIGURE_ARGS+= -DOGG=No
.endif
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index 398212a619..d2b3eabfb9 100644
--- a/compiler-rt/Makefile
+++ b/compiler-rt/Makefile
@@ -20,12 +20,12 @@ USE_TOOLS+= ggrep
GCC_REQD+= 4.8
SSP_SUPPORTED= no
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
-CMAKE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${LLVM_MAJOR_VERSION}
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${LLVM_MAJOR_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_ENABLE_IOS=OFF
TEST_TARGET= check-compiler-rt
diff --git a/conky/Makefile b/conky/Makefile
index 571546ef30..a4230cfc91 100644
--- a/conky/Makefile
+++ b/conky/Makefile
@@ -15,10 +15,10 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DRELEASE=ON
+CMAKE_CONFIGURE_ARGS+= -DRELEASE=ON
# XXX: investigate fixing this with NetBSD curses
-CMAKE_ARGS+= -DBUILD_NCURSES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_NCURSES=OFF
EGDIR= share/examples/conky
OWN_DIRS= ${PKG_SYSCONFDIR}/conky
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index 0350d92869..5c1579590e 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -14,9 +14,9 @@ LICENSE= mit
USE_LANGUAGES= c c++
USE_TOOLS+= bash pax
-# We need to set CMake this way to get defined CMAKE_ARGS
+# We need to set CMake this way to get defined CMAKE_CONFIGURE_ARGS
USE_CMAKE= yes
-CMAKE_ARGS+= -DCORECLR_SET_RPATH:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCORECLR_SET_RPATH:BOOL=OFF
REPLACE_BASH+= build.sh src/pal/tests/palsuite/runpaltests.sh
@@ -55,7 +55,7 @@ do-configure:
do-build:
${RUN} cd ${WRKSRC} && \
${PKGSRC_SETENV} ${MAKE_ENV} PYTHON=${PYTHONBIN:Q} \
- ./build.sh skipmscorlib cmakeargs ${CMAKE_ARGS:Q}
+ ./build.sh skipmscorlib cmakeargs ${CMAKE_CONFIGURE_ARGS:Q}
# Currently there is no unix-like install target.
# Put all produced files under subprefix.
diff --git a/corefx-git/Makefile b/corefx-git/Makefile
index c8e3fdacd4..04ebdf8bc3 100644
--- a/corefx-git/Makefile
+++ b/corefx-git/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/dotnet/corefx
COMMENT= The .NET Core foundational libraries
LICENSE= mit
-# We need to set CMake this way to get defined CMAKE_ARGS
+# We need to set CMake this way to get defined CMAKE_CONFIGURE_ARGS
USE_CMAKE= yes
USE_LANGUAGES= c c++
@@ -25,14 +25,14 @@ PKG_CC= clang
PKG_CXX= clang++
# NetBSD specific for now
-CMAKE_ARGS+= -DHeimdalGssApi=ON
+CMAKE_CONFIGURE_ARGS+= -DHeimdalGssApi=ON
do-configure:
${RUN} ${ECHO} Skip configure and call CMake via build.sh
do-build:
${RUN} cd ${WRKSRC} && \
- ${PKGSRC_SETENV} ${MAKE_ENV} ./build.sh native verbose cmakeargs ${CMAKE_ARGS:Q}
+ ${PKGSRC_SETENV} ${MAKE_ENV} ./build.sh native verbose cmakeargs ${CMAKE_CONFIGURE_ARGS:Q}
# NetBSD uses Heimdal from base
#.include "../../security/mit-krb5/buildlink3.mk"
diff --git a/crosswrench-git/Makefile b/crosswrench-git/Makefile
index 05bca6885c..f4d3cb1a8f 100644
--- a/crosswrench-git/Makefile
+++ b/crosswrench-git/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config
USE_CMAKE= yes
-CMAKE_ARGS+= -DEXTERNAL_LIBS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DEXTERNAL_LIBS:BOOL=ON
.include "../../devel/cxxopts/buildlink3.mk"
.include "../../devel/pstreams/buildlink3.mk"
diff --git a/csound6/Makefile b/csound6/Makefile
index 00334675d1..01ddfb0483 100644
--- a/csound6/Makefile
+++ b/csound6/Makefile
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1 # or later
USE_LANGUAGES= c c++
USE_TOOLS+= bison flex
-CMAKE_ARGS+= -DBUILD_HDF5_OPCODES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_HDF5_OPCODES=OFF
# CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
diff --git a/csound6/options.mk b/csound6/options.mk
index 37f1c330a8..eecedd2f61 100644
--- a/csound6/options.mk
+++ b/csound6/options.mk
@@ -17,37 +17,37 @@ PKG_SUGGESTED_OPTIONS+= portaudio
PLIST_VARS+= alsa
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_ALSA=ON
PLIST.alsa= yes
.else
-CMAKE_ARGS+= -DUSE_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ALSA=OFF
.endif
PLIST_VARS+= jack
.if !empty(PKG_OPTIONS:Mjack)
.include "../../audio/jack/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_JACK=ON
PLIST.jack= yes
.else
-CMAKE_ARGS+= -DUSE_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_JACK=OFF
.endif
PLIST_VARS+= portaudio
.if !empty(PKG_OPTIONS:Mportaudio)
.include "../portaudio/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_PORTAUDIO=ON
-CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${BUILDLINK_PREFIX.portaudio}/include/portaudio2
-CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${BUILDLINK_PREFIX.portaudio}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DUSE_PORTAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${BUILDLINK_PREFIX.portaudio}/include/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_LIBRARY_PATH=${BUILDLINK_PREFIX.portaudio}/lib/portaudio2
PLIST.portaudio= yes
.else
-CMAKE_ARGS+= -DUSE_PORTAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PORTAUDIO=OFF
.endif
PLIST_VARS+= pulseaudio
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_PULSEAUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_PULSEAUDIO=ON
PLIST.pulseaudio= yes
.else
-CMAKE_ARGS+= -DUSE_PULSEAUDIO=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PULSEAUDIO=OFF
.endif
diff --git a/deviceatlas-enterprise-c/Makefile b/deviceatlas-enterprise-c/Makefile
index 85d9541122..8534054bcc 100644
--- a/deviceatlas-enterprise-c/Makefile
+++ b/deviceatlas-enterprise-c/Makefile
@@ -27,7 +27,7 @@ PKG_DESTDIR_SUPPORT= destdir
INSTALLATION_DIRS= lib include
-CMAKE_ARGS+= -DSKIP_INSTALL_RPATH=ON \
+CMAKE_CONFIGURE_ARGS+= -DSKIP_INSTALL_RPATH=ON \
-DBUILD_WITH_INSTALL_RPATH=ON
FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from"
diff --git a/dlib-cpp/Makefile b/dlib-cpp/Makefile
index 61328b20d3..8026343902 100644
--- a/dlib-cpp/Makefile
+++ b/dlib-cpp/Makefile
@@ -12,7 +12,7 @@ COMMENT= Machine learning framework written in C++
LICENSE= boost-license
USE_CMAKE= yes
USE_LANGUAGES+= c c++
-CMAKE_ARGS+= -B ${WRKSRC}/build
+CMAKE_CONFIGURE_ARGS+= -B ${WRKSRC}/build
BUILD_DIRS= build
DOCSDIR= ${PREFIX}/share/doc/dlib
diff --git a/dolfin/Makefile b/dolfin/Makefile
index 5a9f6f6a35..4e39705479 100644
--- a/dolfin/Makefile
+++ b/dolfin/Makefile
@@ -21,7 +21,7 @@ REPLACE_PYTHON+= scripts/dolfin-plot/dolfin-plot
REPLACE_PYTHON+= scripts/dolfin-order/dolfin-order
REPLACE_PYTHON+= scripts/dolfin-convert/dolfin-convert
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DDOLFIN_ENABLE_MPI:BOOL=OFF \
-DLOCALBASE=${PREFIX}
diff --git a/ds2/Makefile b/ds2/Makefile
index d7745d5c70..201a5df43c 100644
--- a/ds2/Makefile
+++ b/ds2/Makefile
@@ -19,11 +19,11 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
GCC_REQD+= 4.8
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLDB_USE_SYSTEM_SIX:BOOL=TRUE
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/edbrowse/Makefile b/edbrowse/Makefile
index 2c4de0850d..dd6556aa49 100644
--- a/edbrowse/Makefile
+++ b/edbrowse/Makefile
@@ -14,7 +14,7 @@ USE_CMAKE= yes
USE_TOOLS+= perl:build
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DTIDY_ROOT=${PREFIX}/include/tidy
+CMAKE_CONFIGURE_ARGS+= -DTIDY_ROOT=${PREFIX}/include/tidy
SUBST_CLASSES+= man
SUBST_STAGE.man= pre-patch
diff --git a/eiskaltdcpp/Makefile b/eiskaltdcpp/Makefile
index 12c7d12e2e..e39d9336b2 100644
--- a/eiskaltdcpp/Makefile
+++ b/eiskaltdcpp/Makefile
@@ -14,8 +14,8 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl:run
-CMAKE_ARGS+= -DUSE_QT=OFF
-CMAKE_ARGS+= -DUSE_QT5=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_QT5=ON
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/et/Makefile b/et/Makefile
index 7edc78fb95..15fac8ee91 100644
--- a/et/Makefile
+++ b/et/Makefile
@@ -19,8 +19,8 @@ USE_LANGUAGES= c c++
USE_TOOLS+= perl
GCC_REQD+= 9 # uses std::filesystem
-CMAKE_ARGS+= -DDISABLE_VCPKG=ON
-CMAKE_ARGS+= -DDISABLE_TELEMETRY=ON
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_VCPKG=ON
+CMAKE_CONFIGURE_ARGS+= -DDISABLE_TELEMETRY=ON
PKGCONFIG_OVERRIDE+= external_imported/Catch2/CMake/catch2.pc.in
PKGCONFIG_OVERRIDE+= external_imported/UniversalStacktrace/external/Catch2/CMake/catch2.pc.in
diff --git a/eureka-devel/Makefile b/eureka-devel/Makefile
index 39d70893e5..6ec0101921 100644
--- a/eureka-devel/Makefile
+++ b/eureka-devel/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++
USE_CC_FEATURES+= c11
USE_CXX_FEATURES+= c++17
-CMAKE_ARGS+= -DENABLE_UNIT_TESTS=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UNIT_TESTS=off
# DOOMWADDIR is intentionally shared with other Doom packages
DOOMWADDIR= share/doom
diff --git a/eureka-devel/options.mk b/eureka-devel/options.mk
index 66b8980c24..b73c85c4eb 100644
--- a/eureka-devel/options.mk
+++ b/eureka-devel/options.mk
@@ -18,7 +18,7 @@ CXXFLAGS= -I"${PREFIX}/include/cairo"
# If FLTK is compiled with opengl option, disabling it here allows to force
# usage of the software renderer (recommended without hardware acceleration).
.if empty(PKG_OPTIONS.fltk14-devel:Mopengl) || empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DENABLE_OPENGL=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENGL=off
.endif
# xdg-utils: Create dependency for xdg-utils (Portland project)
# Can be used by FLTK for fl_open_uri() on X11.
diff --git a/fallout1-ce/Makefile b/fallout1-ce/Makefile
index 0f50c95f57..4b0fec3e74 100644
--- a/fallout1-ce/Makefile
+++ b/fallout1-ce/Makefile
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++
INSTALLATION_DIRS+= bin
INSTALL_TARGET= ${BUILD_TARGET}
-CMAKE_ARGS+= -Dfpattern_SOURCE_DIR=${WRKDIR}/fpattern-1.9
+CMAKE_CONFIGURE_ARGS+= -Dfpattern_SOURCE_DIR=${WRKDIR}/fpattern-1.9
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${CMAKE_BUILD_DIR}/fallout-ce ${DESTDIR}${PREFIX}/bin/
diff --git a/fallout2-ce/Makefile b/fallout2-ce/Makefile
index 40e1e79995..e8e5c085d2 100644
--- a/fallout2-ce/Makefile
+++ b/fallout2-ce/Makefile
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++
INSTALLATION_DIRS+= bin
INSTALL_TARGET= ${BUILD_TARGET}
-CMAKE_ARGS+= -Dfpattern_SOURCE_DIR=${WRKDIR}/fpattern-1.9
+CMAKE_CONFIGURE_ARGS+= -Dfpattern_SOURCE_DIR=${WRKDIR}/fpattern-1.9
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${CMAKE_BUILD_DIR}/fallout2-ce ${DESTDIR}${PREFIX}/bin/
diff --git a/flang-git/Makefile b/flang-git/Makefile
index feed7808bb..7b3d5fc69a 100644
--- a/flang-git/Makefile
+++ b/flang-git/Makefile
@@ -19,9 +19,9 @@ USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/flang/Makefile b/flang/Makefile
index 7e466f3d5a..7bc80f31f5 100644
--- a/flang/Makefile
+++ b/flang/Makefile
@@ -16,10 +16,10 @@ USE_LANGUAGES= c c++
USE_TOOLS+= bash:run gmake
GCC_REQD+= 12
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DFLANG_INCLUDE_TESTS=OFF
-CMAKE_ARGS+= -DCLANG_DIR=${BUILDLINK_PREFIX.clang}/lib/cmake/clang
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=YES
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DFLANG_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCLANG_DIR=${BUILDLINK_PREFIX.clang}/lib/cmake/clang
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=YES
REPLACE_BASH= tools/f18/flang-to-external-fc.in
diff --git a/freecad/Makefile b/freecad/Makefile
index 4572fc84f6..f81383b8e1 100644
--- a/freecad/Makefile
+++ b/freecad/Makefile
@@ -20,12 +20,12 @@ USE_TOOLS+= perl
CXXFLAGS.FreeBSD+= -fPIC
LDFLAGS.FreeBSD+= -fPIC
-CMAKE_ARGS+= -DCMAKE_INSTALL_HOMEDIR:PATH=${PREFIX}/freecad
-CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q}
-CMAKE_ARGS+= -DCMAKE_SHARED_LINKER_FLAGS=${LDFLAGS:Q}
-#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_HOMEDIR:PATH=${PREFIX}/freecad
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SHARED_LINKER_FLAGS=${LDFLAGS:Q}
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON
-CMAKE_ARGS+= -DFREECAD_USE_EXTERNAL_KDL=ON
+CMAKE_CONFIGURE_ARGS+= -DFREECAD_USE_EXTERNAL_KDL=ON
SUBST_CLASSES+= eol
SUBST_MESSAGE.eol= Removing DOS line-ends
diff --git a/freefem++/options.mk b/freefem++/options.mk
index 66aa05460b..55564a86c0 100644
--- a/freefem++/options.mk
+++ b/freefem++/options.mk
@@ -9,17 +9,17 @@ PKG_SUPPORTED_OPTIONS= amd umfpack
#.if !empty(PKG_OPTIONS:Mpulseaudio)
#.include "../../audio/pulseaudio/buildlink3.mk"
#.else
-#CMAKE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
+#CMAKE_CONFIGURE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
#.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNO_PULSE_SIMPLE:BOOL=TRUE
.endif
diff --git a/freegish-git/Makefile b/freegish-git/Makefile
index 08a3ca18ec..63f728ed1f 100644
--- a/freegish-git/Makefile
+++ b/freegish-git/Makefile
@@ -10,8 +10,8 @@ COMMENT= Free version of the game Gish
LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-CMAKE_ARGS+= -DINSTALL_FHS:BOOL=ON
-CMAKE_ARGS+= -DMAN_DIR:PATH=${PREFIX}/${PKGMANDIR}/man6
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_FHS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DMAN_DIR:PATH=${PREFIX}/${PKGMANDIR}/man6
GIT_REPOSITORIES= freegish
GIT_REPO.freegish= https://github.com/freegish/freegish.git
diff --git a/freeserf/Makefile b/freeserf/Makefile
index 9874e75470..b77adcec61 100644
--- a/freeserf/Makefile
+++ b/freeserf/Makefile
@@ -17,8 +17,8 @@ USE_LANGUAGES= c c++11
# C++11
GCC_REQD+= 4.7
-CMAKE_ARGS+= -DENABLE_TESTS=OFF
-CMAKE_ARGS+= -DFREESERF_VERSION=${PKGVERSION}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFREESERF_VERSION=${PKGVERSION}
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
diff --git a/freesynd/Makefile b/freesynd/Makefile
index 7b7ae16c5f..04a7fc36b8 100644
--- a/freesynd/Makefile
+++ b/freesynd/Makefile
@@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=release
-CMAKE_ARGS+= -DSDLIMAGE_INCLUDE_DIR=${BUILDLINK_PREFIX.SDL_image}/include
-CMAKE_ARGS+= -DSDLMIXER_INCLUDE_DIR=${BUILDLINK_PREFIX.SDL_mixer}/include
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=release
+CMAKE_CONFIGURE_ARGS+= -DSDLIMAGE_INCLUDE_DIR=${BUILDLINK_PREFIX.SDL_image}/include
+CMAKE_CONFIGURE_ARGS+= -DSDLMIXER_INCLUDE_DIR=${BUILDLINK_PREFIX.SDL_mixer}/include
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/fs2open/Makefile b/fs2open/Makefile
index dc37235e68..ad13050d16 100644
--- a/fs2open/Makefile
+++ b/fs2open/Makefile
@@ -31,10 +31,10 @@ USE_TOOLS+= pkg-config
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DBINARY_DESTINATION=bin
-CMAKE_ARGS+= -DENABLE_COTIRE=OFF
-CMAKE_ARGS+= -DFSO_BUILD_INCLUDED_LIBS=OFF
-CMAKE_ARGS+= -DFSO_BUILD_WITH_VULKAN=OFF
+CMAKE_CONFIGURE_ARGS+= -DBINARY_DESTINATION=bin
+CMAKE_CONFIGURE_ARGS+= -DENABLE_COTIRE=OFF
+CMAKE_CONFIGURE_ARGS+= -DFSO_BUILD_INCLUDED_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DFSO_BUILD_WITH_VULKAN=OFF
LUA_VERSIONS_ACCEPTED= 51
diff --git a/gdcm/Makefile b/gdcm/Makefile
index 14a739df28..66d0d7c93a 100644
--- a/gdcm/Makefile
+++ b/gdcm/Makefile
@@ -13,12 +13,12 @@ LICENSE= modified-bsd
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
-CMAKE_ARGS+= -DGDCM_USE_SYSTEM_ZLIB=ON
-CMAKE_ARGS+= -DGDCM_USE_SYSTEM_OPENSSL=ON
-CMAKE_ARGS+= -DGDCM_USE_SYSTEM_EXPAT=ON
-CMAKE_ARGS+= -DGDCM_USE_SYSTEM_OPENJPEG=ON
-CMAKE_ARGS+= -DGDCM_INSTALL_MAN_DIR=man
-CMAKE_ARGS+= -DGDCM_MANPAGES_USE_NONET:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DGDCM_USE_SYSTEM_ZLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DGDCM_USE_SYSTEM_OPENSSL=ON
+CMAKE_CONFIGURE_ARGS+= -DGDCM_USE_SYSTEM_EXPAT=ON
+CMAKE_CONFIGURE_ARGS+= -DGDCM_USE_SYSTEM_OPENJPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DGDCM_INSTALL_MAN_DIR=man
+CMAKE_CONFIGURE_ARGS+= -DGDCM_MANPAGES_USE_NONET:BOOL=TRUE
TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
diff --git a/geoloc/Makefile b/geoloc/Makefile
index 3130d344c4..c16c25a9e9 100644
--- a/geoloc/Makefile
+++ b/geoloc/Makefile
@@ -17,7 +17,7 @@ LICENSE= 2-clause-bsd
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS= -DGEOLOC_INSTALL_PATH=${PKGDIR}
+CMAKE_CONFIGURE_ARGS= -DGEOLOC_INSTALL_PATH=${PKGDIR}
CONF_FILES= ${WRKSRC}/geolocd/geolocd.conf ${PREFIX}/etc/geolocd.conf
diff --git a/gm2calc/Makefile b/gm2calc/Makefile
index d106ee35cd..45d0d000dd 100644
--- a/gm2calc/Makefile
+++ b/gm2calc/Makefile
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= cmake/gm2calc.pc.in
# MESSAGE(FATAL_ERROR "GCC 4.6+ is required.")
GCC_REQD+= 4.6
-CMAKE_ARGS+= -Mathematica=off
+CMAKE_CONFIGURE_ARGS+= -Mathematica=off
DEPENDS+= doxygen>=1.8.20:../../devel/doxygen
diff --git a/gnucash-devel/Makefile b/gnucash-devel/Makefile
index 3aaf968361..0bc2ffc71f 100644
--- a/gnucash-devel/Makefile
+++ b/gnucash-devel/Makefile
@@ -35,9 +35,9 @@ CXXFLAGS+= -Wno-deprecated-declarations
CFLAGS+= -Wno-char-subscripts
MAKE_ENV+= GUILE_AUTO_COMPILE=0
-CMAKE_ARGS+= -DWITH_AQBANKING=OFF
-CMAKE_ARGS+= -DPERL_EXECUTABLE=${PERL5}
-CMAKE_ARGS+= -DCOMPILE_GSCHEMAS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_AQBANKING=OFF
+CMAKE_CONFIGURE_ARGS+= -DPERL_EXECUTABLE=${PERL5}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILE_GSCHEMAS=OFF
# test status as of 4.902
# 85% tests passed, 18 tests failed out of 124
diff --git a/gnucash-devel/options.mk b/gnucash-devel/options.mk
index 14e3101f6b..38143dc2d5 100644
--- a/gnucash-devel/options.mk
+++ b/gnucash-devel/options.mk
@@ -12,24 +12,24 @@ DEPENDS+= p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
.endif
.if !empty(PKG_OPTIONS:Mlibofx)
-CMAKE_ARGS+= -DWITH_OFX=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_OFX=ON
PLIST_SRC+= PLIST.ofx
.include "../../finance/libofx/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_OFX=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OFX=OFF
.endif
.if !empty(PKG_OPTIONS:Mlibdbi)
-CMAKE_ARGS+= -DWITH_SQL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQL=ON
PLIST_SRC+= PLIST.dbi
TOOL_DEPENDS+= libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
.include "../../databases/libdbi/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_SQL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SQL=OFF
.endif
.if !empty(PKG_OPTIONS:Mpython)
-CMAKE_ARGS+= -DWITH_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON=ON
PYTHON_VERSIONS_INCOMPATIBLE= 27
REPLACE_PYTHON+= bindings/python/example_scripts/*.py
REPLACE_PYTHON+= bindings/python/example_scripts/rest-api/*.py
@@ -43,5 +43,5 @@ DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.else
-CMAKE_ARGS+= -DWITH_PYTHON=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PYTHON=OFF
.endif
diff --git a/gnuradio-core/Makefile b/gnuradio-core/Makefile
index 7c81c882b7..9a8be59185 100644
--- a/gnuradio-core/Makefile
+++ b/gnuradio-core/Makefile
@@ -18,7 +18,7 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
.endif
# set default as minimum
-CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
# Take care CONF_FILES stuff (The same code in Nocore.mk)
#post-install:
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index 48e077a5fe..69707e55c8 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -88,36 +88,36 @@ CXXFLAGS.SunOS+= -pthreads
INSTALLATION_DIRS+= ${EGDIR}
-# -------- R E S E T CMAKE_ARGS H E R E -------------
-CMAKE_ARGS=
+# -------- R E S E T CMAKE_CONFIGURE_ARGS H E R E -------------
+CMAKE_CONFIGURE_ARGS=
-CMAKE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
-CMAKE_ARGS+= -DENABLE_GR_ANALOG=ON
-CMAKE_ARGS+= -DENABLE_GR_AUDIO=ON
-CMAKE_ARGS+= -DENABLE_GR_BLOCKS=ON
-CMAKE_ARGS+= -DENABLE_GR_FFT=ON
-CMAKE_ARGS+= -DENABLE_GR_FILTER=ON
-CMAKE_ARGS+= -DENABLE_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ANALOG=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_AUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FFT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FILTER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
-CMAKE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
# Default setting (for pkgsrc)
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
-CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
-CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
-CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
-CMAKE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
+CMAKE_CONFIGURE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
# adhoc setup not to pick non default version (say python3.6)
# at configure
-#CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
+#CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
-CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
CMAKE_ARG_PATH= ../
.include "options.mk"
diff --git a/gnuradio-core/options.mk b/gnuradio-core/options.mk
index d2e55bb783..138f0542aa 100644
--- a/gnuradio-core/options.mk
+++ b/gnuradio-core/options.mk
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= filter-design
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mninja-build)
-CMAKE_ARGS+= -GNinja
+CMAKE_CONFIGURE_ARGS+= -GNinja
TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
do-build:
diff --git a/gnuradio-monolithic/Makefile b/gnuradio-monolithic/Makefile
index a8647833d5..e02d95f54e 100644
--- a/gnuradio-monolithic/Makefile
+++ b/gnuradio-monolithic/Makefile
@@ -65,42 +65,42 @@ CXXFLAGS.SunOS+= -pthreads
INSTALLATION_DIRS+= ${EGDIR}
-# -------- R E S E T CMAKE_ARGS H E R E -------------
-CMAKE_ARGS=
+# -------- R E S E T CMAKE_CONFIGURE_ARGS H E R E -------------
+CMAKE_CONFIGURE_ARGS=
-CMAKE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
-CMAKE_ARGS+= -DENABLE_GR_ANALOG=ON
-CMAKE_ARGS+= -DENABLE_GR_AUDIO=ON
-CMAKE_ARGS+= -DENABLE_GR_BLOCKS=ON
-CMAKE_ARGS+= -DENABLE_GR_FFT=ON
-CMAKE_ARGS+= -DENABLE_GR_FILTER=ON
-CMAKE_ARGS+= -DENABLE_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ANALOG=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_AUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FFT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FILTER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
-CMAKE_ARGS+= -DLIB_SUFFIX=""
+CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
# Default setting (for pkgsrc)
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
-CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
-CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
#MAKE_ARGS+= -DCMAKE_MAN_PATH=${PREFIX}/man
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
-CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
+CMAKE_CONFIGURE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
-CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
-CMAKE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
+CMAKE_CONFIGURE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
# adhoc setup not to pick non default version (say python3.6)
# at configure
-#CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
+#CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
-CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
CMAKE_ARG_PATH= ../
.include "options.mk"
@@ -158,8 +158,8 @@ TOOL_DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar
#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf
#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf
-CMAKE_ARGS+= -DENABLE_GR_VIDEO_SDL=ON
-CMAKE_ARGS+= -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_VIDEO_SDL=ON
+CMAKE_CONFIGURE_ARGS+= -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
# Take care CONF_FILES stuff (The same code in Nocore.mk)
#post-install:
diff --git a/gnuradio-monolithic/options.mk b/gnuradio-monolithic/options.mk
index d71fa069f7..074fb85fa6 100644
--- a/gnuradio-monolithic/options.mk
+++ b/gnuradio-monolithic/options.mk
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= filter-design
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mninja-build)
-CMAKE_ARGS+= -GNinja
+CMAKE_CONFIGURE_ARGS+= -GNinja
TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
do-build:
diff --git a/gorilla-audio/Makefile b/gorilla-audio/Makefile
index 9a62c5db83..f89d81d434 100644
--- a/gorilla-audio/Makefile
+++ b/gorilla-audio/Makefile
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/gorilla-audio-a3d6dbe5dd99f4ad29affb8d9a2d893ee30f5f3a
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DSYSTEM_LIBRARIES:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_LIBRARIES:BOOL=TRUE
.include "../../audio/openal-soft/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/gpick/Makefile b/gpick/Makefile
index e74a05f5af..26dfea12d2 100644
--- a/gpick/Makefile
+++ b/gpick/Makefile
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config msgfmt msgmerge xgettext
USE_CXX_FEATURES+= c++14
-CMAKE_ARGS+= -DLua_LIBRARIES=-llua${_LUA_DOT_VERSION}
+CMAKE_CONFIGURE_ARGS+= -DLua_LIBRARIES=-llua${_LUA_DOT_VERSION}
#CXXFLAGS+= -I${BUILDLINK_DIR}/${LUA_INCDIR}
#LDFLAGS+= -llua${_LUA_DOT_VERSION}
diff --git a/gqrx/Makefile b/gqrx/Makefile
index d4755de068..53d823cb33 100644
--- a/gqrx/Makefile
+++ b/gqrx/Makefile
@@ -16,7 +16,7 @@ COMMENT= SDR GUI using GNU Radio
LICENSE= gnu-gpl-v3
USE_CMAKE= yes
-#CMAKE_ARGS+= -DTRY_SHM_VMCIRCBUF=ON
+#CMAKE_CONFIGURE_ARGS+= -DTRY_SHM_VMCIRCBUF=ON
USE_LANGUAGES= c c++
## These dependencies are organized according to upstream's README
diff --git a/gr-fcdproplus-git/Makefile b/gr-fcdproplus-git/Makefile
index 5a1ffe1186..c1cab4082e 100644
--- a/gr-fcdproplus-git/Makefile
+++ b/gr-fcdproplus-git/Makefile
@@ -16,8 +16,8 @@ USE_CMAKE= yes
CXXFLAGS+= -I${PREFIX}/include/libusb-1.0
# Suppress warning for developer
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
SUBST_CLASSES+= libusb
diff --git a/gr-fcdproplus/Makefile b/gr-fcdproplus/Makefile
index 537b9127b0..a5082e6a4e 100644
--- a/gr-fcdproplus/Makefile
+++ b/gr-fcdproplus/Makefile
@@ -20,8 +20,8 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CXXFLAGS+= -I${PREFIX}/include/libusb-1.0
# Suppress warning for developer
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
CFLAGS+= -I${PREFIX}/include/libusb-1.0
diff --git a/greenbone-security-assistant/Makefile b/greenbone-security-assistant/Makefile
index 12904460f1..9c8bf3166b 100644
--- a/greenbone-security-assistant/Makefile
+++ b/greenbone-security-assistant/Makefile
@@ -14,7 +14,7 @@ BUILD_DEFS+= VARBASE
USE_LANGUAGES= c++ c
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
BUILDLINK_TRANSFORM+= rm:-Werror # Redefinition of macros
diff --git a/gzdoom/Makefile b/gzdoom/Makefile
index 15891e365f..a4fc1f4c6e 100644
--- a/gzdoom/Makefile
+++ b/gzdoom/Makefile
@@ -16,8 +16,8 @@ LICENSE= gnu-gpl-v3
WRKSRC= ${WRKDIR}/gzdoom-${GITHUB_TAG}
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DDL_LDFLAGS="${DL_LDFLAGS}"
-CMAKE_ARGS+= -DDL_LIBS="${DL_LIBS}"
+CMAKE_CONFIGURE_ARGS+= -DDL_LDFLAGS="${DL_LDFLAGS}"
+CMAKE_CONFIGURE_ARGS+= -DDL_LIBS="${DL_LIBS}"
CXXFLAGS+= -D PKGSRC_DOOM_PATH='"${PREFIX}/share/games/doom"'
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/hiawatha/Makefile b/hiawatha/Makefile
index a6c1048083..9776f8640f 100644
--- a/hiawatha/Makefile
+++ b/hiawatha/Makefile
@@ -12,15 +12,15 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-CMAKE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
-CMAKE_ARGS+= -DUSE_STATIC_MBEDTLS_LIBRARY=ON
-CMAKE_ARGS+= -DWEBROOT_DIR="${PREFIX}/var/hiawatha"
-CMAKE_ARGS+= -DWORK_DIR="${PREFIX}/var/db/hiawatha"
-CMAKE_ARGS+= -DCONFIG_DIR="${PREFIX}/etc/hiawatha"
-CMAKE_ARGS+= -DLOG_DIR="${PREFIX}/var/log/hiawatha"
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR="${PREFIX}/man"
-CMAKE_ARGS+= -DENABLE_XSLT=ON
-CMAKE_ARGS+= -DPID_DIR="${PREFIX}/var/run"
+CMAKE_CONFIGURE_ARGS+= -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_STATIC_MBEDTLS_LIBRARY=ON
+CMAKE_CONFIGURE_ARGS+= -DWEBROOT_DIR="${PREFIX}/var/hiawatha"
+CMAKE_CONFIGURE_ARGS+= -DWORK_DIR="${PREFIX}/var/db/hiawatha"
+CMAKE_CONFIGURE_ARGS+= -DCONFIG_DIR="${PREFIX}/etc/hiawatha"
+CMAKE_CONFIGURE_ARGS+= -DLOG_DIR="${PREFIX}/var/log/hiawatha"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR="${PREFIX}/man"
+CMAKE_CONFIGURE_ARGS+= -DENABLE_XSLT=ON
+CMAKE_CONFIGURE_ARGS+= -DPID_DIR="${PREFIX}/var/run"
.include "options.mk"
diff --git a/hiawatha/options.mk b/hiawatha/options.mk
index b2b2af8f1e..5ac477dc4f 100644
--- a/hiawatha/options.mk
+++ b/hiawatha/options.mk
@@ -6,13 +6,13 @@ PKG_SUPPORTED_OPTIONS= monitor tomahawk
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mmonitor)
-CMAKE_ARGS+= -DENABLE_MONITOR=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MONITOR=on
.else
-CMAKE_ARGS+= -DENABLE_MONITOR=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MONITOR=off
.endif
.if !empty(PKG_OPTIONS:Mtomahawk)
-CMAKE_ARGS+= -DENABLE_TOMAHAWK=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOMAHAWK=on
.else
-CMAKE_ARGS+= -DENABLE_TOMAHAWK=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOMAHAWK=off
.endif
diff --git a/i2pd-git/Makefile b/i2pd-git/Makefile
index 014ba6b384..1316ef8e05 100644
--- a/i2pd-git/Makefile
+++ b/i2pd-git/Makefile
@@ -10,8 +10,8 @@ WRKSRC= ${WRKDIR}/i2pd-${GIT_SHA}/build
COMMENT= Full-featured C++ implementation of I2P client
-CMAKE_ARGS+= -DWITH_BINARY=yes
-CMAKE_ARGS+= -DWITH_LIBRARY=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_BINARY=yes
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBRARY=no
I2PD_USER= i2pd
I2PD_GROUP= i2pd
diff --git a/i2pd/Makefile b/i2pd/Makefile
index be0c7edcb5..a3319c001a 100644
--- a/i2pd/Makefile
+++ b/i2pd/Makefile
@@ -9,8 +9,8 @@ CONFLICTS+= i2pd-git-*
BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
USE_TOOLS+= pax
-CMAKE_ARGS+= -DWITH_BINARY=yes
-CMAKE_ARGS+= -DWITH_LIBRARY=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_BINARY=yes
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBRARY=no
EGDIR= share/examples/i2pd
diff --git a/include-what-you-use/Makefile b/include-what-you-use/Makefile
index d37d3a4145..cd15d65212 100644
--- a/include-what-you-use/Makefile
+++ b/include-what-you-use/Makefile
@@ -14,7 +14,7 @@ USE_LANGUAGES= c c++14
GCC_REQD+= 5
-CMAKE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang}
+CMAKE_CONFIGURE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang}
REPLACE_PYTHON= *.py
diff --git a/inicpp/Makefile b/inicpp/Makefile
index 83b9117f4e..c88365113b 100644
--- a/inicpp/Makefile
+++ b/inicpp/Makefile
@@ -15,10 +15,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DINICPP_BUILD_SHARED:BOOL=ON
-CMAKE_ARGS+= -DINICPP_BUILD_EXAMPLES:BOOL=ON
-CMAKE_ARGS+= -DINICPP_BUILD_TESTS:BOOL=ON
-CMAKE_ARGS+= -DNO_GOOGLE_TEST:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DINICPP_BUILD_SHARED:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DINICPP_BUILD_EXAMPLES:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DINICPP_BUILD_TESTS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_GOOGLE_TEST:BOOL=ON
TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}
TEST_TARGET= test
diff --git a/kallisto/Makefile b/kallisto/Makefile
index d4036ca9ea..5e5a2d6e34 100644
--- a/kallisto/Makefile
+++ b/kallisto/Makefile
@@ -19,7 +19,7 @@ SUBST_STAGE.test= pre-configure
SUBST_FILES.test= kallisto-test
SUBST_SED.test= -e 's|/usr/local/share/kallisto|${DATADIR}|g'
-CMAKE_ARGS+= -DUSE_HDF5:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_HDF5:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
# Build fails on 8-core Mac M1
MAKE_JOBS_SAFE= no
INSTALLATION_DIRS+= ${DATADIR}
diff --git a/kde-baseapps4/Makefile b/kde-baseapps4/Makefile
index c130cefb08..24e1ffe82a 100644
--- a/kde-baseapps4/Makefile
+++ b/kde-baseapps4/Makefile
@@ -20,7 +20,7 @@ REPLACE_FILES.xdg-open= lib/konq/Templates/Program.desktop
CHECK_INTERPRETER_SKIP= share/kde/templates/.source/Program.desktop
-CMAKE_ARGS+= -DWITH_Baloo:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_Baloo:BOOL=OFF
.include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index 5c83d3b55d..0563b6591a 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -10,22 +10,22 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applications/17.08.3/src/}
.include "../../meta-pkgs/kde4/Makefile.kde4"
# BUILD_MAKE_FLAGS+= VERBOSE=1
-CMAKE_ARGS+= -DWITH_LibSSH:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_LibSSH:BOOL=OFF
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
.if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.dylib
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.dylib
.else
-CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
+CMAKE_CONFIGURE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
.endif
-CMAKE_ARGS+= -DWITH_QNtrack=OFF
-CMAKE_ARGS+= -DWITH_NepomukCore=OFF
-CMAKE_ARGS+= -DBUILD_khelpcenter=OFF
-CMAKE_ARGS+= -DBUILD_kglobalaccel=OFF
-CMAKE_ARGS+= -DBUILD_kuiserver=OFF
-CMAKE_ARGS+= -DBUILD_drkonqi=OFF
-CMAKE_ARGS+= -DBUILD_doc=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_QNtrack=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_NepomukCore=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_khelpcenter=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_kglobalaccel=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_kuiserver=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_drkonqi=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_doc=OFF
#DEPENDS+= htdig>=3.2.0:../../www/htdig
DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons
diff --git a/kde-runtime4/options.mk b/kde-runtime4/options.mk
index c676d597a2..b547856c79 100644
--- a/kde-runtime4/options.mk
+++ b/kde-runtime4/options.mk
@@ -11,19 +11,19 @@ PKG_SUGGESTED_OPTIONS.Linux+= alsa
PLIST_VARS+= smb
.if !empty(PKG_OPTIONS:Msamba)
.include "../../net/samba/buildlink3.mk"
-#CMAKE_ARGS+= -DSAMBA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.samba}/include
-#CMAKE_ARGS+= -DSAMBA_LIBRARIES:FILEPATH=${BUILDLINK_PREFIX.samba}/lib/samba
+#CMAKE_CONFIGURE_ARGS+= -DSAMBA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.samba}/include
+#CMAKE_CONFIGURE_ARGS+= -DSAMBA_LIBRARIES:FILEPATH=${BUILDLINK_PREFIX.samba}/lib/samba
PLIST.smb= yes
.endif
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
.endif
diff --git a/kodi/Makefile b/kodi/Makefile
index b332ba0475..5dd4d79e41 100644
--- a/kodi/Makefile
+++ b/kodi/Makefile
@@ -26,14 +26,14 @@ USE_LANGUAGES= c c++
USE_JAVA= build
USE_JAVA2= yes
-CMAKE_ARGS+= -DJava_JAVA_EXECUTABLE=${JAVA_BINPREFIX}-java
-CMAKE_ARGS+= -DENABLE_INTERNAL_CROSSGUID=no
+CMAKE_CONFIGURE_ARGS+= -DJava_JAVA_EXECUTABLE=${JAVA_BINPREFIX}-java
+CMAKE_CONFIGURE_ARGS+= -DENABLE_INTERNAL_CROSSGUID=no
# internet download, problematic dependency for pkgsrc
-CMAKE_ARGS+= -DENABLE_DVDCSS=no
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DVDCSS=no
# XXX does not work?
-CMAKE_ARGS+= -DKODI_DEPENDSBUILD=0
+CMAKE_CONFIGURE_ARGS+= -DKODI_DEPENDSBUILD=0
PYTHON_VERSIONS_ACCEPTED= 27 # insists on < 3.0 as of 15.2
@@ -52,7 +52,7 @@ post-patch:
do-build:
${MKDIR} ${WRKDIR}/kodi-build
cd ${WRKDIR}/kodi-build ; \
- ${CMAKE} ${WRKSRC}/project/cmake ${CMAKE_ARGS} ; \
+ ${CMAKE} ${WRKSRC}/project/cmake ${CMAKE_CONFIGURE_ARGS} ; \
${GMAKE}
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/ladybird-git/Makefile b/ladybird-git/Makefile
index 92a3acd888..6bbff37c09 100644
--- a/ladybird-git/Makefile
+++ b/ladybird-git/Makefile
@@ -16,7 +16,7 @@ USE_CXX_FEATURES+= c++20
GCC_REQD+= 13
USE_TOOLS+= pkg-config
-#CMAKE_ARGS+= -S Ladybird
+#CMAKE_CONFIGURE_ARGS+= -S Ladybird
# build broken with make
#CMAKE_GENERATOR= ninja
# TODO: this needs fixing
diff --git a/ldc/Makefile b/ldc/Makefile
index aa354cabb0..f153c85c9f 100644
--- a/ldc/Makefile
+++ b/ldc/Makefile
@@ -19,9 +19,9 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -GNinja
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
-CMAKE_ARGS+= -DLDC_WITH_LLD=OFF
+CMAKE_CONFIGURE_ARGS+= -GNinja
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
+CMAKE_CONFIGURE_ARGS+= -DLDC_WITH_LLD=OFF
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/ldc017/Makefile b/ldc017/Makefile
index e20542de40..fccde33112 100644
--- a/ldc017/Makefile
+++ b/ldc017/Makefile
@@ -23,7 +23,7 @@ LICENSE= modified-bsd \
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/ldc120/Makefile b/ldc120/Makefile
index 3382b6d238..6705b90114 100644
--- a/ldc120/Makefile
+++ b/ldc120/Makefile
@@ -18,8 +18,8 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -GNinja
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
+CMAKE_CONFIGURE_ARGS+= -GNinja
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/lgogdownloader-git/Makefile b/lgogdownloader-git/Makefile
index 0f17ef4b85..dda6b6e44e 100644
--- a/lgogdownloader-git/Makefile
+++ b/lgogdownloader-git/Makefile
@@ -13,7 +13,7 @@ TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DPC_JSONCPP_INCLUDEDIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/include/json
+CMAKE_CONFIGURE_ARGS+= -DPC_JSONCPP_INCLUDEDIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/include/json
# https://github.com/Sude-/lgogdownloader/issues/128
PKGSRC_USE_STACK_CHECK= no
diff --git a/libLLVM38/Makefile b/libLLVM38/Makefile
index 45760a7dcd..48798c417c 100644
--- a/libLLVM38/Makefile
+++ b/libLLVM38/Makefile
@@ -27,12 +27,12 @@ PYTHON_FOR_BUILD_ONLY= yes
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=g++
-CMAKE_ARGS+= -DLLVM_INCLUDE_UTILS=OFF
-CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=OFF
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=gcc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=g++
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INSTALL_UTILS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.for tool in bugpoint bugpoint_passes dsymutil gold llc lli llvm_ar \
llvm_as llvm_as_fuzzer llvm_bcanalyzer llvm_c_test llvm_cat \
@@ -45,7 +45,7 @@ CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
llvm_symbolizer llvm_xray lto msbuild obj2yaml opt sancov \
sanstats verify_uselistorder xcode_toolchain yaml2obj
-CMAKE_ARGS+= -DLLVM_TOOL_${tool:tu}_BUILD=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TOOL_${tool:tu}_BUILD=OFF
.endfor
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
diff --git a/libLLVM38/options.mk b/libLLVM38/options.mk
index ccdbddc1aa..152da0a943 100644
--- a/libLLVM38/options.mk
+++ b/libLLVM38/options.mk
@@ -35,4 +35,4 @@ LLVM_TARGETS_TO_BUILD+= ${tgt}
. endif
.endfor
-CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
diff --git a/libbgcode/Makefile b/libbgcode/Makefile
index 14ffcc64f2..697c7d4afe 100644
--- a/libbgcode/Makefile
+++ b/libbgcode/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-agpl-v3
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-#CMAKE_ARGS+= -DLibBGCode_BUILD_DEPS=on
+#CMAKE_CONFIGURE_ARGS+= -DLibBGCode_BUILD_DEPS=on
# CMake goes looking for this binary. Make it happy.
pre-configure:
diff --git a/libc++-abi/Makefile b/libc++-abi/Makefile
index f1e58d46cd..bb8877a3af 100644
--- a/libc++-abi/Makefile
+++ b/libc++-abi/Makefile
@@ -18,12 +18,12 @@ GCC_REQD+= 4.8
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=g++
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=gcc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=g++
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
post-extract:
${MKDIR} ${WRKDIR}/build
diff --git a/libc++/Makefile b/libc++/Makefile
index a4ea2d39a2..d6f92d8631 100644
--- a/libc++/Makefile
+++ b/libc++/Makefile
@@ -18,12 +18,12 @@ GCC_REQD+= 4.8
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=g++
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=gcc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=g++
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
post-extract:
${MKDIR} ${WRKDIR}/build
diff --git a/libcouchbase/Makefile b/libcouchbase/Makefile
index 5145b5512e..01ed10f48f 100644
--- a/libcouchbase/Makefile
+++ b/libcouchbase/Makefile
@@ -14,7 +14,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= perl
# Prevents CouchbaseMock.jar fetching at build time
-CMAKE_ARGS+= -DLCB_NO_MOCK=ON
+CMAKE_CONFIGURE_ARGS+= -DLCB_NO_MOCK=ON
.include "../../devel/libevent/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/libcxx/Makefile b/libcxx/Makefile
index 2b54d3502e..0c26db11f9 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -26,11 +26,11 @@ USE_LANGUAGES= c c++
SSP_SUPPORTED= no
GCC_REQD+= 13
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
-CMAKE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-CMAKE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS=OFF
# avoid conflict with stddef.h
CXXFLAGS.NetBSD+= -D__DEFINED_max_align_t=1
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
index 7821bbc7f0..db261c2afa 100644
--- a/libcxxabi/Makefile
+++ b/libcxxabi/Makefile
@@ -26,10 +26,10 @@ USE_LANGUAGES= c c++
SSP_SUPPORTED= no
GCC_REQD+= 13 # must be in sync with libcxx
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
# "LIBCXXABI_USE_LLVM_UNWINDER is set to ON, but libunwind is not specified in LLVM_ENABLE_RUNTIMES."
-#CMAKE_ARGS+= -DLLVM_ENABLE_RUNTIMES=libunwind
-CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+#CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RUNTIMES=libunwind
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
# avoid conflict with stddef.h
CXXFLAGS.NetBSD+= -D__DEFINED_max_align_t=1
diff --git a/libharu/Makefile b/libharu/Makefile
index d9ef9252a2..7c7ffe312e 100644
--- a/libharu/Makefile
+++ b/libharu/Makefile
@@ -14,7 +14,7 @@ LICENSE= zlib
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DLIBHPDF_STATIC=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBHPDF_STATIC=OFF
INSTALLATION_DIRS= include lib
do-install:
diff --git a/libi2pd/Makefile b/libi2pd/Makefile
index d5b568ee1d..ebb96eb08b 100644
--- a/libi2pd/Makefile
+++ b/libi2pd/Makefile
@@ -4,7 +4,7 @@
PKGNAME= libi2pd-${I2PD_VERSION}
COMMENT= i2pd library
-CMAKE_ARGS+= -DWITH_LIBRARY=yes
-CMAKE_ARGS+= -DWITH_BINARY=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_LIBRARY=yes
+CMAKE_CONFIGURE_ARGS+= -DWITH_BINARY=no
.include "../../mk/bsd.pkg.mk"
diff --git a/libi2pd/options.mk b/libi2pd/options.mk
index fc68b843ea..29bc954188 100644
--- a/libi2pd/options.mk
+++ b/libi2pd/options.mk
@@ -11,26 +11,26 @@ PKG_SUGGESTED_OPTIONS= upnp
### Select build profile
###
.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
###
### Enable UPnP support
###
.if !empty(PKG_OPTIONS:Mupnp)
-CMAKE_ARGS+= -DWITH_UPNP=yes
+CMAKE_CONFIGURE_ARGS+= -DWITH_UPNP=yes
.include "../../net/miniupnpc/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_UPNP=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_UPNP=no
.endif
###
### Enable AES-NI support
###
.if !empty(PKG_OPTIONS:Maesni)
-CMAKE_ARGS+= -DWITH_AESNI=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_AESNI=ON
.else
-CMAKE_ARGS+= -DWITH_AESNI=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_AESNI=OFF
.endif
diff --git a/libical2/Makefile b/libical2/Makefile
index ba699c4a11..e20141e768 100644
--- a/libical2/Makefile
+++ b/libical2/Makefile
@@ -15,7 +15,7 @@ LICENSE= gnu-lgpl-v2.1 OR mpl-1.0
USE_TOOLS+= perl
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DUSE_BUILTIN_TZDATA=false
+CMAKE_CONFIGURE_ARGS+= -DUSE_BUILTIN_TZDATA=false
MAKE_JOBS_SAFE= no
PKGCONFIG_OVERRIDE+= libical.pc.in
diff --git a/libjxl/Makefile b/libjxl/Makefile
index 6f766f44ef..d2d7cce8fc 100644
--- a/libjxl/Makefile
+++ b/libjxl/Makefile
@@ -9,17 +9,17 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DJPEGXL_VERSION=${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-CMAKE_ARGS+= -DJPEGXL_FORCE_SYSTEM_HWY=ON
-CMAKE_ARGS+= -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-CMAKE_ARGS+= -DJPEGXL_ENABLE_DOXYGEN=OFF
-CMAKE_ARGS+= -DJPEGXL_ENABLE_JPEGLI=OFF
-CMAKE_ARGS+= -DJPEGXL_ENABLE_SJPEG=OFF
-CMAKE_ARGS+= -DJPEGXL_ENABLE_SKCMS=OFF
-CMAKE_ARGS+= -DJPEGXL_ENABLE_PLUGINS=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_VERSION=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_HWY=ON
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_DOXYGEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_JPEGLI=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SKCMS=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_PLUGINS=OFF
# test are run during the build stage
-CMAKE_ARGS+= -DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
REPLACE_BASH= deps.sh
diff --git a/libmirisdr-git/Makefile b/libmirisdr-git/Makefile
index 061a28818c..8c7d6ba0bd 100644
--- a/libmirisdr-git/Makefile
+++ b/libmirisdr-git/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS= cmake pkg-config
USE_CMAKE= yes
# Suppress warning for developer
-CMAKE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
.include "../../wip/mk/git-package.mk"
_GIT_FLAGS= # set empty, --depth 1 seems harmfull
diff --git a/libmixed/Makefile b/libmixed/Makefile
index 291ac02b38..e4858a5c2e 100644
--- a/libmixed/Makefile
+++ b/libmixed/Makefile
@@ -14,9 +14,9 @@ LICENSE= zlib
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DBUILD_EXAMPLES=OFF
-CMAKE_ARGS+= -DBUILD_TESTER=OFF
-CMAKE_ARGS+= -DBUILD_SIMD=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTER=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SIMD=OFF
INSTALLATION_DIRS+= lib
diff --git a/libopensync-dev/options.mk b/libopensync-dev/options.mk
index 95efbe5d31..98bcf011bf 100644
--- a/libopensync-dev/options.mk
+++ b/libopensync-dev/options.mk
@@ -8,8 +8,8 @@ PKG_SUGGESTED_OPTIONS+= tests # XXX python doesn't work yet
.if !empty(PKG_OPTIONS:Mpython)
.include "../../devel/swig/buildlink3.mk"
-CMAKE_ARGS+= SWIG_DIR:PATH=${BUILDLINK_PREFIX.swig}/share/swig/1.3
-CMAKE_ARGS+= SWIG_EXECUTABLE=${BUILDLINK_PREFIX.swig}/bin/swig
+CMAKE_CONFIGURE_ARGS+= SWIG_DIR:PATH=${BUILDLINK_PREFIX.swig}/share/swig/1.3
+CMAKE_CONFIGURE_ARGS+= SWIG_EXECUTABLE=${BUILDLINK_PREFIX.swig}/bin/swig
.endif
.if !empty(PKG_OPTIONS:Mtests)
diff --git a/libretro-citra/Makefile b/libretro-citra/Makefile
index 3b7b0dba97..9ac0094411 100644
--- a/libretro-citra/Makefile
+++ b/libretro-citra/Makefile
@@ -77,15 +77,15 @@ USE_TOOLS+= gmake
GCC_REQD= 7.3.0
-CMAKE_ARGS+= -DENABLE_SDL2=OFF
-CMAKE_ARGS+= -DENABLE_QT=OFF
-CMAKE_ARGS+= -DENABLE_LIBRETRO=ON
-CMAKE_ARGS+= -DENABLE_WEB_SERVICE=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SDL2=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LIBRETRO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WEB_SERVICE=OFF
# error: unrecognized command line option '-msha'
-CMAKE_ARGS+= -DCRYPTOPP_DISABLE_ASM=ON
+CMAKE_CONFIGURE_ARGS+= -DCRYPTOPP_DISABLE_ASM=ON
-CMAKE_ARGS+= --target citra_libretro
+CMAKE_CONFIGURE_ARGS+= --target citra_libretro
INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
diff --git a/libsquish/Makefile b/libsquish/Makefile
index 556f1c08bb..b837b4e0ab 100644
--- a/libsquish/Makefile
+++ b/libsquish/Makefile
@@ -14,6 +14,6 @@ EXTRACT_DIR= ${WRKDIR}/${DISTNAME}
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
.include "../../mk/bsd.pkg.mk"
diff --git a/libunwind-git/Makefile b/libunwind-git/Makefile
index 07941e7623..ff2425d878 100644
--- a/libunwind-git/Makefile
+++ b/libunwind-git/Makefile
@@ -19,9 +19,9 @@ USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
CMAKE_ARG_PATH= ${WRKSRC}
diff --git a/libunwind/Makefile b/libunwind/Makefile
index ac018c6e02..46d3cfa354 100644
--- a/libunwind/Makefile
+++ b/libunwind/Makefile
@@ -32,7 +32,7 @@ SSP_SUPPORTED= no
GCC_REQD+= 10 # must be in sync with libcxx
.endif
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
INSTALLATION_DIRS= include
diff --git a/libzippp/Makefile b/libzippp/Makefile
index 1e71d8bd47..9462b67b38 100644
--- a/libzippp/Makefile
+++ b/libzippp/Makefile
@@ -14,10 +14,10 @@ LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/libzippp-${DISTNAME}
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DLIBZIPPP_ENABLE_ENCRYPTION=ON
-CMAKE_ARGS+= -DLIBZIPPP_CMAKE_CONFIG_MODE=ON
-CMAKE_ARGS+= -DLIBZIPPP_GNUINSTALLDIRS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBZIPPP_ENABLE_ENCRYPTION=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBZIPPP_CMAKE_CONFIG_MODE=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBZIPPP_GNUINSTALLDIRS=ON
PKGCONFIG_OVERRIDE= libzippp.pc.in
diff --git a/lld/Makefile b/lld/Makefile
index b7fceb7e32..d3d717ad9e 100644
--- a/lld/Makefile
+++ b/lld/Makefile
@@ -15,9 +15,9 @@ USE_CXX_FEATURES= c++14
USE_LANGUAGES= c c++
GCC_REQD+= 7
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
PYTHON_FOR_BUILD_ONLY= yes
diff --git a/lld/options.mk b/lld/options.mk
index ceaf154539..e7d9584a8a 100644
--- a/lld/options.mk
+++ b/lld/options.mk
@@ -7,14 +7,14 @@ PKG_SUPPORTED_OPTIONS= tests
.if !empty(PKG_OPTIONS:Mtests)
DISTFILES+= llvm-${PKGVERSION_NOREV}.src${EXTRACT_SUFX}
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
-CMAKE_ARGS+= -DLLVM_BUILD_TESTS=ON
-CMAKE_ARGS+= -DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
-CMAKE_ARGS+= -DLLVM_EXTERNAL_LIT=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src/utils/lit/lit.py
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_BUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
+CMAKE_CONFIGURE_ARGS+= -DLLVM_EXTERNAL_LIT=${WRKDIR}/llvm-${PKGVERSION_NOREV}.src/utils/lit/lit.py
REPLACE_PYTHON+= ${WRKDIR}/llvm-${PKGVERSION_NOREV}.src/utils/lit/lit.py
TEST_TARGET= check-lld # failing tests fixed in 8.0
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
.else
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.endif
diff --git a/lldb/Makefile b/lldb/Makefile
index 16cfdf472a..e3d4ced079 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -21,14 +21,14 @@ USE_LANGUAGES= c c++
GCC_REQD+= 7
PY_PATCHPLIST= yes
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
-CMAKE_ARGS+= -DLLDB_CODESIGN_IDENTITY=""
-CMAKE_ARGS+= -DLLDB_USE_SYSTEM_SIX=ON
-CMAKE_ARGS+= -DPYTHON_HOME=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLDB_CODESIGN_IDENTITY=""
+CMAKE_CONFIGURE_ARGS+= -DLLDB_USE_SYSTEM_SIX=ON
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_HOME=${PREFIX}
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
diff --git a/lldb/options.mk b/lldb/options.mk
index 2625b8fdf7..bebd642f2e 100644
--- a/lldb/options.mk
+++ b/lldb/options.mk
@@ -8,18 +8,18 @@ PKG_SUGGESTED_OPTIONS= curses
.include "../../mk/bsd.options.mk"
.if ${PKG_OPTIONS:Mtests}
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
.else
# py-lit, py-psutil, lld
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.endif
.if ${PKG_OPTIONS:Mcurses}
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/terminfo.buildlink3.mk"
-CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=ON
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON
+CMAKE_CONFIGURE_ARGS+= -DLLDB_ENABLE_CURSES=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON
.else
-CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=OFF
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLDB_ENABLE_CURSES=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
.endif
diff --git a/llilc-git/Makefile b/llilc-git/Makefile
index a9b4116e7c..85057031c1 100644
--- a/llilc-git/Makefile
+++ b/llilc-git/Makefile
@@ -25,7 +25,7 @@ PYTHON_FOR_BUILD_ONLY= yes
BUILDLINK_TRANSFORM+= rm:-Werror
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
# DOTNET targets only LLVM
PKGSRC_COMPILER= clang
@@ -75,12 +75,12 @@ REPLACE_PYTHON+= utils/update_llc_test_checks.py
REPLACE_PYTHON+= utils/wciia.py
# Try to optimize building LLVM for now.
-CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="X86"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD="X86"
# https://github.com/dotnet/llilc/blob/master/Documentation/Getting-Started-For-Linux-and-OS-X.md
-CMAKE_ARGS+= -DWITH_CORECLR:PATH=${PREFIX}/CoreCLR
-CMAKE_ARGS+= -DLLVM_OPTIMIZED_TABLEGEN=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_CORECLR:PATH=${PREFIX}/CoreCLR
+CMAKE_CONFIGURE_ARGS+= -DLLVM_OPTIMIZED_TABLEGEN=ON
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/llvm/Makefile b/llvm/Makefile
index f930a60185..94c4d2fd6b 100644
--- a/llvm/Makefile
+++ b/llvm/Makefile
@@ -44,16 +44,16 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
NOT_FOR_PLATFORM+= *-*-alpha
NOT_FOR_PLATFORM+= *-*-vax
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
-CMAKE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
-CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=ON
-CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
-CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INSTALL_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_RTTI=ON
-CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
+CMAKE_CONFIGURE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
@@ -125,12 +125,12 @@ CXXFLAGS+= -mno-pltseq
PLIST_SUBST+= RELEASE_TYPE=${RELEASE_TYPE}
.if ${OPSYS} == "NetBSD"
-CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread
+CMAKE_CONFIGURE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread
.endif
.if ${USE_CROSS_COMPILE:U:tl} == "yes"
TOOL_DEPENDS+= ${PKGNAME}:../../${PKGPATH}
-CMAKE_ARGS+= -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/bin/llvm-tblgen
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TABLEGEN:STRING=${TOOLBASE:Q}/bin/llvm-tblgen
.endif
.include "options.mk"
diff --git a/llvm/options.mk b/llvm/options.mk
index afea46dc17..c9f4000528 100644
--- a/llvm/options.mk
+++ b/llvm/options.mk
@@ -57,33 +57,33 @@ LLVM_EXPERIMENTAL_TARGETS_TO_BUILD+= ${tgt}
. endif
.endfor
.if !empty(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD)
-CMAKE_ARGS+= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:ts;}"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:ts;}"
.endif
.if !empty(PKG_OPTIONS:Mterminfo)
.include "../../mk/terminfo.buildlink3.mk"
.else
-CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
.endif
.if !empty(PKG_OPTIONS:Mz3)
.include "../../math/z3/buildlink3.mk"
-CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
.endif
.if !empty(PKG_OPTIONS:Mdebug)
RELEASE_TYPE?= debug
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
RELEASE_TYPE?= release
.endif
.if !empty(PKG_OPTIONS:Mtests)
# requires "unittes" ?
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
.else
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
.endif
-CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
+CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"
diff --git a/lua-luv/Makefile b/lua-luv/Makefile
index 9be2d3bd7a..1b3ad4d47e 100644
--- a/lua-luv/Makefile
+++ b/lua-luv/Makefile
@@ -20,11 +20,11 @@ DEPENDS+= ${LUA_PKGPREFIX}-compat53-[0-9]*:../../devel/lua-compat53
USE_CMAKE= yes
-CMAKE_ARGS+= -DWITH_SHARED_LIBUV=ON
-CMAKE_ARGS+= -DBUILD_MODULE=ON
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DLUA_BUILD_TYPE=System
-CMAKE_ARGS+= -DWITH_LUA_ENGINE=Lua
+CMAKE_CONFIGURE_ARGS+= -DWITH_SHARED_LIBUV=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MODULE=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DLUA_BUILD_TYPE=System
+CMAKE_CONFIGURE_ARGS+= -DWITH_LUA_ENGINE=Lua
pre-configure:
.if ${_LUA_VERSION} == "51" || ${_LUA_VERSION} == "52"
diff --git a/luabind/Makefile b/luabind/Makefile
index 1c91f94e3a..2d1f4af131 100644
--- a/luabind/Makefile
+++ b/luabind/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DWITH_LUA53:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_LUA53:BOOL=ON
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../lang/lua53/buildlink3.mk"
diff --git a/luv/Makefile b/luv/Makefile
index 5e38d770a8..d8eb93cd3e 100644
--- a/luv/Makefile
+++ b/luv/Makefile
@@ -16,12 +16,12 @@ USE_CMAKE= yes
# should follow the LuaJIT API compatibility as those are the 2 options
LUA_VERSIONS_ACCEPTED= 51
-CMAKE_ARGS+= -DWITH_SHARED_LIBUV=ON
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+= -DBUILD_MODULE=OFF
-CMAKE_ARGS+= -DLUA_BUILD_TYPE=System
-CMAKE_ARGS+= -DLUA_COMPAT53_DIR=${PREFIX}/${LUA_LDIR}/compat53/
-CMAKE_ARGS+= -DCMAKE_C_FLAGS="-I${PREFIX}/${LUA_INCDIR} -I${PREFIX}/${LUA_LDIR}/compat53"
+CMAKE_CONFIGURE_ARGS+= -DWITH_SHARED_LIBUV=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MODULE=OFF
+CMAKE_CONFIGURE_ARGS+= -DLUA_BUILD_TYPE=System
+CMAKE_CONFIGURE_ARGS+= -DLUA_COMPAT53_DIR=${PREFIX}/${LUA_LDIR}/compat53/
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="-I${PREFIX}/${LUA_INCDIR} -I${PREFIX}/${LUA_LDIR}/compat53"
.include "options.mk"
diff --git a/luv/options.mk b/luv/options.mk
index 4b9ef9a337..313d513ff1 100644
--- a/luv/options.mk
+++ b/luv/options.mk
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS= lua
###
.if !empty(PKG_OPTIONS:Mlua)
.include "../../lang/lua/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_LUA_ENGINE=Lua
+CMAKE_CONFIGURE_ARGS+= -DWITH_LUA_ENGINE=Lua
.endif
###
@@ -21,5 +21,5 @@ CMAKE_ARGS+= -DWITH_LUA_ENGINE=Lua
###
.if !empty(PKG_OPTIONS:Mluajit)
.include "../../lang/LuaJIT2/buildlink3.mk"
-CMAKE_ARGS+= -DWITH_LUA_ENGINE=LuaJIT
+CMAKE_CONFIGURE_ARGS+= -DWITH_LUA_ENGINE=LuaJIT
.endif
diff --git a/melonds/Makefile b/melonds/Makefile
index f3e4ff92cb..04af5933c9 100644
--- a/melonds/Makefile
+++ b/melonds/Makefile
@@ -17,8 +17,8 @@ USE_LANGUAGES= c c++
# C++17
GCC_REQD+= 7
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DENABLE_LTO=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
+CMAKE_CONFIGURE_ARGS+= -DENABLE_LTO=OFF
# TODO: Make src/ARMJIT_Memory.cpp PaX MPROTECT safe.
NOT_PAX_MPROTECT_SAFE+= bin/melonDS
diff --git a/miktex/options.mk b/miktex/options.mk
index 13de24d818..b764960f09 100644
--- a/miktex/options.mk
+++ b/miktex/options.mk
@@ -7,8 +7,8 @@ PKG_SUPPORTED_OPTIONS+= qt5
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mqt5)
-CMAKE_ARGS+= -DWITH_UI_QT=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_UI_QT=ON
.include "../../print/poppler-qt5/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_UI_QT=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_UI_QT=OFF
.endif
diff --git a/mlir/Makefile b/mlir/Makefile
index f29a048088..32e51436a6 100644
--- a/mlir/Makefile
+++ b/mlir/Makefile
@@ -15,9 +15,9 @@ USE_CXX_FEATURES= c++14
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
-CMAKE_ARGS+= -DMLIR_BUILD_MLIR_C_DYLIB=YES
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DMLIR_INSTALL_AGGREGATE_OBJECTS=NO
+CMAKE_CONFIGURE_ARGS+= -DMLIR_BUILD_MLIR_C_DYLIB=YES
.include "../../devel/cmake/build.mk"
.include "../../wip/llvm/buildlink3.mk"
diff --git a/msgpack-git/Makefile b/msgpack-git/Makefile
index f157c07ce8..28a6c81888 100644
--- a/msgpack-git/Makefile
+++ b/msgpack-git/Makefile
@@ -19,8 +19,8 @@ LICENSE= apache-2.0
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DMSGPACK_BUILD_TESTS=OFF
-CMAKE_ARGS+= -DMSGPACK_BUILD_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DMSGPACK_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DMSGPACK_BUILD_EXAMPLES=OFF
CONFLICTS= msgpack-[0-9]*
diff --git a/msgpack-git/options.mk b/msgpack-git/options.mk
index c670a586ed..9a69f72ca8 100644
--- a/msgpack-git/options.mk
+++ b/msgpack-git/options.mk
@@ -10,5 +10,5 @@ PKG_SUPPORTED_OPTIONS= tests
BUILDLINK_DEPMETHOD.googletest+= build
.include "../../devel/googletest/buildlink3.mk"
TEST_TARGET= check
-CMAKE_ARGS+= -DMSGPACK_BUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DMSGPACK_BUILD_TESTS=ON
.endif
diff --git a/navit-git/Makefile b/navit-git/Makefile
index 60611762e5..f19ffd16a3 100644
--- a/navit-git/Makefile
+++ b/navit-git/Makefile
@@ -24,12 +24,12 @@ CFLAGS.NetBSD+= -DUSE_SYS_ENDIAN_H
USE_TOOLS+= cmake pkg-config
-CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
-CMAKE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DUSE_PLUGINS=0
-CMAKE_ARGS+= -DSAMPLE_MAP=1
-CMAKE_ARGS+= -DSVG2PNG=0
-CMAKE_ARGS+= -DUSE_NATIVE_LANGUAGE_SUPPORT=1
+CMAKE_CONFIGURE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
+CMAKE_CONFIGURE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DUSE_PLUGINS=0
+CMAKE_CONFIGURE_ARGS+= -DSAMPLE_MAP=1
+CMAKE_CONFIGURE_ARGS+= -DSVG2PNG=0
+CMAKE_CONFIGURE_ARGS+= -DUSE_NATIVE_LANGUAGE_SUPPORT=1
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/navit/Makefile b/navit/Makefile
index 9d216ef96d..ca3e3a688f 100644
--- a/navit/Makefile
+++ b/navit/Makefile
@@ -18,12 +18,12 @@ CFLAGS.NetBSD+= -DUSE_SYS_ENDIAN_H
USE_TOOLS+= cmake pkg-config
-CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
-CMAKE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DUSE_PLUGINS=0
-CMAKE_ARGS+= -DSAMPLE_MAP=1
-CMAKE_ARGS+= -DSVG2PNG=0
-CMAKE_ARGS+= -DUSE_NATIVE_LANGUAGE_SUPPORT=1
+CMAKE_CONFIGURE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
+CMAKE_CONFIGURE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DUSE_PLUGINS=0
+CMAKE_CONFIGURE_ARGS+= -DSAMPLE_MAP=1
+CMAKE_CONFIGURE_ARGS+= -DSVG2PNG=0
+CMAKE_CONFIGURE_ARGS+= -DUSE_NATIVE_LANGUAGE_SUPPORT=1
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/neovim-qt/Makefile b/neovim-qt/Makefile
index b53d039371..f32ec718fa 100644
--- a/neovim-qt/Makefile
+++ b/neovim-qt/Makefile
@@ -20,9 +20,9 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DUSE_SYSTEM_MSGPACK=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_MSGPACK=ON
pre-configure:
${MKDIR} -p ${WRKSRC}/build
diff --git a/neovim/Makefile b/neovim/Makefile
index c84e3cb394..d61b380e14 100644
--- a/neovim/Makefile
+++ b/neovim/Makefile
@@ -25,9 +25,9 @@ SHLIB_EXT= so
PLIST.notdarwin= yes
.endif
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DLIBVTERM_LIBRARY=${BUILDLINK_PREFIX.libvterm03}/lib/libvterm03/libvterm.${SHLIB_EXT}
-CMAKE_ARGS+= -DLIBVTERM_INCLUDE_DIR=${BUILDLINK_PREFIX.libvterm03}/include/libvterm03
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DLIBVTERM_LIBRARY=${BUILDLINK_PREFIX.libvterm03}/lib/libvterm03/libvterm.${SHLIB_EXT}
+CMAKE_CONFIGURE_ARGS+= -DLIBVTERM_INCLUDE_DIR=${BUILDLINK_PREFIX.libvterm03}/include/libvterm03
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
@@ -70,7 +70,7 @@ BUILDLINK_API_DEPENDS.libvterm03+= libvterm03>=0.3.3
.if ${PLATFORM_SUPPORTS_LUAJIT:tl} == "yes"
. include "../../lang/LuaJIT2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DPREFER_LUA=ON
+CMAKE_CONFIGURE_ARGS+= -DPREFER_LUA=ON
. include "../../lang/lua51/buildlink3.mk"
.endif
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/nextpnr/options.mk b/nextpnr/options.mk
index 1d5012c2df..f1285af5ac 100644
--- a/nextpnr/options.mk
+++ b/nextpnr/options.mk
@@ -16,32 +16,32 @@ PKG_SUGGESTED_OPTIONS= ice40
PLIST_VARS+= ice40 generic ecp5
.if !empty(PKG_OPTIONS:Mall)
-CMAKE_ARGS+= -DARCH=all
+CMAKE_CONFIGURE_ARGS+= -DARCH=all
PLIST.ice40= yes
PLIST.ecp5= yes
PLIST.generic= yes
# .elif !empty(PKG_OPTIONS:Mall+alpha)
-# CMAKE_ARGS+= -DARCH=all+alpha
+# CMAKE_CONFIGURE_ARGS+= -DARCH=all+alpha
# PLIST.ice40= yes
# PLIST.ecp5= yes
# PLIST.generic= yes
.elif !empty(PKG_OPTIONS:Mice40)
-CMAKE_ARGS+= -DARCH=ice40
+CMAKE_CONFIGURE_ARGS+= -DARCH=ice40
PLIST.ice40= yes
.elif !empty(PKG_OPTIONS:Mecp5)
-CMAKE_ARGS+= -DARCH=ecp5
+CMAKE_CONFIGURE_ARGS+= -DARCH=ecp5
PLIST.ecp5= yes
.elif !empty(PKG_OPTIONS:Mgeneric)
-CMAKE_ARGS+= -DARCH=generic
+CMAKE_CONFIGURE_ARGS+= -DARCH=generic
PLIST.generic= yes
# .elif !empty(PKG_OPTIONS:Mgowin)
-# CMAKE_ARGS+= -DARCH=gowin
+# CMAKE_CONFIGURE_ARGS+= -DARCH=gowin
# .elif !empty(PKG_OPTIONS:Mfpgainterchange)
-# CMAKE_ARGS+= -DARCH=fpga_interchange
+# CMAKE_CONFIGURE_ARGS+= -DARCH=fpga_interchange
# .elif !empty(PKG_OPTIONS:Mmachxo2)
-# CMAKE_ARGS+= -DARCH=machxo2
+# CMAKE_CONFIGURE_ARGS+= -DARCH=machxo2
# .elif !empty(PKG_OPTIONS:Mmistral)
-# CMAKE_ARGS+= -DARCH=mistral
+# CMAKE_CONFIGURE_ARGS+= -DARCH=mistral
.endif
@@ -63,6 +63,6 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-prjtrellis-[0-9]*:../../wip/prjtrellis
### Build with the QT5 GUI
###
.if !empty(PKG_OPTIONS:Mx11)
-CMAKE_ARGS+= -DBUILD_GUI=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GUI=ON
.include "../../x11/qt5-qtbase/buildlink3.mk"
.endif
diff --git a/nlopt/options.mk b/nlopt/options.mk
index b87cd70ce6..18fe7a8ba5 100644
--- a/nlopt/options.mk
+++ b/nlopt/options.mk
@@ -8,36 +8,36 @@ PKG_SUGGESTED_OPTIONS=
PLIST_SRC= PLIST
-CMAKE_ARGS+= -DNLOPT_SWIG:BOOL=TRUE
-CMAKE_ARGS+= -DNLOPT_FORTRAN:BOOL=FALSE # just builds tests
-CMAKE_ARGS+= -DNLOPT_MATLAB:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_SWIG:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_FORTRAN:BOOL=FALSE # just builds tests
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_MATLAB:BOOL=FALSE
# GUILE fails to be found by cmake?
#.if !empty(PKG_OPTIONS:Mguile)
#.include "../../lang/guile30/buildlink3.mk"
-#CMAKE_ARGS+= -DNLOPT_GUILE:BOOL=TRUE
+#CMAKE_CONFIGURE_ARGS+= -DNLOPT_GUILE:BOOL=TRUE
#.else
-#CMAKE_ARGS+= -DNLOPT_GUILE:BOOL=FALSE
+#CMAKE_CONFIGURE_ARGS+= -DNLOPT_GUILE:BOOL=FALSE
#.endif
.if !empty(PKG_OPTIONS:Moctave)
.include "../../math/octave/buildlink3.mk"
-CMAKE_ARGS+= -DNLOPT_OCTAVE:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_OCTAVE:BOOL=TRUE
PLIST_SRC+= PLIST.octave
PLIST_SUBST+= OCTAVE_VERSION=9.2.0
.else
-CMAKE_ARGS+= -DNLOPT_OCTAVE:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_OCTAVE:BOOL=FALSE
.endif
.if !empty(PKG_OPTIONS:Mpython)
.include "../../lang/python/extension.mk"
.include "../../math/py-numpy/buildlink3.mk"
-CMAKE_ARGS+= -DNLOPT_PYTHON:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_PYTHON:BOOL=TRUE
PLIST_SRC+= PLIST.python
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
PLIST_SUBST+= PYTHON_VERSION=${PYTHON_VERSION}
.else
-CMAKE_ARGS+= -DNLOPT_PYTHON:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DNLOPT_PYTHON:BOOL=FALSE
.endif
diff --git a/notcurses/Makefile b/notcurses/Makefile
index 34a9e8b77a..4ad62bb85a 100644
--- a/notcurses/Makefile
+++ b/notcurses/Makefile
@@ -13,7 +13,7 @@ LICENSE= apache-2.0
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DUSE_PANDOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_PANDOC=OFF
PKGCONFIG_OVERRIDE+= tools/notcurses++.pc.in
PKGCONFIG_OVERRIDE+= tools/notcurses-core.pc.in
diff --git a/nvi2-git/options.mk b/nvi2-git/options.mk
index 4ef875233f..78ad36f32e 100644
--- a/nvi2-git/options.mk
+++ b/nvi2-git/options.mk
@@ -8,19 +8,19 @@ PKG_SUGGESTED_OPTIONS= iconv wide-curses
.if !empty(PKG_OPTIONS:Miconv)
. include "../../converters/libiconv/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_ICONV=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_ICONV=ON
.else
-CMAKE_ARGS+= -DUSE_ICONV=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_ICONV=OFF
.endif
.if !empty(PKG_OPTIONS:Mwide-curses)
. include "../../mk/curses.buildlink3.mk"
. if ${CURSES_TYPE} != "ncurses" # XXX: Why is this necessary!?
-CMAKE_ARGS+= -DUSE_WIDECHAR=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIDECHAR=ON
. else
-CMAKE_ARGS+= -DUSE_WIDECHAR=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIDECHAR=OFF
. endif
.else
. include "../../mk/curses.buildlink3.mk"
-CMAKE_ARGS+= -DUSE_WIDECHAR=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_WIDECHAR=OFF
.endif
diff --git a/occt/Makefile b/occt/Makefile
index 6f845afbe2..f29111f6f0 100644
--- a/occt/Makefile
+++ b/occt/Makefile
@@ -19,10 +19,10 @@ WRKSRC= ${WRKDIR}/occt-V${PKGVERSION_NOREV:S/./_/g}
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-CMAKE_ARGS+= -DUSE_FREETYPE=ON
-CMAKE_ARGS+= -DUSE_EIGEN=ON
-CMAKE_ARGS+= -DUSE_RAPIDJSON=ON
-CMAKE_ARGS+= -DBUILD_DOC_Overview=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FREETYPE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_EIGEN=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_RAPIDJSON=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOC_Overview=OFF
REPLACE_BASH+= adm/templates/draw.sh
diff --git a/occt/buildlink3.mk b/occt/buildlink3.mk
index 523ac9ddc2..d62f868657 100644
--- a/occt/buildlink3.mk
+++ b/occt/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.occt+= occt>=7.7.0nb2
BUILDLINK_PKGSRCDIR.occt?= ../../wip/occt
BUILDLINK_INCDIRS.occt+= include/opencascade
-CMAKE_ARGS+= -DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.occt}/include/opencascade
+CMAKE_CONFIGURE_ARGS+= -DOCC_INCLUDE_DIR=${BUILDLINK_PREFIX.occt}/include/opencascade
pkgbase := occt
.include "../../mk/pkg-build-options.mk"
diff --git a/occt/options.mk b/occt/options.mk
index 43c18bdcdd..1bb1e70213 100644
--- a/occt/options.mk
+++ b/occt/options.mk
@@ -14,34 +14,34 @@ PKG_SUGGESTED_OPTIONS+= x11
.include "../../graphics/freeimage/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_XLIB=ON
-CMAKE_ARGS+= -DUSE_FREEIMAGE=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_XLIB=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_FREEIMAGE=ON
.else
-CMAKE_ARGS+= -DUSE_XLIB=OFF
-CMAKE_ARGS+= -DUSE_FREEIMAGE=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_XLIB=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FREEIMAGE=OFF
.endif
.if !empty(PKG_OPTIONS:Mocct-draw)
.include "../../lang/tcl/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
-CMAKE_ARGS+= -DUSE_TCL=ON
-CMAKE_ARGS+= -DUSE_TK=ON
-CMAKE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include
-CMAKE_ARGS+= -D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_PREFIX.tcl}/lib
-CMAKE_ARGS+= -D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_PREFIX.tk}/include
-CMAKE_ARGS+= -D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_PREFIX.tk}/lib
+CMAKE_CONFIGURE_ARGS+= -DUSE_TCL=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_TK=ON
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${BUILDLINK_PREFIX.tcl}/include
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY_DIR=${BUILDLINK_PREFIX.tcl}/lib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_INCLUDE_DIR=${BUILDLINK_PREFIX.tk}/include
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY_DIR=${BUILDLINK_PREFIX.tk}/lib
. if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.dylib
-CMAKE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.dylib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.dylib
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.dylib
. elif ${OPSYS} == "SunOS"
-CMAKE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.so
-CMAKE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.so
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TCL_LIBRARY=${BUILDLINK_PREFIX.tcl}/lib/libtcl86.so
+CMAKE_CONFIGURE_ARGS+= -D3RDPARTY_TK_LIBRARY=${BUILDLINK_PREFIX.tk}/lib/libtk86.so
. endif
.else
-CMAKE_ARGS+= -DUSE_TCL=OFF
-CMAKE_ARGS+= -DUSE_TK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_TCL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_TK=OFF
.endif
# TODO
-CMAKE_ARGS+= -DUSE_VTK=OFF
-CMAKE_ARGS+= -DUSE_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_VTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
diff --git a/oorexx-svn/Makefile b/oorexx-svn/Makefile
index 6dde91b8ea..92a21b2ada 100644
--- a/oorexx-svn/Makefile
+++ b/oorexx-svn/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DORX_SHEBANG=1
+CMAKE_CONFIGURE_ARGS+= -DORX_SHEBANG=1
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/opencv-contrib-face/Makefile b/opencv-contrib-face/Makefile
index 3ce3103c2a..8e30b0e497 100644
--- a/opencv-contrib-face/Makefile
+++ b/opencv-contrib-face/Makefile
@@ -15,57 +15,57 @@ INSTALL_DIRS= build/modules/face build/modules/plot build/modules/tracking
WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}
-CMAKE_ARGS+= -DBUILD_DOCS=OFF
-CMAKE_ARGS+= -DWITH_FFMPEG=OFF
-CMAKE_ARGS+= -DWITH_JASPER=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
-CMAKE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
-CMAKE_ARGS+= -DBUILD_opencv_adas=OFF
-CMAKE_ARGS+= -DBUILD_opencv_bgsegm=OFF
-CMAKE_ARGS+= -DBUILD_opencv_bioinspired=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ccalib=OFF
-CMAKE_ARGS+= -DBUILD_opencv_contrib_world=OFF
-CMAKE_ARGS+= -DBUILD_opencv_cvv=OFF
-CMAKE_ARGS+= -DBUILD_opencv_datasets=OFF
-CMAKE_ARGS+= -DBUILD_opencv_dnn_objdetect=OFF
-CMAKE_ARGS+= -DBUILD_opencv_hdf=OFF
-CMAKE_ARGS+= -DBUILD_opencv_hfs=OFF
-CMAKE_ARGS+= -DBUILD_opencv_img_hash=OFF
-CMAKE_ARGS+= -DBUILD_opencv_latentsvm=OFF
-CMAKE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
-CMAKE_ARGS+= -DBUILD_opencv_matlab=OFF
-CMAKE_ARGS+= -DBUILD_opencv_optflow=OFF
-CMAKE_ARGS+= -DBUILD_opencv_reg=OFF
-CMAKE_ARGS+= -DBUILD_opencv_rgbd=OFF
-CMAKE_ARGS+= -DBUILD_opencv_saliency=OFF
-CMAKE_ARGS+= -DBUILD_opencv_surface_matching=OFF
-CMAKE_ARGS+= -DBUILD_opencv_text=OFF
-CMAKE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ximgproc=OFF
-CMAKE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
-CMAKE_ARGS+= -DBUILD_opencv_xphoto=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_adas=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_bgsegm=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_bioinspired=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ccalib=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_contrib_world=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_cvv=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_datasets=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn_objdetect=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_hdf=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_hfs=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_img_hash=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_latentsvm=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_matlab=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_optflow=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_reg=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_rgbd=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_saliency=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_surface_matching=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_text=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ximgproc=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_xphoto=OFF
-CMAKE_ARGS+= -DBUILD_opencv_dnn=OFF
-CMAKE_ARGS+= -DBUILD_opencv_flann=OFF
-CMAKE_ARGS+= -DBUILD_opencv_highgui=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ml=OFF
-CMAKE_ARGS+= -DBUILD_opencv_python2=OFF
-CMAKE_ARGS+= -DBUILD_opencv_python3=OFF
-CMAKE_ARGS+= -DBUILD_opencv_stitching=OFF
-CMAKE_ARGS+= -DBUILD_opencv_superres=OFF
-CMAKE_ARGS+= -DBUILD_opencv_ts=OFF
-CMAKE_ARGS+= -DBUILD_opencv_videoio=OFF
-CMAKE_ARGS+= -DBUILD_opencv_videostab=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_dnn=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_flann=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_highgui=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ml=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python2=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_python3=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_stitching=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_superres=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_ts=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videoio=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_videostab=OFF
# At least as of 3.4.6, these are dependencies of the 'face' module
# and need to be built and installed ('photo' and 'video' are
# part of the main opencv package already
-#CMAKE_ARGS+= -DBUILD_opencv_calib3d=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_features2d=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_photo=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_plot=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_tracking=OFF
-#CMAKE_ARGS+= -DBUILD_opencv_video=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_calib3d=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_features2d=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_photo=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_plot=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_tracking=OFF
+#CMAKE_CONFIGURE_ARGS+= -DBUILD_opencv_video=OFF
# direct patch difficult due to partial merge with opencv package
SUBST_CLASSES+= stereo
diff --git a/opencv/Makefile.common b/opencv/Makefile.common
index ea9d71c7b1..780fa5a810 100644
--- a/opencv/Makefile.common
+++ b/opencv/Makefile.common
@@ -22,19 +22,19 @@ CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
CHECK_PORTABILITY_SKIP+= platforms/ios/cmake/Toolchains/xcodebuild_wrapper.in
CHECK_PORTABILITY_SKIP+= cmake/templates/xcode-*
-CMAKE_ARGS+= -DBUILD_JAVA=OFF
-CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF
-CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
-CMAKE_ARGS+= -DENABLE_CCACHE=OFF
-CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
-CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
-CMAKE_ARGS+= -DWITH_EIGEN=OFF
-CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JAVA=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PROTOBUF=OFF
+CMAKE_CONFIGURE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CCACHE=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF
+CMAKE_CONFIGURE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_EIGEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
# doesn't build on NetBSD with libva-2.17.0
-CMAKE_ARGS+= -DWITH_VA=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_VA=OFF
#.include "../../multimedia/libva/buildlink3.mk"
-CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
-CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
+CMAKE_CONFIGURE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
+CMAKE_CONFIGURE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
BUILDLINK_TRANSFORM+= rm:-Werror=address
BUILDLINK_TRANSFORM+= rm:-Werror=non-virtual-dtor
@@ -46,7 +46,7 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections
.if ${MACHINE_ARCH} == "i386"
# Disable SSE/SSE2 to avoid build errors from missing _mm_pause.
-CMAKE_ARGS+= -DCPU_BASELINE=""
+CMAKE_CONFIGURE_ARGS+= -DCPU_BASELINE=""
.endif
PYTHON_VERSIONS_INCOMPATIBLE= 27
diff --git a/opencv/options.mk b/opencv/options.mk
index 19416a5083..964ea167a3 100644
--- a/opencv/options.mk
+++ b/opencv/options.mk
@@ -13,29 +13,29 @@ PKG_SUGGESTED_OPTIONS+= gtk
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mffmpeg)
-CMAKE_ARGS+= -DWITH_FFMPEG=ON
-CMAKE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
-CMAKE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
.include "../../multimedia/ffmpeg4/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_FFMPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_FFMPEG=OFF
.endif
.if !empty(PKG_OPTIONS:Mjasper)
-CMAKE_ARGS+= -DWITH_JASPER=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=ON
# jasper uses SIZE_MAX and friends in its headers.
CXXFLAGS+= -D__STDC_LIMIT_MACROS
.include "../../graphics/jasper/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_JASPER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_JASPER=OFF
.endif
.if !empty(PKG_OPTIONS:Mgtk)
-CMAKE_ARGS+= -DWITH_GTK=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=ON
.include "../../x11/gtk3/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_GTK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GTK=OFF
.endif
# FIXME: should be option.mk'ed instead
-CMAKE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
diff --git a/openjkdf2/Makefile b/openjkdf2/Makefile
index 8cf54161a9..f4adc4116d 100644
--- a/openjkdf2/Makefile
+++ b/openjkdf2/Makefile
@@ -16,13 +16,13 @@ USE_LANGUAGES= c c++
.include "../../lang/python/pyversion.mk"
TOOL_DEPENDS+= ${PYPKGPREFIX}-cogapp-[0-9]*:../../devel/py-cogapp
-CMAKE_ARGS+= -DPLAT_PKGSRC:BOOL=TRUE
-CMAKE_ARGS+= -DPLAT_PKGSRC64:BOOL=FALSE
-CMAKE_ARGS+= -DPYVERSSUFFIX=${PYVERSSUFFIX}
+CMAKE_CONFIGURE_ARGS+= -DPLAT_PKGSRC:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DPLAT_PKGSRC64:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DPYVERSSUFFIX=${PYVERSSUFFIX}
.for platform in ${LP64PLATFORMS}
. if ${MACHINE_PLATFORM:M${platform}}
-CMAKE_ARGS+= -DPLAT_PKGSRC64:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DPLAT_PKGSRC64:BOOL=TRUE
. endif
.endfor
diff --git a/openmp/Makefile b/openmp/Makefile
index 95de92ad6d..116202202b 100644
--- a/openmp/Makefile
+++ b/openmp/Makefile
@@ -16,9 +16,9 @@ USE_LANGUAGES= c gnu++17
USE_TOOLS+= perl pkg-config
GCC_REQD+= 7
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DOPENMP_ENABLE_LIBOMPTARGET=OFF
-CMAKE_ARGS+= -DOPENMP_ENABLE_OMPT_TOOLS=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DOPENMP_ENABLE_LIBOMPTARGET=OFF
+CMAKE_CONFIGURE_ARGS+= -DOPENMP_ENABLE_OMPT_TOOLS=OFF
BUILDLINK_TRANSFORM.NetBSD+= opt:-std=c++17:-std=gnu++17 # alloca
diff --git a/openrw-git/Makefile b/openrw-git/Makefile
index 328fdddcc7..7bd2b0dbc7 100644
--- a/openrw-git/Makefile
+++ b/openrw-git/Makefile
@@ -18,9 +18,9 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -D_FFMPEG_AVCODEC_INCLUDE_DIRS=${PREFIX}/include/ffmpeg4
-CMAKE_ARGS+= -D_FFMPEG_AVCODEC_LIBRARY_DIRS=${PREFIX}/lib/ffmpeg4
-CMAKE_ARGS+= -D_FFMPEG_AVFORMAT_LIBRARY_DIRS=${PREFIX}/lib/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -D_FFMPEG_AVCODEC_INCLUDE_DIRS=${PREFIX}/include/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -D_FFMPEG_AVCODEC_LIBRARY_DIRS=${PREFIX}/lib/ffmpeg4
+CMAKE_CONFIGURE_ARGS+= -D_FFMPEG_AVFORMAT_LIBRARY_DIRS=${PREFIX}/lib/ffmpeg4
.include "../../wip/mk/git-package.mk"
.include "../../audio/libmad/buildlink3.mk"
diff --git a/opensubdiv/Makefile b/opensubdiv/Makefile
index 2203327456..370f9aae9b 100644
--- a/opensubdiv/Makefile
+++ b/opensubdiv/Makefile
@@ -16,11 +16,11 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
# Useless and installs files by default into subdirs of $PREFIX/bin/
-CMAKE_ARGS+= -DNO_TUTORIALS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_TUTORIALS:BOOL=ON
# TODO
-CMAKE_ARGS+= -DNO_OPENCL:BOOL=ON
-CMAKE_ARGS+= -DNO_CUDA:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_OPENCL:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_CUDA:BOOL=ON
TEST_TARGET= test
diff --git a/opensubdiv/options.mk b/opensubdiv/options.mk
index ba3c3f972c..6d8f3f3379 100644
--- a/opensubdiv/options.mk
+++ b/opensubdiv/options.mk
@@ -10,25 +10,25 @@ PLIST_VARS+= opengl doc # ptex has no extra PLIST entries
.if !empty(PKG_OPTIONS:Mopengl)
.include "../../graphics/glew/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
-CMAKE_ARGS+= -DGLEW_LOCATION:PATH=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DGLEW_LOCATION:PATH=${PREFIX}
PLIST.opengl= yes
.else
-CMAKE_ARGS+= -DNO_OPENGL:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_OPENGL:BOOL=ON
.endif
.if !empty(PKG_OPTIONS:Mptex)
.include "../../graphics/ptex/buildlink3.mk"
-CMAKE_ARGS+= -DPTEX_LOCATION:PATH=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DPTEX_LOCATION:PATH=${PREFIX}
.else
-CMAKE_ARGS+= -DNO_PTEX:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_PTEX:BOOL=ON
.endif
.if !empty(PKG_OPTIONS:Mdoc)
TOOL_DEPENDS+= doxygen>=1.8.9.1:../../devel/doxygen
TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
-CMAKE_ARGS+= -DRST2HTML_EXECUTABLE:PATH=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
+CMAKE_CONFIGURE_ARGS+= -DRST2HTML_EXECUTABLE:PATH=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
.include "../../lang/python/pyversion.mk"
PLIST.doc= yes
.else
-CMAKE_ARGS+= -DNO_DOC:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_DOC:BOOL=ON
.endif
diff --git a/opensurge/Makefile b/opensurge/Makefile
index de18c6ca8b..f9eb8440ac 100644
--- a/opensurge/Makefile
+++ b/opensurge/Makefile
@@ -13,11 +13,11 @@ LICENSE= gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DGAME_BINDIR=${PREFIX}/bin
-CMAKE_ARGS+= -DGAME_DATADIR=${PREFIX}/share/${PKGBASE}
-CMAKE_ARGS+= -DDESKTOP_ICON_PATH=${PREFIX}/share/pixmaps
-CMAKE_ARGS+= -DDESKTOP_ENTRY_PATH=${PREFIX}/share/applications
-CMAKE_ARGS+= -DDESKTOP_METAINFO_PATH=${PREFIX}/share/metainfo
+CMAKE_CONFIGURE_ARGS+= -DGAME_BINDIR=${PREFIX}/bin
+CMAKE_CONFIGURE_ARGS+= -DGAME_DATADIR=${PREFIX}/share/${PKGBASE}
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_ICON_PATH=${PREFIX}/share/pixmaps
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_ENTRY_PATH=${PREFIX}/share/applications
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_METAINFO_PATH=${PREFIX}/share/metainfo
.include "../../devel/allegro5/buildlink3.mk"
.include "../../lang/surgescript/buildlink3.mk"
diff --git a/openttd/Makefile b/openttd/Makefile
index 030ae362e1..4238cf13b5 100644
--- a/openttd/Makefile
+++ b/openttd/Makefile
@@ -25,16 +25,16 @@ FORCE_CXX_STD= gnu++20
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DPERSONAL_DIR=.openttd
-CMAKE_ARGS+= -DSHARED_DIR=${VARBASE}/games/openttd
-CMAKE_ARGS+= -DGLOBAL_DIR=${PREFIX}/share/openttd
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_INSTALL_BINDIR=bin
-CMAKE_ARGS+= -DCMAKE_INSTALL_DATADIR=share
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Grfcodec=ON
-CMAKE_ARGS+= -DOPTION_INSTALL_FHS=ON
+CMAKE_CONFIGURE_ARGS+= -DPERSONAL_DIR=.openttd
+CMAKE_CONFIGURE_ARGS+= -DSHARED_DIR=${VARBASE}/games/openttd
+CMAKE_CONFIGURE_ARGS+= -DGLOBAL_DIR=${PREFIX}/share/openttd
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_BINDIR=bin
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_DATADIR=share
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Grfcodec=ON
+CMAKE_CONFIGURE_ARGS+= -DOPTION_INSTALL_FHS=ON
PLIST_VARS= unix
.if ${OPSYS} != "Darwin"
diff --git a/openvas-cli/Makefile b/openvas-cli/Makefile
index 1299b81ceb..4e2f83e952 100644
--- a/openvas-cli/Makefile
+++ b/openvas-cli/Makefile
@@ -14,7 +14,7 @@ BUILD_DEFS+= VARBASE
USE_LANGUAGES= c++ c
USE_TOOLS+= pkg-config bash
-CMAKE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
BUILDLINK_TRANSFORM+= rm:-Werror # -Wmissing-field-initializers
diff --git a/openvas-libraries/Makefile b/openvas-libraries/Makefile
index b82ac8c2e0..b6c333e794 100644
--- a/openvas-libraries/Makefile
+++ b/openvas-libraries/Makefile
@@ -14,7 +14,7 @@ BUILD_DEFS+= VARBASE
USE_LANGUAGES= c++ c
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
.include "../../databases/hiredis/buildlink3.mk"
.include "../../databases/openldap-client/buildlink3.mk"
diff --git a/openvas-manager/Makefile b/openvas-manager/Makefile
index ed2bdb6b3e..296d24978a 100644
--- a/openvas-manager/Makefile
+++ b/openvas-manager/Makefile
@@ -14,7 +14,7 @@ BUILD_DEFS+= VARBASE
USE_LANGUAGES= c++ c
USE_TOOLS+= pkg-config gsed:run
-CMAKE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
REPLACE_PYTHON+= tools/extra/xml_split
diff --git a/openvas-scanner/Makefile b/openvas-scanner/Makefile
index c6de1c2049..56e0123bcb 100644
--- a/openvas-scanner/Makefile
+++ b/openvas-scanner/Makefile
@@ -14,7 +14,7 @@ BUILD_DEFS+= VARBASE
USE_LANGUAGES= c++ c
USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
.include "../../wip/openvas-libraries/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/openwsman/Makefile b/openwsman/Makefile
index 4eacd402c6..3ec54e30ef 100644
--- a/openwsman/Makefile
+++ b/openwsman/Makefile
@@ -14,9 +14,9 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DBUILD_PYTHON3:BOOL=ON
-CMAKE_ARGS+= -DBUILD_PYTHON:BOOL=OFF
-CMAKE_ARGS+= -DLIB:PATH=lib
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PYTHON3:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PYTHON:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIB:PATH=lib
PKGCONFIG_OVERRIDE+= openwsman++.pc.in
PKGCONFIG_OVERRIDE+= openwsman-server.pc.in
diff --git a/openxcom/Makefile b/openxcom/Makefile
index 6966a0fd07..3ce218eeb8 100644
--- a/openxcom/Makefile
+++ b/openxcom/Makefile
@@ -29,7 +29,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake
USE_CMAKE= yes
# Yes, this is slightly confusing (the data gets appended by OpenXcom)
-CMAKE_ARGS+= -DDATADIR=${OPENXCOM_BASE}
+CMAKE_CONFIGURE_ARGS+= -DDATADIR=${OPENXCOM_BASE}
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/osmo-sdr-git/Makefile b/osmo-sdr-git/Makefile
index e96042ee64..80a018c4cb 100644
--- a/osmo-sdr-git/Makefile
+++ b/osmo-sdr-git/Makefile
@@ -18,7 +18,7 @@ USE_CMAKE= yes
WRKSRC= ${WRKDIR}/osmo-sdr
# Suppress warning for developer
-CMAKE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
REPLACE_PERL+= utils/e4000_distance.pl
REPLACE_PERL+= utils/e4000_pl.pl
diff --git a/overgrowth/Makefile b/overgrowth/Makefile
index 10c88509de..d5c2288b1d 100644
--- a/overgrowth/Makefile
+++ b/overgrowth/Makefile
@@ -15,10 +15,10 @@ WRKSRC= ${WRKDIR}/overgrowth-${GITHUB_TAG}/Projects
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++11
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DENABLE_RAD_TELEMETRY=OFF
-CMAKE_ARGS+= -DBUILD_OGDA=OFF
-CMAKE_ARGS+= -DAUX_DATA=${PREFIX}/share/overgrowth
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DENABLE_RAD_TELEMETRY=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_OGDA=OFF
+CMAKE_CONFIGURE_ARGS+= -DAUX_DATA=${PREFIX}/share/overgrowth
#CMAKE_ARG_PATH= ${WRKSRC}
INSTALLATION_DIRS+= bin
diff --git a/paraview/Makefile b/paraview/Makefile
index 867bb33686..f3e477f616 100644
--- a/paraview/Makefile
+++ b/paraview/Makefile
@@ -16,41 +16,41 @@ FORCE_CXX_STD+= c++14
WRKSRC= ${WRKDIR}/${DISTNAME}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DPARAVIEW_USE_PYTHON=ON
-CMAKE_ARGS+= -DPARAVIEW_USE_MPI=OFF
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_lzma=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_png=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=ON
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-CMAKE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON
-CMAKE_ARGS+= -DVTK_SMP_ENABLE_OPENMP=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DPARAVIEW_USE_PYTHON=ON
+CMAKE_CONFIGURE_ARGS+= -DPARAVIEW_USE_MPI=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_lzma=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_png=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON
+CMAKE_CONFIGURE_ARGS+= -DVTK_SMP_ENABLE_OPENMP=ON
DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
#DEPENDS+= ${PYPKGPREFIX}-mpi4py-[0-9]*:../../wip/py-mpi4py
diff --git a/pharo-vm/Makefile b/pharo-vm/Makefile
index ddf30346d3..a1207e5e6d 100644
--- a/pharo-vm/Makefile
+++ b/pharo-vm/Makefile
@@ -20,10 +20,10 @@ WRKSRC= ${WRKDIR}/pharo-vm
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DFLAVOUR=CoInterpreter
-CMAKE_ARGS+= -DALWAYS_INTERACTIVE=1
-CMAKE_ARGS+= -DGENERATE_SOURCES=OFF
-CMAKE_ARGS+= -DPHARO_BIN_LOCATION=${PREFIX}/lib/pharo9
+CMAKE_CONFIGURE_ARGS+= -DFLAVOUR=CoInterpreter
+CMAKE_CONFIGURE_ARGS+= -DALWAYS_INTERACTIVE=1
+CMAKE_CONFIGURE_ARGS+= -DGENERATE_SOURCES=OFF
+CMAKE_CONFIGURE_ARGS+= -DPHARO_BIN_LOCATION=${PREFIX}/lib/pharo9
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-build
diff --git a/pharo-vm10/Makefile b/pharo-vm10/Makefile
index 266df6b407..1700125b96 100644
--- a/pharo-vm10/Makefile
+++ b/pharo-vm10/Makefile
@@ -20,10 +20,10 @@ WRKSRC= ${WRKDIR}/pharo-vm
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DFLAVOUR=CoInterpreter
-CMAKE_ARGS+= -DALWAYS_INTERACTIVE=1
-CMAKE_ARGS+= -DGENERATE_SOURCES=OFF
-CMAKE_ARGS+= -DPHARO_BIN_LOCATION=${PREFIX}/lib/pharo10
+CMAKE_CONFIGURE_ARGS+= -DFLAVOUR=CoInterpreter
+CMAKE_CONFIGURE_ARGS+= -DALWAYS_INTERACTIVE=1
+CMAKE_CONFIGURE_ARGS+= -DGENERATE_SOURCES=OFF
+CMAKE_CONFIGURE_ARGS+= -DPHARO_BIN_LOCATION=${PREFIX}/lib/pharo10
TOOL_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
diff --git a/phonon-backend-xine/Makefile b/phonon-backend-xine/Makefile
index 1cca4d02b8..489332c704 100644
--- a/phonon-backend-xine/Makefile
+++ b/phonon-backend-xine/Makefile
@@ -19,7 +19,7 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
-#CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
+#CMAKE_CONFIGURE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
diff --git a/piglit-git/Makefile b/piglit-git/Makefile
index 0054a7f954..05b890278e 100644
--- a/piglit-git/Makefile
+++ b/piglit-git/Makefile
@@ -32,7 +32,7 @@ REPLACE_PYTHON= piglit piglit-*.py
GENERATE_PLIST+= cd ${DESTDIR}${PREFIX} && \
find lib/piglit \( -type f -or -type l \) -print ;
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/piglit/lib
diff --git a/pioneer/Makefile b/pioneer/Makefile
index fc139f6b2f..8b38bc88df 100644
--- a/pioneer/Makefile
+++ b/pioneer/Makefile
@@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DPIONEER_DATA_DIR=${PREFIX}/share/pioneer/data
-CMAKE_ARGS+= -DUSE_SYSTEM_LIBGLEW=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_LIBLUA=ON
+CMAKE_CONFIGURE_ARGS+= -DPIONEER_DATA_DIR=${PREFIX}/share/pioneer/data
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBGLEW=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBLUA=ON
.include "../../archivers/lz4/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/plplot/Makefile b/plplot/Makefile
index afecc2209d..bf8f597ede 100644
--- a/plplot/Makefile
+++ b/plplot/Makefile
@@ -16,19 +16,19 @@ USE_TOOLS+= perl
CHECK_PORTABILITY_SKIP+= plplot_test/test_single_tcl.sh
-CMAKE_ARGS+= -DENABLE_f77:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_f95:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_python:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_java:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_tcl:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_itcl:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_tk:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_itk:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_ada:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_pdl:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_d:BOOL=OFF
-CMAKE_ARGS+= -DENABLE_ocaml:BOOL=OFF
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_f77:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_f95:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_python:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_java:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_tcl:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_itcl:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_tk:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_itk:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ada:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_pdl:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_d:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ocaml:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
SUBST_CLASSES+= builddirrefs
diff --git a/polly/Makefile b/polly/Makefile
index f5e1eb35de..b5bd2f6a4f 100644
--- a/polly/Makefile
+++ b/polly/Makefile
@@ -18,9 +18,9 @@ FORCE_CXX_STD= c++17
USE_LANGUAGES= c c++
GCC_REQD+= 4.8
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
.include "../../devel/cmake/build.mk"
.include "../../wip/llvm/buildlink3.mk"
diff --git a/ppsspp/Makefile b/ppsspp/Makefile
index e4d904fcdd..4b60900121 100644
--- a/ppsspp/Makefile
+++ b/ppsspp/Makefile
@@ -23,16 +23,16 @@ CFLAGS+= -fPIE
ONLY_FOR_PLATFORM= *-*-*arm* *-*-x86_64 *-*-i386
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CLANGBASE:Q}/bin/clang
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CLANGBASE:Q}/bin/clang++
-CMAKE_ARGS+= -DUSE_DISCORD=OFF
-CMAKE_ARGS+= -DUSE_SYSTEM_FFMPEG=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_LIBPNG=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_LIBSDL2=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_LIBZIP=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_MINIUPNPC=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_SNAPPY=ON
-CMAKE_ARGS+= -DUSE_SYSTEM_ZSTD=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CLANGBASE:Q}/bin/clang
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CLANGBASE:Q}/bin/clang++
+CMAKE_CONFIGURE_ARGS+= -DUSE_DISCORD=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_FFMPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBPNG=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBSDL2=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBZIP=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_MINIUPNPC=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_SNAPPY=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_ZSTD=ON
NOT_PAX_ASLR_SAFE+= bin/PPSSPPSDL
NOT_PAX_MPROTECT_SAFE+= bin/PPSSPPSDL
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index 59b1bff06d..6f4ed92c08 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -30,8 +30,8 @@ BUILDLINK_TRANSFORM.NetBSD+= l:libexpat:expat
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-CMAKE_ARGS+= -DSLIC3R_FHS:BOOL=TRUE
-CMAKE_ARGS+= -DSLIC3R_PCH:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DSLIC3R_FHS:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DSLIC3R_PCH:BOOL=FALSE
# CMake goes looking for these binaries. Make it happy.
pre-configure:
diff --git a/prusaslicer/options.mk b/prusaslicer/options.mk
index 9708a010cd..553ab2fb18 100644
--- a/prusaslicer/options.mk
+++ b/prusaslicer/options.mk
@@ -7,6 +7,6 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mglesv2)
-CMAKE_ARGS+= -DSLIC3R_OPENGL_ES:BOOL=TRUE
-CMAKE_ARGS+= -DCMAKE_C_FLAGS:STRING=-DGLAD_GLES2_USE_SYSTEM_EGL=1
+CMAKE_CONFIGURE_ARGS+= -DSLIC3R_OPENGL_ES:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS:STRING=-DGLAD_GLES2_USE_SYSTEM_EGL=1
.endif
diff --git a/py-blosc2/Makefile b/py-blosc2/Makefile
index c936315b1e..333651387f 100644
--- a/py-blosc2/Makefile
+++ b/py-blosc2/Makefile
@@ -29,16 +29,16 @@ DEPENDS+= ${PYPKGPREFIX}-ndindex>=1.8:../../wip/py-ndindex
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
-CMAKE_ARGS+= -DUSE_SYSTEM_BLOSC2:BOOl=TRUE
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_BLOSC2:BOOl=TRUE
# work around RPATH error: file RPATH_CHANGE could not write new RPATH:
-CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=1
pre-configure:
${LN} -sf ${PREFIX}/bin/cython-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/cython
do-build:
${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TOOL_PYTHONBIN} \
- setup.py bdist_wheel ${CMAKE_ARGS}
+ setup.py bdist_wheel ${CMAKE_CONFIGURE_ARGS}
TEST_DEPENDS+= ${PYPKGPREFIX}-msgpack>=1.0.8:../../devel/py-msgpack
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
diff --git a/py-dlib/Makefile b/py-dlib/Makefile
index 7ce1752b8d..38b134b150 100644
--- a/py-dlib/Makefile
+++ b/py-dlib/Makefile
@@ -12,7 +12,7 @@ COMMENT= Machine learning framework written in C++ (python bindings)
LICENSE= boost-license
USE_CMAKE= yes
USE_LANGUAGES+= c c++
-CMAKE_ARGS+= -B ${WRKSRC}/build
+CMAKE_CONFIGURE_ARGS+= -B ${WRKSRC}/build
BUILD_DIRS= build
DEPENDS+= dlib-cpp>=19.24:../../wip/dlib-cpp
diff --git a/py-pyside-shiboken/Makefile b/py-pyside-shiboken/Makefile
index 1c8576d97d..9698b9025c 100644
--- a/py-pyside-shiboken/Makefile
+++ b/py-pyside-shiboken/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/Shiboken-${VERSION}
USE_TOOLS+= gmake cmake pkg-config
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
@@ -32,7 +32,7 @@ pre-configure:
cd ${WRKSRC} && ${MKDIR} build
do-configure:
- cd ${WRKSRC}/build && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} ..
+ cd ${WRKSRC}/build && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_CONFIGURE_ARGS} ..
do-build:
cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV:Q} ${MAKE_PROGRAM}
diff --git a/py-pyside-tools/Makefile b/py-pyside-tools/Makefile
index f18bcfde33..edd4fc56b3 100644
--- a/py-pyside-tools/Makefile
+++ b/py-pyside-tools/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/Tools-${VERSION}
USE_TOOLS+= gmake cmake pkg-config
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
REPLACE_PYTHON+= pyside-uic
@@ -35,7 +35,7 @@ pre-configure:
cd ${WRKSRC} && ${MKDIR} build
do-configure:
- cd ${WRKSRC}/build && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} ..
+ cd ${WRKSRC}/build && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_CONFIGURE_ARGS} ..
do-build:
cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV:Q} ${MAKE_PROGRAM}
diff --git a/py-pyside/Makefile b/py-pyside/Makefile
index 680c033c83..83cf7bb861 100644
--- a/py-pyside/Makefile
+++ b/py-pyside/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/PySide-${VERSION}
USE_TOOLS+= gmake cmake pkg-config
USE_LANGUAGES+= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
BUILDLINK_DEPMETHOD.qt4-tools= full
@@ -29,7 +29,7 @@ pre-configure:
cd ${WRKSRC} && ${MKDIR} build
do-configure:
- cd ${WRKSRC}/build && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_ARGS} ..
+ cd ${WRKSRC}/build && ${SETENV} ${CONFIGURE_ENV} ${CMAKE} ${CMAKE_CONFIGURE_ARGS} ..
do-build:
cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
diff --git a/py-symbolic/Makefile b/py-symbolic/Makefile
index 528f3cd758..fe8a34ea08 100644
--- a/py-symbolic/Makefile
+++ b/py-symbolic/Makefile
@@ -58,10 +58,10 @@ USE_LANGUAGES= c c++ c++11
USE_LIBTOOL= yes
USE_TOOLS+= bash gmake perl:build pkg-config
-CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags
diff --git a/py-torch/Makefile b/py-torch/Makefile
index 37aedc97ca..9573387e04 100644
--- a/py-torch/Makefile
+++ b/py-torch/Makefile
@@ -19,7 +19,7 @@ DEPENDS+= cmake>=3.17:../../devel/cmake
DEPENDS+= protobuf>=3.20.1:../../devel/protobuf
USE_CMAKE= yes
-CMAKE_ARGS+= -B build \
+CMAKE_CONFIGURE_ARGS+= -B build \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DBUILD_BINARY:BOOL=ON \
-DBUILD_CAFFE2=OFF \
diff --git a/qgis/Makefile b/qgis/Makefile
index 3ecb1c284b..ff6f476e68 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -50,18 +50,18 @@ SUBST_SED.pyqt+= -e '/^ *SET/s,pyuic5,&-${PYVERSSUFFIX},'
SUBST_SED.pyqt+= -e '/^ *SET/s,pyrcc5,&-${PYVERSSUFFIX},'
SUBST_SED.pyqt+= -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
-CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
-CMAKE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DWITH_INTERNAL_MARKUPSAFE=FALSE
# \todo Understand what draco is and perhaps add to pkgsrc.
-CMAKE_ARGS+= -DWITH_DRACO=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_DRACO=FALSE
# \todo Understand and probably add.
-CMAKE_ARGS+= -DWITH_3D=FALSE
+CMAKE_CONFIGURE_ARGS+= -DWITH_3D=FALSE
# Server support is WIP; it has merely been tested that regular use
# has not been broken.
-CMAKE_ARGS+= -DWITH_SERVER:BOOL=TRUE
-CMAKE_ARGS+= -DQGIS_CGIBIN_SUBDIR=libexec/cgi-bin
+CMAKE_CONFIGURE_ARGS+= -DWITH_SERVER:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DQGIS_CGIBIN_SUBDIR=libexec/cgi-bin
PYTHON_VERSIONS_INCOMPATIBLE= 27 38
@@ -78,10 +78,10 @@ DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
# for metasearch
DEPENDS+= ${PYPKGPREFIX}-owslib-[0-9]*:../../geography/py-owslib
-CMAKE_ARGS+= -DWITH_QTWEBKIT=FALSE
-CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR}
+CMAKE_CONFIGURE_ARGS+= -DWITH_QTWEBKIT=FALSE
+CMAKE_CONFIGURE_ARGS+= -DQWT_DIR=${QWT_DIR}
# uncomment to tell cmake not to hide build commands (i.e., to show them)
-#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=TRUE
# \todo Hoist this to become a general facility where a variable controls
# actually showing build output.
diff --git a/qt5-libqtlua/Makefile b/qt5-libqtlua/Makefile
index 6c90ae3d6f..128b0c4072 100644
--- a/qt5-libqtlua/Makefile
+++ b/qt5-libqtlua/Makefile
@@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v3 OR gnu-lgpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DINSTALL_BIN=${QTDIR}/bin
-CMAKE_ARGS+= -DINSTALL_INC=${QTDIR}/include
-CMAKE_ARGS+= -DINSTALL_LIB=${QTDIR}/lib
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_BIN=${QTDIR}/bin
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_INC=${QTDIR}/include
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIB=${QTDIR}/lib
.include "../../lang/lua51/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/raze/Makefile b/raze/Makefile
index fd2e88e6c5..0350a08078 100644
--- a/raze/Makefile
+++ b/raze/Makefile
@@ -19,8 +19,8 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++17
-CMAKE_ARGS+= -DINSTALL_PK3_PATH=share/games/raze
-CMAKE_ARGS+= -DDYN_OPENAL=Off
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_PK3_PATH=share/games/raze
+CMAKE_CONFIGURE_ARGS+= -DDYN_OPENAL=Off
CXXFLAGS+= -D PKGSRC_RAZE_PATH='"${PREFIX}/share/games/raze"'
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/rdsn-git/Makefile b/rdsn-git/Makefile
index 74debcea55..edc8997e8e 100644
--- a/rdsn-git/Makefile
+++ b/rdsn-git/Makefile
@@ -21,9 +21,9 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
GCC_REQD+= 4.8
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=g++
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER=gcc
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER=g++
CMAKE_ARG_PATH= ${WRKSRC}
diff --git a/realm-core/Makefile b/realm-core/Makefile
index 7cd648f94f..8e4e04d572 100644
--- a/realm-core/Makefile
+++ b/realm-core/Makefile
@@ -12,8 +12,8 @@ LICENSE= apache-2.0
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DPEGTL_SYSTEM=1
-CMAKE_ARGS+= -DSSL_SYSTEM=1
+CMAKE_CONFIGURE_ARGS+= -DPEGTL_SYSTEM=1
+CMAKE_CONFIGURE_ARGS+= -DSSL_SYSTEM=1
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
diff --git a/reone/Makefile b/reone/Makefile
index b760670b17..cac52c8f84 100644
--- a/reone/Makefile
+++ b/reone/Makefile
@@ -18,7 +18,7 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-#CMAKE_ARGS+= -DUSE_EXTERNAL_GLM:BOOL=NO
+#CMAKE_CONFIGURE_ARGS+= -DUSE_EXTERNAL_GLM:BOOL=NO
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
diff --git a/rlottie/Makefile b/rlottie/Makefile
index 2383ecb726..4cda841702 100644
--- a/rlottie/Makefile
+++ b/rlottie/Makefile
@@ -18,8 +18,8 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS= -DLIB_INSTALL_DIR=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS= -DLIB_INSTALL_DIR=${PREFIX}/lib
PKGCONFIG_OVERRIDE+= rlottie.pc.in
diff --git a/rmilter/Makefile b/rmilter/Makefile
index aee668b102..7443498437 100644
--- a/rmilter/Makefile
+++ b/rmilter/Makefile
@@ -25,11 +25,11 @@ PKG_GROUPS_VARS= RMILTER_GROUP
PKG_USERS_VARS= RMILTER_USER
PKG_GECOS.${R_USER}= rspamd user
-CMAKE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR}
-CMAKE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DRMILTER_USER=${RMILTER_USER}
-CMAKE_ARGS+= -DRMILTER_GROUP=${RMILTER_GROUP}
-CMAKE_ARGS+= -DENABLE_DKIM=OFF
+CMAKE_CONFIGURE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR}
+CMAKE_CONFIGURE_ARGS+= -DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DRMILTER_USER=${RMILTER_USER}
+CMAKE_CONFIGURE_ARGS+= -DRMILTER_GROUP=${RMILTER_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DKIM=OFF
PKG_SYSCONFSUBDIR= rmilter
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/rstudio/Makefile b/rstudio/Makefile
index 732167f06f..3254a46119 100644
--- a/rstudio/Makefile
+++ b/rstudio/Makefile
@@ -25,8 +25,8 @@ WRKSRC= ${WRKDIR}/rstudio-rstudio-e31bd49
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DRSTUDIO_TARGET=Desktop
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DRSTUDIO_TARGET=Desktop
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
SUBST_CLASSES+= path
SUBST_STAGE.path= pre-configure
diff --git a/rtaudio/Makefile b/rtaudio/Makefile
index 3121207cec..d6d7bff71a 100644
--- a/rtaudio/Makefile
+++ b/rtaudio/Makefile
@@ -13,7 +13,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c++
-CMAKE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
PKGCONFIG_OVERRIDE+= rtaudio.pc.in
diff --git a/rtaudio/options.mk b/rtaudio/options.mk
index 26f1384e20..ca59b0168e 100644
--- a/rtaudio/options.mk
+++ b/rtaudio/options.mk
@@ -19,34 +19,34 @@ PKG_SUGGESTED_OPTIONS+= coreaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DRTAUDIO_API_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DRTAUDIO_API_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mcoreaudio)
-CMAKE_ARGS+= -DRTAUDIO_API_CORE=ON
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_CORE=ON
.else
-CMAKE_ARGS+= -DRTAUDIO_API_CORE=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_CORE=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DRTAUDIO_API_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_JACK=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DRTAUDIO_API_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_JACK=OFF
.endif
.if !empty(PKG_OPTIONS:Moss)
-CMAKE_ARGS+= -DRTAUDIO_API_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_OSS=ON
.else
-CMAKE_ARGS+= -DRTAUDIO_API_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_OSS=OFF
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CMAKE_ARGS+= -DRTAUDIO_API_PULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_PULSE=ON
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CMAKE_ARGS+= -DRTAUDIO_API_PULSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTAUDIO_API_PULSE=OFF
.endif
diff --git a/rtl-sdr-git/Makefile b/rtl-sdr-git/Makefile
index fa87c8c494..3ab8cab95b 100644
--- a/rtl-sdr-git/Makefile
+++ b/rtl-sdr-git/Makefile
@@ -26,11 +26,11 @@ SUBST_FILES.destdir= build/cmake_install.cmake
SUBST_STAGE.destdir= pre-install
SUBST_SED.destdir= -e 's|\$${CMAKE_INSTALL_PREFIX}|${DESTDIR}\$${CMAKE_INSTALL_PREFIX}|'
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib
-CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
CMAKE_ARG_PATH= ../
CONFIGURE_DIRS= build
diff --git a/rtl_433/Makefile b/rtl_433/Makefile
index bb862f8111..b86364b678 100644
--- a/rtl_433/Makefile
+++ b/rtl_433/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+= pkg-config
USE_CMAKE= yes
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
PKGCONFIG_OVERRIDE+= rtl433.pc.in
diff --git a/rtmidi/Makefile b/rtmidi/Makefile
index 9ea1105f09..7e7c73e822 100644
--- a/rtmidi/Makefile
+++ b/rtmidi/Makefile
@@ -13,7 +13,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
PKGCONFIG_OVERRIDE+= rtmidi.pc.in
diff --git a/rtmidi/options.mk b/rtmidi/options.mk
index 0b7b4f4907..a8536ad52b 100644
--- a/rtmidi/options.mk
+++ b/rtmidi/options.mk
@@ -19,21 +19,21 @@ PKG_SUGGESTED_OPTIONS+= coreaudio
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CMAKE_ARGS+= -DRTMIDI_API_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DRTMIDI_API_ALSA=ON
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CMAKE_ARGS+= -DRTMIDI_API_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTMIDI_API_ALSA=OFF
.endif
.if !empty(PKG_OPTIONS:Mcoreaudio)
-CMAKE_ARGS+= -DRTMIDI_API_CORE=ON
+CMAKE_CONFIGURE_ARGS+= -DRTMIDI_API_CORE=ON
.else
-CMAKE_ARGS+= -DRTMIDI_API_CORE=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTMIDI_API_CORE=OFF
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CMAKE_ARGS+= -DRTMIDI_API_JACK=ON
+CMAKE_CONFIGURE_ARGS+= -DRTMIDI_API_JACK=ON
.include "../../audio/jack/buildlink3.mk"
.else
-CMAKE_ARGS+= -DRTMIDI_API_JACK=OFF
+CMAKE_CONFIGURE_ARGS+= -DRTMIDI_API_JACK=OFF
.endif
diff --git a/salmon/Makefile b/salmon/Makefile
index aaecb4b4a6..7f4fe33085 100644
--- a/salmon/Makefile
+++ b/salmon/Makefile
@@ -44,7 +44,7 @@ USE_TOOLS+= cmake gmake
REPLACE_BASH= scripts/*.sh
REPLACE_PYTHON= scripts/*.py
USE_CMAKE= yes
-CMAKE_ARGS+= -DDISTDIR:PATH=${DISTDIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DDISTDIR:PATH=${DISTDIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
CONFIGURE_ENV+= DISTDIR=${DISTDIR} DIST_SUBDIR=salmon
LDFLAGS+= -lz
diff --git a/sddm/Makefile b/sddm/Makefile
index 1376047b56..0cd0d5b7ca 100644
--- a/sddm/Makefile
+++ b/sddm/Makefile
@@ -19,14 +19,14 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.if !exists(/etc/login.defs)
-CMAKE_ARGS+= -DUID_MIN=1000
-CMAKE_ARGS+= -DUID_MAX=65000
+CMAKE_CONFIGURE_ARGS+= -DUID_MIN=1000
+CMAKE_CONFIGURE_ARGS+= -DUID_MAX=65000
.endif
-CMAKE_ARGS+= -DDBUS_CONFIG_DIR=${PREFIX}/share/examples/sddm
-CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR:PATH=${PKG_SYSCONFDIR:Q}
-CMAKE_ARGS+= -DBUILD_MAN_PAGES=ON
-CMAKE_ARGS+= -DRST2MAN_EXECUTABLE=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DDBUS_CONFIG_DIR=${PREFIX}/share/examples/sddm
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR:PATH=${PKG_SYSCONFDIR:Q}
+CMAKE_CONFIGURE_ARGS+= -DBUILD_MAN_PAGES=ON
+CMAKE_CONFIGURE_ARGS+= -DRST2MAN_EXECUTABLE=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
+#CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
SUBST_CLASSES+= paths egs
SUBST_STAGE.paths= pre-configure
diff --git a/serious-engine-tfe-git/Makefile b/serious-engine-tfe-git/Makefile
index 8aa0132d79..38fb8e8cf4 100644
--- a/serious-engine-tfe-git/Makefile
+++ b/serious-engine-tfe-git/Makefile
@@ -2,7 +2,7 @@
PKGNAME= serious-engine-tfe-0.0
-CMAKE_ARGS+= -DTFE:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DTFE:BOOL=TRUE
CXXFLAGS+= -DPACKAGE_LIBDIR=\""${PREFIX}/lib/ssam-tfe/"\"
.include "../../wip/serious-engine-tfe-git/Makefile.common"
diff --git a/serious-engine-tfe-git/Makefile.common b/serious-engine-tfe-git/Makefile.common
index b75637a291..2602a9c3dd 100644
--- a/serious-engine-tfe-git/Makefile.common
+++ b/serious-engine-tfe-git/Makefile.common
@@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR}/serious/Sources
USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_TOOLS+= bison pkg-config
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
-CMAKE_ARGS+= -DCMAKE_INCLUDE_CURRENT_DIR:BOOL=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_CURRENT_DIR:BOOL=TRUE
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
diff --git a/serious-engine-tse-git/Makefile b/serious-engine-tse-git/Makefile
index 0f279c10d7..3a20d7e2d1 100644
--- a/serious-engine-tse-git/Makefile
+++ b/serious-engine-tse-git/Makefile
@@ -3,7 +3,7 @@
PKGNAME= serious-engine-tse-0.0
PATCHDIR= ../../wip/serious-engine-tfe-git/patches
-CMAKE_ARGS+= -DTFE:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DTFE:BOOL=FALSE
CXXFLAGS+= -DPACKAGE_LIBDIR=\""${PREFIX}/lib/ssam-tse/"\"
.include "../../wip/serious-engine-tfe-git/Makefile.common"
diff --git a/sipwitch/Makefile b/sipwitch/Makefile
index d507f4f874..f4ac716c64 100644
--- a/sipwitch/Makefile
+++ b/sipwitch/Makefile
@@ -25,7 +25,7 @@ SUBST_FILES.files= cmake_install.cmake server/cmake_install.cmake
SUBST_SED.files+= -e 's|SETUID|SETUID OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE|1'
CFLAGS+= -fPIC
-CMAKE_ARGS+= -DINSTALL_LIBDIR:STRING=lib -DINSTALL_MANDIR:STRING=${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_LIBDIR:STRING=lib -DINSTALL_MANDIR:STRING=${PKGMANDIR}
SPECIAL_PERMS+= bin/sippasswd ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4555
EGDIR= share/examples/sipwitch
diff --git a/slade/Makefile b/slade/Makefile
index efbb2927b0..d874d87ea7 100644
--- a/slade/Makefile
+++ b/slade/Makefile
@@ -17,12 +17,12 @@ USE_CXX_FEATURES+= c++17 filesystem
USE_TOOLS+= pkg-config zip
-CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DNO_COTIRE=ON # CMake has similar functionality since 3.16
-CMAKE_ARGS+= -DNO_LUA=ON
-CMAKE_ARGS+= -DNO_WEBVIEW=ON
-CMAKE_ARGS+= -DBUILD_PK3=ON
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release # Use "Debug" for development
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
+CMAKE_CONFIGURE_ARGS+= -DNO_COTIRE=ON # CMake has similar functionality since 3.16
+CMAKE_CONFIGURE_ARGS+= -DNO_LUA=ON
+CMAKE_CONFIGURE_ARGS+= -DNO_WEBVIEW=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_PK3=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release # Use "Debug" for development
INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
diff --git a/speed-dreams/Makefile b/speed-dreams/Makefile
index d70a838fcb..edfd4c2cc5 100644
--- a/speed-dreams/Makefile
+++ b/speed-dreams/Makefile
@@ -11,9 +11,9 @@ EXTRACT_DIR= ${WRKDIR}/${DISTNAME}
USE_CMAKE= yes
USE_LANGUAGES+= c c++
-CMAKE_ARGS+= -DOPTION_3RDPARTY_EXPAT:BOOL=ON
-CMAKE_ARGS+= -DOPTION_3RDPARTY_SQLITE3:BOOL=ON
-CMAKE_ARGS+= -DOPTION_SDL2:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DOPTION_3RDPARTY_EXPAT:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DOPTION_3RDPARTY_SQLITE3:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DOPTION_SDL2:BOOL=ON
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
diff --git a/sra-tools/Makefile b/sra-tools/Makefile
index 74620ebd0b..4345dfa7af 100644
--- a/sra-tools/Makefile
+++ b/sra-tools/Makefile
@@ -38,8 +38,8 @@ SUBST_FILES.submoddir+= CMakeLists.txt
REPLACE_BASH= */*.sh */*/*.sh */*/*/*.sh */*/*/*/*.sh
USE_CMAKE= yes
-CMAKE_ARGS+= -DVDB_LIBDIR:STRING=${WRKSRC}/ncbi-vdb/build/lib
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DVDB_LIBDIR:STRING=${WRKSRC}/ncbi-vdb/build/lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl # ncbi-vdb/CMakeLists.posix.txt
EXAMPLESDIR= ${PREFIX}/share/examples/sra-tools
diff --git a/stormlib/Makefile b/stormlib/Makefile
index 221245787a..9028f93032 100644
--- a/stormlib/Makefile
+++ b/stormlib/Makefile
@@ -15,7 +15,7 @@ EXTRACT_USING= gtar
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DSTORM_BUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DSTORM_BUILD_TESTS=OFF
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/stratagus/Makefile b/stratagus/Makefile
index 74e12ec675..eb7c5e8a0d 100644
--- a/stratagus/Makefile
+++ b/stratagus/Makefile
@@ -16,9 +16,9 @@ USE_LANGUAGES= c c++
TOOL_DEPENDS+= tolua++-[0-9]*:../../wip/tolua++
-CMAKE_ARGS+= -DENABLE_DEV=ON
-CMAKE_ARGS+= -DWANT_METASERVER=OFF
-CMAKE_ARGS+= -DWITH_RENDERER=NativeSDL
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEV=ON
+CMAKE_CONFIGURE_ARGS+= -DWANT_METASERVER=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_RENDERER=NativeSDL
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../audio/fluidsynth/buildlink3.mk"
diff --git a/supercollider/Makefile b/supercollider/Makefile
index ff4010b881..9879baa809 100644
--- a/supercollider/Makefile
+++ b/supercollider/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/SuperCollider-Source
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
USE_CMAKE= yes
-CMAKE_ARGS+= -DSYSTEM_BOOST:BOOL=true
+CMAKE_CONFIGURE_ARGS+= -DSYSTEM_BOOST:BOOL=true
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/symphony-of-empires/Makefile b/symphony-of-empires/Makefile
index e1a4c6aed0..9feca05fab 100644
--- a/symphony-of-empires/Makefile
+++ b/symphony-of-empires/Makefile
@@ -18,11 +18,11 @@ USE_LANGUAGES+= c c++
USE_TOOLS+= pax
USE_CMAKE= yes
-CMAKE_ARGS+= -DE3D_BACKEND_D3D9=OFF
-CMAKE_ARGS+= -DE3D_BACKEND_GLES=OFF
-CMAKE_ARGS+= -DE3D_BACKEND_OPENGL=ON
-CMAKE_ARGS+= -DBUILD_ENGINE=ON
-CMAKE_ARGS+= -DBUILD_GAME=ON
+CMAKE_CONFIGURE_ARGS+= -DE3D_BACKEND_D3D9=OFF
+CMAKE_CONFIGURE_ARGS+= -DE3D_BACKEND_GLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DE3D_BACKEND_OPENGL=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_ENGINE=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GAME=ON
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= lib
diff --git a/systemc/Makefile b/systemc/Makefile
index 906c795d58..3c49af8d38 100644
--- a/systemc/Makefile
+++ b/systemc/Makefile
@@ -15,7 +15,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DENABLE_PTHREADS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_PTHREADS=ON
PKGCONFIG_OVERRIDE+= src/systemc.pc.in
diff --git a/tdlib-purple/Makefile b/tdlib-purple/Makefile
index 49d07cd976..9a61d219cd 100644
--- a/tdlib-purple/Makefile
+++ b/tdlib-purple/Makefile
@@ -18,10 +18,10 @@ USE_LANGUAGES= c++
# Pass STUFF to avoid possible API_ID_PUBLISHED_FLOOD errors and
# building the package similarly to upstream binary packages:
# https://github.com/ars3niy/tdlib-purple/issues/95
-CMAKE_ARGS+= -DSTUFF="AFADBDIyvuCrHF@E@GCC@qAvGus@rIArrGGtIvqC"
-CMAKE_ARGS+= -DNoWebp=TRUE
-CMAKE_ARGS+= -DNoLottie=TRUE
-CMAKE_ARGS+= -DNoVoip=TRUE
+CMAKE_CONFIGURE_ARGS+= -DSTUFF="AFADBDIyvuCrHF@E@GCC@qAvGus@rIArrGGtIvqC"
+CMAKE_CONFIGURE_ARGS+= -DNoWebp=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNoLottie=TRUE
+CMAKE_CONFIGURE_ARGS+= -DNoVoip=TRUE
PKGCONFIG_OVERRIDE+= fmt/support/cmake/fmt.pc.in
PKGCONFIG_OVERRIDE+= rlottie/rlottie.pc.in
diff --git a/telegram-desktop/Makefile b/telegram-desktop/Makefile
index 1f432fbd1b..576e713d1e 100644
--- a/telegram-desktop/Makefile
+++ b/telegram-desktop/Makefile
@@ -23,28 +23,28 @@ USE_CMAKE= yes
ONLY_FOR_COMPILER= gcc
GCC_REQD= 10
-CMAKE_ARGS+= -Ddisable_autoupdate=1
-CMAKE_ARGS+= -DWITHOUT_PULSE=ON
-CMAKE_ARGS+= -DWITHOUT_ALSA=ON
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/usr/pkg
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DTDESKTOP_API_TEST=ON
-CMAKE_ARGS+= -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-CMAKE_ARGS+= -DDESKTOP_APP_USE_PACKAGED=ON
-CMAKE_ARGS+= -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-CMAKE_ARGS+= -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-CMAKE_ARGS+= -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON
-CMAKE_ARGS+= -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
-CMAKE_ARGS+= -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
-CMAKE_ARGS+= -DDESKTOP_APP_SPECIAL_TARGET=""
-CMAKE_ARGS+= -DTDESKTOP_LAUNCHER_BASENAME="telegram-desktop"
-CMAKE_ARGS+= -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON
+CMAKE_CONFIGURE_ARGS+= -Ddisable_autoupdate=1
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_PULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DWITHOUT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/usr/pkg
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_API_TEST=ON
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_USE_PACKAGED=ON
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_SPECIAL_TARGET=""
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_LAUNCHER_BASENAME="telegram-desktop"
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" # NetBSD-specific config
-CMAKE_ARGS+= -DTDESKTOP_WITHOUT_ALSA=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_WITHOUT_ALSA=ON
.elif ${OPSYS} == "Linux"
-CMAKE_ARGS+= -DTDESKTOP_WITHOUT_ALSA=OFF
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_WITHOUT_ALSA=OFF
.endif
diff --git a/telegram-desktop/options.mk b/telegram-desktop/options.mk
index 8f973a1875..d64adf9d8e 100644
--- a/telegram-desktop/options.mk
+++ b/telegram-desktop/options.mk
@@ -10,33 +10,33 @@ PKG_SUPPORTED_OPTIONS= gtk3 spell dbus libressl
### GTK+3 integration
###
.if !empty(PKG_OPTIONS:Mgtk3)
-CMAKE_ARGS+= -DTDESKTOP_DISABLE_GTK_INTEGRATION=OFF
-CMAKE_ARGS+= -DTDESKTOP_FORCE_GTK_FILE_DIALOG=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_DISABLE_GTK_INTEGRATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_FORCE_GTK_FILE_DIALOG=ON
.include "../../devel/libappindicator/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.else
-CMAKE_ARGS+= -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON
-CMAKE_ARGS+= -DTDESKTOP_FORCE_GTK_FILE_DIALOG=OFF
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_FORCE_GTK_FILE_DIALOG=OFF
.endif
###
### Spell checking
###
.if !empty(PKG_OPTIONS:Mspell)
-CMAKE_ARGS+= -DDESKTOP_APP_DISABLE_SPELLCHECK=OFF
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_DISABLE_SPELLCHECK=OFF
.include "../../textproc/enchant/buildlink3.mk"
.else
-CMAKE_ARGS+= -DDESKTOP_APP_DISABLE_SPELLCHECK=ON
+CMAKE_CONFIGURE_ARGS+= -DDESKTOP_APP_DISABLE_SPELLCHECK=ON
.endif
###
### D-Bus integration
###
.if !empty(PKG_OPTIONS:Mdbus)
-CMAKE_ARGS+= -DTDESKTOP_DISABLE_DBUS_INTEGRATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_DISABLE_DBUS_INTEGRATION=OFF
.include "../../sysutils/dbus/buildlink3.mk"
.else
-CMAKE_ARGS+= -DTDESKTOP_DISABLE_DBUS_INTEGRATION=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_DISABLE_DBUS_INTEGRATION=ON
.endif
###
@@ -53,8 +53,8 @@ CMAKE_ARGS+= -DTDESKTOP_DISABLE_DBUS_INTEGRATION=ON
###
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../security/pulseaudio/buildlink3.mk"
-CMAKE_ARGS+= -DTDESKTOP_WITHOUT_PULSE=OFF
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_WITHOUT_PULSE=OFF
.else
-CMAKE_ARGS+= -DTDESKTOP_WITHOUT_PULSE=ON
+CMAKE_CONFIGURE_ARGS+= -DTDESKTOP_WITHOUT_PULSE=ON
.endif
diff --git a/tg_owt-git/Makefile b/tg_owt-git/Makefile
index d534bf8442..47f05a58e1 100644
--- a/tg_owt-git/Makefile
+++ b/tg_owt-git/Makefile
@@ -20,7 +20,7 @@ USE_LANGUAGES= c c++
.include "../../mk/bsd.prefs.mk"
-CMAKE_ARGS+= -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC"
.include "../../audio/libopus/buildlink3.mk"
.include "../../comms/srtp/buildlink3.mk"
diff --git a/timewarrior/Makefile b/timewarrior/Makefile
index 3b04b1d026..f9b2e57931 100644
--- a/timewarrior/Makefile
+++ b/timewarrior/Makefile
@@ -20,9 +20,9 @@ GCC_REQD+= 4.8
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
-CMAKE_ARGS+= -DTIMEW_MANDIR=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DTIMEW_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DTIMEW_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
-CMAKE_ARGS+= -DTIMEW_MAN7DIR=${PREFIX}/${PKGMANDIR}/man7
+CMAKE_CONFIGURE_ARGS+= -DTIMEW_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DTIMEW_MAN1DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DTIMEW_MAN5DIR=${PREFIX}/${PKGMANDIR}/man5
+CMAKE_CONFIGURE_ARGS+= -DTIMEW_MAN7DIR=${PREFIX}/${PKGMANDIR}/man7
.include "../../mk/bsd.pkg.mk"
diff --git a/timg/Makefile b/timg/Makefile
index 95bec89f0e..96a3e38fdd 100644
--- a/timg/Makefile
+++ b/timg/Makefile
@@ -17,8 +17,8 @@ WRKSRC= ${WRKDIR}/timg-1.4.2
USE_TOOLS= cmake pkg-config
USE_CMAKE= yes
USE_LANGUAGES= c++
-CMAKE_ARGS+= -DTIMG_VERSION_FROM_GIT=OFF
-CMAKE_ARGS+= -DWITH_OPENSLIDE_SUPPORT=OFF
+CMAKE_CONFIGURE_ARGS+= -DTIMG_VERSION_FROM_GIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_OPENSLIDE_SUPPORT=OFF
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/timg/options.mk b/timg/options.mk
index 839d6f57ce..00bee182a4 100644
--- a/timg/options.mk
+++ b/timg/options.mk
@@ -11,29 +11,29 @@ PKG_SUGGESTED_OPTIONS= ffmpeg graphicsmagick
### Use ffmpeg
###
.if !empty(PKG_OPTIONS:Mffmpeg)
-CMAKE_ARGS+= -DWITH_VIDEO_DECODING=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_VIDEO_DECODING=ON
.include "../../multimedia/ffmpeg4/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_VIDEO_DECODING=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_VIDEO_DECODING=OFF
.endif
###
### Use GraphicsMagick
###
.if !empty(PKG_OPTIONS:Mgraphicsmagick)
-CMAKE_ARGS+= -DWITH_GRAPHICSMAGICK=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_GRAPHICSMAGICK=ON
.include "../../graphics/GraphicsMagick/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_GRAPHICSMAGICK=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_GRAPHICSMAGICK=OFF
.endif
###
### Use OpenSlide - Not yet in pkgsrc, so disabled
###
#.if !empty(PKG_OPTIONS:Mopenslide)
-#CMAKE_ARGS+= -DWITH_OPENSLIDE_SUPPORT=ON
+#CMAKE_CONFIGURE_ARGS+= -DWITH_OPENSLIDE_SUPPORT=ON
#.else
-#CMAKE_ARGS+= -DWITH_OPENSLIDE_SUPPORT=OFF
+#CMAKE_CONFIGURE_ARGS+= -DWITH_OPENSLIDE_SUPPORT=OFF
#.endif
###
@@ -41,8 +41,8 @@ CMAKE_ARGS+= -DWITH_GRAPHICSMAGICK=OFF
### Not enabled by default as it conflicts with graphics/jpeg
###
.if !empty(PKG_OPTIONS:Mjpegturbo)
-CMAKE_ARGS+= -DWITH_TURBOJPEG=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_TURBOJPEG=ON
.include "../../graphics/libjpeg-turbo/buildlink3.mk"
.else
-CMAKE_ARGS+= -DWITH_TURBOJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_TURBOJPEG=OFF
.endif
diff --git a/torque3d/Makefile b/torque3d/Makefile
index 6c312bd068..f05de750d1 100644
--- a/torque3d/Makefile
+++ b/torque3d/Makefile
@@ -16,7 +16,7 @@ USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DTORQUE_APP_NAME:STRING="TORQUE3D"
+CMAKE_CONFIGURE_ARGS+= -DTORQUE_APP_NAME:STRING="TORQUE3D"
PKGCONFIG_OVERRIDE+= Engine/lib/bullet/bullet.pc.in
PKGCONFIG_OVERRIDE+= Engine/lib/lpng/libpng.pc.in
diff --git a/tuxanci-server/Makefile b/tuxanci-server/Makefile
index 8e6dc5d3fe..1095fb2bd2 100644
--- a/tuxanci-server/Makefile
+++ b/tuxanci-server/Makefile
@@ -22,7 +22,7 @@ MAKE_ENV+= EGDIR=${EGDIR}
MAKE_DIRS+= ${PKG_SYSCONFDIR}/tuxanci-server
CONF_FILES+= ${EGDIR}/tuxanci-server/server.conf ${PKG_SYSCONFDIR}/tuxanci-server/server.conf
-CMAKE_ARGS+= -DServer=1 \
+CMAKE_CONFIGURE_ARGS+= -DServer=1 \
-DPREFIX=\\\"${PREFIX}/\\\" \
-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-DEGDIR=${EGDIR}
diff --git a/tuxanci/Makefile b/tuxanci/Makefile
index 983719b7dd..a7da11be0c 100644
--- a/tuxanci/Makefile
+++ b/tuxanci/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/pkgs/tuxanci-0.20.0-src
USE_CMAKE= yes
USE_LANGUAGES+= c c++
-CMAKE_ARGS+= -DPREFIX=\\\"${PREFIX}/\\\" \
+CMAKE_CONFIGURE_ARGS+= -DPREFIX=\\\"${PREFIX}/\\\" \
-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-DSDL_INCLUDE_DIR=${PREFIX}/include/SDL \
-DSDLIMAGE_INCLUDE_DIR=${PREFIX}/include/SDL \
diff --git a/twinkle/Makefile b/twinkle/Makefile
index f4e72ec433..76bee356b5 100644
--- a/twinkle/Makefile
+++ b/twinkle/Makefile
@@ -16,9 +16,9 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= bison flex
-CMAKE_ARGS+= -DWITH_ALSA:BOOL=OFF
-CMAKE_ARGS+= -DWITH_SPEEX:BOOL=ON
-CMAKE_ARGS+= -DWITH_ZRTP:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ALSA:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_SPEEX:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZRTP:BOOL=ON
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
diff --git a/uTox-git/Makefile b/uTox-git/Makefile
index a3d07a5ea0..153ae472e0 100644
--- a/uTox-git/Makefile
+++ b/uTox-git/Makefile
@@ -18,7 +18,7 @@ USE_CMAKE= yes
TEST_TARGET= test
# Unclear crash in OpenAL on NetBSD
-CMAKE_ARGS+= -DENABLE_ASAN=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_ASAN=OFF
.include "../../chat/toxcore/buildlink3.mk"
.include "../../audio/filter_audio/buildlink3.mk"
diff --git a/ufc/Makefile b/ufc/Makefile
index 00a0f8d77c..ae180b3de5 100644
--- a/ufc/Makefile
+++ b/ufc/Makefile
@@ -19,7 +19,7 @@ USE_CMAKE= yes
.include "../../mk/bsd.prefs.mk"
# Cmake's FindSWIG looks first for swig2.0, then for swig
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
# Needed on OS X
# Not needed on NetBSD
diff --git a/usrsctp/Makefile b/usrsctp/Makefile
index b9ac4bcc98..d4e4dffbad 100644
--- a/usrsctp/Makefile
+++ b/usrsctp/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= usrsctp.pc.in
-CMAKE_ARGS+= -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC"
#.include "../../devel/meson/build.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/vala-panel-appmenu/Makefile b/vala-panel-appmenu/Makefile
index 70d02f890b..f9a4dba78a 100644
--- a/vala-panel-appmenu/Makefile
+++ b/vala-panel-appmenu/Makefile
@@ -12,10 +12,10 @@ LICENSE= gnu-lgpl-v3
USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
-CMAKE_ARGS+= -DENABLE_MATE=ON
-CMAKE_ARGS+= -DENABLE_XFCE=ON
-CMAKE_ARGS+= -DENABLE_APPMENU_GTK_MODULE=ON
-CMAKE_ARGS+= -DENABLE_VALAPANEL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MATE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_XFCE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_APPMENU_GTK_MODULE=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_VALAPANEL=ON
PKGCONFIG_OVERRIDE+= subprojects/appmenu-gtk-module/data/appmenu-gtk2-parser.pc.in
PKGCONFIG_OVERRIDE+= subprojects/appmenu-gtk-module/data/appmenu-gtk3-parser.pc.in
diff --git a/vulkan-loader/Makefile b/vulkan-loader/Makefile
index 3e1931507c..44555bd0e5 100644
--- a/vulkan-loader/Makefile
+++ b/vulkan-loader/Makefile
@@ -19,8 +19,8 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
# wayland support missing in pkgsrc
-CMAKE_ARGS+= -DBUILD_WSI_WAYLAND_SUPPORT=OFF
-CMAKE_ARGS+= -DBUILD_TESTS=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WSI_WAYLAND_SUPPORT=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=ON
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
diff --git a/warsow/Makefile b/warsow/Makefile
index c2a5069d55..1f0fd3e900 100644
--- a/warsow/Makefile
+++ b/warsow/Makefile
@@ -22,7 +22,7 @@ USE_CMAKE= yes
USE_TOOLS+= pax
USE_LANGUAGES= c c++
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/libexec/warsow
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/libexec/warsow
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/warsow
diff --git a/wasi-compiler-rt/Makefile b/wasi-compiler-rt/Makefile
index 57b384b89a..bf25837a20 100644
--- a/wasi-compiler-rt/Makefile
+++ b/wasi-compiler-rt/Makefile
@@ -30,32 +30,32 @@ BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/include
CMAKE_BUILD_DIR= cmake-pkgsrc-build
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=wasi
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
-CMAKE_ARGS+= -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi
-CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
-CMAKE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
-CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
-CMAKE_ARGS+= -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_BFLOAT16:BOOL=OFF
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
-CMAKE_ARGS+= -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
-CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
-CMAKE_ARGS+= -DCOMPILER_RT_ENABLE_IOS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=wasi
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_BFLOAT16:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
+CMAKE_CONFIGURE_ARGS+= -DCOMPILER_RT_ENABLE_IOS:BOOL=OFF
CMAKE_INSTALL_PREFIX= ${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
GENERATE_PLIST+= find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
@@ -68,18 +68,18 @@ pre-configure:
do-configure:
${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
${SETENV} ${CONFIGURE_ENV} cmake \
- ${CMAKE_ARGS} \
+ ${CMAKE_CONFIGURE_ARGS} \
${WRKSRC}/lib/builtins
do-build:
${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
${SETENV} ${MAKE_ENV} \
- ${MAKE} ${CMAKE_ARGS} ${BUILD_TARGET}
+ ${MAKE} ${CMAKE_CONFIGURE_ARGS} ${BUILD_TARGET}
do-install:
${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR} && \
${SETENV} ${INSTALL_ENV} \
- ${MAKE} ${CMAKE_ARGS} ${INSTALL_TARGET}
+ ${MAKE} ${CMAKE_CONFIGURE_ARGS} ${INSTALL_TARGET}
# Run llvm-ranlib again on the archive. Fixes mystery build failure
# in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
diff --git a/wasi-libcxx/Makefile b/wasi-libcxx/Makefile
index 1c5175c84e..56eae5abf8 100644
--- a/wasi-libcxx/Makefile
+++ b/wasi-libcxx/Makefile
@@ -38,108 +38,108 @@ USE_CMAKE= yes
SSP_SUPPORTED= no
PKGSRC_USE_STACK_CHECK= no
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/libcxx/include
-CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1
-CMAKE_ARGS+= -DCXX_SUPPORTS_CXX11=ON
-CMAKE_ARGS+= -DLLVM_COMPILER_CHECKED=ON
-CMAKE_ARGS+= -DUNIX:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
-CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi
-CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config
-CMAKE_ARGS+= -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi
-CMAKE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=FALSE
-CMAKE_ARGS+= -DLIBCXX_INCLUDE_TESTS:BOOL=FALSE
-CMAKE_ARGS+= -DLIBCXX_ENABLE_THREADS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_HAS_PTHREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_SHARED:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI=libcxxabi
-CMAKE_ARGS+= -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_ABI_VERSION=2
-CMAKE_ARGS+= -DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi
-CMAKE_ARGS+= -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WALL_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_W_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_EHS_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_EHA_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_ZL_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WALL_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_W_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_EHS_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_EHA_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_ZL_FLAG:BOOL=OFF
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WCONVERSION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHADOW_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_PEDANTIC_FLAG:BOOL=ON
-CMAKE_ARGS+= -DLIBCXXABI_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON
-CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
-CMAKE_ARGS+= -DCMAKE_C_FLAGS=-fno-exceptions
-CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=-fno-exceptions
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
-CMAKE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/libcxxabi/include
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/libcxx/include
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=OFF
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1
+CMAKE_CONFIGURE_ARGS+= -DCXX_SUPPORTS_CXX11=ON
+CMAKE_CONFIGURE_ARGS+= -DLLVM_COMPILER_CHECKED=ON
+CMAKE_CONFIGURE_ARGS+= -DUNIX:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_INCLUDE_TESTS:BOOL=FALSE
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_THREADS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_PTHREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_SHARED:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=libcxxabi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_ABI_VERSION=2
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WALL_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_W_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_EHS_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_EHA_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_ZL_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_HAS_COMMENT_LIB_PRAGMA:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WALL_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_W_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNO_IGNORED_ATTRIBUTES_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_EHS_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_EHA_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_ZL_FLAG:BOOL=OFF
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_NODEFAULTLIB_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WCONVERSION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHADOW_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_PEDANTIC_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DLIBCXXABI_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS=-fno-exceptions
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_FLAGS=-fno-exceptions
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI=system-libcxxabi
+CMAKE_CONFIGURE_ARGS+= -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/libcxxabi/include
CMAKE_INSTALL_PREFIX= ${PREFIX}/wasi
@@ -155,10 +155,10 @@ post-extract:
do-configure:
cd ${WRKSRC} && cd build_libcxx && \
${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
- cmake ${CMAKE_ARGS} ../libcxx
+ cmake ${CMAKE_CONFIGURE_ARGS} ../libcxx
cd ${WRKSRC} && cd build_libcxxabi && \
${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
- cmake ${CMAKE_ARGS} ../libcxxabi
+ cmake ${CMAKE_CONFIGURE_ARGS} ../libcxxabi
# Run llvm-ranlib again on the archives. Fixes mystery build failure
# in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index ec93a430b3..ab936afa42 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -37,23 +37,23 @@ PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk.pc.in
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DPORT=GTK
-CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
-CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
-CMAKE_ARGS+= -DENABLE_GAMEPAD=OFF
-CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
-CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
-CMAKE_ARGS+= -DENABLE_JOURNALD_LOG=OFF
-CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
-CMAKE_ARGS+= -DENABLE_DOCUMENTATION=OFF
-CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
-CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
-CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
-CMAKE_ARGS+= -DUSE_SOUP2=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DPORT=GTK
+CMAKE_CONFIGURE_ARGS+= -DENABLE_X11_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MINIBROWSER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GAMEPAD=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GEOLOCATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_INTROSPECTION=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JOURNALD_LOG=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOCUMENTATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_GSTREAMER_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LIBHYPHEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SOUP2=ON
.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
-CMAKE_ARGS+= -DAVOID_INT128=ON
+CMAKE_CONFIGURE_ARGS+= -DAVOID_INT128=ON
.endif
REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
@@ -113,11 +113,11 @@ SUBST_MESSAGE.python= Fixing path to python binary.
.include "../../lang/ruby/rubyversion.mk"
.include "../../lang/ruby/replace.mk"
TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
-CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
+CMAKE_CONFIGURE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
CXXFLAGS.SunOS+= -fpermissive
diff --git a/webkit-gtk/options.mk b/webkit-gtk/options.mk
index 67c6883317..8cef40f364 100644
--- a/webkit-gtk/options.mk
+++ b/webkit-gtk/options.mk
@@ -35,47 +35,47 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit
# JIT support
#
.if !empty(PKG_OPTIONS:Mwebkit-jit)
-CMAKE_ARGS+= -DENABLE_JIT=ON
-CMAKE_ARGS+= -DENABLE_C_LOOP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JIT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_C_LOOP=OFF
.else
-CMAKE_ARGS+= -DENABLE_JIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JIT=OFF
.endif
#
# OpenGL support: enable support for GLX, WebGL and accelerated compositing
#
.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DUSE_OPENGL_OR_ES=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL_OR_ES=ON
.else
-CMAKE_ARGS+= -DUSE_OPENGL_OR_ES=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENGL_OR_ES=OFF
.endif
#
# Spellcheck support using enchant
#
.if !empty(PKG_OPTIONS:Menchant)
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELLCHECK=ON
.include "../../textproc/enchant2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELLCHECK=OFF
.endif
#
# Debug build
#
.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
#
# Wayland display server support
#
.if !empty(PKG_OPTIONS:Mwayland)
-CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
-CMAKE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
.include "../../devel/wayland/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
.endif
diff --git a/webkit-gtk4/Makefile b/webkit-gtk4/Makefile
index 55bc93f792..5194721eb1 100644
--- a/webkit-gtk4/Makefile
+++ b/webkit-gtk4/Makefile
@@ -29,24 +29,24 @@ USE_GCC_RUNTIME= yes
# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
# versions of ld.gold.
-CMAKE_ARGS+= -DUSE_LD_GOLD=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LD_GOLD=OFF
PKGCONFIG_OVERRIDE+= Source/JavaScriptCore/javascriptcoregtk.pc.in
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk.pc.in
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+= -DPORT=GTK
-CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
-CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
-CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
-CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
-CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
-CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
-CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
-CMAKE_ARGS+= -DUSE_SYSTEMD=OFF
-CMAKE_ARGS+= -DUSE_GTK4=ON
-CMAKE_ARGS+= -DCMAKE_INSTALL_OLDINCLUDEDIR=${PREFIX}/include
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DPORT=GTK
+CMAKE_CONFIGURE_ARGS+= -DENABLE_X11_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MINIBROWSER=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GEOLOCATION=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_GSTREAMER_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_LIBHYPHEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OPENJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEMD=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_GTK4=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_OLDINCLUDEDIR=${PREFIX}/include
REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
@@ -105,11 +105,11 @@ SUBST_MESSAGE.python= Fixing path to python binary.
.include "../../lang/ruby/rubyversion.mk"
.include "../../lang/ruby/replace.mk"
TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
-CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
+CMAKE_CONFIGURE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
+CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
CXXFLAGS.SunOS+= -fpermissive
@@ -130,9 +130,9 @@ NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/jsc
.if ${OPSYS} == "Darwin"
.include "../../graphics/MesaLib/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_X11_TARGET=OFF
-CMAKE_ARGS+= -DENABLE_QUARTZ_TARGET=ON
-CMAKE_ARGS+= -DENABLE_GRAPHICS_CONTEXT_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_X11_TARGET=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QUARTZ_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRAPHICS_CONTEXT_GL=OFF
.endif
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
diff --git a/webkit-gtk4/options.mk b/webkit-gtk4/options.mk
index 57a353c72b..3f317be6c3 100644
--- a/webkit-gtk4/options.mk
+++ b/webkit-gtk4/options.mk
@@ -37,39 +37,39 @@ PKG_SUGGESTED_OPTIONS+= webkit-jit
# JIT support
#
.if !empty(PKG_OPTIONS:Mwebkit-jit)
-CMAKE_ARGS+= -DENABLE_JIT=ON
-CMAKE_ARGS+= -DENABLE_C_LOOP=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JIT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_C_LOOP=OFF
.else
-CMAKE_ARGS+= -DENABLE_JIT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_JIT=OFF
.endif
#
# OpenGL support: enable support for GLX, WebGL and accelerated compositing
#
.if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+= -DENABLE_OPENGL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENGL=ON
.else
-CMAKE_ARGS+= -DENABLE_OPENGL=OFF
-CMAKE_ARGS+= -DENABLE_GRAPHICS_CONTEXT_GL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_OPENGL=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GRAPHICS_CONTEXT_GL=OFF
.endif
#
# Spellcheck support using enchant
#
.if !empty(PKG_OPTIONS:Menchant)
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELLCHECK=ON
.include "../../textproc/enchant2/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_SPELLCHECK=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_SPELLCHECK=OFF
.endif
#
# Debug build
#
.if !empty(PKG_OPTIONS:Mdebug)
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
#
@@ -80,18 +80,18 @@ PLIST.introspection= yes
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
BUILDLINK_DEPMETHOD.gobject-introspection+= build
.include "../../devel/gobject-introspection/buildlink3.mk"
-CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_INTROSPECTION=ON
.else
-CMAKE_ARGS+= -DENABLE_INTROSPECTION=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_INTROSPECTION=OFF
.endif
#
# Wayland display server support
#
.if !empty(PKG_OPTIONS:Mwayland)
-CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
-CMAKE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_TARGET=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_WPE_RENDERER=OFF # TODO
.include "../../devel/wayland/buildlink3.mk"
.else
-CMAKE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND_TARGET=OFF
.endif
diff --git a/widelands/Makefile b/widelands/Makefile
index 1d7fd1b4e7..b5ce264dff 100644
--- a/widelands/Makefile
+++ b/widelands/Makefile
@@ -19,10 +19,10 @@ USE_CXX_FEATURES+= c++11
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DWL_INSTALL_BASEDIR=${PREFIX}
-CMAKE_ARGS+= -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands
-CMAKE_ARGS+= -DWL_INSTALL_BINDIR=${PREFIX}/bin
-CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/boost
+CMAKE_CONFIGURE_ARGS+= -DWL_INSTALL_BASEDIR=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands
+CMAKE_CONFIGURE_ARGS+= -DWL_INSTALL_BINDIR=${PREFIX}/bin
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/boost
BUILDLINK_TRANSFORM+= rm:-Werror=shadow
diff --git a/wsjtx/Makefile b/wsjtx/Makefile
index c94014bc37..b00c5841a5 100644
--- a/wsjtx/Makefile
+++ b/wsjtx/Makefile
@@ -21,18 +21,18 @@ USE_LIBTOOL= yes
DEPENDS+= qt5-qttranslations-[0-9]*:../../x11/qt5-qttranslations
-CMAKE_ARGS+= -DNVTT_SHARED=ON
-CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX=${DESTDIR}${PREFIX}
-CMAKE_ARGS+= -DWSJT_SKIP_MANPAGES=ON
-CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX}/qt5
-CMAKE_ARGS+= -DWSJT_GENERATE_DOCS=OFF
-CMAKE_ARGS+= -DLDFLAGS='-lusb-1.0 -L${PREFIX}/lib -lfftwf'
-CMAKE_ARGS+= -DFortran_FLAGS+='-L${PREFIX}/lib'
-CMAKE_ARGS+= -DLDFLAGS=-'Wl,-rpath-link=-lusb-1.0 -L${PREFIX}/lib'
-CMAKE_ARGS+= -DLIBUSB_CFLAGS='-I ${PREFIX}/include/libusb-1.0 -lusb-1.0 -L${PREFIX}/lib'
-CMAKE_ARGS+= -DLIBUSB_LIBS='-Wl,-rpath-link=-lusb-1.0 -L${PREFIX}/lib'
-CMAKE_ARGS+= -DLIBS='-Wl,-rpath-link=-lusb-1.0 -L${PREFIX}/lib'
-CMAKE_ARGS+= -DQt5Test_DIR=${PREFIX}/qt5/lib/cmake/Qt5Test
+CMAKE_CONFIGURE_ARGS+= -DNVTT_SHARED=ON
+CMAKE_CONFIGURE_ARGS+= -D CMAKE_INSTALL_PREFIX=${DESTDIR}${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DWSJT_SKIP_MANPAGES=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX}/qt5
+CMAKE_CONFIGURE_ARGS+= -DWSJT_GENERATE_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLDFLAGS='-lusb-1.0 -L${PREFIX}/lib -lfftwf'
+CMAKE_CONFIGURE_ARGS+= -DFortran_FLAGS+='-L${PREFIX}/lib'
+CMAKE_CONFIGURE_ARGS+= -DLDFLAGS=-'Wl,-rpath-link=-lusb-1.0 -L${PREFIX}/lib'
+CMAKE_CONFIGURE_ARGS+= -DLIBUSB_CFLAGS='-I ${PREFIX}/include/libusb-1.0 -lusb-1.0 -L${PREFIX}/lib'
+CMAKE_CONFIGURE_ARGS+= -DLIBUSB_LIBS='-Wl,-rpath-link=-lusb-1.0 -L${PREFIX}/lib'
+CMAKE_CONFIGURE_ARGS+= -DLIBS='-Wl,-rpath-link=-lusb-1.0 -L${PREFIX}/lib'
+CMAKE_CONFIGURE_ARGS+= -DQt5Test_DIR=${PREFIX}/qt5/lib/cmake/Qt5Test
#IBUSB_CFLAGS+= -lusb-1.0 -L${PREFIX}/lib
LDFLAGS+= ${COMPILER_RPATH_FLAG}=-lusb-1.0 -L${PREFIX}/lib
diff --git a/wyrmgus/Makefile b/wyrmgus/Makefile
index 75a3094efc..6720cb5cab 100644
--- a/wyrmgus/Makefile
+++ b/wyrmgus/Makefile
@@ -14,9 +14,9 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_CMAKE= yes
-CMAKE_ARGS+= -DENABLE_TOUCHSCREEN=OFF
-CMAKE_ARGS+= -DENABLE_METASERVER=OFF
-CMAKE_ARGS+= -DENABLE_DOC=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOUCHSCREEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_METASERVER=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DOC=OFF
# C++20
GCC_REQD+= 9.3.0
diff --git a/yder/Makefile b/yder/Makefile
index 84a5350062..b0c69f41ac 100644
--- a/yder/Makefile
+++ b/yder/Makefile
@@ -11,7 +11,7 @@ COMMENT= Logging library written in C
LICENSE= gnu-lgpl-v2.1
USE_CMAKE= yes
-CMAKE_ARGS+= -DWITH_JOURNALD=off
+CMAKE_CONFIGURE_ARGS+= -DWITH_JOURNALD=off
USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= libyder.pc.in
diff --git a/zeek/Makefile b/zeek/Makefile
index ce32dea53f..2b9da8906e 100644
--- a/zeek/Makefile
+++ b/zeek/Makefile
@@ -19,12 +19,12 @@ BUILD_DEFS+= VARBASE
PKG_SYSCONFSUBDIR= ${PKGBASE}
CONFIGURE_DIRS= build
-CMAKE_ARGS+= -DINSTALL_ZEEK_ARCHIVER:BOOL=ON
-CMAKE_ARGS+= -DINSTALL_ZEEKCTL:BOOL=ON
-CMAKE_ARGS+= -DINSTALL_ZKG:BOOL=ON
-CMAKE_ARGS+= -DZEEK_ETC_INSTALL_DIR:PATH=${PKG_SYSCONFDIR}
-CMAKE_ARGS+= -DZEEK_MAN_INSTALL_PATH:PATH=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+= -DCAF_ROOT:BOOL=ON # use pkgsrc CAF(actors-framework)
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_ZEEK_ARCHIVER:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_ZEEKCTL:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_ZKG:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DZEEK_ETC_INSTALL_DIR:PATH=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DZEEK_MAN_INSTALL_PATH:PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DCAF_ROOT:BOOL=ON # use pkgsrc CAF(actors-framework)
CMAKE_ARG_PATH= ..
pre-configure:
diff --git a/zig-git/Makefile b/zig-git/Makefile
index d5c4683aa5..33d26d2601 100644
--- a/zig-git/Makefile
+++ b/zig-git/Makefile
@@ -16,11 +16,11 @@ USE_LANGUAGES= c c++14
.include "options.mk"
-CMAKE_ARGS+= -DDESTDIR=${DESTDIR}
+CMAKE_CONFIGURE_ARGS+= -DDESTDIR=${DESTDIR}
# avoid full-cu-features available to build host,
# in other words ensure that we run everywhere
-CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline
-CMAKE_ARGS+= -DZIG_PIE=ON
+CMAKE_CONFIGURE_ARGS+= -DZIG_TARGET_MCPU=baseline
+CMAKE_CONFIGURE_ARGS+= -DZIG_PIE=ON
REPLACE_BASH+= lib/libcxxabi/src/demangle/cp-to-llvm.sh
diff --git a/zig-git/options.mk b/zig-git/options.mk
index 195494dc23..f329569587 100644
--- a/zig-git/options.mk
+++ b/zig-git/options.mk
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug
.include "../../mk/bsd.options.mk"
.if ${PKG_OPTIONS:Mdebug}
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.else
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.endif
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index dacceb0f8f..74db3a66ca 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -53,11 +53,11 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config
# Place man pages following pkgsrc norms, rather than share/man.
-CMAKE_ARGS+= -DZM_MANPAGE_DEST_PREFIX=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DZM_MANPAGE_DEST_PREFIX=${PREFIX}/${PKGMANDIR}
# For now, lean to debugging.
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=true
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=true
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
## PATHS
@@ -67,20 +67,20 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
# ZoneMinder prefers a subdirectory of etc. Further, it demands a
# conf.d subdirectory within its config directory, which would be
# irregular at top level.
-CMAKE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}/zm
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/zm/conf.d ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# \todo We prepare a webroot, even without the apache option.
ZM_HTTPD_ROOT= share/zoneminder/htdocs
-CMAKE_ARGS+= -DZM_WEBDIR=${PREFIX}/${ZM_HTTPD_ROOT:Q}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEBDIR=${PREFIX}/${ZM_HTTPD_ROOT:Q}
PLIST_SUBST+= ZM_HTTPD_ROOT=${ZM_HTTPD_ROOT:Q}
PRINT_PLIST_AWK+= { gsub(/${ZM_HTTPD_ROOT:S|/|\\/|g}/, "$${ZM_HTTPD_ROOT}") }
OWN_DIRS+= ${ZM_HTTPD_ROOT:Q}
INSTALLATION_DIRS+= share/zoneminder ${ZM_HTTPD_ROOT}
ZM_HTTPD_CGIBIN= libexec/zoneminder/cgi-bin
-CMAKE_ARGS+= -DZM_CGIDIR=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
+CMAKE_CONFIGURE_ARGS+= -DZM_CGIDIR=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
PLIST_SUBST+= ZM_HTTPD_CGIBIN=${ZM_HTTPD_CGIBIN:Q}
PRINT_PLIST_AWK+= { gsub(/${ZM_HTTPD_CGIBIN:S|/|\\/|g}/, "$${ZM_HTTPD_CGIBIN}") }
BUILD_DEFS+= ZM_HTTPD_CGIBIN
@@ -88,37 +88,37 @@ OWN_DIRS+= ${ZM_HTTPD_CGIBIN:Q}
INSTALLATION_DIRS+= libexec/zoneminder ${ZM_HTTPD_CGIBIN}
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DZM_RUNDIR=${VARBASE}/run/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_RUNDIR=${VARBASE}/run/zm
# \todo Consider a way to clean up on de-install as anything left
# should just be removed.
OWN_DIRS_PERMS+= ${VARBASE}/run/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# NB: Startup script must create /var/run/zm.
-CMAKE_ARGS+= -DZM_SOCKDIR=${VARBASE}/run/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_SOCKDIR=${VARBASE}/run/zm
# Choose /var/tmp for now. \todo Revisit.
-CMAKE_ARGS+= -DZM_TMPDIR=${VARBASE}/tmp/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_TMPDIR=${VARBASE}/tmp/zm
OWN_DIRS_PERMS+= ${VARBASE}/tmp/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_LOGDIR=${VARBASE}/log/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_LOGDIR=${VARBASE}/log/zm
OWN_DIRS_PERMS+= ${VARBASE}/log/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# \todo Define this per-OS; /var/shm is for NetBSD
ZM_SHM= /var/shm
-CMAKE_ARGS+= -DZM_PATH_MAP=${ZM_SHM}
+CMAKE_CONFIGURE_ARGS+= -DZM_PATH_MAP=${ZM_SHM}
# Cache directory is for js files to be served. For now, use
# /var/cache/zoneminder. \todo Consider /tmp/zm instead.
ZM_CACHE= ${VARBASE}/cache/zoneminder
-CMAKE_ARGS+= -DZM_CACHEDIR=${ZM_CACHE}
+CMAKE_CONFIGURE_ARGS+= -DZM_CACHEDIR=${ZM_CACHE}
OWN_DIRS_PERMS+= ${ZM_CACHE} ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# Storage of events; this should persist and is hence in /var/db.
# \todo Understand how and why /images is used.
ZM_CONTENT= ${VARBASE}/db/zoneminder
-CMAKE_ARGS+= -DZM_CONTENTDIR=${ZM_CONTENT}
+CMAKE_CONFIGURE_ARGS+= -DZM_CONTENTDIR=${ZM_CONTENT}
OWN_DIRS_PERMS+= ${ZM_CONTENT} ${REAL_ROOT_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_DIR_EVENTS=${ZM_CONTENT}/events
+CMAKE_CONFIGURE_ARGS+= -DZM_DIR_EVENTS=${ZM_CONTENT}/events
OWN_DIRS_PERMS+= ${ZM_CONTENT}/events ${APACHE_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_DIR_IMAGES=${ZM_CONTENT}/images
+CMAKE_CONFIGURE_ARGS+= -DZM_DIR_IMAGES=${ZM_CONTENT}/images
OWN_DIRS_PERMS+= ${ZM_CONTENT}/images ${APACHE_USER} ${APACHE_GROUP} 775
## Dependencies other than perl and php.
@@ -133,15 +133,15 @@ SOEXT= dylib
SOEXT= so
.endif
.for lib in AVFORMAT AVCODEC AVDEVICE AVUTIL SWSCALE SWRESAMPLE
-CMAKE_ARGS+= -D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg6}/include/ffmpeg6
-CMAKE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg6}/lib/ffmpeg6/lib${lib:tl}.${SOEXT}
+CMAKE_CONFIGURE_ARGS+= -D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg6}/include/ffmpeg6
+CMAKE_CONFIGURE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg6}/lib/ffmpeg6/lib${lib:tl}.${SOEXT}
.endfor
# \todo Revisit this and see if there is a better way.
# MySQL uses openssl. Force zoneminder not to choose otherwise by
# finding libraries that are present but not buildlinked.
-CMAKE_ARGS+= -DGNUTLS_LIBRARIES=""
-CMAKE_ARGS+= -DGCRYPT_LIBRARIES=""
+CMAKE_CONFIGURE_ARGS+= -DGNUTLS_LIBRARIES=""
+CMAKE_CONFIGURE_ARGS+= -DGCRYPT_LIBRARIES=""
# Darwin does have sendfile(), but the API differs from ZoneMinder's
# expectation.
@@ -160,7 +160,7 @@ PERL5_CONFIGURE= no
.include "../../lang/perl5/module.mk"
# Override perl detection so proper perl path is in installed binaries.
-CMAKE_ARGS+= -DPERL_EXECUTABLE=${PREFIX}/bin/perl
+CMAKE_CONFIGURE_ARGS+= -DPERL_EXECUTABLE=${PREFIX}/bin/perl
DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
DEPENDS+= p5-Device-SerialPort-[0-9]*:../../comms/p5-Device-SerialPort
@@ -230,9 +230,9 @@ PKG_USERS_VARS+= APACHE_USER
PKG_GROUPS_VARS+= APACHE_GROUP
BUILD_DEFS+= APACHE_USER APACHE_GROUP
-CMAKE_ARGS+= -DZM_WEB_USER=${APACHE_USER}
-CMAKE_ARGS+= -DZM_WEB_GROUP=${APACHE_GROUP}
-CMAKE_ARGS+= -DZM_PATH_ZMS=zm/cgi-bin/nph-zms
+CMAKE_CONFIGURE_ARGS+= -DZM_WEB_USER=${APACHE_USER}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEB_GROUP=${APACHE_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DZM_PATH_ZMS=zm/cgi-bin/nph-zms
.if !empty(PKG_OPTIONS:Mapache)
.include "../../mk/apache.mk"
diff --git a/zoneminder132/Makefile b/zoneminder132/Makefile
index 164c612f92..6fa3e5cbbb 100644
--- a/zoneminder132/Makefile
+++ b/zoneminder132/Makefile
@@ -45,8 +45,8 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl pkg-config
# For now, lean to debugging.
-CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=true
-CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=true
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
## PATHS
@@ -56,20 +56,20 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
# ZoneMinder prefers a subdirectory of etc. Further, it demands a
# conf.d subdirectory within its config directory, which would be
# irregular at top level.
-CMAKE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}/zm
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/zm/conf.d ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# \todo We prepare a webroot, even without the apache option.
ZM_HTTPD_ROOT= share/zoneminder/htdocs
-CMAKE_ARGS+= -DZM_WEBDIR=${PREFIX}/${ZM_HTTPD_ROOT:Q}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEBDIR=${PREFIX}/${ZM_HTTPD_ROOT:Q}
PLIST_SUBST+= ZM_HTTPD_ROOT=${ZM_HTTPD_ROOT:Q}
PRINT_PLIST_AWK+= { gsub(/${ZM_HTTPD_ROOT:S|/|\\/|g}/, "$${ZM_HTTPD_ROOT}") }
OWN_DIRS+= ${ZM_HTTPD_ROOT:Q}
INSTALLATION_DIRS+= share/zoneminder ${ZM_HTTPD_ROOT}
ZM_HTTPD_CGIBIN= libexec/zoneminder/cgi-bin
-CMAKE_ARGS+= -DZM_CGIDIR=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
+CMAKE_CONFIGURE_ARGS+= -DZM_CGIDIR=${PREFIX}/${ZM_HTTPD_CGIBIN:Q}
PLIST_SUBST+= ZM_HTTPD_CGIBIN=${ZM_HTTPD_CGIBIN:Q}
PRINT_PLIST_AWK+= { gsub(/${ZM_HTTPD_CGIBIN:S|/|\\/|g}/, "$${ZM_HTTPD_CGIBIN}") }
BUILD_DEFS+= ZM_HTTPD_CGIBIN
@@ -77,37 +77,37 @@ OWN_DIRS+= ${ZM_HTTPD_CGIBIN:Q}
INSTALLATION_DIRS+= libexec/zoneminder ${ZM_HTTPD_CGIBIN}
BUILD_DEFS+= VARBASE
-CMAKE_ARGS+= -DZM_RUNDIR=${VARBASE}/run/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_RUNDIR=${VARBASE}/run/zm
# \todo Consider a way to clean up on de-install as anything left
# should just be removed.
OWN_DIRS_PERMS+= ${VARBASE}/run/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# NB: Startup script must create /var/run/zm.
-CMAKE_ARGS+= -DZM_SOCKDIR=${VARBASE}/run/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_SOCKDIR=${VARBASE}/run/zm
# Choose /var/tmp for now. \todo Revisit.
-CMAKE_ARGS+= -DZM_TMPDIR=${VARBASE}/tmp/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_TMPDIR=${VARBASE}/tmp/zm
OWN_DIRS_PERMS+= ${VARBASE}/tmp/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_LOGDIR=${VARBASE}/log/zm
+CMAKE_CONFIGURE_ARGS+= -DZM_LOGDIR=${VARBASE}/log/zm
OWN_DIRS_PERMS+= ${VARBASE}/log/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# \todo Define this per-OS; /var/shm is for NetBSD
ZM_SHM= /var/shm
-CMAKE_ARGS+= -DZM_PATH_MAP=${ZM_SHM}
+CMAKE_CONFIGURE_ARGS+= -DZM_PATH_MAP=${ZM_SHM}
# Cache directory is for js files to be served. For now, use
# /var/cache/zoneminder. \todo Consider /tmp/zm instead.
ZM_CACHE= ${VARBASE}/cache/zoneminder
-CMAKE_ARGS+= -DZM_CACHEDIR=${ZM_CACHE}
+CMAKE_CONFIGURE_ARGS+= -DZM_CACHEDIR=${ZM_CACHE}
OWN_DIRS_PERMS+= ${ZM_CACHE} ${REAL_ROOT_USER} ${APACHE_GROUP} 775
# Storage of events; this should persist and is hence in /var/db.
# \todo Understand how and why /images is used.
ZM_CONTENT= ${VARBASE}/db/zoneminder
-CMAKE_ARGS+= -DZM_CONTENTDIR=${ZM_CONTENT}
+CMAKE_CONFIGURE_ARGS+= -DZM_CONTENTDIR=${ZM_CONTENT}
OWN_DIRS_PERMS+= ${ZM_CONTENT} ${REAL_ROOT_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_DIR_EVENTS=${ZM_CONTENT}/events
+CMAKE_CONFIGURE_ARGS+= -DZM_DIR_EVENTS=${ZM_CONTENT}/events
OWN_DIRS_PERMS+= ${ZM_CONTENT}/events ${APACHE_USER} ${APACHE_GROUP} 775
-CMAKE_ARGS+= -DZM_DIR_IMAGES=${ZM_CONTENT}/images
+CMAKE_CONFIGURE_ARGS+= -DZM_DIR_IMAGES=${ZM_CONTENT}/images
OWN_DIRS_PERMS+= ${ZM_CONTENT}/images ${APACHE_USER} ${APACHE_GROUP} 775
## Dependencies other than perl and php.
@@ -124,8 +124,8 @@ SOEXT= dylib
SOEXT= so
.endif
.for lib in AVFORMAT AVCODEC AVDEVICE AVUTIL SWSCALE
-CMAKE_ARGS+= -D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg2}/include/ffmpeg2
-CMAKE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg2}/lib/ffmpeg2/lib${lib:tl}.${SOEXT}
+CMAKE_CONFIGURE_ARGS+= -D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg2}/include/ffmpeg2
+CMAKE_CONFIGURE_ARGS+= -D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg2}/lib/ffmpeg2/lib${lib:tl}.${SOEXT}
.endfor
# This is somewhat awkward. ffmpeg's libavformat/avformat.h requires
# constant macros from stdint.h, but these are only defined under C++ if
@@ -136,8 +136,8 @@ CFLAGS+= -D__STDC_CONSTANT_MACROS
# MySQL uses openssl. Force zoneminder not to choose otherwise by
# finding libraries that are present but not buildlinked.
-CMAKE_ARGS+= -DGNUTLS_LIBRARIES=""
-CMAKE_ARGS+= -DGCRYPT_LIBRARIES=""
+CMAKE_CONFIGURE_ARGS+= -DGNUTLS_LIBRARIES=""
+CMAKE_CONFIGURE_ARGS+= -DGCRYPT_LIBRARIES=""
# Darwin does have sendfile(), but the API differs from ZoneMinder's
# expectation.
@@ -168,7 +168,7 @@ PERL5_REQD+= 5.6.0
#PERL5_CONFIGURE_DIRS+= ${WRKSRC}/onvif/modules
#PERL5_PACKLIST= auto/ZoneMinder/.packlist
#PERL5_PACKLIST+= auto/ONVIF/.packlist
-#CMAKE_ARGS+= -DZM_PERL_MM_PARMS="INSTALLDIRS=vendor"
+#CMAKE_CONFIGURE_ARGS+= -DZM_PERL_MM_PARMS="INSTALLDIRS=vendor"
#.include "../../lang/perl5/module.mk"
# ZoneMinder discourages building from source and does not appear to
@@ -258,9 +258,9 @@ PKG_USERS_VARS+= APACHE_USER
PKG_GROUPS_VARS+= APACHE_GROUP
BUILD_DEFS+= APACHE_USER APACHE_GROUP
-CMAKE_ARGS+= -DZM_WEB_USER=${APACHE_USER}
-CMAKE_ARGS+= -DZM_WEB_GROUP=${APACHE_GROUP}
-CMAKE_ARGS+= -DZM_PATH_ZMS=zm/cgi-bin/nph-zms
+CMAKE_CONFIGURE_ARGS+= -DZM_WEB_USER=${APACHE_USER}
+CMAKE_CONFIGURE_ARGS+= -DZM_WEB_GROUP=${APACHE_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DZM_PATH_ZMS=zm/cgi-bin/nph-zms
.if !empty(PKG_OPTIONS:Mapache)
.include "../../mk/apache.mk"
Home |
Main Index |
Thread Index |
Old Index