Remove expired misc/kdehier4 and update all of its consumers to not reference it any

longer. This is a no-op because KDE4_PREFIX is equal to LOCALBASE

Fix up properties for misc/kde4-l10n/files/bsd.l10n.mk to make svn happy.

PR:		209014 (partial)
Submitted by:	myself
Approved by:	portmgr (bapt)
Differential Revision:	https://reviews.freebsd.org/D6542

15 files changed, 14 insertions, 15 deletions

diff --git a/net-im/kde-telepathy/Makefile b/net-im/kde-telepathy/Makefile
index ea3960161d6a..ed12e076f269 100644
--- a/net-im/kde-telepathy/Makefile
+++ b/net-im/kde-telepathy/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_ktp_accounts.so:net-im/ktp-accounts-kcm
 		${KDE4_PREFIX}/lib/kde4/kded_ktp_integration_module.so:net-im/ktp-kded-integration-module \
 		${KDE4_PREFIX}/lib/kde4/libexec/ktp-text-ui:net-im/ktp-text-ui
 
-USE_KDE4=	kdeprefix
 USES=		metaport
 
 OPTIONS_DEFINE=	PLASMA SEND_FILE
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 3d1bc2762eec..08cea47af3a7 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libqca.so:devel/qca \
 		libgif.so:graphics/giflib
 
 USE_GNOME=	libxml2 libxslt
-USE_KDE4=	kdeprefix kdelibs libkonq automoc4
+USE_KDE4=	kdelibs libkonq automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile
index 9066fbb794e4..b3f669df55da 100644
--- a/net-im/kopete-kde4/Makefile
+++ b/net-im/kopete-kde4/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 USES=		cmake:outsource jpeg pkgconfig shebangfix sqlite tar:xz webplugin:native
 USE_GNOME=	libxml2 libxslt
-USE_KDE4=	kdelibs kdeprefix pimlibs \
+USE_KDE4=	kdelibs pimlibs \
 		automoc4 qimageblitz
 USE_QT4=	corelib gui network qt3support sql xml \
 		moc_build qmake_build rcc_build uic_build uic3_build
diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile
index 00e0197c7b77..2a607f13eccb 100644
--- a/net-im/ktp-accounts-kcm/Makefile
+++ b/net-im/ktp-accounts-kcm/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile
index e36d345a2330..507622d747ef 100644
--- a/net-im/ktp-approver/Makefile
+++ b/net-im/ktp-approver/Makefile
@@ -12,7 +12,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile
index 51fdcb96bfc5..511e1ff2a038 100644
--- a/net-im/ktp-auth-handler/Makefile
+++ b/net-im/ktp-auth-handler/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libqjson.so:devel/qjson \
 		libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib dbus gui xml webkit \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index 684e5b0aa5be..b49019f61d55 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -12,7 +12,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4
 RUN_DEPENDS=	${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control
 
-USE_KDE4=	kdeprefix kdelibs pimlibs automoc4
+USE_KDE4=	kdelibs pimlibs automoc4
 USE_QT4=	declarative script \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake compiler:c++11-lang gettext tar:bzip2
diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile
index 9e9c9a4a5efb..c1053ada1fd9 100644
--- a/net-im/ktp-contact-list/Makefile
+++ b/net-im/ktp-contact-list/Makefile
@@ -12,7 +12,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile
index 9f9e6cf1da33..724bb1d11718 100644
--- a/net-im/ktp-contact-runner/Makefile
+++ b/net-im/ktp-contact-runner/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KRunner integration module for KDE Telepathy
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile
index 01cbeb7d33be..f90a5a026826 100644
--- a/net-im/ktp-desktop-applets/Makefile
+++ b/net-im/ktp-desktop-applets/Makefile
@@ -10,7 +10,7 @@ COMMENT=	KDE instant messaging plasma widgets
 
 LIB_DEPENDS=	libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile
index acb57d33de8b..0cbf05daaf56 100644
--- a/net-im/ktp-filetransfer-handler/Makefile
+++ b/net-im/ktp-filetransfer-handler/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KDE instant messaging file transfer handler
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-kded-integration-module/Makefile b/net-im/ktp-kded-integration-module/Makefile
index c508b8b6ca98..af282c378431 100644
--- a/net-im/ktp-kded-integration-module/Makefile
+++ b/net-im/ktp-kded-integration-module/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Module for integration of instant messaging into KDE Workspaces
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile
index 4854a5c84ea7..421a1d772420 100644
--- a/net-im/ktp-send-file/Makefile
+++ b/net-im/ktp-send-file/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \
 		${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index de21ab385946..b277065e00f0 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list
 
-USE_KDE4=	kdeprefix automoc4
+USE_KDE4=	automoc4
 USE_QT4=	corelib webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake compiler:c++11-lang gettext tar:bzip2
diff --git a/net-im/plasma-applet-ktp/Makefile b/net-im/plasma-applet-ktp/Makefile
index 77e29ef955c4..a9fe6b6c81a2 100644
--- a/net-im/plasma-applet-ktp/Makefile
+++ b/net-im/plasma-applet-ktp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	KDE instant messaging Plasma applets
 LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4 \
 		libktpcommoninternalsprivate.so:net-im/ktp-common-internals
 
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	corelib declarative \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2