- Add missing sharedmime to the list of USE_KDE4 components. It will be

  superseded by recently introduced USES= shared-mime-info later.
- Remove no longer needed exec/unexec from plist and post-install calls for
  update-mime-database
- Trim Makefile header while I'm here

21 files changed, 6 insertions, 50 deletions

diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index a4047a0dbf12..07cadbbb051d 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Virtual globe and world atlas for KDE
 
 CONFLICTS=	kdeedu-4.4.[0-4]
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4 sharedmime
 USES=		cmake:outsource
 USE_QT4=	corelib dbus declarative designer_build gui network phonon \
 		qtestlib script sql svg webkit xml \
diff --git a/deskutils/kdepim44-runtime/pkg-plist b/deskutils/kdepim44-runtime/pkg-plist
index 7c29a5009e0c..f0b9a677cae3 100644
--- a/deskutils/kdepim44-runtime/pkg-plist
+++ b/deskutils/kdepim44-runtime/pkg-plist
@@ -103,5 +103,3 @@ share/mime/packages/kdepim-mime.xml
 @dirrmtry share/apps/akonadi
 @dirrm share/akonadi/agents
 @dirrm share/akonadi
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index f2456d2f232f..8acc284530ec 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -54,7 +54,4 @@ post-patch:
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/app/CMakeLists.txt
 
-post-install:
-	@-update-mime-database ${PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/devel/kdevelop-kde4/pkg-plist b/devel/kdevelop-kde4/pkg-plist
index 8ca214038210..82674ee23be6 100644
--- a/devel/kdevelop-kde4/pkg-plist
+++ b/devel/kdevelop-kde4/pkg-plist
@@ -550,5 +550,3 @@ share/mime/packages/kdevelop.xml
 @dirrmtry share/apps/kdevappwizard
 @dirrm include/kdevelop/make
 @dirrm include/kdevelop
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/devel/piklab/pkg-plist b/devel/piklab/pkg-plist
index 910260b59e81..89a038e68da6 100644
--- a/devel/piklab/pkg-plist
+++ b/devel/piklab/pkg-plist
@@ -32,5 +32,3 @@ share/locale/it/LC_MESSAGES/piklab.mo
 %%KDE4%%@dirrm share/doc/HTML/en/piklab
 %%KDE4%%@dirrm share/apps/piklab/pics
 %%KDE4%%@dirrm share/apps/piklab
-%%KDE4%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-%%KDE4%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist
index 339e8bde834f..7262d7fa495b 100644
--- a/editors/kile-kde4/pkg-plist
+++ b/editors/kile-kde4/pkg-plist
@@ -1652,5 +1652,3 @@ share/mime/text/x-kilepr.xml
 @dirrm share/apps/kile/complete/abbreviation
 @dirrm share/apps/kile/complete
 @dirrm share/apps/kile
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index d3c3b79a32d5..2c547b7fc5b6 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -1422,5 +1422,3 @@ share/mime/packages/x-kmymoney.xml
 %%CALENDAR%%@dirrm share/apps/kmm_icalendarexport
 @dirrm share/apps/kmm_csvimport
 @dirrm include/kmymoney
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 6f4f85e3191a..0008b4849352 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -25,7 +25,4 @@ MAKE_JOBS_SAFE=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-post-install:
-	@-update-mime-database ${KDE4_PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/finance/skrooge/pkg-plist b/finance/skrooge/pkg-plist
index 88ce4d56998e..b02a5b5e1ab9 100644
--- a/finance/skrooge/pkg-plist
+++ b/finance/skrooge/pkg-plist
@@ -643,5 +643,3 @@ share/mime/packages/x-skg.xml
 @dirrmtry share/akonadi
 @dirrmtry lib/kde4/plugins/grantlee/0.3
 @dirrmtry lib/kde4/plugins/grantlee
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 3c69c604a19e..20d5cac10bdd 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -67,7 +67,7 @@ USE_QT4+=	webkit
 CMAKE_ARGS+=	-DWITHOUT_QTWEBKIT=yes
 . endif
 .else #defined(PKGNAMESUFFIX)
-USE_KDE4=	kdelibs automoc4 kdeprefix
+USE_KDE4=	kdelibs automoc4 kdeprefix sharedmime
 PLIST_SUB+=	QT="@comment " KDE=""
 .endif #defined(PKGNAMESUFFIX)
 
diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist
index 2e2540b65c4c..bb59dcb6c1a0 100644
--- a/irc/kvirc/pkg-plist
+++ b/irc/kvirc/pkg-plist
@@ -2318,5 +2318,3 @@ share/pixmaps/kvirc.png
 @dirrm lib/kvirc/%%VER%%/modules
 @dirrm lib/kvirc/%%VER%%
 @dirrm lib/kvirc
-%%KDE%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-%%KDE%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 8447e0088033..d29b39be69ad 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -1,9 +1,4 @@
-# ports collection makefile for:	krecipies
-# Date created:				19 March 2005
-# Whom:					hank
-#
 # $FreeBSD$
-#
 
 PORTNAME=	krecipes
 DISTVERSION=	2.0-beta2
diff --git a/misc/krecipes-kde4/pkg-plist b/misc/krecipes-kde4/pkg-plist
index 9d9f31a13927..7a937b1e5766 100644
--- a/misc/krecipes-kde4/pkg-plist
+++ b/misc/krecipes-kde4/pkg-plist
@@ -254,5 +254,3 @@ share/mime/packages/krecipes-mime.xml
 @dirrm share/apps/krecipes/layouts
 @dirrm share/apps/krecipes/data
 @dirrm share/apps/krecipes
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index e261149916dc..dde91b986fb7 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -22,7 +22,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 
 USE_BZIP2=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix libksane pimlibs \
-		automoc4 qimageblitz libkcddb
+		automoc4 qimageblitz libkcddb sharedmime
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USES=		cmake gettext
 MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index 9c8e635b2054..dd8b3c094ce9 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -72,7 +72,4 @@ post-patch:
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/src/mimetypes/CMakeLists.txt
 
-post-install:
-	@-update-mime-database ${PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/multimedia/kdenlive/pkg-plist b/multimedia/kdenlive/pkg-plist
index 2b0792e6ee78..c2d564e888b6 100644
--- a/multimedia/kdenlive/pkg-plist
+++ b/multimedia/kdenlive/pkg-plist
@@ -435,5 +435,3 @@ share/mime/packages/westley.xml
 @dirrm share/apps/kdenlive/effects/update
 @dirrm share/apps/kdenlive/effects
 @dirrm share/apps/kdenlive
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index 008d2d43ff3e..8a5d84e063f8 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	subtitlecomposer
-# Date created:		2008-01-08
-# Whom:			Max Brazhnikov <makc@issp.ac.ru>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	subtitlecomposer
 PORTVERSION=	0.5.3
@@ -16,7 +11,7 @@ COMMENT=	Subtitle editor for KDE
 
 USE_BZIP2=	yes
 USES=		cmake
-USE_KDE4=	kdeprefix kdelibs automoc4
+USE_KDE4=	kdeprefix kdelibs automoc4 sharedmime
 USE_QT4=	gui qmake_build moc_build rcc_build uic_build
 
 LATEST_LINK=	${PORTNAME}-kde4
diff --git a/print/kover/Makefile b/print/kover/Makefile
index d82931c7489a..ea460c5042fb 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	cddb:${PORTSDIR}/audio/libcddb \
 		cdio:${PORTSDIR}/sysutils/libcdio
 
 USE_BZIP2=	yes
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+USE_KDE4=	automoc4 kdehier kdeprefix kdelibs sharedmime
 USE_QT4=	corelib dbus gui network svg xml \
 		qmake_build uic_build rcc_build
 USE_PERL5_BUILD=yes
@@ -28,7 +28,4 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/libcdio/s|>=.*)|)|' ${WRKSRC}/src/CMakeLists.txt
 
-post-install:
-	-update-mime-database ${PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/print/kover/pkg-plist b/print/kover/pkg-plist
index b48d51fabc2d..57d03194f53a 100644
--- a/print/kover/pkg-plist
+++ b/print/kover/pkg-plist
@@ -26,5 +26,3 @@ share/mime/packages/kover.xml
 @dirrmtry share/icons/locolor/16x16
 @dirrmtry share/icons/locolor
 @dirrm share/apps/kover
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 4221fe9dfbab..290f3575dd44 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USES=		cmake
 CMAKE_ARGS=	-DK3B_BUILD_K3BSETUP:BOOL=OFF \
 		-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
-USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb
+USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb sharedmime
 USE_QT4=	gui dbus network phonon qt3support sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist
index ea72412b8a38..b5dae0d79aaa 100644
--- a/sysutils/k3b-kde4/pkg-plist
+++ b/sysutils/k3b-kde4/pkg-plist
@@ -638,5 +638,3 @@ share/mime/packages/x-k3b.xml
 @dirrm share/apps/k3b/extra
 @dirrm share/apps/k3b/cdi
 @dirrm share/apps/k3b
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true