{kde-cli-tools,khotkeys,kinfocenter,kwin, systemsettings} fix dependency locations

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Fri May 27 00:01:23 2016 +1200
Changeset:	2331ebee8abf5a607cc92550ea8b15f0dace6c53

Modified Files:
	kde-cli-tools/Makefile
	khotkeys/Makefile
	kinfocenter/Makefile
	kwin/Makefile
	systemsettings/Makefile
	systemsettings/buildlink3.mk

Log Message:
{kde-cli-tools,khotkeys,kinfocenter,kwin,systemsettings} fix dependency locations

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2331ebee8abf5a607cc92550ea8b15f0dace6c53

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

diffstat:
 kde-cli-tools/Makefile       |  6 +++---
 khotkeys/Makefile            |  4 ++--
 kinfocenter/Makefile         |  6 +++---
 kwin/Makefile                | 12 ++++++------
 systemsettings/Makefile      |  4 ++--
 systemsettings/buildlink3.mk |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diffs:
diff --git a/kde-cli-tools/Makefile b/kde-cli-tools/Makefile
index 0e3742a..b2778cb 100644
--- a/kde-cli-tools/Makefile
+++ b/kde-cli-tools/Makefile
@@ -9,12 +9,12 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 .include "../../wip/kde5/plasma.mk"
 
-BUILD_DEPENDS+=	kdoctools>=5.19.0:../../wip/kdoctools
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config
 
-.include "../../wip/kcmutils/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
 .include "../../wip/kdelibs4support/buildlink3.mk"
-.include "../../wip/kdesu/buildlink3.mk"
+.include "../../security/kdesu/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/khotkeys/Makefile b/khotkeys/Makefile
index 776b09b..7232071 100644
--- a/khotkeys/Makefile
+++ b/khotkeys/Makefile
@@ -9,7 +9,7 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 .include "../../wip/kde5/plasma.mk"
 
-BUILD_DEPENDS+=	kdoctools>=5.19.0:../../wip/kdoctools
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config
 
@@ -28,7 +28,7 @@ SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 #CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/plasmoids.knsrc \
 #		${PKG_SYSCONFDIR}/xdg/plasmoids.knsrc
 
-.include "../../wip/kcmutils/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
 .include "../../wip/kdelibs4support/buildlink3.mk"
 .include "../../wip/plasma-workspace/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index 9ff6db5..97a410a 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -9,7 +9,7 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND gnu-fdl-v1.2
 
 .include "../../wip/kde5/plasma.mk"
 
-BUILD_DEPENDS+=	kdoctools>=5.19.0:../../wip/kdoctools
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config
 
@@ -18,9 +18,9 @@ CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/menus/kinfocenter.menu \
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/pciutils/buildlink3.mk"
-.include "../../wip/kcmutils/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
 .include "../../wip/kdelibs4support/buildlink3.mk"
 .include "../../wip/kwayland/buildlink3.mk"
-.include "../../wip/plasma-framework/buildlink3.mk"
+.include "../../x11/plasma-framework/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kwin/Makefile b/kwin/Makefile
index 3802c1e..3673e68 100644
--- a/kwin/Makefile
+++ b/kwin/Makefile
@@ -11,8 +11,8 @@ LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
 CONFLICTS+=	kde-workspace4-[0-9]*
 
-BUILD_DEPENDS+=	kdoctools>=5.19.0:../../wip/kdoctools
-DEPENDS+=	kinit>=5.21.0:../../wip/kinit
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
+DEPENDS+=	kinit>=5.21.0:../../x11/kinit
 
 USE_TOOLS+=	msgmerge pkg-config
 
@@ -40,12 +40,12 @@ CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/org_kde_kwin.categories \
 		${PKG_SYSCONFDIR}/xdg/org_kde_kwin.categories
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../wip/kcmutils/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
 .include "../../wip/kdecoration/buildlink3.mk"
-.include "../../wip/kio/buildlink3.mk"
-.include "../../wip/knewstuff/buildlink3.mk"
+.include "../../devel/kio/buildlink3.mk"
+.include "../../net/knewstuff/buildlink3.mk"
 .include "../../wip/kscreenlocker/buildlink3.mk"
-.include "../../wip/plasma-framework/buildlink3.mk"
+.include "../../x11/plasma-framework/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/xcb-util-cursor/buildlink3.mk"
diff --git a/systemsettings/Makefile b/systemsettings/Makefile
index eb8a135..eb8d569 100644
--- a/systemsettings/Makefile
+++ b/systemsettings/Makefile
@@ -11,11 +11,11 @@ LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
 CONFLICTS+=	kde-workspace4-[0-9]*
 
-BUILD_DEPENDS+=	kdoctools>=5.19.0:../../wip/kdoctools
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge
 
-.include "../../wip/kcmutils/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
 .include "../../wip/khtml/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/systemsettings/buildlink3.mk b/systemsettings/buildlink3.mk
index 4bb79c4..4dc6e3c 100644
--- a/systemsettings/buildlink3.mk
+++ b/systemsettings/buildlink3.mk
@@ -8,7 +8,7 @@ SYSTEMSETTINGS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.systemsettings+=	systemsettings>=5.6.3
 BUILDLINK_PKGSRCDIR.systemsettings?=	../../wip/systemsettings
 
-.include "../../wip/kcmutils/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
 .include "../../wip/khtml/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# SYSTEMSETTINGS_BUILDLINK3_MK