- 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

8 files changed, 13 insertions, 14 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 0e7d1a9cb36d..6498460234cf 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 13e1788ead4a..2b376aab0848 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 97a46054a0e0..6d86be3da67b 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 454fbd04653f..83443c48cb5d 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 a49e64c091a6..0fa7366ce1e9 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 478cc7805a27..f733e48d415a 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 b227577143b8..b1f4ce704cc6 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 712a9f2f73ad..b66f725615ec 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