CVS commit: pkgsrc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Jan 22 09:08:03 UTC 2025

Modified Files:
        pkgsrc/sysutils/pcmanfm-qt: Makefile
        pkgsrc/x11/libfm-qt: Makefile
        pkgsrc/x11/lxqt-config: Makefile
        pkgsrc/x11/lxqt-panel: Makefile

Log Message:
sysutils/lxqt-menu-data: Use buildlink3 rather than straight DEPENDS.

This way we can control exposure of .cmake files during the build.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/pcmanfm-qt/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/libfm-qt/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/lxqt-config/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/lxqt-panel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/pcmanfm-qt/Makefile
diff -u pkgsrc/sysutils/pcmanfm-qt/Makefile:1.45 pkgsrc/sysutils/pcmanfm-qt/Makefile:1.46
--- pkgsrc/sysutils/pcmanfm-qt/Makefile:1.45    Wed Jan 22 09:07:13 2025
+++ pkgsrc/sysutils/pcmanfm-qt/Makefile Wed Jan 22 09:08:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2025/01/22 09:07:13 riastradh Exp $
+# $NetBSD: Makefile,v 1.46 2025/01/22 09:08:02 riastradh Exp $
 
 DISTNAME=      pcmanfm-qt-2.1.0
 CATEGORIES=    sysutils
@@ -27,13 +27,13 @@ CONF_FILES+=                ${AUTOSTART_CONF}/lxqt-des
 CONF_FILES+=           ${SETTINGS_CONF}/settings.conf \
                        ${PKG_SYSCONFDIR}/pcmanfm-qt/lxqt/settings.conf
 
-DEPENDS+=      lxqt-menu-data-[0-9]*:../../sysutils/lxqt-menu-data
 TOOL_DEPENDS+= lxqt-build-tools>=2.1.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
 .include "../../devel/cmake/build.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/lxqt-menu-data/buildlink3.mk"
 .include "../../x11/libfm-qt/buildlink3.mk"
 .include "../../x11/liblxqt/buildlink3.mk"
 .include "../../x11/plasma6-layer-shell-qt/buildlink3.mk"

Index: pkgsrc/x11/libfm-qt/Makefile
diff -u pkgsrc/x11/libfm-qt/Makefile:1.45 pkgsrc/x11/libfm-qt/Makefile:1.46
--- pkgsrc/x11/libfm-qt/Makefile:1.45   Wed Jan 22 09:07:27 2025
+++ pkgsrc/x11/libfm-qt/Makefile        Wed Jan 22 09:08:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2025/01/22 09:07:27 riastradh Exp $
+# $NetBSD: Makefile,v 1.46 2025/01/22 09:08:02 riastradh Exp $
 
 DISTNAME=      libfm-qt-2.1.0
 PKGREVISION=   1
@@ -25,13 +25,13 @@ SUBST_FILES.prefix+=        src/core/vfs/vfs-me
 SUBST_SED.prefix=      -e 's,/etc/xdg,${PKG_SYSCONFDIR},g'
 SUBST_SED.prefix+=     -e 's,/usr/share,${PREFIX}/share,g'
 
-DEPENDS+=      lxqt-menu-data-[0-9]*:../../sysutils/lxqt-menu-data
 TOOL_DEPENDS+= lxqt-build-tools>=2.1.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
 .include "../../devel/cmake/build.mk"
 
 .include "../../graphics/libexif/buildlink3.mk"
+.include "../../sysutils/lxqt-menu-data/buildlink3.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../x11/xcb-util-cursor/buildlink3.mk"

Index: pkgsrc/x11/lxqt-config/Makefile
diff -u pkgsrc/x11/lxqt-config/Makefile:1.44 pkgsrc/x11/lxqt-config/Makefile:1.45
--- pkgsrc/x11/lxqt-config/Makefile:1.44        Wed Jan 22 09:07:34 2025
+++ pkgsrc/x11/lxqt-config/Makefile     Wed Jan 22 09:08:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2025/01/22 09:07:34 riastradh Exp $
+# $NetBSD: Makefile,v 1.45 2025/01/22 09:08:02 riastradh Exp $
 
 DISTNAME=      lxqt-config-2.1.0
 CATEGORIES=    x11
@@ -36,7 +36,6 @@ SUBST_FILES.prefix=   lxqt-config-input/ke
 SUBST_VARS.prefix=     X11BASE
 SUBST_VARS.prefix+=    XKBSUB
 
-DEPENDS+=      lxqt-menu-data-[0-9]*:../../sysutils/lxqt-menu-data
 DEPENDS+=      lxqt-themes-[0-9]*:../../graphics/lxqt-themes
 TOOL_DEPENDS+= lxqt-build-tools>=2.1.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
@@ -45,6 +44,7 @@ TOOL_DEPENDS+=        qt6-qttools-[0-9]*:../../
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../sysutils/lxqt-menu-data/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/liblxqt/buildlink3.mk"
 .include "../../x11/plasma6-libkscreen/buildlink3.mk"

Index: pkgsrc/x11/lxqt-panel/Makefile
diff -u pkgsrc/x11/lxqt-panel/Makefile:1.58 pkgsrc/x11/lxqt-panel/Makefile:1.59
--- pkgsrc/x11/lxqt-panel/Makefile:1.58 Wed Jan 22 09:07:41 2025
+++ pkgsrc/x11/lxqt-panel/Makefile      Wed Jan 22 09:08:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2025/01/22 09:07:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.59 2025/01/22 09:08:02 riastradh Exp $
 
 DISTNAME=      lxqt-panel-2.1.4
 CATEGORIES=    x11
@@ -45,7 +45,6 @@ CONF_FILES+=  ${AUTOSTART_CONF}/lxqt-pane
 CONF_FILES+=   ${PANEL_CONF}/panel.conf \
                ${PKG_SYSCONFDIR}/lxqt/panel.conf
 
-DEPENDS+=      lxqt-menu-data-[0-9]*:../../sysutils/lxqt-menu-data
 TOOL_DEPENDS+= lxqt-build-tools>=2.1.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
@@ -56,6 +55,7 @@ TOOL_DEPENDS+=        qt6-qttools-[0-9]*:../../
 .include "../../devel/libdbusmenu-lxqt/buildlink3.mk"
 .include "../../devel/libstatgrab/buildlink3.mk"
 .include "../../sysutils/kf6-solid/buildlink3.mk"
+.include "../../sysutils/lxqt-menu-data/buildlink3.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
 .include "../../x11/kf6-kguiaddons/buildlink3.mk"
 .include "../../x11/kf6-kwindowsystem/buildlink3.mk"