diff --git a/lxqt-about/Makefile b/lxqt-about/Makefile index f3daf865ba9..b673769664f 100644 --- a/lxqt-about/Makefile +++ b/lxqt-about/Makefile @@ -24,5 +24,5 @@ TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools .include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-admin/Makefile b/lxqt-admin/Makefile index cd5f52f8fa2..a38148a85dd 100644 --- a/lxqt-admin/Makefile +++ b/lxqt-admin/Makefile @@ -29,5 +29,5 @@ DEPENDS+= lxqt-policykit-[0-9]*:../../wip/lxqt-policykit .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/kwindowsystem/buildlink3.mk" .include "../../security/polkit-qt5/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-config/Makefile b/lxqt-config/Makefile index 963a8cd848e..8cf769460d6 100644 --- a/lxqt-config/Makefile +++ b/lxqt-config/Makefile @@ -32,6 +32,6 @@ DEPENDS+= lxqt-themes-[0-9]*:../../wip/lxqt-themes .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../wip/libkscreen/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-globalkeys/Makefile b/lxqt-globalkeys/Makefile index 64107265599..4aa1c34ad48 100644 --- a/lxqt-globalkeys/Makefile +++ b/lxqt-globalkeys/Makefile @@ -24,5 +24,5 @@ TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools .include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-notificationd/Makefile b/lxqt-notificationd/Makefile index 1c0f463b9cc..a7d9681db2e 100644 --- a/lxqt-notificationd/Makefile +++ b/lxqt-notificationd/Makefile @@ -24,5 +24,5 @@ TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools .include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-openssh-askpass/Makefile b/lxqt-openssh-askpass/Makefile index df1614f2bb2..2c0fbed0f92 100644 --- a/lxqt-openssh-askpass/Makefile +++ b/lxqt-openssh-askpass/Makefile @@ -25,5 +25,5 @@ TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools DEPENDS+= openssh-[0-9]*:../../security/openssh .include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-policykit/Makefile b/lxqt-policykit/Makefile index 5aa6c5eaf85..a4312102600 100644 --- a/lxqt-policykit/Makefile +++ b/lxqt-policykit/Makefile @@ -23,6 +23,6 @@ pre-configure: TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../security/polkit-qt5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-powermanagement/Makefile b/lxqt-powermanagement/Makefile index faa27a729d8..dfb008ca902 100644 --- a/lxqt-powermanagement/Makefile +++ b/lxqt-powermanagement/Makefile @@ -26,7 +26,7 @@ TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../x11/qt5-qtx11extras/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../devel/kidletime/buildlink3.mk" .include "../../sysutils/upower/buildlink3.mk" .include "../../sysutils/solid/buildlink3.mk" diff --git a/lxqt-qtplugin/Makefile b/lxqt-qtplugin/Makefile index 6e40aad2eef..ce4443faa26 100644 --- a/lxqt-qtplugin/Makefile +++ b/lxqt-qtplugin/Makefile @@ -27,5 +27,5 @@ TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools .include "../../devel/libdbusmenu-qt5/buildlink3.mk" .include "../../x11/qt5-qtx11extras/buildlink3.mk" .include "../../x11/libqtxdg/buildlink3.mk" -.include "../../wip/libfm-qt/buildlink3.mk" +.include "../../x11/libfm-qt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-session/Makefile b/lxqt-session/Makefile index 17eed173329..24275412b00 100644 --- a/lxqt-session/Makefile +++ b/lxqt-session/Makefile @@ -30,5 +30,5 @@ DEPENDS+= xdg-user-dirs-[0-9]*:../../x11/xdg-user-dirs .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/kwindowsystem/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt-sudo/Makefile b/lxqt-sudo/Makefile index c729155a4bf..f27c89eea68 100644 --- a/lxqt-sudo/Makefile +++ b/lxqt-sudo/Makefile @@ -27,5 +27,5 @@ TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools DEPENDS+= sudo-[0-9]*:../../security/sudo .include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lxqt/Makefile b/lxqt/Makefile index de5429a5ae8..05b0623ff0a 100644 --- a/lxqt/Makefile +++ b/lxqt/Makefile @@ -15,12 +15,12 @@ TOOL_DEPENDS+= lxqt-build-tools>=0.6.0:../../devel/lxqt-build-tools DEPENDS+= libqtxdg>=3.4.0:../../x11/libqtxdg DEPENDS+= libsysstat>=0.4.2:../../wip/libsysstat -DEPENDS+= liblxqt>=0.14.1:../../wip/liblxqt -DEPENDS+= libfm-qt>=0.14.1:../../wip/libfm-qt +DEPENDS+= liblxqt>=0.14.1:../../x11/liblxqt +DEPENDS+= libfm-qt>=0.14.1:../../x11/libfm-qt DEPENDS+= lxqt-themes>=0.14.0:../../wip/lxqt-themes DEPENDS+= pavucontrol-qt>=0.14.1:../../wip/pavucontrol-qt -DEPENDS+= qtermwidget>=0.14.1:../../wip/qtermwidget -DEPENDS+= lximage-qt>=0.14.1:../../wip/lximage-qt +DEPENDS+= qtermwidget>=0.14.1:../../x11/qtermwidget +DEPENDS+= lximage-qt>=0.14.1:../../graphics/lximage-qt DEPENDS+= lxqt-about>=0.14.1:../../wip/lxqt-about DEPENDS+= lxqt-policykit>=0.14.1:../../wip/lxqt-policykit DEPENDS+= lxqt-admin>=0.14.1:../../wip/lxqt-admin @@ -32,8 +32,8 @@ DEPENDS+= lxqt-powermanagement>=0.14.1:../../wip/lxqt-powermanagement DEPENDS+= lxqt-qtplugin>=0.14.0:../../wip/lxqt-qtplugin DEPENDS+= lxqt-session>=0.14.1:../../wip/lxqt-session DEPENDS+= lxqt-sudo>=0.14.1:../../wip/lxqt-sudo -DEPENDS+= pcmanfm-qt>=0.14.1:../../wip/pcmanfm-qt -DEPENDS+= qterminal>=0.14.1:../../wip/qterminal +DEPENDS+= pcmanfm-qt>=0.14.1:../../sysutils/pcmanfm-qt +DEPENDS+= qterminal>=0.14.1:../../x11/qterminal DEPENDS+= lxqt-panel>=0.14.1:../../wip/lxqt-panel DEPENDS+= lxqt-runner>=0.14.1:../../wip/lxqt-runner DEPENDS+= qt5-qttranslations>=5.14.1:../../x11/qt5-qttranslations diff --git a/pavucontrol-qt/Makefile b/pavucontrol-qt/Makefile index ba6b8adaed8..0cba637e111 100644 --- a/pavucontrol-qt/Makefile +++ b/pavucontrol-qt/Makefile @@ -24,6 +24,6 @@ TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../devel/lxqt-build-tools TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools .include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../wip/liblxqt/buildlink3.mk" +.include "../../x11/liblxqt/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" .include "../../mk/bsd.pkg.mk"