KDE/FreeBSD team presents KDE SC 4.10.1 ports!

- kdegames4 port has been split.
- kdeutils4-printer-applet and system-config-printer-kde have been
  replaced by print/kde4-print-manager.
- Recover misc/kde4-l10n-mr from attic.
- New USE_KDE4 components: kactivities, libkdegames, nepomuk-core,
  and nepomuk-widgets.
- Provide sharedmime component with magic: ports don't need to
  run update-mime-database themselves now.
- Switch some ports to out-of-source build.
- Update port comments.
- Adjust dependence on Qt4 components.
- x11/kde4 installs modern kdepim4 now.
- Remove redundant aspell and hspell from kdelibs4, both
  can be enabled in textproc/enchant if needed.
- Remove stale bits from bsd.kde4.mk

The area51 repository features commits by Schaich Alonso and myself.

Contributors:
- Tobias Berner

5 files changed, 45 insertions, 25 deletions

diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index 88a49ef29edd..b5dd4384f99d 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -6,23 +6,30 @@ PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Core Nepomuk system libraries and services for KDE
 
+LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		tag.1:${PORTSDIR}/audio/taglib \
+		exiv2.12:${PORTSDIR}/graphics/exiv2 \
+		swscale${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
+
 CONFLICTS_INSTALL=	kde-runtime-4.[7-8].*
 
 USE_XZ=		yes
-USE_KDE4=	kdeprefix kdehier automoc4 kdelibs \
-		ontologies soprano strigi
+USE_KDE4=	kdeprefix kdehier automoc4 kdelibs ontologies soprano
 USES=		cmake:outsource
-USE_QT4=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib dbus gui qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	nepomuk-env.sh
 
+# supported versions: ffmpeg1, ffmpeg-devel
+FFMPEG_SUFFIX?=	1
+
 post-install:
 	${MKDIR} ${PREFIX}/env
 	${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${PREFIX}/env
diff --git a/sysutils/nepomuk-core/distinfo b/sysutils/nepomuk-core/distinfo
index 02abf50596d1..b4ddaa3463f3 100644
--- a/sysutils/nepomuk-core/distinfo
+++ b/sysutils/nepomuk-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/nepomuk-core-4.9.5.tar.xz) = fcae27e7806b2654ba639636c59f9813b1ee9bb41559bd42d7d43061344bd851
-SIZE (KDE/nepomuk-core-4.9.5.tar.xz) = 391260
+SHA256 (KDE/4.10.1/nepomuk-core-4.10.1.tar.xz) = 968fb2be613492fbc70c3ed4da5e4e2c9b55d90440a0a5374883b6f363d96796
+SIZE (KDE/4.10.1/nepomuk-core-4.10.1.tar.xz) = 371548
diff --git a/sysutils/nepomuk-core/files/patch-autotests__test__querytests.cpp b/sysutils/nepomuk-core/files/patch-autotests__test__querytests.cpp
deleted file mode 100644
index 811245a32ac8..000000000000
--- a/sysutils/nepomuk-core/files/patch-autotests__test__querytests.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./autotests/test/querytests.cpp.orig	2012-11-30 09:00:24.000000000 +0100
-+++ ./autotests/test/querytests.cpp	2013-01-09 20:41:58.662772968 +0100
-@@ -295,7 +295,7 @@
- 
-     // Resource Type Term
-     {
--        Query::Query query( ResourceTypeTerm( NAO::Tag() ) );
-+        Query::Query query( ( ResourceTypeTerm( NAO::Tag() ) ) );
- 
-         QSet<QUrl> uris;
-         NepomukStatementIterator it( RDF::type() );
diff --git a/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt b/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt
new file mode 100644
index 000000000000..b6bbd0322a81
--- /dev/null
+++ b/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt
@@ -0,0 +1,13 @@
+# Reorder include directories to fix build when ffmpeg-0.7 is installed
+#
+--- ./services/fileindexer/indexer/CMakeLists.txt.orig	2013-03-07 02:19:03.114665070 +0000
++++ ./services/fileindexer/indexer/CMakeLists.txt	2013-03-07 02:19:11.568663110 +0000
+@@ -108,7 +108,7 @@
+ endif(EXIV2_FOUND)
+ 
+ if(FFMPEG_FOUND)
+-    include_directories( ${FFMPEG_INCLUDE_DIRS} )
++    include_directories(BEFORE ${FFMPEG_INCLUDE_DIRS} )
+ 
+     kde4_add_plugin( nepomukffmpegextractor ffmpegextractor.cpp extractorplugin.cpp )
+ 
diff --git a/sysutils/nepomuk-core/pkg-plist b/sysutils/nepomuk-core/pkg-plist
index 31e7aea8bab8..c20bb3d737b7 100644
--- a/sysutils/nepomuk-core/pkg-plist
+++ b/sysutils/nepomuk-core/pkg-plist
@@ -1,5 +1,7 @@
 bin/nepomuk-simpleresource-rcgen
+bin/nepomuk2-rcgen
 bin/nepomukbackup
+bin/nepomukcleaner
 bin/nepomukindexer
 bin/nepomukserver
 bin/nepomukservicestub
@@ -22,6 +24,7 @@ include/Nepomuk2/Query/QueryServiceClient
 include/Nepomuk2/Query/ResourceTerm
 include/Nepomuk2/Query/ResourceTypeTerm
 include/Nepomuk2/Query/Result
+include/Nepomuk2/Query/ResultIterator
 include/Nepomuk2/Query/SimpleTerm
 include/Nepomuk2/Query/StandardQuery
 include/Nepomuk2/Query/Term
@@ -90,6 +93,7 @@ include/nepomuk2/resourceterm.h
 include/nepomuk2/resourcetypeterm.h
 include/nepomuk2/resourcewatcher.h
 include/nepomuk2/result.h
+include/nepomuk2/resultiterator.h
 include/nepomuk2/simpleresource.h
 include/nepomuk2/simpleresourcegraph.h
 include/nepomuk2/simpleterm.h
@@ -100,30 +104,33 @@ include/nepomuk2/term.h
 include/nepomuk2/tmo.h
 include/nepomuk2/utils.h
 include/nepomuk2/variant.h
+include/nepomuk2/vocabulary.h
+lib/cmake/NepomukCore/Nepomuk2AddOntologyClasses.cmake
 lib/cmake/NepomukCore/NepomukCoreConfig.cmake
 lib/cmake/NepomukCore/NepomukCoreConfigVersion.cmake
 lib/cmake/NepomukCore/NepomukCoreTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/NepomukCore/NepomukCoreTargetsWithPrefix.cmake
-lib/kde4/nepomukbackupsync.so
+lib/kde4/nepomukexiv2extractor.so
+lib/kde4/nepomukffmpegextractor.so
 lib/kde4/nepomukfileindexer.so
 lib/kde4/nepomukfilewatch.so
-lib/kde4/nepomukqueryservice.so
+lib/kde4/nepomukplaintextextractor.so
+lib/kde4/nepomukpopplerextractor.so
 lib/kde4/nepomukstorage.so
+lib/kde4/nepomuktaglibextractor.so
 lib/libkdeinit4_nepomukserver.so
 lib/libnepomukcommon.so
 lib/libnepomukcore.so
 lib/libnepomukcore.so.5
 lib/libnepomukcore.so.5.0.1
-lib/libnepomuksync.so
-lib/libnepomuksync.so.5
-lib/libnepomuksync.so.5.0.1
 share/applications/kde4/nepomukbackup.desktop
+share/applications/kde4/nepomukcleaner.desktop
 share/apps/fileindexerservice/nepomukfileindexer.notifyrc
 share/apps/nepomukfilewatch/nepomukfilewatch.notifyrc
 share/apps/nepomukstorage/nepomukstorage.notifyrc
 share/autostart/nepomukserver.desktop
 share/dbus-1/interfaces/org.kde.NepomukServer.xml
-share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml
+share/dbus-1/interfaces/org.kde.nepomuk.BackupManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
 share/dbus-1/interfaces/org.kde.nepomuk.FileIndexer.xml
 share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
@@ -134,17 +141,21 @@ share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
 share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
 share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
 share/kde4/services/nepomukactivitiesservice.desktop
 share/kde4/services/nepomukbackupsync.desktop
+share/kde4/services/nepomukexiv2extractor.desktop
+share/kde4/services/nepomukffmpegextractor.desktop
 share/kde4/services/nepomukfileindexer.desktop
 share/kde4/services/nepomukfilewatch.desktop
 share/kde4/services/nepomukontologyloader.desktop
+share/kde4/services/nepomukplaintextextractor.desktop
+share/kde4/services/nepomukpopplerextractor.desktop
 share/kde4/services/nepomukqueryservice.desktop
 share/kde4/services/nepomukremovablestorageservice.desktop
 share/kde4/services/nepomukstorage.desktop
 share/kde4/services/nepomukstrigiservice.desktop
+share/kde4/services/nepomuktaglibextractor.desktop
+share/kde4/servicetypes/nepomukextractor.desktop
 share/kde4/servicetypes/nepomukservice.desktop
 share/ontology/kde/kext.ontology
 share/ontology/kde/kext.trig