- Remove deprecated USE_KDE4=kdehier

- while here, remove any reference to KDE in deskutils/charmtimetracker (Qt-only app)
  and supposedly fix build of graphics/gnash with KDE4 option

61 files changed, 63 insertions, 72 deletions

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index a8a9778..1a28a9c 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -144,8 +144,6 @@ _USE_KDE4_ALL+=		akonadi attica automoc4 ontologies qimageblitz soprano \
 			strigi
 # Meta components
 _USE_KDE4_ALL+=		kdeprefix
-# Deprecated
-_USE_KDE4_ALL+=		kdehier
 
 baloo_PORT=		sysutils/baloo
 baloo_PATH=		${KDE4_PREFIX}/lib/libbaloocore.so
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index cbf23fe..3881553 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -72,10 +72,6 @@ DEV_WARNING+=	"USE_GNOME=gnomehack is deprecated, please use USES=pathfix"
 DEV_WARNING+=	"USE_GNOME=desktopfileutils is deprecated, please use USES=desktop-file-utils"
 .endif
 
-.if defined(USE_KDE4) && ${USE_KDE4:Mkdehier}
-DEV_WARNING+=	"USE_KDE4=kdehier is deprecated, please use USE_KDE4=kdeprefix"
-.endif
-
 .if defined(LIB_DEPENDS) && ${LIB_DEPENDS:Nlib*}
 DEV_ERROR+=	"Please use the new format for LIB_DEPENDS, see handbook for details"
 .endif
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 562b47f..0860f5ad 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${POR
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-USE_KDE4=	kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
+USE_KDE4=	kdelibs kdeprefix libkcddb libkcompactdisc \
 		nepomuk-core runtime automoc4 strigi
 USE_MYSQL=	embedded
 USE_QT4=	corelib dbus designer gui network opengl \
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 8b58ba8..c7ab38a 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
 USES=		cmake tar:bzip2
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_KDE4=	automoc4 kdehier kdeprefix libkcddb libkcompactdisc
+USE_KDE4=	automoc4 kdeprefix libkcddb libkcompactdisc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index e501fd6..255be43 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Program for recording streams for KDE4
 RUN_DEPENDS=	${LOCALBASE}/bin/streamripper:${PORTSDIR}/audio/streamripper
 
 USES=		cmake gettext-tools tar:bzip2
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
 CMAKE_ARGS+=	-DWITHOUT_LIBPROXY=YES # requires libproxy >= 0.3.1
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 132ae92..0f45a15 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -37,7 +37,6 @@ FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
 FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
 FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 KDE4_DESC=		Konqueror/Dolphin integration
-KDE4_USE=		KDE4=kdehier
 LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 LAUDIO_DESC=		Laudio support
 LAUDIO_RUN_DEPENDS=	laudio:${PORTSDIR}/audio/linux-laudio
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index f3c32f4..bea3b91 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -20,7 +20,7 @@ GH_COMMIT=	405363b
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs libkcddb
+USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb
 INSTALLS_ICONS=	yes
 WRKSRC_SUBDIR=	src
 
diff --git a/audio/waheela/Makefile b/audio/waheela/Makefile
index a87102f..8bf5e78 100644
--- a/audio/waheela/Makefile
+++ b/audio/waheela/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	amarok>=2:${PORTSDIR}/audio/amarok-kde4
 
 USES=		cmake
-USE_KDE4=	automoc4 kdeprefix kdehier kdelibs
+USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
 
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index a1ac551..9d2b7cd 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	charmtimetracker
 PORTVERSION=	1.6.0
 PORTREVISION=	2
-CATEGORIES=	deskutils kde
+CATEGORIES=	deskutils
 
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Time tracker
@@ -18,7 +18,6 @@ GH_COMMIT=	3151d25
 
 USES=		cmake
 CMAKE_ARGS+=	-DCharm_VERSION:STRING=${PORTVERSION}
-USE_KDE4=	kdehier kdeprefix
 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui network \
 		qtestlib sql sql-sqlite3 xml
 USE_XORG=	ice x11 xext xscrnsaver
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 0756087..b16960d 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KDE mind mapping tool
 
 LICENSE=	GPLv3
 
-USE_KDE4=	kdehier kdelibs kdeprefix
+USE_KDE4=	kdelibs kdeprefix
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
 USE_QT4=	corelib gui linguist_build svg webkit xml \
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index a929e50..b6698aa 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Information management tool
 RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
 
 USES=		cmake
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index d7d1593..319e097 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=	KDE4
 OPTIONS_SUB=	yes
 
 KDE4_USES=	shared-mime-info
-KDE4_USE=	KDE4=automoc4,kdehier,kdelibs,kdeprefix
+KDE4_USE=	KDE4=automoc4,kdelibs,kdeprefix
 KDE4_CMAKE_OFF=	-DQT_ONLY:BOOL=ON \
 		-DLOCALE_INSTALL_DIR:STRING="${PREFIX}/share/locale"
 
diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk
index e407048..c65cd75 100644
--- a/editors/calligra-l10n/files/bsd.l10n.mk
+++ b/editors/calligra-l10n/files/bsd.l10n.mk
@@ -7,7 +7,7 @@ DIST_SUBDIR=	KDE/calligra-l10n
 
 CONFLICTS=	${PKGNAMEPREFIX}koffice-l10n-2.*
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib xml moc_build qmake_build rcc_build uic_build
 USES+=		cmake gettext tar:xz
 NO_ARCH=	yes
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index d7483066..b260a4e 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -38,7 +38,7 @@ CONFLICTS_BUILD=qt-3.*
 
 USE_GL=		glew
 USE_GNOME=	glib20 libxml2 libxslt
-USE_KDE4=	kactivities kdehier kdelibs kdeprefix libkdcraw nepomuk-core \
+USE_KDE4=	kactivities kdelibs kdeprefix libkdcraw nepomuk-core \
 		okular pimlibs attica automoc4 soprano
 USE_QT4=	corelib dbus designer_build gui opengl phonon porting_build \
 		qt3support qtestlib_build script sql svg webkit xml xmlpatterns \
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 86c476a..a83ee5d 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libboost_graph.so:${PORTSDIR}/devel/boost-libs \
 USES=		cmake pkgconfig shared-mime-info shebangfix tar:xz
 USE_QT4=	gui dbus network phonon sql svg xml \
 		qmake_build moc_build rcc_build uic_build
-USE_KDE4=	kdehier kdeprefix automoc4 kdelibs pimlibs
+USE_KDE4=	kdeprefix automoc4 kdelibs pimlibs
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	kmymoney/misc/financequote.pl
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index eff5688..451e121 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
 LICENSE=	GPLv2
 
 USES=		cmake:outsource tar:bzip2
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace libkdegames
+USE_KDE4=	kdelibs kdeprefix automoc4 workspace libkdegames
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
 OPTIONS_DEFINE=	DOCS NLS
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 0e7d1a9..6498460 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -107,9 +107,8 @@ CONFIGURE_ARGS+=	--disable-npapi
 .endif
 
 .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN}
-PLIST_SUB+=	KPARTS4=""
-USE_LDCONFIG+=	${KDE4_PREFIX}/lib/kde4
-CONFIGURE_ARGS+=	--with-kde4_prefix=${PREFIX}/kde4
+PLIST_SUB+=	KPARTS4="${KDE4_PREFIX}"
+CONFIGURE_ARGS+=	--with-kde4_prefix=${KDE4_PREFIX}
 .else
 PLIST_SUB+=	KPARTS4="@comment "
 CONFIGURE_ARGS+=	--disable-kparts4
@@ -129,7 +128,7 @@ GNASH_GUIS+=	gtk
 GNASH_GUIS+=	kde4
 USE_QT4=	moc_build
 QT_NONSTANDARD=	yes
-USE_KDE4=	kdehier kdelibs
+USE_KDE4=	kdelibs
 CONFIGURE_ENV+=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
 .endif
 
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index 13e1788..2b376aa 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -190,10 +190,10 @@ include/gnash/vm/SafeStack.h
 include/gnash/vm/VM.h
 include/gnash/vm/fn_call.h
 include/gnash/zlib_adapter.h
-%%KPARTS4%%kde4/share/apps/klash/pluginsinfo
-%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc
-%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop
-%%KPARTS4%%kde4/lib/kde4/libklashpart.so
+%%KPARTS4%%/share/apps/klash/pluginsinfo
+%%KPARTS4%%/share/apps/klash/klashpartui.rc
+%%KPARTS4%%/share/kde4/services/klash_part.desktop
+%%KPARTS4%%/lib/kde4/libklashpart.so
 %%CYGNAL%%lib/cygnal/plugins/echo.so
 %%CYGNAL%%lib/cygnal/plugins/oflaDemo.so
 %%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so
diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile
index 97a4605..6d86be3 100644
--- a/graphics/kcoloredit/Makefile
+++ b/graphics/kcoloredit/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Palette files editor for KDE
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile
index 454fbd0..83443c4 100644
--- a/graphics/kiconedit/Makefile
+++ b/graphics/kiconedit/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE icon editor
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index a49e64c..0fa7366 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 
 USES=		cmake:outsource pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	script/open-raw.pl script/kpa-backup.sh
-USE_KDE4=	kdehier kdelibs kdeprefix libkdcraw libkipi automoc4
+USE_KDE4=	kdelibs kdeprefix libkdcraw libkipi automoc4
 USE_QT4=	phonon sql \
 		qmake_build moc_build rcc_build uic_build
 
diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile
index 478cc78..f733e48 100644
--- a/graphics/kpovmodeler/Makefile
+++ b/graphics/kpovmodeler/Makefile
@@ -14,7 +14,7 @@ COMMENT=	KDE editor/frontend for Povray
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
 
 USE_GL=		glu
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib opengl qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index b227577..b1f4ce7 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -15,7 +15,7 @@ COMMENT=	KDE image viewer
 BROKEN=		depends on imlib
 
 USE_GNOME=	imlib
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib opengl qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext pkgconfig tar:bzip2
 
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index 712a9f2..b66f725 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple image scanning application for KDE
 
 LIB_DEPENDS=	libksane.so:${PORTSDIR}/graphics/libksane
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USES=		cmake:outsource gettext tar:xz
 
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 26f7409..6be184b 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mail notification utility for KDE with nice features
 
 LICENSE=	GPLv2
 
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	corelib dbus gui network svg xml \
 		qmake_build uic_build rcc_build
 USE_PERL5=	build
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index f708d36..4672b55 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -12,7 +12,7 @@ COMMENT=	POP3 mail checker for KDE
 
 LICENSE=	GPLv2
 
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs pimlibs
+USE_KDE4=	automoc4 kdeprefix kdelibs pimlibs
 USE_QT4=	corelib dbus gui network svg xml \
 		qmake_build uic_build rcc_build
 USE_PERL5=	build
diff --git a/math/abakus/Makefile b/math/abakus/Makefile
index 73a3bb8..eb017ad 100644
--- a/math/abakus/Makefile
+++ b/math/abakus/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
 
-USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
+USE_KDE4=	automoc4 kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USES=		bison cmake tar:bzip2
 CMAKE_ARGS=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index b1904e3..60e6784 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-USE_KDE4=	kdehier kdelibs kdeprefix libksane pimlibs \
+USE_KDE4=	kdelibs kdeprefix libksane pimlibs \
 		automoc4 qimageblitz libkcddb
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USES=		cmake gettext shared-mime-info tar:bzip2
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 86d0c9b..719dca1 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_KDE4=	kdehier kdeprefix automoc4 kdelibs
+USE_KDE4=	kdeprefix automoc4 kdelibs
 USE_QT4=	corelib gui phonon svg network dbus xml sql \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext gmake
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index e32a344..ac6e66c 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libmlt.so:${PORTSDIR}/multimedia/mlt \
 		libqjson.so:${PORTSDIR}/devel/qjson
 RUN_DEPENDS=	ffmpeg${FFMPEG_SUFX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
 
-USE_KDE4=	automoc4 kdehier kdelibs kdeprefix nepomuk-core
+USE_KDE4=	automoc4 kdelibs kdeprefix nepomuk-core
 USE_QT4=	corelib dbus gui opengl script svg xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11
diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index 7eda5aa..ea300ca 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -16,7 +16,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USES=		cmake gettext tar:bzip2
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+USE_KDE4=	kdeprefix kdelibs automoc4
 LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -L${LOCALBASE}/kde4/lib -lsolid
 
 post-patch:
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index 014f3d7..b5a16ca 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -16,7 +16,7 @@ COMMENT=	The xine backend for Phonon
 LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
 
 USES=		cmake pkgconfig tar:bzip2
-USE_KDE4=	kdehier automoc4 kdeprefix
+USE_KDE4=	automoc4 kdeprefix
 USE_QT4=	corelib dbus gui phonon \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	xcb
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index 6c8165d..b02bf57 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -51,7 +51,7 @@ LOUDMOUTH_DESC=	XMPP (jabber) support
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB}
-USE_KDE4=	kdehier kdelibs
+USE_KDE4=	kdelibs
 USE_QT4=	corelib
 CONFIGURE_ARGS+=--enable-kde
 #CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 01e69b4..3970c0e 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
 LATEST_LINK=	${PORTNAME}-kde4
 
 USE_GNOME=	libxml2 libxslt
-USE_KDE4=	kdehier kdeprefix kdelibs libkonq automoc4
+USE_KDE4=	kdeprefix kdelibs libkonq automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index bc4f45b..0d372e7 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libktorrent.so:${PORTSDIR}/net-p2p/libktorrent
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 pimlibs workspace
+USE_KDE4=	kdelibs kdeprefix automoc4 pimlibs workspace
 USE_QT4=	corelib gui network qt3support qtestlib webkit \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake:outsource gettext tar:bzip2
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index d30bc89..4dd7072 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libqca.so:${PORTSDIR}/devel/qca
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qtestlib_build qmake_build moc_build rcc_build uic_build
 USES=		cmake:outsource gettext tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index f8c8709..85ba084 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -16,7 +16,7 @@ COMMENT=	KIO slave to access UPnP MediaServers
 LIB_DEPENDS=	libHUpnp.so:${PORTSDIR}/net/hupnp
 
 USES=		cmake tar:bzip2
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	corelib network xml dbus gui \
 		qmake_build moc_build rcc_build uic_build
 
diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile
index 49f984a..b775513 100644
--- a/net/kwooty/Makefile
+++ b/net/kwooty/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
 		${LOCALBASE}/bin/par2:${PORTSDIR}/archivers/par2cmdline \
 		${LOCALBASE}/bin/7z:${PORTSDIR}/archivers/p7zip
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
+USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext
 USE_LDCONFIG=	yes
diff --git a/net/libkfbapi/Makefile b/net/libkfbapi/Makefile
index 250a3a1..c850a65 100644
--- a/net/libkfbapi/Makefile
+++ b/net/libkfbapi/Makefile
@@ -16,7 +16,7 @@ LICENSE=	LGPL20
 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 USES=		cmake:outsource gettext tar:bzip2
-USE_KDE4=	automoc4 kdelibs kdeprefix kdehier pimlibs
+USE_KDE4=	automoc4 kdelibs kdeprefix pimlibs
 USE_LDCONFIG=	yes
 USE_QT4=	gui webkit \
 		qmake_build moc_build rcc_build uic_build
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index a47aa7a..9d2d7a5 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -19,7 +19,7 @@ SAMBA_PORT?=	net/samba36
 
 USES=		cmake gettext tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/kde4
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4 runtime
+USE_KDE4=	kdeprefix kdelibs automoc4 runtime
 USE_QT4=	corelib gui network opengl script svg webkit \
 		qmake_build moc_build rcc_build uic_build phonon
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/smb4k
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 5923a1b..85c964d 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
 
 USES=		qmake
 USE_QT4=	corelib gui network xml moc_build uic_build rcc_build
-USE_KDE4=	kdehier
+USE_KDE4=	# dummy
 PLIST_SUB=	KDE4=${KDE4_PREFIX:S|${LOCALBASE}/||}
 QMAKE_ARGS=	KDE4_PREFIX=${KDE4_PREFIX}
 INSTALLS_ICONS=	yes
diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile
index 6fef2af..e889938 100644
--- a/ports-mgmt/kpackagekit/Makefile
+++ b/ports-mgmt/kpackagekit/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpackagekit-qt.so:${PORTSDIR}/ports-mgmt/packagekit-qt4
 
-USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
+USE_KDE4=	automoc4 kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext pkgconfig tar:bzip2
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/print/kover/Makefile b/print/kover/Makefile
index 241d1da..a38c6d8 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb \
 		libcdio.so:${PORTSDIR}/sysutils/libcdio
 
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_QT4=	corelib dbus gui network svg xml \
 		qmake_build uic_build rcc_build
 USE_PERL5=	build
diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile
index 3230dc1..e1152d4 100644
--- a/sysutils/kcm-polkit-kde/Makefile
+++ b/sysutils/kcm-polkit-kde/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Polkit-KDE configuration module
 LIB_DEPENDS=	libpolkit-qt-agent-1.so:${PORTSDIR}/sysutils/polkit-qt
 RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	dbus xml moc_build qmake_build rcc_build uic_build
 USES=		cmake gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 6508913..0bd8f20 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libqimageblitz.so:${PORTSDIR}/x11/qimageblitz
 
 CONFLICTS=	knutclient-0.*
 USES=		cmake gettext
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 LATEST_LINK=	knutclient-kde4
 
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index 2e4c83f..e0576b3 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpolkit-qt-agent-1.so:${PORTSDIR}/sysutils/polkit-qt
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USES=		cmake tar:bzip2
 
diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile
index 258f24b..b8eb642 100644
--- a/textproc/dikt/Makefile
+++ b/textproc/dikt/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	goran.tal@gmail.com
 COMMENT=	Dictionary for KDE4
 
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib gui network svg xml \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:xz
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index 6dd1d11..ed33f95 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -10,7 +10,7 @@ LIB_DEPENDS=	libuim.so:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4
 
 USE_GCC=	any
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	qmake_build moc_build qt3support uic rcc
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/www/kpartsplugin/Makefile b/www/kpartsplugin/Makefile
index 9be19eb..edea37e 100644
--- a/www/kpartsplugin/Makefile
+++ b/www/kpartsplugin/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTDATE}
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Browser file viewer using KDE technology
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 USES=		cmake webplugin:native tar:bzip2
 CMAKE_ARGS=	-DNSPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}"
diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile
index dfbdf70..c9bd366 100644
--- a/www/kwebkitpart/Makefile
+++ b/www/kwebkitpart/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/makc
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Web browser component for KDE SC based on QtWebKit
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	designer gui webkit \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake cpe tar:xz
diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index 2f5b45c..bea6cc7 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Lightweight KDE browser based on WebKit
 
 USES=		cmake:outsource gettext tar:xz
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	script webkit \
 		moc_build qmake_build rcc_build uic_build
 
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index 1a73b35..33b026c 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Twin panel file manager for KDE, like midnight or norton commander
 
 USES=		cmake:outsource gettext tar:bzip2
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-bespin/Makefile b/x11-themes/kde4-style-bespin/Makefile
index fbe50ed..03b91b0 100644
--- a/x11-themes/kde4-style-bespin/Makefile
+++ b/x11-themes/kde4-style-bespin/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Configurable KDE4 style
 LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/cloudcity
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
+USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake
 
diff --git a/x11-themes/kde4-style-nitrogen/Makefile b/x11-themes/kde4-style-nitrogen/Makefile
index af34d7d..b149cbc 100644
--- a/x11-themes/kde4-style-nitrogen/Makefile
+++ b/x11-themes/kde4-style-nitrogen/Makefile
@@ -15,7 +15,7 @@ COMMENT=	KDE style with animations
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/kde4-kstyle-nitrogen-${PORTVERSION}-Source
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake
 
diff --git a/x11-themes/kde4-style-oxygen-transparent/Makefile b/x11-themes/kde4-style-oxygen-transparent/Makefile
index 47dd879..a203168 100644
--- a/x11-themes/kde4-style-oxygen-transparent/Makefile
+++ b/x11-themes/kde4-style-oxygen-transparent/Makefile
@@ -13,7 +13,7 @@ COMMENT=	KDE oxygen style with transparency
 
 LICENSE=	GPLv2
 
-USE_KDE4=	kdelibs kdehier kdeprefix workspace automoc4
+USE_KDE4=	kdelibs kdeprefix workspace automoc4
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:xz
 
diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile
index c3a551b..599fc71 100644
--- a/x11-themes/kde4-style-polyester/Makefile
+++ b/x11-themes/kde4-style-polyester/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	kde4-style-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE style and window decoration
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USES=		cmake gettext tar:bzip2
 
diff --git a/x11-themes/kde4-style-skulpture/Makefile b/x11-themes/kde4-style-skulpture/Makefile
index 7608228..8641032 100644
--- a/x11-themes/kde4-style-skulpture/Makefile
+++ b/x11-themes/kde4-style-skulpture/Makefile
@@ -14,7 +14,7 @@ COMMENT=	KDE style featuring 3D artwork and enhanced the visual experience
 
 LICENSE=	GPLv3
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
+USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:bzip2
 
diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile
index b28aa7b..785262a 100644
--- a/x11-themes/kde4-windeco-crystal/Makefile
+++ b/x11-themes/kde4-windeco-crystal/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Transparent KDE window decoration
 
 LICENSE=	GPLv2
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
+USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build \
 		corelib gui qt3support
 USES=		cmake:outsource tar:bzip2
diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile
index 80168f9..9e34dc2 100644
--- a/x11-themes/kde4-windeco-dekorator/Makefile
+++ b/x11-themes/kde4-windeco-dekorator/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libqimageblitz.so:${PORTSDIR}/x11/qimageblitz
 
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
+USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile
index 7994069..1c90c60 100644
--- a/x11-themes/qtcurve-kde4/Makefile
+++ b/x11-themes/qtcurve-kde4/Makefile
@@ -13,6 +13,6 @@ COMMENT=	QtCurve KDE4 widget style
 
 USES=		cmake gettext-tools tar:bzip2
 USE_QT4=	qmake_build uic_build moc_build rcc_build
-USE_KDE4=	kdelibs workspace kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs workspace kdeprefix automoc4
 
 .include <bsd.port.mk>
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 5ac10c6..561c86a7 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -15,7 +15,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USES=		cmake gettext tar:bzip2
 USE_QT4=	qmake_build moc_build rcc_build uic_build
-USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+USE_KDE4=	kdeprefix kdelibs automoc4
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>