Fix build with CMake 3.23

- Use CFLAGS and CXXFLAGS instead of CMAKE_CXX_FLAGS and CMAKE_C_FLAGS. - Use MODCMAKE_LDFLAGS instead of CMAKE_EXE_LINKER_FLAGS - Fix broken builds with CMake 3.23
2022-05-28 06:19:58 +00:00 · 2022-05-28 06:19:58 +00:00 · 6ecf5561f1
commit 6ecf5561f1
parent b6a8a48098
114 changed files with 338 additions and 214 deletions
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@ -43,12 +43,13 @@ RUN_DEPENDS=		net/curl \

 CONFIGURE_ENV=		HOME=${WRKDIR}

-CONFIGURE_ARGS=		-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-			-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
+CONFIGURE_ARGS=		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
 			-DENABLE_LIBGPS=0 \
 			-DSTELLARIUM_RELEASE_BUILD=1

+CFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+CXXFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+
 PORTHOME=		${WRKDIR}

 NO_TEST=		Yes
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@ -32,6 +32,8 @@ CONFIGURE_ARGS =	-DBUILD_TOOLS=ON \

 TEST_TARGET =		check

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/cmake/modules/FindGTest.cmake

--- a/audio/clementine/Makefile
+++ b/audio/clementine/Makefile
@ -60,6 +60,8 @@ CONFIGURE_ARGS +=	-DBUILD_WERROR=ON
 # is missing. To be investigated.
 CONFIGURE_ARGS +=	-DBUNDLE_PROJECTM_PRESETS=ON

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 post-extract:
 	cp ${FILESDIR}/config.h.in ${WRKSRC}/ext/libclementine-common/

--- a/audio/mscore/Makefile
+++ b/audio/mscore/Makefile
@ -41,7 +41,6 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic

 CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -Wno-inconsistent-missing-override" \
 		-DBUILD_ALSA=OFF \
 		-DBUILD_JACK=OFF \
 		-DBUILD_PORTMIDI=OFF \
@ -53,6 +52,10 @@ CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DDOWNLOAD_SOUNDFONT=OFF \
 		-DBUILD_TELEMETRY_MODULE=OFF

+CXXFLAGS +=	-Wno-inconsistent-missing-override
+CXXFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
 CXXFLAGS +=	-mxgot
 .endif
--- a/cad/graywolf/Makefile
+++ b/cad/graywolf/Makefile
@ -21,7 +21,7 @@ MODULES =	devel/cmake
 LIB_DEPENDS =	devel/gsl

 # Really really not C99
-CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS} -Wno-return-type"
+CFLAGS +=	-Wno-return-type

 NO_TEST =	Yes

--- a/cad/oce/Makefile
+++ b/cad/oce/Makefile
@ -39,8 +39,9 @@ LIB_DEPENDS =		${MODTK_LIB_DEPENDS}
 RUN_DEPENDS =		${MODTK_RUN_DEPENDS} \
 			shells/bash

-CONFIGURE_ARGS +=	-DCMAKE_CXX_FLAGS="-I${X11BASE}/include ${CXXFLAGS}" \
-			-DINSTALL_DIR_RESOURCE:STRING="share/opencascade/src"
+CONFIGURE_ARGS +=	-DINSTALL_DIR_RESOURCE:STRING="share/opencascade/src"
+
+CXXFLAGS +=		-I${X11BASE}/include

 .include <bsd.port.arch.mk>
 .if ${PROPERTIES:Mlp64}
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@ -32,9 +32,11 @@ TEST_DEPENDS = 		devel/cmake

 CONFIGURE_ARGS +=	-DINSTALL_MAN_DIR:STRING=man \
 			-DINSTALL_BASH_COMPLETION=OFF \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -liconv -lintl" \
 			-Wno-dev

+CFLAGS +=		-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib -liconv -lintl
+
 FLAVORS += 		mysql pgsql
 FLAVOR ?=
 SEPARATE_BUILD = 	flavored
--- a/comms/hackrf/Makefile
+++ b/comms/hackrf/Makefile
@ -27,7 +27,8 @@ MODULES =		devel/cmake
 LIB_DEPENDS =		devel/libusb1 \
 			math/fftw3,float

-CONFIGURE_ARGS =	-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 NO_TEST =		Yes

--- a/converters/opencc/Makefile
+++ b/converters/opencc/Makefile
@ -27,8 +27,9 @@ MODULES =		devel/cmake \

 LIB_DEPENDS =		textproc/libmarisa,-main

-CONFIGURE_ARGS =	-DUSE_SYSTEM_MARISA=ON \
-			-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CONFIGURE_ARGS =	-DUSE_SYSTEM_MARISA=ON
+
+CXXFLAGS +=		-I${LOCALBASE}/include -L${LOCALBASE}/lib

 MODPY_RUNDEP =		No

--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -63,9 +63,10 @@ CONFIGURE_ARGS=		-DWITH_KRB5=OFF \
 			-DWITH_LIBDB_CFLAGS="-I${LOCALBASE}/include/db4" \
 			-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb" \
 			-DWITH_OPENLDAP=${LOCALBASE} \
-			-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 			-DWITH_GWEATHER4=ON

+CFLAGS +=		-I${LOCALBASE}/include
+
 DEBUG_PACKAGES=		${BUILD_PACKAGES}

 pre-configure:
--- a/databases/kexi/patches/patch-CMakeLists_txt
+++ b/databases/kexi/patches/patch-CMakeLists_txt
@ -1,6 +1,15 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
+@@ -106,7 +106,7 @@ set_package_properties(KF5Crash PROPERTIES TYPE OPTION
+                        PURPOSE "Used to provide crash reporting on Linux")
+ 
+ set(REQUIRED_QT_VERSION 5.4.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test)
+find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test Sensors)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets)
+ 
+ # use sane compile flags
@@ -198,8 +198,8 @@ endif()
 ##
 ## Test for marble
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@ -51,15 +51,13 @@ CONFIGURE_ARGS +=	-DBUILD_SHARED_LIBS=ON \
 			-DBUILD_EXTRAS=ON \
 			-DBUILD_PYBULLET=OFF \
 			-DINSTALL_LIBS=ON \
-			-DCMAKE_SHARED_LINKER_FLAGS="-L${X11BASE}/lib" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-L${X11BASE}/lib" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${X11BASE}/lib" \
 			-DUSE_DOUBLE_PRECISION=ON

 NO_TEST =		Yes

 CFLAGS +=		-I${X11BASE}/include
 CXXFLAGS +=		-I${X11BASE}/include
+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib

 post-install:
 	rm -rf ${PREFIX}/include/bullet/pybullet
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@ -43,8 +43,8 @@ CONFIGURE_ARGS =-DCUTTER_ENABLE_GRAPHVIZ=ON \

 NO_TEST =	Yes

-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include/KF5" \
-                   	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include/KF5"
+CFLAGS +=	-I${LOCALBASE}/include/KF5
+CXXFLAGS +=	-I${LOCALBASE}/include/KF5

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/Cutter ${PREFIX}/bin/cutter
--- a/devel/kf5/kdewebkit/patches/patch-CMakeLists_txt
+++ b/devel/kf5/kdewebkit/patches/patch-CMakeLists_txt
@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -16,7 +16,7 @@ option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Desig
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ set(REQUIRED_QT_VERSION 5.15.2)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Widgets WebKitWidgets Network)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Widgets WebKitWidgets WebChannel Network Positioning Sensors Quick)
+ include(KDEInstallDirs)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
--- a/devel/kreport/patches/patch-CMakeLists_txt
+++ b/devel/kreport/patches/patch-CMakeLists_txt
@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -37,7 +37,7 @@ set(REQUIRED_KPROPERTY_VERSION 3.2.0)
+ 
+ # Required components to build this framework
+ # TODO move Widgets/KF5WidgetsAddons-dependent part to a libKReportDesigner
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Xml PrintSupport)
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Xml PrintSupport Sensors)
+ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED CoreAddons WidgetsAddons GuiAddons Config)
+ find_package(KPropertyWidgets ${REQUIRED_KPROPERTY_VERSION} COMPONENTS KF)
+ set_package_properties(KPropertyWidgets PROPERTIES TYPE REQUIRED
--- a/devel/libgit2/libgit2/Makefile
+++ b/devel/libgit2/libgit2/Makefile
@ -26,13 +26,9 @@ WANTLIB += crypto http_parser pcre pcreposix pthread ssh2 ssl
 WANTLIB += z

 CONFIGURE_ARGS=		-DUSE_SSH=ON \
-			-DUSE_HTTP_PARSER=system \
-			-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib" \
-			-DCMAKE_SHARED_LINKER_FLAGS:STRING="-L${LOCALBASE}/lib"
+			-DUSE_HTTP_PARSER=system

-# XXX
-# libgit2-1.4.0/libgit2-1.4.0/deps/ntlmclient/unicode_builtin.h:13:10:
-# fatal error: 'iconv.h' file not found
-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="-I${LOCALBASE}/include"
+CFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 .include <bsd.port.mk>
--- a/devel/mygui/Makefile
+++ b/devel/mygui/Makefile
@ -28,8 +28,9 @@ MODULES =		devel/cmake
 BUILD_DEPENDS =		devel/ois
 LIB_DEPENDS =		x11/ogre,-main

-CONFIGURE_ARGS += 	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -fPIC" \
-			-DMYGUI_BUILD_TOOLS=false \
+CXXFLAGS +=		-fPIC
+
+CONFIGURE_ARGS += 	-DMYGUI_BUILD_TOOLS=false \
 			-DMYGUI_BUILD_PLUGINS=false

 NO_TEST =		Yes
--- a/devel/zeal/patches/patch-src_libs_core_CMakeLists_txt
+++ b/devel/zeal/patches/patch-src_libs_core_CMakeLists_txt
@ -0,0 +1,12 @@
+Index: src/libs/core/CMakeLists.txt
+--- src/libs/core/CMakeLists.txt.orig
+++ src/libs/core/CMakeLists.txt
+@@ -9,7 +9,7 @@ add_library(Core
+ 
+ target_link_libraries(Core Registry Ui)
+ 
+-find_package(Qt5 COMPONENTS Network WebKit Widgets REQUIRED)
+find_package(Qt5 COMPONENTS Network WebKit Widgets Sensors Positioning Quick WebChannel REQUIRED)
+ target_link_libraries(Core Qt5::Network Qt5::WebKit Qt5::Widgets)
+ 
+ find_package(LibArchive REQUIRED)
--- a/devel/zeal/patches/patch-src_libs_ui_CMakeLists_txt
+++ b/devel/zeal/patches/patch-src_libs_ui_CMakeLists_txt
@ -0,0 +1,10 @@
+Index: src/libs/ui/CMakeLists.txt
+--- src/libs/ui/CMakeLists.txt.orig
+++ src/libs/ui/CMakeLists.txt
+@@ -31,5 +31,5 @@ add_library(Ui
+ 
+ target_link_libraries(Ui QxtGlobalShortcut Registry)
+ 
+-find_package(Qt5 COMPONENTS WebKitWidgets REQUIRED)
+find_package(Qt5 COMPONENTS WebKitWidgets Sensors Positioning Quick WebChannel REQUIRED)
+ target_link_libraries(Ui Qt5::WebKitWidgets)
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@ -35,6 +35,8 @@ LIB_DEPENDS=	databases/sqlite3 \
 		lang/guile \
 		x11/qt5/qtsvg,-main

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 # requires Xorg access
 NO_TEST =		Yes

--- a/editors/featherpad/Makefile
+++ b/editors/featherpad/Makefile
@ -25,8 +25,9 @@ LIB_DEPENDS =	textproc/hunspell \
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic

-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-			-DCMAKE_INSTALL_PREFIX="${PREFIX}"
+CONFIGURE_ARGS =	-DCMAKE_INSTALL_PREFIX="${PREFIX}"
+
+CXXFLAGS +=	-I${LOCALBASE}/include

 NO_TEST =	Yes

--- a/editors/sigil/Makefile
+++ b/editors/sigil/Makefile
@ -32,6 +32,8 @@ LIB_DEPENDS =		textproc/hunspell \

 CONFIGURE_ARGS =	-DUSE_SYSTEM_LIBS=ON

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 NO_TEST =		Yes

 .include <bsd.port.mk>
--- a/editors/teaqt/Makefile
+++ b/editors/teaqt/Makefile
@ -28,12 +28,9 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic


-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="${CFLAGS} \
-				-I${LOCALBASE}/include" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} \
-				-I${LOCALBASE}/include" \
-			-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
-				-L${LOCALBASE}/lib"
+CFLAGS +=	-I${LOCALBASE}/include
+CXXFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 NO_TEST =	Yes

--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@ -39,11 +39,13 @@ LIB_DEPENDS =	devel/cryptopp \
 		net/enet \
 		x11/qt5/qtmultimedia

-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" \
-			-DCMAKE_PREFIX_PATH="-I${LOCALBASE}/lib/qt5/cmake/Qt5/" \
+CONFIGURE_ARGS =	-DCMAKE_PREFIX_PATH="-I${LOCALBASE}/lib/qt5/cmake/Qt5/" \
 			-DENABLE_CUBEB=OFF \
 			-DENABLE_WEB_SERVICE=OFF

+CXXFLAGS +=		-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 do-test:
 	cd ${WRKBUILD}/src/tests && ./tests

--- a/emulators/dolphin/Makefile
+++ b/emulators/dolphin/Makefile
@ -66,6 +66,8 @@ CONFIGURE_ARGS +=	-Dmandir:=${PREFIX}/man \
 			-DUSE_DISCORD_PRESENCE=OFF
 TEST_TARGET =		unittests

+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 FIX_CRLF_FILES =	Externals/soundtouch/SoundTouch.cpp \
 			Externals/soundtouch/SoundTouch.h

--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@ -58,14 +58,14 @@ LIB_DEPENDS =		archivers/snappy \
 			graphics/png
 COMPILER =		base-clang ports-gcc

-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="-I${X11BASE}/include" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-			-DUSE_SYSTEM_FFMPEG=ON \
+CONFIGURE_ARGS =	-DUSE_SYSTEM_FFMPEG=ON \
 			-DUSE_SYSTEM_LIBZIP=ON \
 			-DUSE_SYSTEM_SNAPPY=ON \
 			-DUSE_DISCORD=OFF \
 			-DUSING_EGL=OFF

+CXXFLAGS +=	-I${X11BASE}/include
+
 NO_TEST =		Yes

 post-extract:
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@ -35,11 +35,12 @@ CONFIGURE_ARGS =	-DBUILD_CRASHHANDLER=OFF \
 			-DBUILD_CRASHREPORTER=OFF \
 			-DBUILD_IO_LIBRARY=OFF \
 			-DBUILD_TESTS=ON \
-			-DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
 			-DCMAKE_INSTALL_MANDIR=${LOCALBASE}/man \
 			-DCMAKE_INSTALL_PREFIX=${LOCALBASE}/share/arx \
 			-DUNITY_BUILD=OFF

+MODCMAKE_LDFLAGS =		-lpthread
+
 PORTHOME =	${WRKDIR}

 post-install:
--- a/games/barony/Makefile
+++ b/games/barony/Makefile
@ -37,13 +37,14 @@ LIB_DEPENDS =	audio/libvorbis \
 		graphics/png

 CONFIGURE_ENV =		RAPID_JSONROOT="${WRKDIR}/rapidjson-${RAPIDJSON_V}/"
-CONFIGURE_ARGS =	-DCMAKE_C_FLAGS="${CFLAGS}" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-			-DOPENAL_ENABLED=ON \
+
+CONFIGURE_ARGS =	-DOPENAL_ENABLED=ON \
 			-DEDITOR_EXE_NAME="barony-editor" \
 			-DDATA_DIR=ON \
 			-DCMAKE_INSTALL_BINDIR="${LOCALBASE}/bin"

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 NO_TEST =	Yes

 post-install:
--- a/games/choria/Makefile
+++ b/games/choria/Makefile
@ -16,6 +16,8 @@ WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX}

 COMPILER =		base-clang ports-gcc base-gcc

+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib
+
 MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=choria/}

 MODULES =	devel/cmake
--- a/games/colobot/colobot/Makefile
+++ b/games/colobot/colobot/Makefile
@ -24,11 +24,11 @@ LIB_DEPENDS =		audio/libsndfile \
 RUN_DEPENDS =		games/colobot/data \
 			games/colobot/music

-CONFIGURE_ARGS +=	-DCOLOBOT_INSTALL_BIN_DIR="${PREFIX}/bin" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include \
-				-I${X11BASE}/include" \
-			-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \
-			-DCMAKE_EXE_LINKER_FLAGS="-lintl"
+CONFIGURE_ARGS +=	-DCOLOBOT_INSTALL_BIN_DIR="${PREFIX}/bin"
+
+CFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+CXXFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib -lintl

 NO_TEST =		Yes

--- a/games/dustrac/Makefile
+++ b/games/dustrac/Makefile
@ -31,4 +31,6 @@ CONFIGURE_ARGS +=	-DReleaseBuild=ON \
 			-DDOC_PATH=${PREFIX}/share/dustrac \
 			-DQOpenGLFunctions=OFF

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 .include <bsd.port.mk>
--- a/games/flightgear/base/Makefile
+++ b/games/flightgear/base/Makefile
@ -30,6 +30,8 @@ CONFIGURE_ARGS +=	-DCMAKE_INSTALL_MANDIR="${PREFIX}/man" \
 			-DENABLE_FGCOM=OFF \
 			-DENABLE_QT=OFF

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 NO_TEST =	Yes

 # Keep C++ #include <version> from picking up this unrelated file
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@ -37,8 +37,6 @@ RUN_DEPENDS = 		devel/desktop-file-utils \
 CONFIGURE_ARGS +=	-DSYSCONF_DIR=${SYSCONFDIR}/gemrb \
 			-DEXAMPLE_CONF_DIR=${PREFIX}/share/examples/gemrb/ \
 			-DMAN_DIR=${PREFIX}/man/man6 \
-			-DCMAKE_MODULE_LINKER_FLAGS=-lc \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
 			-DDISABLE_WERROR=1 \
 			-DSDL_BACKEND=SDL \
 			-Wno-dev
--- a/games/gzdoom/Makefile
+++ b/games/gzdoom/Makefile
@ -32,7 +32,8 @@ MODULES =		devel/cmake
 CONFIGURE_ARGS +=	-DNO_GTK=ON
 CONFIGURE_ARGS += 	-DDYN_OPENAL=NO
 CONFIGURE_ARGS +=	-DHAVE_STDINT_H=1
-CONFIGURE_ARGS +=	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I. -I${LOCALBASE}/include"
+
+CXXFLAGS +=		 -I. -I${LOCALBASE}/include

 LIB_DEPENDS =		audio/openal \
 			audio/zmusic \
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@ -26,6 +26,8 @@ RUN_DEPENDS =	devel/desktop-file-utils

 WRKDIST =	${WRKDIR}/irrlamb-$Vr613

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 NO_TEST =	Yes

 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
--- a/games/lugaru/Makefile
+++ b/games/lugaru/Makefile
@ -32,6 +32,8 @@ LIB_DEPENDS =		audio/libvorbis \

 CONFIGURE_ARGS =	-DSYSTEM_INSTALL=Yes

+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 NO_TEST =		Yes

 .include <bsd.port.mk>
--- a/games/meandmyshadow/Makefile
+++ b/games/meandmyshadow/Makefile
@ -28,7 +28,7 @@ COMPILER =		base-clang ports-gcc base-gcc
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic

-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -Wno-narrowing"
+CXXFLAGS +=	-Wno-narrowing

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
--- a/games/megaglest/base/Makefile
+++ b/games/megaglest/base/Makefile
@ -27,8 +27,9 @@ LIB_DEPENDS =		audio/openal \

 CONFIGURE_ARGS = 	-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=0 \
 			-DFORCE_LUA_VERSION=${MODLUA_VERSION} \
-			-DMEGAGLEST_MANPAGE_INSTALL_PATH="${LOCALBASE}/man/man6" \
-			-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CXXFLAGS}"
+			-DMEGAGLEST_MANPAGE_INSTALL_PATH="${LOCALBASE}/man/man6"
+
+CXXFLAGS +=		-I${LOCALBASE}/include

 pre-configure:
 	@${SUBST_CMD} ${WRKSRC}/mk/cmake/Modules/FindLUA.cmake \
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@ -32,7 +32,9 @@ CONFIGURE_ARGS =	-DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
 CONFIGURE_ARGS+=	-DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
 CONFIGURE_ARGS+=	-DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
 CONFIGURE_ARGS+=	-DBUILD_SERVER=TRUE
-CONFIGURE_ENV +=	CXXFLAGS="-I${X11BASE}/include"
+
+CXXFLAGS +=		-I${X11BASE}/include
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib

 BUILD_DEPENDS =		devel/gettext,-tools

--- a/games/odamex/Makefile
+++ b/games/odamex/Makefile
@ -27,8 +27,8 @@ MODULES =		devel/cmake

 # Note that odamex won't build against the system libjsoncpp (doesn't build
 # with std=gnu++98), so we use the bundled one. Upstream notified.
-CONFIGURE_ENV +=	CXXFLAGS=-I${LOCALBASE}/include/miniupnpc \
-			LDFLAGS=-L${LOCALBASE}/lib
+CXXFLAGS +=		-I${LOCALBASE}/include/miniupnpc
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
 CONFIGURE_ARGS +=	-DNO_AG-ODALAUNCH_TARGET=YES

 LIB_DEPENDS =		x11/wxWidgets \
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@ -42,12 +42,12 @@ LIB_DEPENDS =	audio/freealut \
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic

-# CMAKE_EXE_LINKER_FLAGS to make lld happy.
 CONFIGURE_ARGS +=	-DFREETYPE_INCLUDE_DIRS="${X11BASE}/include/freetype2" \
 			-DHAVE_PRECOMPILED_HEADERS:BOOL=OFF \
-			-DGLDEBUGPROCARB_USERPARAM_IS_CONST=ON \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+			-DGLDEBUGPROCARB_USERPARAM_IS_CONST=ON
+
+CXXFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 # Random, intermittent failures with Ninja during fake.
 USE_NINJA =	No
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@ -44,7 +44,6 @@ CONFIGURE_ARGS += 	-DBINDIR=${LOCALBASE}/bin \
 			-DDATADIR:PATH=${LOCALBASE}/share/openmw \
 			-DSYSCONFDIR=${PREFIX}/share/examples/openmw \
 			-DGLOBAL_CONFIG_PATH="${SYSCONFDIR}" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${X11BASE}/lib" \
 			-DMORROWIND_DATA_FILES="${LOCALBASE}/share/openmw/data"\
 			-DOPENMW_RESOURCE_FILES="${LOCALBASE}/share/openmw/resources" \
 			-DCMAKE_PREFIX_PATH="${LOCALBASE}/lib/qt5/cmake" \
@ -55,7 +54,8 @@ NO_TEST =		Yes
 WRKDIST =		${WRKDIR}/openmw-openmw-$V

 CFLAGS += 		-I${X11BASE}/include -pthread
-CXXFLAGS += 		-I${X11BASE}/include -pthread
+CXXFLAGS +=		-I${X11BASE}/include -pthread
+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib

 post-extract:
 	mkdir ${WRKDIST}/extern/fetched
--- a/games/openomf/Makefile
+++ b/games/openomf/Makefile
@ -28,8 +28,4 @@ LIB_DEPENDS =	audio/libxmp \

 NO_TEST =	Yes

-# CONFIGURE_ARGS = -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}" does not catch
-do-gen:
-	sed -i 's,-O2,${CFLAGS},g' ${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@ -22,6 +22,8 @@ MASTER_SITES =	https://mirrors.nycbug.org/pub/distfiles/
 # C++17
 COMPILER =	base-clang ports-gcc

+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 MODULES =	devel/cmake

 LIB_DEPENDS =	archivers/libzip \
--- a/games/speeddreams/Makefile
+++ b/games/speeddreams/Makefile
@ -60,15 +60,13 @@ RUN_DEPENDS-main =	${BASE_PKGPATH},-data

 PKG_ARCH-data =		*

-CONFIGURE_ARGS +=	-DOPTION_OFFICIAL_ONLY=ON \
-			-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS +=	-DOPTION_OFFICIAL_ONLY=ON
+
+CXXFLAGS +=	-I${X11BASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 NO_TEST =		Yes

-CXXFLAGS +=		-I${X11BASE}/include
-
 pre-extract:
 	@mkdir ${WRKDIST}

--- a/games/stepmania/Makefile
+++ b/games/stepmania/Makefile
@ -20,9 +20,10 @@ CONFIGURE_STYLE = cmake

 #MODCMAKE_DEBUG =	Yes

-INC=-I${X11BASE}/include -I${LOCALBASE}/include
-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS} ${INC}"
-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="${CFLAGS} ${INC}"
+CXXFLAGS +=	-I${X11BASE}/include -I${LOCALBASE}/include
+CFLAGS +=	-I${X11BASE}/include -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 CONFIGURE_ARGS +=	-Wno-dev
 CONFIGURE_ARGS +=	-DWITH_SYSTEM_FFMPEG=Yes
 CONFIGURE_ARGS +=	-DCMAKE_INSTALL_PREFIX=${PREFIX}/libdata
--- a/games/sumwars/Makefile
+++ b/games/sumwars/Makefile
@ -41,10 +41,11 @@ LIB_DEPENDS =		x11/cegui \
 			net/enet

 CONFIGURE_ARGS += \
-	-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -liconv -lintl" \
 	-DSUMWARS_NO_ENET=ON \
 	-DSUMWARS_NO_TINYXML=ON

+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib -liconv -lintl
+
 NO_TEST =		Yes

 WRKDIST =		${WRKDIR}/sumwars-${V}
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@ -26,6 +26,8 @@ EXTRACT_SUFX =		.tar.xz
 MODULES =		devel/cmake
 COMPILER =		base-clang ports-gcc

+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 RUN_DEPENDS =		devel/desktop-file-utils
 LIB_DEPENDS =		audio/openal>=0.0.8p7 \
 			audio/libvorbis \
--- a/games/tic80/Makefile
+++ b/games/tic80/Makefile
@ -45,10 +45,11 @@ RUN_DEPENDS =	devel/desktop-file-utils

 # Remember to update VERSION_HASH when updating!
 CONFIGURE_ARGS =	-DBUILD_PRO=ON \
-			-DCMAKE_C_FLAGS="${CFLAGS} `sdl2-config --cflags` -I${MODLUA_INCL_DIR}" \
-			-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} `sdl2-config --libs`" \
 			-DVERSION_HASH=a838293

+CFLAGS +=	`sdl2-config --cflags` -I${MODLUA_INCL_DIR}
+MODCMAKE_LDFLAGS =	`sdl2-config --libs`
+
 NO_TEST =	Yes

 # Install the cart creation binaries.
--- a/games/valyriatear/Makefile
+++ b/games/valyriatear/Makefile
@ -24,6 +24,7 @@ MASTER_SITES =	https://github.com/ValyriaTear/ValyriaTear/releases/download/${V}

 # C++11
 COMPILER =	base-clang ports-gcc
+MODCMAKE_LDFLAGS = 	-L${X11BASE}/lib -L${LOCALBASE}/lib

 MODULES =	devel/cmake \
 		lang/lua
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@ -47,11 +47,12 @@ CONFIGURE_ARGS+=-DFIFO_DIR=${VARBASE}/wesnothd \
 		-DSERVER_GID=708 \
 		-DENABLE_CAMPAIGN_SERVER=ON \
 		-DENABLE_STRICT_COMPILATION=OFF \
-		-DCMAKE_EXE_LINKER_FLAGS=-lpthread \
 		-DHAVE_SYS_SENDFILE_H=0 \
 		-DOPT=-O2 \
 		-Wno_dev

+MODCMAKE_LDFLAGS =	-lpthread
+
 NO_TEST=	Yes

 .include <bsd.port.mk>
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@ -38,9 +38,9 @@ RUN_DEPENDS =	devel/desktop-file-utils
 BUILD_DEPENDS =	devel/gettext,-runtime \
 		devel/gettext,-tools

-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include \
-				-I${X11BASE}/include -I${MODLUA_INCL_DIR}"
-CXXFLAGS +=		-Wno-mismatched-tags
+CXXFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+CXXFLAGS +=	-I${MODLUA_INCL_DIR} -Wno-mismatched-tags
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib

 NO_TEST =		Yes

--- a/geo/lib2geom/Makefile
+++ b/geo/lib2geom/Makefile
@ -30,6 +30,8 @@ SUBST_VARS +=	V
 # c++17
 COMPILER =	base-clang ports-gcc

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 BUILD_DEPENDS =	devel/boost \
 		devel/gtest \
 		lang/cython${MODPY_FLAVOR} \
--- a/geo/mdal/Makefile
+++ b/geo/mdal/Makefile
@ -28,7 +28,8 @@ LIB_DEPENDS =	math/netcdf>=4 \

 BUILD_DEPENDS =	devel/gtest

-CONFIGURE_ARGS=	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
+CXXFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 WANTLIB += ${COMPILER_LIBCXX} c gdal hdf5 m netcdf sqlite3 xml2 z

--- a/geo/osm2pgsql/Makefile
+++ b/geo/osm2pgsql/Makefile
@ -49,9 +49,9 @@ MODLUA_SA =		Yes
 CONFIGURE_ARGS =	-DBUILD_TESTS=ON \
 			-DEXTERNAL_LIBOSMIUM=ON \
 			-DEXTERNAL_PROTOZERO=ON \
-			-DEXTERNAL_FMT=ON \
-			-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/utfcpp \
-				${CXXFLAGS}"
+			-DEXTERNAL_FMT=ON
+
+CXXFLAGS +=		-I${LOCALBASE}/include/utfcpp

 # bump postgresql,-server limits according to its README otherwise some
 # tests fail
--- a/geo/osrm-backend/Makefile
+++ b/geo/osrm-backend/Makefile
@ -33,10 +33,10 @@ LIB_DEPENDS =		archivers/bzip2 \
 			devel/tbb

 CONFIGURE_ARGS =	-DOSMIUM_INCLUDE_DIR=${LOCALBASE}/include/osmium \
-			-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include/utfcpp \
-				${CXXFLAGS}" \
 			-DENABLE_CCACHE=Off

+CXXFLAGS +=		-I${LOCALBASE}/include/utfcpp
+
 # Requires network access, and http access to sample osrm data is 403'd
 NO_TEST =		Yes

--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@ -96,6 +96,9 @@ CONFIGURE_ARGS =-DPYTHON_EXECUTABLE=${MODPY_BIN} \
 		-DWITH_PDAL=TRUE \
 		-DWITH_SERVER=TRUE -DWITH_SERVER_PLUGINS=TRUE -DWITH_QSPATIALITE=TRUE

+
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 # does more than just debug pkgs
 #DEBUG_CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=RelWithDebInfo

--- a/geo/qgis/patches/patch-CMakeLists_txt
+++ b/geo/qgis/patches/patch-CMakeLists_txt
@ -14,3 +14,12 @@ Index: CMakeLists.txt
   find_package(BISON REQUIRED)
 
   #############################################################
+@@ -449,7 +449,7 @@ if(WITH_CORE)
+       set (HAVE_QT5SERIALPORT TRUE)
+   endif()
+ 
+-  find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test UiTools Sql REQUIRED)
+  find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test UiTools Sql  Sensors Quick WebChannel REQUIRED)
+   if (WITH_QT6)
+     find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat REQUIRED)
+   else()
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@ -121,4 +121,6 @@ CONFIGURE_ARGS +=	-DENABLE_MYSQLSUPPORT=ON
 # XXX W^X binary outside wxallowed
 TEST_IS_INTERACTIVE =	X11

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 .include <bsd.port.mk>
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@ -36,7 +36,7 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 		misc/shared-mime-info \
 		x11/gtk+3,-guic

-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
+CXXFLAGS +=	-I${LOCALBASE}/include

 NO_TEST =	Yes

--- a/graphics/gdcm/Makefile
+++ b/graphics/gdcm/Makefile
@ -30,6 +30,7 @@ MODULES =			devel/cmake
 # c++-14
 COMPILER =			base-clang ports-gcc
 CXXFLAGS +=			-std=c++14
+MODCMAKE_LDFLAGS =			-L${LOCALBASE}/lib

 WANTLIB += ${COMPILER_LIBCXX} c crypto expat json-c m openjp2
 WANTLIB += poppler ssl uuid xml2 z
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@ -19,8 +19,9 @@ EXTRACT_SUFX =	.zip

 MODULES =	devel/cmake

-CONFIGURE_ARGS =	-DBUILD_SHARED_LIBS=ON \
-			-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include"
+CONFIGURE_ARGS =	-DBUILD_SHARED_LIBS=ON
+
+CFLAGS +=		-I${X11BASE}/include

 NO_TEST =	Yes

--- a/graphics/gmic-qt/Makefile.inc
+++ b/graphics/gmic-qt/Makefile.inc
@ -31,15 +31,12 @@ CONFIGURE_STYLE = cmake

 # just so that the build doesn't create a crazy log
 MAKE_ENV = 	TERM=xterm
-LDFLAGS = 	-L${LOCALBASE}/lib
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 # XXX does not do what it says it does
 CONFIGURE_ARGS += -DCUSTOM_CFLAGS=Yes

 CONFIGURE_ARGS += -DGMIC_QT_HOST=${QT_HOST}
-CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}"
-CONFIGURE_ARGS += -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}"
-CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}"
 CONFIGURE_ARGS += -DENABLE_DYNAMIC_LINKING=ON
 CONFIGURE_ARGS += -DGMIC_PATH=${WRKDIST}/src

--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@ -44,14 +44,11 @@ CONFIGURE_STYLE = cmake
 # tput wants a terminal name to do something, and gmic
 # initial run creates loads of temporary files
 MAKE_ENV = 	TERM=xterm TMP=${WRKDIR}/tmp
-LDFLAGS = 	-L${LOCALBASE}/lib
+MODCMAKE_LDFLAGS = 	-L${LOCALBASE}/lib

 # XXX does not do what it says it does
 CONFIGURE_ARGS += -DCUSTOM_CFLAGS=Yes

-CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}"
-CONFIGURE_ARGS += -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}"
-CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}"
 CONFIGURE_ARGS += -DENABLE_OPENCV=ON

 DEBUG_PACKAGES = ${BUILD_PACKAGES}
--- a/graphics/ksnip/Makefile
+++ b/graphics/ksnip/Makefile
@ -26,7 +26,7 @@ LIB_DEPENDS =		graphics/kcolorpicker \
 			graphics/kimageannotator>=0.4.1 \
 			x11/qt5/qtx11extras

-CONFIGURE_ARGS +=	-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ENV +=	LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CXXFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib

 .include <bsd.port.mk>
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@ -36,10 +36,9 @@ LIB_DEPENDS =		devel/pystring \
 CONFIGURE_ARGS +=	-DPYTHON="${MODPY_BIN}" \
 			-DOCIO_BUILD_STATIC=OFF \
 			-DOCIO_BUILD_APPS=OFF \
-			-DOCIO_BUILD_GPU_TESTS=OFF \
-			-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+			-DOCIO_BUILD_GPU_TESTS=OFF
+
+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib

 .if ${MACHINE_ARCH} == "amd64"
 CONFIGURE_ARGS +=	-DOCIO_USE_SSE=ON
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@ -51,7 +51,7 @@ LIB_DEPENDS-doc=	# empty
 RUN_DEPENDS-doc=	# empty
 WANTLIB-doc=		# empty

-CONFIGURE_ARGS=		-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib

 post-install:
 # fix links target; symlinks are required for FindIlmbase.cmake etc. to find the
--- a/graphics/orthanc/postgresql-plugin/Makefile
+++ b/graphics/orthanc/postgresql-plugin/Makefile
@ -25,9 +25,9 @@ LIB_DEPENDS =		databases/postgresql \
 			devel/boost \
 			devel/jsoncpp

-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="-I${LOCALBASE}/include -pthread" \
-			-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include -pthread" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib"
+CFLAGS=			-I${LOCALBASE}/include -pthread
+CXXFLAGS=		-I${LOCALBASE}/include -pthread
+MODCMAKE_LDFLAGS=	-L${LOCALBASE}/lib

 # XXX: undefined references to testing libs, and requires running postgres
 CONFIGURE_ARGS +=	-DBUILD_UNIT_TESTS=Off
--- a/graphics/orthanc/server/Makefile
+++ b/graphics/orthanc/server/Makefile
@ -46,9 +46,9 @@ CONFIGURE_ARGS +=	-DUSE_SYSTEM_MONGOOSE=Off \
 			-DORTHANC_BUILD_UNIT_TESTS=Off

 # override these as otherwise the tests from Compiler.cmake won't pick them up yet
-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="-I${LOCALBASE}/include -pthread" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -luuid" \
-			-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib" \
+CFLAGS=			-I${LOCALBASE}/include -pthread
+CXXFLAGS=		-I${LOCALBASE}/include -pthread
+MODCMAKE_LDFLAGS=	-L${LOCALBASE}/lib -luuid

 # CMAKE_COMPILER_IS_GNUCXX isn't set for clang as we invoke the compiler
 # as 'c++' and not 'clang++' (ref: CMakeDetermineCXXCompiler.cmake)
--- a/graphics/orthanc/webviewer-plugin/Makefile
+++ b/graphics/orthanc/webviewer-plugin/Makefile
@ -33,9 +33,9 @@ LIB_DEPENDS =		databases/sqlite3 \
 			devel/jsoncpp \
 			graphics/gdcm

-CONFIGURE_ARGS +=       -DCMAKE_C_FLAGS="-I${LOCALBASE}/include -pthread" \
-                        -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include -pthread" \
-                        -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -luuid"
+CFLAGS=			-I${LOCALBASE}/include -pthread
+CXXFLAGS=		-I${LOCALBASE}/include -pthread
+MODCMAKE_LDFLAGS=	-L${LOCALBASE}/lib -luuid

 post-extract:
 	mkdir ${WRKSRC}/ThirdPartyDownloads/
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@ -42,10 +42,10 @@ LIB_DEPENDS =		audio/libcanberra,-gtk3 \

 CONFIGURE_ARGS =	-DBUILD_SHARED=ON \
 			-DOPTION_OMP=OFF \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-			-DCMAKE_EXE_LINKER_FLAGS=-L${X11BASE}/lib \
 			-Wno-dev

+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib
+
 NO_TEST = 		Yes

 .include <bsd.port.mk>
--- a/inputmethods/fcitx/Makefile
+++ b/inputmethods/fcitx/Makefile
@ -57,9 +57,10 @@ LIB_DEPENDS =		devel/harfbuzz,-main \
 			x11/xkbcommon

 CONFIGURE_ARGS =	-DENABLE_WAYLAND=OFF \
-			-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples \
-			-DCMAKE_CXX_FLAGS="-I${X11BASE}/include \
-					   -I${LOCALBASE}/include"
+			-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
+
+CFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include
+CXXFLAGS +=	-I${LOCALBASE}/include -I${X11BASE}/include

 post-patch:
 	cp ${FULLDISTDIR}/en_dict-20121020.tar.gz \
--- a/lang/flang/libpgmath/Makefile
+++ b/lang/flang/libpgmath/Makefile
@ -20,7 +20,7 @@ COMPILER =	ports-gcc
 # Attempt to prevent libestdc++ and libc++ symbol conflicts in the edge case
 # where you're on aarch64 and you are linking together both Fortran and C++
 # code into a single object.
-CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS='-static-libstdc++ -static-libgcc'
+MODCMAKE_LDFLAGS =	-static-libstdc++ -static-libgcc
 .endif

 MODULES =	devel/cmake \
--- a/lang/ldc/Makefile
+++ b/lang/ldc/Makefile
@ -33,8 +33,7 @@ BUILD_DEPENDS =	devel/llvm
 RUN_DEPENDS =	devel/llvm

 # COMPILE_D_MODULES_SEPARATELY=ON lets ldc compile with sane memory limits.
-CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-			-DCOMPILE_D_MODULES_SEPARATELY=ON \
+CONFIGURE_ARGS =	-DCOMPILE_D_MODULES_SEPARATELY=ON \
 			-DLDC_DYNAMIC_COMPILE=OFF \
 			-DLDC_WITH_LLD=OFF \
 			-DLLVM_CONFIG="${LOCALBASE}/bin/llvm-config"
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@ -57,6 +57,7 @@ BUILD_DEPENDS +=	textproc/highlight
 RUN_DEPENDS +=		textproc/highlight

 MODGNOME_LDFLAGS=	-L${X11BASE}/lib
+CFLAGS=			-I${X11BASE}/include -I${LOCALBASE}/include
 MODGNOME_TOOLS=		desktop-file-utils gtk-update-icon-cache yelp

 CONFIGURE_ARGS=		-DWITH_BOGOFILTER="${LOCALBASE}/bin/bogofilter" \
@ -64,7 +65,6 @@ CONFIGURE_ARGS=		-DWITH_BOGOFILTER="${LOCALBASE}/bin/bogofilter" \
 			-DWITH_SPAMASSASSIN="${LOCALBASE}/bin/spamassassin" \
 			-DWITH_OPENLDAP=${LOCALBASE} \
 			-DVERSION_SUBSTRING=" (OpenBSD Ports)" \
-			-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
 			-DMAN_INSTALL_DIR="${PREFIX}/man" \
 			-DWITH_ENCHANT_VERSION=2 \
 			-DWITH_GWEATHER4=ON
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@ -46,6 +46,8 @@ CONFIGURE_ARGS +=	-DGIT_EXECUTABLE="" \
 			-DWITH_ZLIB:Bool=ON \
 			-DWITH_QT5:Bool=ON

+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib
+
 TEST_IS_INTERACTIVE =	X11

 pre-configure:
--- a/math/armadillo/Makefile
+++ b/math/armadillo/Makefile
@ -23,6 +23,8 @@ LIB_DEPENDS += 	math/arpack \
 CONFIGURE_STYLE = cmake
 CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX=${PREFIX}

+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib
+
 NO_TEST = 	Yes

 .include <bsd.port.mk>
--- a/math/imath/Makefile
+++ b/math/imath/Makefile
@ -34,8 +34,9 @@ LIB_DEPENDS=		devel/boost
 CXXFLAGS +=		-mxgot
 .endif

-CONFIGURE_ARGS=		-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" \
-			-DPYTHON:BOOL=ON
+CONFIGURE_ARGS =	-DPYTHON=ON
+
+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib

 DEBUG_PACKAGES=		${BUILD_PACKAGES}

--- a/math/rstudio/Makefile
+++ b/math/rstudio/Makefile
@ -67,8 +67,9 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 CONFIGURE_ARGS =	-DBoost_INCLUDE_DIR="${LOCALBASE}/include" \
 			-DQT_QMAKE_EXECUTABLE="${LOCALBASE}/bin/qmake-qt5" \
 			-DQt5WebEngine_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5WebEngine" \
-			-DQt5WebEngineWidgets_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5WebEngineWidgets" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib/inotify -linotify -rpath ${LOCALBASE}/lib/inotify -rpath ${LOCALBASE}/lib/R/lib"
+			-DQt5WebEngineWidgets_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5WebEngineWidgets"
+
+MODCMAKE_LDFLAGS = 		-L${LOCALBASE}/lib/inotify -linotify -rpath ${LOCALBASE}/lib/inotify -rpath ${LOCALBASE}/lib/R/lib

 NO_TEST =	Yes

--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@ -20,9 +20,9 @@ COMPILER =	base-clang ports-gcc base-gcc

 MODULES =	devel/cmake

-CONFIGURE_ARGS+=	-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-			-DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
+CFLAGS +=	-I${LOCALBASE}/include
+CXXFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 LIB_DEPENDS +=	textproc/libebml>=1.4.2

--- a/net/dino/Makefile
+++ b/net/dino/Makefile
@ -48,6 +48,8 @@ WANTLIB += qrencode signal-protocol-c soup-2.4 sqlite3 srtp2

 CONFIGURE_ARGS =	-DBUILD_TESTS=ON

+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib
+
 do-test:
 	find ${WRKBUILD} -type f -perm -+x -name \*-test -print -exec {} \;

--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@ -39,11 +39,7 @@ FLAVOR?=
 CFLAGS+=	-DNS_IN6ADDRSZ=16 -DNS_INT16SZ=2

 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CFLAGS}" \
-		-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-		-DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" \
-		-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
-		-DMAN_INSTALLDIR="${TRUEPREFIX}/man" \
+CONFIGURE_ARGS+= -DMAN_INSTALLDIR="${TRUEPREFIX}/man" \
 		-DENABLE_GEOIP=off \
 		-DBUNDLED_LIBS=off

--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@ -56,9 +56,7 @@ WANTLIB-webkit += glib-2.0 gobject-2.0 javascriptcoregtk-4.0 proxy pthread
 CONFIGURE_ENV=	LIBlibproxy_VERSION=${LIBproxy_VERSION}
 MAKE_ENV=	LIBlibproxy_VERSION=${LIBproxy_VERSION}

-CONFIGURE_ARGS=		-DCMAKE_C_FLAGS="${CFLAGS}" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-			-DWITH_PERL:BOOL=ON \
+CONFIGURE_ARGS=		-DWITH_PERL:BOOL=ON \
 			-DPERL_LINK_LIBPERL:BOOL=ON \
 			-DWITH_GNOME3:BOOL=ON \
 			-DWITH_VALA:BOOL=ON \
--- a/net/nextcloudclient/Makefile
+++ b/net/nextcloudclient/Makefile
@ -67,19 +67,9 @@ CONFIGURE_ARGS +=	-DCMAKE_DISABLE_FIND_PACKAGE_SharedMimeInfo=ON
 # Do not install under /etc/Nextcloud
 CONFIGURE_ARGS +=	-DSYSCONF_INSTALL_DIR=${SYSCONFDIR}

-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="${CFLAGS} \
-				-I${LOCALBASE}/include/inotify \
-				-I${LOCALBASE}/include/qtkeychain \
-				-I${LOCALBASE}/include" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} \
-				-I${LOCALBASE}/include/inotify \
-				-I${LOCALBASE}/include/qtkeychain \
-				-I${LOCALBASE}/include" \
-			-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
-				-L${LOCALBASE}/lib/inotify \
-				-L${LOCALBASE}/lib \
-				-linotify \
-				-Wl,-rpath=${LOCALBASE}/lib/inotify"
+CFLAGS +=	-I${LOCALBASE}/include -I${LOCALBASE}/include/inotify -I${LOCALBASE}/include/qtkeychain
+CXXFLAGS +=	-I${LOCALBASE}/include -I${LOCALBASE}/include/inotify -I${LOCALBASE}/include/qtkeychain
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath=${LOCALBASE}/lib/inotify

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/Nextcloud/
--- a/net/owncloudclient/Makefile
+++ b/net/owncloudclient/Makefile
@ -37,27 +37,16 @@ LIB_DEPENDS =		databases/sqlite3 \
 CONFIGURE_ARGS +=	-Wno-dev \
 			-DSYSCONF_INSTALL_DIR=${SYSCONFDIR} \
 			-DKDE_INSTALL_PLUGINDIR=${PREFIX}/lib/ownCloud/plugins/ \
-			-DCMAKE_C_FLAGS="${CFLAGS} \
-				-I/usr/include \
-				-I${LOCALBASE}/include/inotify \
-				-I${LOCALBASE}/include/qtkeychain \
-				-I${LOCALBASE}/include" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} \
-				-I/usr/include \
-				-I${LOCALBASE}/include/inotify \
-				-I${LOCALBASE}/include/qtkeychain \
-				-I${LOCALBASE}/include" \
-			-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
-				-L${LOCALBASE}/lib/inotify \
-				-L${LOCALBASE}/lib \
-				-linotify \
-				-Wl,-rpath=${LOCALBASE}/lib/inotify" \
 			-DCMAKE_DISABLE_FIND_PACKAGE_KF5=TRUE \
 			-DCMAKE_DISABLE_FIND_PACKAGE_CMocka=TRUE \
 			-DInotify_INCLUDE_DIRS=${LOCALBASE}/include/inotify \
 			-DInotify_LIBRARIES=${LOCALBASE}/lib/inotify \
 			-DCSYNC_REQUIRED_LIBRARIES=c

+CFLAGS +=	-I${LOCALBASE}/include -I${LOCALBASE}/include/inotify -I${LOCALBASE}/include/qtkeychain
+CXXFLAGS +=	-I${LOCALBASE}/include -I${LOCALBASE}/include/inotify -I${LOCALBASE}/include/qtkeychain
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath=${LOCALBASE}/lib/inotify
+
 NO_TEST =		Yes

 post-install:
--- a/net/qsyncthingtray/patches/patch-CMakeLists_txt
+++ b/net/qsyncthingtray/patches/patch-CMakeLists_txt
@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -12,7 +12,7 @@ set(CMAKE_AUTOMOC ON)
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+-find_package(Qt5 5.6 COMPONENTS Widgets Network PrintSupport)
+find_package(Qt5 5.6 COMPONENTS Widgets Network PrintSupport Positioning Sensors Quick WebChannel)
+ if (NOT Qt5_FOUND)
+   message(FATAL_ERROR
+     "Some components of Qt5 not found (see above messages for details. "
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@ -78,6 +78,8 @@ CONFIGURE_ARGS+=	-DTCL_TCLSH=${MODTCL_BIN} \
 			-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
 			-DMODTCL_LIB=${MODTCL_LIB}

+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib
+
 .include <bsd.port.arch.mk>
 .if ${PROPERTIES:Mclang}
 # needed for ruby 3 on llvm
--- a/print/gl2ps/Makefile
+++ b/print/gl2ps/Makefile
@ -24,6 +24,8 @@ BUILD_DEPENDS =		print/texlive/base
 LIB_DEPENDS =		graphics/freeglut \
 			graphics/png

+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 TEST_IS_INTERACTIVE =	x11

 TEST_TMP=${WRKDIR}/test_tmp
--- a/productivity/libalkimia/patches/patch-CMakeLists_txt
+++ b/productivity/libalkimia/patches/patch-CMakeLists_txt
@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -108,7 +108,7 @@ else()
+     find_package(Qt5 REQUIRED COMPONENTS
+         Core
+         Test
+-        ${QT_BROWSER_COMPONENT}
+        ${QT_BROWSER_COMPONENT} Positioning Sensors Quick WebChannel
+         Qml
+     )
+ 
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@ -66,8 +66,7 @@ CONFIGURE_ARGS +=	-DWITH_XC_BROWSER=ON \

 FIX_CRLF_FILES =	src/keeshare/ShareExport.cpp

-# ld: error: unable to find library -lX11
-CONFIGURE_ARGS +=	-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -L${X11BASE}/lib"
+MODCMAKE_LDFLAGS =		-L${X11BASE}/lib

 post-patch:
 	cd ${WRKSRC}/src/; sed -i -e 's/Q_OS_LINUX/Q_OS_UNIX/g' \
--- a/security/minisign/Makefile
+++ b/security/minisign/Makefile
@ -17,7 +17,7 @@ WANTLIB =  c pthread sodium
 MODULES =		devel/cmake
 LIB_DEPENDS =		security/libsodium

-CONFIGURE_ARGS =	-DCMAKE_C_FLAGS="-I${LOCALBASE}/include ${CFLAGS}"
+CFLAGS +=	-I${LOCALBASE}/include

 NO_TEST =		Yes

--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@ -20,10 +20,9 @@ MODULES =		devel/cmake \
 			x11/qt5
 LIB_DEPENDS += 		x11/gnome/libsecret

-CONFIGURE_ARGS += 	-DCMAKE_SHARED_LINKER_FLAGS="-L${PREFIX}/lib" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-L${PREFIX}/lib" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${PREFIX}/lib" \
-			-DECM_MKSPECS_INSTALL_DIR="${PREFIX}/lib/${QT}/mkspecs/modules"
+CONFIGURE_ARGS += 	-DECM_MKSPECS_INSTALL_DIR="${PREFIX}/lib/${QT}/mkspecs/modules"
+
+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib

 LIBNAME = 		Qt5Keychain
 LIBNAME_L = 		qt5keychain
--- a/security/stegseek/Makefile
+++ b/security/stegseek/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS +=		graphics/jpeg \
 			security/libmcrypt \
 			security/mhash

-CONFIGURE_ARGS =        -DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" \
-			-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CXXFLAGS +=	-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =	-L${LOCALBASE}/lib

 .include <bsd.port.mk>
--- a/telephony/linphone/mediastreamer2/Makefile
+++ b/telephony/linphone/mediastreamer2/Makefile
@ -16,8 +16,7 @@ CONFIGURE_ARGS =-DENABLE_STATIC=NO \
 		-DGSM_INCLUDE_DIRS=${LOCALBASE}/include \
 		-DV4L_INCLUDE_DIRS=${LOCALBASE}/include

-CONFIGURE_ENV +=	LDFLAGS=-L${X11BASE}/lib
-
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib

 #bcg729 ?
 LIB_DEPENDS =	telephony/linphone/bctoolbox\
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@ -26,6 +26,8 @@ MODULES =		devel/cmake
 BUILD_DEPENDS =		devel/gtest
 LIB_DEPENDS =		devel/boost

+MODCMAKE_LDFLAGS =		-L${LOCALBASE}/lib
+
 do-test:
 	cd ${WRKBUILD} && ./src/test/lucene++-tester \
 		--test_dir="${WRKSRC}/src/test/testfiles/"
--- a/textproc/podofo/Makefile
+++ b/textproc/podofo/Makefile
@ -26,9 +26,10 @@ LIB_DEPENDS=	converters/libunistring \
 		graphics/png \
 		graphics/tiff

-CONFIGURE_ARGS+=	-DCMAKE_INCLUDE_PATH=${X11BASE}/include \
-			-DCMAKE_LIBRARY_PATH=${X11BASE}/lib \
-			-DFREETYPE_INCLUDE_DIR=${X11BASE}/include/freetype2 \
+CXXFLAGS =	-I${X11BASE}/include
+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib
+
+CONFIGURE_ARGS+=	-DFREETYPE_INCLUDE_DIR=${X11BASE}/include/freetype2 \
 			-DPODOFO_BUILD_SHARED=True \
 			-DPODOFO_BUILD_STATIC=True

--- a/www/webkitgtk4/Makefile
+++ b/www/webkitgtk4/Makefile
@ -84,8 +84,6 @@ LIB_DEPENDS =		archivers/woff2 \
 CONFIGURE_ENV =		WK_USE_CCACHE=NO
 CONFIGURE_ARGS =	-DPORT=GTK \
 			-DENABLE_MINIBROWSER=ON \
-			-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-			-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
 			-DENABLE_JOURNALD_LOG=OFF \
 			-DUSE_SOUP2=ON

--- a/x11/grantlee-qt5/Makefile
+++ b/x11/grantlee-qt5/Makefile
@ -33,8 +33,6 @@ CONFIGURE_ARGS =	-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
 			-DCMAKE_DISABLE_FIND_PACKAGE_LCov=ON \
 			-DCMAKE_DISABLE_FIND_PACKAGE_Cccc=ON

-CONFIGURE_ARGS +=	-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -lc -lpthread" \
-			-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS} -lc -lpthread" \
-			-DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS} -lc -lpthread"
+MODCMAKE_LDFLAGS =		-lc -lpthread

 .include <bsd.port.mk>
--- a/x11/kde-applications/akonadiconsole/Makefile
+++ b/x11/kde-applications/akonadiconsole/Makefile
@ -54,8 +54,8 @@ LIB_DEPENDS =	databases/xapian-core \
 		x11/kde-applications/messagelib \
 		x11/kde-applications/pimcommon

-CONFIGURE_ARGS +=	-DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include/KF5" \
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include/KF5"
+CFLAGS +=	-I${LOCALBASE}/include/KF5
+CXXFLAGS +=	-I${LOCALBASE}/include/KF5

 TEST_IS_INTERACTIVE =	X11

--- a/x11/kde-applications/audiocd-kio/Makefile
+++ b/x11/kde-applications/audiocd-kio/Makefile
@ -17,6 +17,8 @@ MODKDE5_TRANSLATIONS = yes
 MODKF5_L10N_CONFLICT = yes
 MODKDE5_DOCS = yes

+MODCMAKE_LDFLAGS =	-L${X11BASE}/lib -L${LOCALBASE}/lib
+
 LIB_DEPENDS =	audio/cdparanoia \
 		audio/flac \
 		audio/libvorbis \
--- a/Show More
+++ b/Show More