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

23 files changed, 13 insertions, 98 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 4e027844b972..7bf888641dc8 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -231,7 +231,6 @@
     SUBDIR += kde4-l10n-wa
     SUBDIR += kde4-xdg-env
     SUBDIR += kdeedu4
-    SUBDIR += kdehier4
     SUBDIR += kdeutils4
     SUBDIR += kenny
     SUBDIR += kgeography
diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
index ea171e210805..3dff6632455f 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtqui
 
 IGNORE=		not usable, links to both GStreamer 0.10.x and 1.x
 
-USE_KDE4=	automoc4 kdelibs kdeprefix libkdeedu runtime_run
+USE_KDE4=	automoc4 kdelibs libkdeedu runtime_run
 USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile
index 006b07e3c844..71d0615585b5 100644
--- a/misc/kde-thumbnailer-chm/Makefile
+++ b/misc/kde-thumbnailer-chm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	KDE thumbnail generator for CHM files
 LIB_DEPENDS=	libchm.so:misc/chmlib
 
 USES=		cmake
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/misc/kde-thumbnailer-epub/Makefile b/misc/kde-thumbnailer-epub/Makefile
index 963de4cfeca9..041adeb4186c 100644
--- a/misc/kde-thumbnailer-epub/Makefile
+++ b/misc/kde-thumbnailer-epub/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE thumbnail generator for ePub files
 
 USES=		cmake:outsource
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/misc/kde-thumbnailer-fb2/Makefile b/misc/kde-thumbnailer-fb2/Makefile
index 71926d53dfa4..899611472952 100644
--- a/misc/kde-thumbnailer-fb2/Makefile
+++ b/misc/kde-thumbnailer-fb2/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE thumbnail generator for fb2 files
 
 USES=		cmake:outsource
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdelibs automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index bcc2e9adb04a..9b6de9d3db6a 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	misc kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Localized messages and documentation for KDE SC 4
 
-USE_KDE4=	kdeprefix
 USES=		metaport
 
 KDE4_LANG_ALL=	ar bg bs ca ca@valencia cs da de el en_GB es et eu fa \
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 5ca5cebf2dd8..34ba5be49640 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -4,7 +4,7 @@ DISTNAME=	${PORTNAME}-${KDE4_L10N}-${PORTVERSION}
 DIST_SUBDIR?=	KDE/${PORTVERSION}/kde-l10n
 
 USE_QT4=	uic_build moc_build qmake_build rcc_build xml
-USE_KDE4=	kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs automoc4
 USES=		cmake gettext tar:xz
 
 
diff --git a/misc/kde4-xdg-env/Makefile b/misc/kde4-xdg-env/Makefile
index ec373b090728..4f1b1776ca24 100644
--- a/misc/kde4-xdg-env/Makefile
+++ b/misc/kde4-xdg-env/Makefile
@@ -10,8 +10,6 @@ DISTFILES=	# none
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Script which hooks into startkde and helps KDE pick up XDG apps/menus
 
-USE_KDE4=	kdeprefix
-
 SUB_LIST+=	KDE4_PREFIX=${KDE4_PREFIX}
 
 NO_BUILD=	yes
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index b291d6b834db..4c22110d5f39 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	misc kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Entertaining and educational programs for KDE 4 (meta port)
 
-USE_KDE4=	kdeprefix
 USES=		metaport
 
 OPTIONS_DEFINE=	ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOGRAPHY \
diff --git a/misc/kdehier4/Makefile b/misc/kdehier4/Makefile
deleted file mode 100644
index 13d1fcbedeea..000000000000
--- a/misc/kdehier4/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	kdehier4
-PORTVERSION=	1.3
-CATEGORIES=	misc kde
-DISTFILES=	# none
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Meta port to organize KDE4_PREFIX
-
-NO_BUILD=	yes
-USE_KDE4=	#
-
-DEPRECATED=	Not used since 2014
-EXPIRATION_DATE=2016-03-09
-
-.include <bsd.port.pre.mk>
-
-.if ${KDE4_PREFIX} != ${PREFIX}
-USE_LDCONFIG=	${KDE4_PREFIX}/lib
-PLIST_SUB+=	MTREE="" \
-		LDCONFIG_DIR="${LDCONFIG_DIR}" \
-		LDCONFIG32_DIR="${LDCONFIG32_DIR}"
-SUB_FILES=	session-kde4.conf \
-		system-kde4.conf
-SUB_LIST=	KDE4_PREFIX="${KDE4_PREFIX}"
-.else
-PLIST_SUB+=	MTREE="@comment "
-.endif
-
-do-install:
-.if ${KDE4_PREFIX} != ${PREFIX}
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1
-	${INSTALL_DATA} ${WRKDIR}/session-kde4.conf ${STAGEDIR}${PREFIX}/etc/dbus-1
-	${INSTALL_DATA} ${WRKDIR}/system-kde4.conf ${STAGEDIR}${PREFIX}/etc/dbus-1
-	${MKDIR} ${STAGEDIR}${KDE4_PREFIX}/etc
-. for dir in pam.d polkit-1 rc.d
-	${LN} -sf ${PREFIX}/etc/${dir} ${STAGEDIR}${KDE4_PREFIX}/etc/
-. endfor
-	${MKDIR} ${STAGEDIR}${KDE4_PREFIX}/libdata
-	${LN} -sf ${PREFIX}/${LDCONFIG_DIR} ${STAGEDIR}${KDE4_PREFIX}/libdata/
-	${LN} -sf ${PREFIX}/${LDCONFIG32_DIR} ${STAGEDIR}${KDE4_PREFIX}/libdata/
-	${LN} -sf ${PREFIX}/libdata/pkgconfig ${STAGEDIR}${KDE4_PREFIX}/libdata/
-	${MKDIR} ${STAGEDIR}${KDE4_PREFIX}/share/dbus-1
-. for dir in services system-services
-	${LN} -sf ${PREFIX}/share/dbus-1/${dir} ${STAGEDIR}${KDE4_PREFIX}/share/dbus-1/
-. endfor
-	${MKDIR} ${STAGEDIR}${KDE4_PREFIX}/share/polkit-1/
-	${LN} -sf ${PREFIX}/share/polkit-1/actions ${STAGEDIR}${KDE4_PREFIX}/share/polkit-1/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/misc/kdehier4/files/session-kde4.conf.in b/misc/kdehier4/files/session-kde4.conf.in
deleted file mode 100644
index 44e4b4b62a16..000000000000
--- a/misc/kdehier4/files/session-kde4.conf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <includedir>%%KDE4_PREFIX%%/etc/dbus-1/session.d</includedir>
-
-</busconfig>
diff --git a/misc/kdehier4/files/system-kde4.conf.in b/misc/kdehier4/files/system-kde4.conf.in
deleted file mode 100644
index c48e70c01d2c..000000000000
--- a/misc/kdehier4/files/system-kde4.conf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <includedir>%%KDE4_PREFIX%%/etc/dbus-1/system.d</includedir>
-
-</busconfig>
diff --git a/misc/kdehier4/pkg-descr b/misc/kdehier4/pkg-descr
deleted file mode 100644
index d6a5fb2a7678..000000000000
--- a/misc/kdehier4/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a helper port that only used by other KDE ports
-if KDE4_PREFIX != LOCALBASE.
diff --git a/misc/kdehier4/pkg-plist b/misc/kdehier4/pkg-plist
deleted file mode 100644
index 911d457d4b2e..000000000000
--- a/misc/kdehier4/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%MTREE%%etc/dbus-1/session-kde4.conf
-%%MTREE%%etc/dbus-1/system-kde4.conf
-%%MTREE%%%%KDE4_PREFIX%%/etc/pam.d
-%%MTREE%%%%KDE4_PREFIX%%/etc/polkit-1
-%%MTREE%%%%KDE4_PREFIX%%/etc/rc.d
-%%MTREE%%%%KDE4_PREFIX%%/%%LDCONFIG_DIR%%
-%%MTREE%%%%KDE4_PREFIX%%/%%LDCONFIG32_DIR%%
-%%MTREE%%%%KDE4_PREFIX%%/libdata/pkgconfig
-%%MTREE%%%%KDE4_PREFIX%%/share/dbus-1/services
-%%MTREE%%%%KDE4_PREFIX%%/share/dbus-1/system-services
-%%MTREE%%%%KDE4_PREFIX%%/share/polkit-1/actions
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 58a54329ccbc..76eeff77cf1f 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	misc kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Collection of utilities for KDE 4
 
-USE_KDE4=	kdeprefix
 USES=		metaport
 
 OPTIONS_DEFINE=	ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 2dd7e42f8c11..be995f7e187e 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 geography trainer
 
-USE_KDE4=	kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs automoc4
 USES=		cmake:outsource tar:xz
 USE_QT4=	xml moc_build qmake_build rcc_build uic_build
 
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index 8a4c9e6bff87..9e07cad55217 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Alphabet learning tool for KDE 4
 
-USE_KDE4=	kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs automoc4
 USES=		cmake:outsource tar:xz
 USE_QT4=	xml moc_build qmake_build rcc_build uic_build
 
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 316ac15f3b1e..dd905daf32bf 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 USES=		cmake gettext shared-mime-info
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_KDE4=	automoc4 kdeprefix kdelibs qimageblitz
+USE_KDE4=	automoc4 kdelibs qimageblitz
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	SQLITE MYSQL PGSQL
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 43f4c9ca0783..a0bc1bb2059c 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Touch typing tutor for KDE 4
 
 RUN_DEPENDS=	${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
 
-USE_KDE4=	kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs automoc4
 USES=		cmake:outsource tar:xz
 USE_QT4=	corelib declarative opengl phonon script sql xmlpatterns \
 		moc_build qmake_build rcc_build uic_build
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 0b080eda8a9a..4698f4c9873a 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Flash card trainer for KDE 4
 
-USE_KDE4=	kdelibs kdeprefix libkdeedu automoc4
+USE_KDE4=	kdelibs libkdeedu automoc4
 USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index 735d2eaf95f9..01af2af4aedf 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries used by KDE educational applications
 
-USE_KDE4=	kdelibs kdeprefix automoc4
+USE_KDE4=	kdelibs automoc4
 USES=		cmake:outsource tar:xz
 USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index d13f04d0221f..b3495004ca9b 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Vocabulary trainer for KDE 4
 
 USE_GNOME=	libxml2 libxslt
-USE_KDE4=	kdelibs kdeprefix libkdeedu attica automoc4
+USE_KDE4=	kdelibs libkdeedu attica automoc4
 USES=		cmake:outsource tar:xz
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xrender
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index fa14544b7347..84a395af83ac 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 		libexempi.so:textproc/exempi \
 		libqjson.so:devel/qjson
 
-USE_KDE4=	kdelibs kdeprefix libksane pimlibs \
+USE_KDE4=	kdelibs libksane pimlibs \
 		automoc4 qimageblitz libkcddb libkcompactdisc
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USES=		cmake gettext pkgconfig shared-mime-info tar:bzip2