pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Correct path for liblxqt and libfm-qt
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Tue Feb 18 09:09:12 2020 +0100
Changeset: 30e0f23cc14d68d5c2d536a8d66c3b4aed242ace
Modified Files:
libfm-qt/Makefile
liblxqt/Makefile
liblxqt/buildlink3.mk
Log Message:
Correct path for liblxqt and libfm-qt
after libqtxdg import
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=30e0f23cc14d68d5c2d536a8d66c3b4aed242ace
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libfm-qt/Makefile | 3 +--
liblxqt/Makefile | 6 ++----
liblxqt/buildlink3.mk | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diffs:
diff --git a/libfm-qt/Makefile b/libfm-qt/Makefile
index c3128cdcfd..6eb8c0a100 100644
--- a/libfm-qt/Makefile
+++ b/libfm-qt/Makefile
@@ -18,12 +18,11 @@ CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt5
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
pre-configure:
${MKDIR} -p ${WRKSRC}/build
-TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
+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"
diff --git a/liblxqt/Makefile b/liblxqt/Makefile
index 6c53169e59..22ba4e8ad5 100644
--- a/liblxqt/Makefile
+++ b/liblxqt/Makefile
@@ -17,18 +17,16 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-
pre-configure:
${MKDIR} -p ${WRKSRC}/build
-TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
+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 "../../x11/qt5-qtx11extras/buildlink3.mk"
.include "../../x11/kwindowsystem/buildlink3.mk"
-.include "../../wip/libqtxdg/buildlink3.mk"
+.include "../../x11/libqtxdg/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
.include "../../security/polkit-qt5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/liblxqt/buildlink3.mk b/liblxqt/buildlink3.mk
index 486c11f6d6..ea4d949652 100644
--- a/liblxqt/buildlink3.mk
+++ b/liblxqt/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.liblxqt?= ../../wip/liblxqt
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtx11extras/buildlink3.mk"
.include "../../x11/kwindowsystem/buildlink3.mk"
-.include "../../wip/libqtxdg/buildlink3.mk"
+.include "../../x11/libqtxdg/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
.endif # LIBLXQT_BUILDLINK3_MK
Home |
Main Index |
Thread Index |
Old Index