pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: riastradh
Date: Thu Jan 23 23:27:30 UTC 2025
Modified Files:
pkgsrc/devel/kdiff3: Makefile
pkgsrc/devel/plasma-wayland-protocols: Makefile
pkgsrc/devel/zeal: Makefile
pkgsrc/graphics/drawpile: Makefile
pkgsrc/graphics/kdiagram: Makefile
pkgsrc/graphics/oxygen-icons: Makefile
pkgsrc/inputmethod/fcitx: Makefile
pkgsrc/inputmethod/fcitx-qt5: Makefile
pkgsrc/inputmethod/fcitx5: Makefile
pkgsrc/inputmethod/fcitx5-anthy: Makefile
pkgsrc/inputmethod/fcitx5-chewing: Makefile
pkgsrc/inputmethod/fcitx5-chinese-addons: Makefile
pkgsrc/inputmethod/fcitx5-configtool: Makefile
pkgsrc/inputmethod/fcitx5-gtk: Makefile
pkgsrc/inputmethod/fcitx5-hangul: Makefile
pkgsrc/inputmethod/fcitx5-kkc: Makefile
pkgsrc/inputmethod/fcitx5-libthai: Makefile
pkgsrc/inputmethod/fcitx5-lua: Makefile
pkgsrc/inputmethod/fcitx5-m17n: Makefile
pkgsrc/inputmethod/fcitx5-qt: Makefile
pkgsrc/inputmethod/fcitx5-rime: Makefile
pkgsrc/inputmethod/fcitx5-sayura: Makefile
pkgsrc/inputmethod/fcitx5-skk: Makefile
pkgsrc/inputmethod/fcitx5-table-extra: Makefile
pkgsrc/inputmethod/fcitx5-table-other: Makefile
pkgsrc/inputmethod/fcitx5-unikey: Makefile
pkgsrc/inputmethod/fcitx5-zhuyin: Makefile
pkgsrc/inputmethod/libime: Makefile
pkgsrc/meta-pkgs/kde: Makefile.common kf5.mk kf6.mk
pkgsrc/multimedia/phonon-qt5: Makefile
pkgsrc/multimedia/phonon-qt5-backend-gstreamer: Makefile
pkgsrc/multimedia/phonon-qt5-backend-vlc: Makefile
pkgsrc/net/nextcloud-client: Makefile
pkgsrc/net/owncloudclient: Makefile
pkgsrc/security/gpgmepp: Makefile
pkgsrc/x11/copyq: Makefile
pkgsrc/x11/libkscreen: Makefile
pkgsrc/x11/xcb-imdkit: Makefile
Added Files:
pkgsrc/devel/extra-cmake-modules: buildlink3.mk
Log Message:
devel/extra-cmake-modules: Use buildlink3.mk, not TOOL_DEPENDS.
This one is borderline: should it be BUILD_DEPENDS or TOOL_DEPENDS?
It doesn't appear to vary depending on the build environment, so it
doesn't meaningfully describe the cross-builder vs the target system.
It is used only at build-time, but it doesn't have any native
executables -- they're just source code cmake scripts.
For now, it is convenient to use a buildlink3.mk file because this
enables us to explicitly expose only files under share/ECM/ -- and
not other random files installed in the prefix -- via buildlink3 to
keep dependent package builds clean. Eventually we should have the
same mechanism for TOOL_DEPENDS but that day has not yet come.
This change creates a new use of BUILDLINK_DEPMETHOD build for
extra-cmake-modules, which is a priori risky. Fortunately,
extra-cmake-modules has no libraries, so this is unlikely to cause
trouble.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/extra-cmake-modules/buildlink3.mk
cvs rdiff -u -r1.112 -r1.113 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/plasma-wayland-protocols/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/zeal/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/drawpile/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/kdiagram/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/oxygen-icons/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/inputmethod/fcitx/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/inputmethod/fcitx-qt5/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/inputmethod/fcitx5/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/inputmethod/fcitx5-anthy/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/fcitx5-chewing/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/inputmethod/fcitx5-chinese-addons/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/fcitx5-configtool/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/inputmethod/fcitx5-gtk/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/fcitx5-hangul/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/fcitx5-kkc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/fcitx5-libthai/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/inputmethod/fcitx5-lua/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/inputmethod/fcitx5-m17n/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/inputmethod/fcitx5-qt/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/inputmethod/fcitx5-rime/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/fcitx5-sayura/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/fcitx5-skk/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/fcitx5-table-extra/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/fcitx5-table-other/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/fcitx5-unikey/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/inputmethod/fcitx5-zhuyin/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/inputmethod/libime/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/meta-pkgs/kde/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/meta-pkgs/kde/kf5.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/meta-pkgs/kde/kf6.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/multimedia/phonon-qt5/Makefile
cvs rdiff -u -r1.48 -r1.49 \
pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/nextcloud-client/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/owncloudclient/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/security/gpgmepp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/copyq/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/libkscreen/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xcb-imdkit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/kdiff3/Makefile
diff -u pkgsrc/devel/kdiff3/Makefile:1.112 pkgsrc/devel/kdiff3/Makefile:1.113
--- pkgsrc/devel/kdiff3/Makefile:1.112 Thu Nov 14 22:19:24 2024
+++ pkgsrc/devel/kdiff3/Makefile Thu Jan 23 23:27:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2024/11/14 22:19:24 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2025/01/23 23:27:25 riastradh Exp $
DISTNAME= kdiff3-1.10.7
PKGREVISION= 7
@@ -20,10 +20,11 @@ USE_CXX_FEATURES+= c++17
BUILDLINK_TRANSFORM+= rm:-Wl,--fatal-warnings
-TOOL_DEPENDS+= extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules
TOOLS_DEPENDS.cmake= cmake>=3.1:../../devel/cmake
.include "../../devel/boost-headers/buildlink3.mk"
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.10.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.kcoreaddons+= kcoreaddons>=5.80.0
.include "../../devel/kcoreaddons/buildlink3.mk"
Index: pkgsrc/devel/plasma-wayland-protocols/Makefile
diff -u pkgsrc/devel/plasma-wayland-protocols/Makefile:1.22 pkgsrc/devel/plasma-wayland-protocols/Makefile:1.23
--- pkgsrc/devel/plasma-wayland-protocols/Makefile:1.22 Sun May 26 10:22:25 2024
+++ pkgsrc/devel/plasma-wayland-protocols/Makefile Thu Jan 23 23:27:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/05/26 10:22:25 markd Exp $
+# $NetBSD: Makefile,v 1.23 2025/01/23 23:27:25 riastradh Exp $
DISTNAME= plasma-wayland-protocols-1.13.0
CATEGORIES= devel kde
@@ -10,10 +10,10 @@ HOMEPAGE= https://github.com/kde/plasma-
COMMENT= Plasma Specific Protocols for Wayland
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules>=5.60.0:../../devel/extra-cmake-modules
-
USE_LANGUAGES= c c++
.include "../../devel/cmake/build.mk"
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.60.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/zeal/Makefile
diff -u pkgsrc/devel/zeal/Makefile:1.23 pkgsrc/devel/zeal/Makefile:1.24
--- pkgsrc/devel/zeal/Makefile:1.23 Thu Nov 14 22:19:37 2024
+++ pkgsrc/devel/zeal/Makefile Thu Jan 23 23:27:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/11/14 22:19:37 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/01/23 23:27:25 riastradh Exp $
DISTNAME= zeal-0.7.2
PKGREVISION= 1
@@ -11,8 +11,6 @@ HOMEPAGE= https://zealdocs.org/
COMMENT= Offline documentation browser inspired by Dash
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules
-
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
@@ -26,6 +24,8 @@ INSTALLATION_DIRS+= share/icons/hicolor/
.include "../../devel/cmake/build.mk"
.include "../../archivers/libarchive/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.10.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
Index: pkgsrc/graphics/drawpile/Makefile
diff -u pkgsrc/graphics/drawpile/Makefile:1.29 pkgsrc/graphics/drawpile/Makefile:1.30
--- pkgsrc/graphics/drawpile/Makefile:1.29 Thu Nov 14 22:20:05 2024
+++ pkgsrc/graphics/drawpile/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/11/14 22:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= Drawpile-2.1.17
PKGNAME= ${DISTNAME:tl}
@@ -11,7 +11,6 @@ HOMEPAGE= https://drawpile.net/
COMMENT= Collaborative drawing program
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
USE_CMAKE= yes
@@ -21,6 +20,7 @@ USE_LANGUAGES= c c++
CMAKE_CONFIGURE_ARGS+= -DINITSYS=""
.include "../../archivers/karchive/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../multimedia/libvpx/buildlink3.mk"
Index: pkgsrc/graphics/kdiagram/Makefile
diff -u pkgsrc/graphics/kdiagram/Makefile:1.11 pkgsrc/graphics/kdiagram/Makefile:1.12
--- pkgsrc/graphics/kdiagram/Makefile:1.11 Thu Nov 14 22:20:10 2024
+++ pkgsrc/graphics/kdiagram/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2024/11/14 22:20:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= kdiagram-2.8.0
PKGREVISION= 9
@@ -11,13 +11,14 @@ HOMEPAGE= https://www.kde.org/
COMMENT= Powerful libraries for creating business diagrams
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules>=5.60.0:../../devel/extra-cmake-modules
-
USE_LANGUAGES= c c++
CMAKE_CONFIGURE_ARGS+= -DECM_MKSPECS_INSTALL_DIR=${QTDIR}/mkspecs/modules
.include "../../devel/cmake/build.mk"
+
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.60.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qttools/buildlink3.mk"
.include "../../x11/qt5-qtsvg/buildlink3.mk"
Index: pkgsrc/graphics/oxygen-icons/Makefile
diff -u pkgsrc/graphics/oxygen-icons/Makefile:1.49 pkgsrc/graphics/oxygen-icons/Makefile:1.50
--- pkgsrc/graphics/oxygen-icons/Makefile:1.49 Sun Aug 25 06:18:53 2024
+++ pkgsrc/graphics/oxygen-icons/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2024/08/25 06:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= oxygen-icons-5.114.0
CATEGORIES= graphics kde
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.oxygen-icons.org/
COMMENT= Oxygen icon set for the KDE integrated X11 desktop
LICENSE= gnu-lgpl-v3
-TOOL_DEPENDS+= extra-cmake-modules>=5.98.0:../../devel/extra-cmake-modules
-
USE_LANGUAGES= c c++
# Why a collection of images requires a C++17 compiler is anyone's guess,
@@ -21,4 +19,7 @@ USE_CXX_FEATURES+= c++17
CMAKE_CONFIGURE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
.include "../../devel/cmake/build.mk"
+
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.98.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx/Makefile
diff -u pkgsrc/inputmethod/fcitx/Makefile:1.53 pkgsrc/inputmethod/fcitx/Makefile:1.54
--- pkgsrc/inputmethod/fcitx/Makefile:1.53 Fri Dec 27 08:20:08 2024
+++ pkgsrc/inputmethod/fcitx/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2024/12/27 08:20:08 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2025/01/23 23:27:26 riastradh Exp $
#
DISTNAME= fcitx-4.2.9.6
@@ -26,8 +26,6 @@ MAINTAINER= rxg%NetBSD.org@localhost
HOMEPAGE= https://www.fcitx-im.org/
COMMENT= Free Chinese Input Toy of X
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_LANGUAGES+= c c++
USE_TOOLS+= bash:run gmake pkg-config
@@ -61,6 +59,7 @@ post-extract:
${WRKSRC}/src/im/table/data/
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../devel/libexecinfo/buildlink3.mk"
.include "../../devel/libuuid/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx-qt5/Makefile
diff -u pkgsrc/inputmethod/fcitx-qt5/Makefile:1.31 pkgsrc/inputmethod/fcitx-qt5/Makefile:1.32
--- pkgsrc/inputmethod/fcitx-qt5/Makefile:1.31 Thu Nov 14 22:20:22 2024
+++ pkgsrc/inputmethod/fcitx-qt5/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/11/14 22:20:22 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= fcitx-qt5-1.2.3
PKGREVISION= 28
@@ -11,8 +11,6 @@ HOMEPAGE= https://download.fcitx-im.org/
COMMENT= Fcitx Qt5 Input Context
LICENSE= gnu-gpl-v2 OR modified-bsd
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_TOOLS+= pkg-config
USE_CMAKE= yes
USE_LANGUAGES= c c++
@@ -20,6 +18,7 @@ USE_LANGUAGES= c c++
LDFLAGS+= -lintl
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../inputmethod/fcitx/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5/Makefile
diff -u pkgsrc/inputmethod/fcitx5/Makefile:1.23 pkgsrc/inputmethod/fcitx5/Makefile:1.24
--- pkgsrc/inputmethod/fcitx5/Makefile:1.23 Fri Dec 27 08:20:08 2024
+++ pkgsrc/inputmethod/fcitx5/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/12/27 08:20:08 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-5.1.7
PKGREVISION= 4
@@ -37,8 +37,6 @@ USE_CXX_FEATURES+= charconv
REPLACE_BASH+= data/fcitx5-diagnose.sh
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
CMAKE_CONFIGURE_ARGS+= -DENABLE_WAYLAND=off # cairo-egl is required.
CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEMD=off
CMAKE_CONFIGURE_ARGS+= -DLibIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
@@ -68,6 +66,8 @@ pre-configure:
${WRKSRC}/src/modules/spell/
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gettext-tools/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-anthy/Makefile
diff -u pkgsrc/inputmethod/fcitx5-anthy/Makefile:1.7 pkgsrc/inputmethod/fcitx5-anthy/Makefile:1.8
--- pkgsrc/inputmethod/fcitx5-anthy/Makefile:1.7 Sat Feb 10 10:01:21 2024
+++ pkgsrc/inputmethod/fcitx5-anthy/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/02/10 10:01:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= fcitx5-anthy-5.1.3
CATEGORIES= inputmethod
@@ -10,13 +10,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Anthy Japanese inputmethod for Fcitx5
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/anthy/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-chewing/Makefile
diff -u pkgsrc/inputmethod/fcitx5-chewing/Makefile:1.17 pkgsrc/inputmethod/fcitx5-chewing/Makefile:1.18
--- pkgsrc/inputmethod/fcitx5-chewing/Makefile:1.17 Thu Nov 14 22:20:22 2024
+++ pkgsrc/inputmethod/fcitx5-chewing/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/11/14 22:20:22 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= fcitx5-chewing-5.1.1
PKGREVISION= 4
@@ -11,13 +11,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Chewing engine for Fcitx5
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../inputmethod/libchewing/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-chinese-addons/Makefile
diff -u pkgsrc/inputmethod/fcitx5-chinese-addons/Makefile:1.36 pkgsrc/inputmethod/fcitx5-chinese-addons/Makefile:1.37
--- pkgsrc/inputmethod/fcitx5-chinese-addons/Makefile:1.36 Sun Dec 29 15:09:53 2024
+++ pkgsrc/inputmethod/fcitx5-chinese-addons/Makefile Thu Jan 23 23:27:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/12/29 15:09:53 adam Exp $
+# $NetBSD: Makefile,v 1.37 2025/01/23 23:27:26 riastradh Exp $
DISTNAME= fcitx5-chinese-addons-5.1.3
PKGREVISION= 9
@@ -22,8 +22,6 @@ SITES.${f}= https://download.fcitx-im.or
.endfor
EXTRACT_ONLY= ${DEFAULT_DISTFILES}
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
@@ -37,6 +35,7 @@ post-extract:
.include "../../devel/cmake/build.mk"
.include "../../converters/opencc/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5-lua/buildlink3.mk"
.include "../../inputmethod/fcitx5-qt/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-configtool/Makefile
diff -u pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.25 pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.26
--- pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.25 Thu Nov 14 22:20:22 2024
+++ pkgsrc/inputmethod/fcitx5-configtool/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/11/14 22:20:22 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-configtool-5.1.3
PKGREVISION= 5
@@ -15,8 +15,6 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
CMAKE_CONFIGURE_ARGS+= -DENABLE_KCM=off
# CMAKE_INSTALL_RPATH does not work.
@@ -26,6 +24,7 @@ SUBST_MESSAGE.rpath= Setting RPATH
SUBST_FILES.rpath+= src/migrator/lib/CMakeLists.txt
SUBST_VARS.rpath+= COMPILER_RPATH_FLAG PREFIX QTDIR
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
#.include "../../devel/kcoreaddons/buildlink3.mk"
#.include "../../devel/kdeclarative/buildlink3.mk"
#.include "../../devel/ki18n/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-gtk/Makefile
diff -u pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.23 pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.24
--- pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.23 Fri Dec 27 08:20:08 2024
+++ pkgsrc/inputmethod/fcitx5-gtk/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/12/27 08:20:08 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-gtk-5.1.1
PKGREVISION= 6
@@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= GTK input method module for fcitx5
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
@@ -21,6 +19,8 @@ USE_CXX_FEATURES+= c++17
PKGCONFIG_OVERRIDE+= fcitx-gclient/Fcitx5GClient.pc.in
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../textproc/fmtlib/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-hangul/Makefile
diff -u pkgsrc/inputmethod/fcitx5-hangul/Makefile:1.6 pkgsrc/inputmethod/fcitx5-hangul/Makefile:1.7
--- pkgsrc/inputmethod/fcitx5-hangul/Makefile:1.6 Sat Feb 10 12:03:20 2024
+++ pkgsrc/inputmethod/fcitx5-hangul/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/02/10 12:03:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-hangul-5.1.1
CATEGORIES= inputmethod
@@ -10,13 +10,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Hangul Wrapper for Fcitx5
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../inputmethod/libhangul/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-kkc/Makefile
diff -u pkgsrc/inputmethod/fcitx5-kkc/Makefile:1.22 pkgsrc/inputmethod/fcitx5-kkc/Makefile:1.23
--- pkgsrc/inputmethod/fcitx5-kkc/Makefile:1.22 Thu Nov 14 22:20:23 2024
+++ pkgsrc/inputmethod/fcitx5-kkc/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/11/14 22:20:23 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-kkc-5.1.1
PKGREVISION= 5
@@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= libkkc input method support for fcitx5
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
# for std::underlying_type_t
# TODO: check if '8' is correct
GCC_REQD+= 8
@@ -25,7 +23,9 @@ USE_LANGUAGES= c c++11
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
.include "../../converters/libkkc/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5-qt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-libthai/Makefile
diff -u pkgsrc/inputmethod/fcitx5-libthai/Makefile:1.6 pkgsrc/inputmethod/fcitx5-libthai/Makefile:1.7
--- pkgsrc/inputmethod/fcitx5-libthai/Makefile:1.6 Sat Feb 10 12:06:47 2024
+++ pkgsrc/inputmethod/fcitx5-libthai/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/02/10 12:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-libthai-5.1.2
CATEGORIES= inputmethod
@@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Thai language input method for Fcitx5
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -24,6 +22,7 @@ USE_GNU_ICONV= yes
.endif
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/cmake/build.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/libthai/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-lua/Makefile
diff -u pkgsrc/inputmethod/fcitx5-lua/Makefile:1.7 pkgsrc/inputmethod/fcitx5-lua/Makefile:1.8
--- pkgsrc/inputmethod/fcitx5-lua/Makefile:1.7 Sat Feb 10 12:08:28 2024
+++ pkgsrc/inputmethod/fcitx5-lua/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2024/02/10 12:08:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-lua-5.0.12
CATEGORIES= inputmethod
@@ -10,14 +10,14 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Lua support for fcitx5
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
LUA_VERSIONS_ACCEPTED= 54 53
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../lang/lua/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-m17n/Makefile
diff -u pkgsrc/inputmethod/fcitx5-m17n/Makefile:1.24 pkgsrc/inputmethod/fcitx5-m17n/Makefile:1.25
--- pkgsrc/inputmethod/fcitx5-m17n/Makefile:1.24 Thu Nov 14 22:20:23 2024
+++ pkgsrc/inputmethod/fcitx5-m17n/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/11/14 22:20:23 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-m17n-5.1.0
PKGREVISION= 6
@@ -11,13 +11,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Wrapper library of m17n for Fcitx5
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/m17n-lib/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../textproc/fmtlib/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-qt/Makefile
diff -u pkgsrc/inputmethod/fcitx5-qt/Makefile:1.23 pkgsrc/inputmethod/fcitx5-qt/Makefile:1.24
--- pkgsrc/inputmethod/fcitx5-qt/Makefile:1.23 Thu Nov 14 22:20:23 2024
+++ pkgsrc/inputmethod/fcitx5-qt/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2024/11/14 22:20:23 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-qt-5.1.4
PKGREVISION= 5
@@ -11,8 +11,6 @@ HOMEPAGE= https://download.fcitx-im.org/
COMMENT= Qt library and IM module for fcitx5
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
@@ -21,6 +19,8 @@ CMAKE_CONFIGURE_ARGS+= -DENABLE_QT5=on
CMAKE_CONFIGURE_ARGS+= -DENABLE_QT6=off
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-rime/Makefile
diff -u pkgsrc/inputmethod/fcitx5-rime/Makefile:1.5 pkgsrc/inputmethod/fcitx5-rime/Makefile:1.6
--- pkgsrc/inputmethod/fcitx5-rime/Makefile:1.5 Sat Feb 10 12:14:03 2024
+++ pkgsrc/inputmethod/fcitx5-rime/Makefile Thu Jan 23 23:27:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/02/10 12:14:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2025/01/23 23:27:27 riastradh Exp $
DISTNAME= fcitx5-rime-5.1.4
CATEGORIES= inputmethod
@@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= RIME traditional Chinese input method for Fcitx5
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
DEPENDS+= rime-luna-pinyin-[0-9]*:../../inputmethod/rime-luna-pinyin
USE_PKGLOCALEDIR= yes
@@ -18,6 +17,8 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../inputmethod/librime/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-sayura/Makefile
diff -u pkgsrc/inputmethod/fcitx5-sayura/Makefile:1.6 pkgsrc/inputmethod/fcitx5-sayura/Makefile:1.7
--- pkgsrc/inputmethod/fcitx5-sayura/Makefile:1.6 Sat Feb 10 12:15:36 2024
+++ pkgsrc/inputmethod/fcitx5-sayura/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/02/10 12:15:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-sayura-5.1.1
CATEGORIES= inputmethod
@@ -10,13 +10,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Sinhala input method for Fcitx5
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-skk/Makefile
diff -u pkgsrc/inputmethod/fcitx5-skk/Makefile:1.22 pkgsrc/inputmethod/fcitx5-skk/Makefile:1.23
--- pkgsrc/inputmethod/fcitx5-skk/Makefile:1.22 Thu Nov 14 22:20:23 2024
+++ pkgsrc/inputmethod/fcitx5-skk/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/11/14 22:20:23 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-skk-5.1.1
PKGREVISION= 5
@@ -11,13 +11,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= SKK Kana-Kanji inputmethod for fcitx5
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5-qt/buildlink3.mk"
Index: pkgsrc/inputmethod/fcitx5-table-extra/Makefile
diff -u pkgsrc/inputmethod/fcitx5-table-extra/Makefile:1.13 pkgsrc/inputmethod/fcitx5-table-extra/Makefile:1.14
--- pkgsrc/inputmethod/fcitx5-table-extra/Makefile:1.13 Sun Dec 29 15:09:53 2024
+++ pkgsrc/inputmethod/fcitx5-table-extra/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/12/29 15:09:53 adam Exp $
+# $NetBSD: Makefile,v 1.14 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-table-extra-5.1.3
PKGREVISION= 2
@@ -11,7 +11,6 @@ HOMEPAGE= https://download.fcitx-im.org/
COMMENT= Extra Chinese table for Fcitx5
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
DEPENDS+= fcitx5-[0-9]*:../../inputmethod/fcitx5
DEPENDS+= libime-[0-9]*:../../inputmethod/libime
@@ -19,6 +18,8 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-table-other/Makefile
diff -u pkgsrc/inputmethod/fcitx5-table-other/Makefile:1.13 pkgsrc/inputmethod/fcitx5-table-other/Makefile:1.14
--- pkgsrc/inputmethod/fcitx5-table-other/Makefile:1.13 Sun Dec 29 15:09:54 2024
+++ pkgsrc/inputmethod/fcitx5-table-other/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/12/29 15:09:54 adam Exp $
+# $NetBSD: Makefile,v 1.14 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-table-other-5.1.0
PKGREVISION= 2
@@ -11,8 +11,6 @@ HOMEPAGE= https://download.fcitx-im.org/
COMMENT= Non-Chinese tables for Fcitx5
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
DEPENDS+= fcitx5-[0-9]*:../../inputmethod/fcitx5
DEPENDS+= libime-[0-9]*:../../inputmethod/libime
@@ -20,6 +18,8 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-unikey/Makefile
diff -u pkgsrc/inputmethod/fcitx5-unikey/Makefile:1.21 pkgsrc/inputmethod/fcitx5-unikey/Makefile:1.22
--- pkgsrc/inputmethod/fcitx5-unikey/Makefile:1.21 Thu Nov 14 22:20:23 2024
+++ pkgsrc/inputmethod/fcitx5-unikey/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/11/14 22:20:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-unikey-5.1.2
PKGREVISION= 5
@@ -11,13 +11,13 @@ HOMEPAGE= https://github.com/fcitx/fcitx
COMMENT= Unikey Vietnamese input method engine for Fcitx5
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5-qt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/inputmethod/fcitx5-zhuyin/Makefile
diff -u pkgsrc/inputmethod/fcitx5-zhuyin/Makefile:1.9 pkgsrc/inputmethod/fcitx5-zhuyin/Makefile:1.10
--- pkgsrc/inputmethod/fcitx5-zhuyin/Makefile:1.9 Tue Jul 16 10:02:04 2024
+++ pkgsrc/inputmethod/fcitx5-zhuyin/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/07/16 10:02:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.10 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= fcitx5-zhuyin-5.1.0
PKGREVISION= 1
@@ -19,8 +19,6 @@ SITES.${f}= https://download.fcitx-im.or
.endfor
EXTRACT_ONLY= ${DEFAULT_DISTFILES}
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -32,6 +30,8 @@ post-extract:
.endfor
.include "../../devel/cmake/build.mk"
+
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../textproc/fmtlib/buildlink3.mk"
Index: pkgsrc/inputmethod/libime/Makefile
diff -u pkgsrc/inputmethod/libime/Makefile:1.19 pkgsrc/inputmethod/libime/Makefile:1.20
--- pkgsrc/inputmethod/libime/Makefile:1.19 Sun Dec 29 15:09:54 2024
+++ pkgsrc/inputmethod/libime/Makefile Thu Jan 23 23:27:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/12/29 15:09:54 adam Exp $
+# $NetBSD: Makefile,v 1.20 2025/01/23 23:27:28 riastradh Exp $
DISTNAME= libime-1.1.5
PKGREVISION= 2
@@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/fcitx/libim
COMMENT= Generic inputmethod implementation library
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
DICTDISTFILES+= lm_sc.arpa-20230712.tar.xz
DICTDISTFILES+= dict-20230412.tar.xz
DICTDISTFILES+= table-20240108.tar.gz
@@ -36,8 +34,10 @@ post-extract:
.endfor
.include "../../devel/cmake/build.mk"
+
.include "../../archivers/zstd/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../inputmethod/fcitx5/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/meta-pkgs/kde/Makefile.common
diff -u pkgsrc/meta-pkgs/kde/Makefile.common:1.11 pkgsrc/meta-pkgs/kde/Makefile.common:1.12
--- pkgsrc/meta-pkgs/kde/Makefile.common:1.11 Wed Aug 21 11:21:41 2024
+++ pkgsrc/meta-pkgs/kde/Makefile.common Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2024/08/21 11:21:41 markd Exp $
+# $NetBSD: Makefile.common,v 1.12 2025/01/23 23:27:29 riastradh Exp $
#
# used by meta-pkgs/kde/applications.mk
# used by meta-pkgs/kde/kf5.mk
@@ -8,7 +8,8 @@
MAINTAINER?= markd%NetBSD.org@localhost
-TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.19.0
USE_LANGUAGES+= c c++
CMAKE_BUILD_DIR= _KDE_build
Index: pkgsrc/meta-pkgs/kde/kf5.mk
diff -u pkgsrc/meta-pkgs/kde/kf5.mk:1.20 pkgsrc/meta-pkgs/kde/kf5.mk:1.21
--- pkgsrc/meta-pkgs/kde/kf5.mk:1.20 Wed Nov 13 02:28:41 2024
+++ pkgsrc/meta-pkgs/kde/kf5.mk Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: kf5.mk,v 1.20 2024/11/13 02:28:41 markd Exp $
+# $NetBSD: kf5.mk,v 1.21 2025/01/23 23:27:29 riastradh Exp $
# used by archivers/karchive/Makefile
# used by devel/kbookmarks/Makefile
# used by devel/kcmutils/Makefile
@@ -81,7 +81,8 @@ CATEGORIES+= kde
MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/${KF5VER:R}/}
EXTRACT_SUFX= .tar.xz
-TOOL_DEPENDS+= extra-cmake-modules>=${KF5VER}:../../devel/extra-cmake-modules
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=${KF5VER}
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
TOOLS_DEPENDS.cmake= cmake>=3.0:../../devel/cmake
CMAKE_CONFIGURE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
Index: pkgsrc/meta-pkgs/kde/kf6.mk
diff -u pkgsrc/meta-pkgs/kde/kf6.mk:1.5 pkgsrc/meta-pkgs/kde/kf6.mk:1.6
--- pkgsrc/meta-pkgs/kde/kf6.mk:1.5 Thu Dec 5 09:43:29 2024
+++ pkgsrc/meta-pkgs/kde/kf6.mk Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: kf6.mk,v 1.5 2024/12/05 09:43:29 markd Exp $
+# $NetBSD: kf6.mk,v 1.6 2025/01/23 23:27:29 riastradh Exp $
# used by archivers/kf6-karchive/Makefile
# used by devel/kf6-kbookmarks/Makefile
# used by devel/kf6-kcmutils/Makefile
@@ -71,7 +71,8 @@ MASTER_SITES= ${MASTER_SITE_KDE:=framewo
EXTRACT_SUFX= .tar.xz
PKGNAME?= kf6-${DISTNAME}
-TOOL_DEPENDS+= extra-cmake-modules>=${KF6VER}:../../devel/extra-cmake-modules
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=${KF6VER}
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
TOOLS_DEPENDS.cmake= cmake>=3.0:../../devel/cmake
CMAKE_CONFIGURE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
Index: pkgsrc/multimedia/phonon-qt5/Makefile
diff -u pkgsrc/multimedia/phonon-qt5/Makefile:1.66 pkgsrc/multimedia/phonon-qt5/Makefile:1.67
--- pkgsrc/multimedia/phonon-qt5/Makefile:1.66 Thu Nov 14 22:21:00 2024
+++ pkgsrc/multimedia/phonon-qt5/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2024/11/14 22:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= phonon-4.11.1
PKGNAME= ${DISTNAME:S/-/-qt5-/}
@@ -12,7 +12,6 @@ COMMENT= Multimedia API for KF5
HOMEPAGE= https://community.kde.org/Phonon
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
USE_TOOLS+= pkg-config gmake
USE_LANGUAGES= c c++
@@ -29,6 +28,9 @@ pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
.include "../../devel/cmake/build.mk"
+
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.19.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.10.1nb2
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qttools/buildlink3.mk"
Index: pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile
diff -u pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile:1.48 pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile:1.49
--- pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile:1.48 Thu Nov 14 22:21:01 2024
+++ pkgsrc/multimedia/phonon-qt5-backend-gstreamer/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2024/11/14 22:21:01 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= phonon-backend-gstreamer-4.10.0
PKGNAME= ${DISTNAME:S/-/-qt5-/}
@@ -26,10 +26,11 @@ pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
${MKDIR} ${WRKSRC}/_build
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.19.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
DEPENDS+= phonon-backend-gstreamer-shared-${PKGVERSION_NOREV}{,nb*}:../../multimedia/phonon-backend-gstreamer-shared
.include "../../multimedia/phonon-qt5/buildlink3.mk"
Index: pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile
diff -u pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile:1.47 pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile:1.48
--- pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile:1.47 Thu Nov 14 22:21:01 2024
+++ pkgsrc/multimedia/phonon-qt5-backend-vlc/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2024/11/14 22:21:01 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= phonon-backend-vlc-0.11.2
PKGNAME= ${DISTNAME:S/-/-qt5-/}
@@ -24,9 +24,8 @@ pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
${MKDIR} ${WRKSRC}/_build
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.19.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../multimedia/vlc/buildlink3.mk"
-TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
-
.include "../../multimedia/phonon-qt5/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/nextcloud-client/Makefile
diff -u pkgsrc/net/nextcloud-client/Makefile:1.17 pkgsrc/net/nextcloud-client/Makefile:1.18
--- pkgsrc/net/nextcloud-client/Makefile:1.17 Thu Nov 14 22:21:13 2024
+++ pkgsrc/net/nextcloud-client/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/11/14 22:21:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2025/01/23 23:27:29 riastradh Exp $
#
DISTNAME= nextcloud-client-3.13.2
@@ -41,12 +41,11 @@ LDFLAGS+= -Wl,--no-fatal-warnings
AUTO_MKDIRS= yes
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
.include "../../archivers/karchive/buildlink3.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/cmake/build.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/kio/buildlink3.mk"
.include "../../devel/libinotify/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/net/owncloudclient/Makefile
diff -u pkgsrc/net/owncloudclient/Makefile:1.50 pkgsrc/net/owncloudclient/Makefile:1.51
--- pkgsrc/net/owncloudclient/Makefile:1.50 Thu Nov 14 22:21:14 2024
+++ pkgsrc/net/owncloudclient/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2024/11/14 22:21:14 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= ownCloud-2.7.6.3261
PKGNAME= ${DISTNAME:S/ownCloud/owncloudclient/1}
@@ -17,8 +17,6 @@ BROKEN= "Needs to be updated, for qt5 c
USE_CMAKE= yes
USE_LANGUAGES= c c++
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
CMAKE_CONFIGURE_ARGS+= -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR}
CMAKE_CONFIGURE_ARGS+= -DBUILD_SHELL_INTEGRATION=OFF
CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
@@ -32,6 +30,7 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/ownCloud
.include "../../mk/bsd.prefs.mk"
BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.9.0
.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.if ${OPSYS} != "Linux"
. include "../../devel/libinotify/buildlink3.mk"
.endif
Index: pkgsrc/security/gpgmepp/Makefile
diff -u pkgsrc/security/gpgmepp/Makefile:1.42 pkgsrc/security/gpgmepp/Makefile:1.43
--- pkgsrc/security/gpgmepp/Makefile:1.42 Thu Nov 14 22:21:29 2024
+++ pkgsrc/security/gpgmepp/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2024/11/14 22:21:29 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= gpgmepp-15.12.2
PKGREVISION= 37
@@ -11,14 +11,14 @@ HOMEPAGE= https://projects.kde.org/gpgme
COMMENT= C++ bindings/wrapper for gpgme
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
-
USE_LANGUAGES= c c++
CMAKE_CONFIGURE_ARGS+= -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
.include "../../devel/cmake/build.mk"
.include "../../devel/boost-headers/buildlink3.mk"
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.19.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/copyq/Makefile
diff -u pkgsrc/x11/copyq/Makefile:1.1 pkgsrc/x11/copyq/Makefile:1.2
--- pkgsrc/x11/copyq/Makefile:1.1 Wed Jan 22 12:10:06 2025
+++ pkgsrc/x11/copyq/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/01/22 12:10:06 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= copyq-9.1.0
CATEGORIES= x11
@@ -10,12 +10,13 @@ MAINTAINER= kikadf.01%gmail.com@localhost
COMMENT= Qt5 based clipboard manager
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
-
USE_LANGUAGES= c c++
WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PKGVERSION_NOREV}
.include "../../devel/cmake/build.mk"
+
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.19.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/knotifications/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
Index: pkgsrc/x11/libkscreen/Makefile
diff -u pkgsrc/x11/libkscreen/Makefile:1.29 pkgsrc/x11/libkscreen/Makefile:1.30
--- pkgsrc/x11/libkscreen/Makefile:1.29 Thu Nov 14 22:22:21 2024
+++ pkgsrc/x11/libkscreen/Makefile Thu Jan 23 23:27:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/11/14 22:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2025/01/23 23:27:29 riastradh Exp $
DISTNAME= libkscreen-${PLASMAVER}
PKGREVISION= 5
@@ -16,9 +16,10 @@ USE_CXX_FEATURES+= c++17
PKGCONFIG_OVERRIDE+= src/kscreen2.pc.in
-TOOL_DEPENDS+= extra-cmake-modules>=5.102.0:../../devel/extra-cmake-modules
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=5.102.0
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
BUILDLINK_API_DEPENDS.kconfig+= kconfig>=5.102.0
.include "../../devel/kconfig/buildlink3.mk"
BUILDLINK_API_DEPENDS.kwayland+= kwayland>=5.102.0
Index: pkgsrc/x11/xcb-imdkit/Makefile
diff -u pkgsrc/x11/xcb-imdkit/Makefile:1.4 pkgsrc/x11/xcb-imdkit/Makefile:1.5
--- pkgsrc/x11/xcb-imdkit/Makefile:1.4 Sat Feb 10 08:55:26 2024
+++ pkgsrc/x11/xcb-imdkit/Makefile Thu Jan 23 23:27:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/02/10 08:55:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2025/01/23 23:27:30 riastradh Exp $
DISTNAME= xcb-imdkit-1.0.6
CATEGORIES= x11
@@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/fcitx/xcb-i
COMMENT= Implementation of xim protocol in xcb
LICENSE= gnu-lgpl-v2
-TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-
USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES+= c c++
@@ -20,6 +18,7 @@ PKGCONFIG_OVERRIDE+= src/xcb-imdkit.pc.i
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--as-needed
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
.include "../../devel/uthash/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
.include "../../x11/xcb-util/buildlink3.mk"
Added files:
Index: pkgsrc/devel/extra-cmake-modules/buildlink3.mk
diff -u /dev/null pkgsrc/devel/extra-cmake-modules/buildlink3.mk:1.1
--- /dev/null Thu Jan 23 23:27:30 2025
+++ pkgsrc/devel/extra-cmake-modules/buildlink3.mk Thu Jan 23 23:27:25 2025
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2025/01/23 23:27:25 riastradh Exp $
+
+BUILDLINK_TREE+= extra-cmake-modules
+
+.if !defined(EXTRA_CMAKE_MODULES_BUILDLINK3_MK)
+EXTRA_CMAKE_MODULES_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.extra-cmake-modules+= extra-cmake-modules>=6.8.0
+BUILDLINK_PKGSRCDIR.extra-cmake-modules= ../../devel/extra-cmake-modules
+BUILDLINK_DEPMETHOD.extra-cmake-modules?= build
+BUILDLINK_FILES.extra-cmake-modules+= share/ECM/*/*
+.endif # EXTRA_CMAKE_MODULES_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -extra-cmake-modules
Home |
Main Index |
Thread Index |
Old Index