4 files changed, 40 insertions, 33 deletions

diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index 9f0f60c2147d..13092ebf98c6 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -3,21 +3,19 @@
 
 PORTNAME=	nepomuk-core
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Core Nepomuk system libraries and services for KDE
 
 LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		tag.1:${PORTSDIR}/audio/taglib \
-		exiv2.12:${PORTSDIR}/graphics/exiv2 \
-		swscale:${PORTSDIR}/multimedia/ffmpeg
-
-CONFLICTS_INSTALL=	kde-runtime-4.[7-8].*
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
+		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
+		libepub.so:${PORTSDIR}/textproc/ebook-tools \
+		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
 
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs ontologies soprano
@@ -28,9 +26,8 @@ MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 
 SUB_FILES=	nepomuk-env.sh
 
-NO_STAGE=	yes
 post-install:
-	${MKDIR} ${PREFIX}/env
-	${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${PREFIX}/env
+	${MKDIR} ${STAGEDIR}${PREFIX}/env
+	${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${STAGEDIR}${PREFIX}/env
 
 .include <bsd.port.mk>
diff --git a/sysutils/nepomuk-core/distinfo b/sysutils/nepomuk-core/distinfo
index caa3192eb1fd..ac3ee832f13e 100644
--- a/sysutils/nepomuk-core/distinfo
+++ b/sysutils/nepomuk-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/nepomuk-core-4.10.5.tar.xz) = ffe6c39cc6fae22618ef98ddb9e1f66f2482f6bc50193260886411f610e2f989
-SIZE (KDE/4.10.5/nepomuk-core-4.10.5.tar.xz) = 372444
+SHA256 (KDE/4.12.2/nepomuk-core-4.12.2.tar.xz) = 64f9496f0c257b5fa566f2b0a0ebfcbbf04fe3cd8861f52a5fbf2ba98af26a5c
+SIZE (KDE/4.12.2/nepomuk-core-4.12.2.tar.xz) = 380300
diff --git a/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt b/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt
deleted file mode 100644
index b6bbd0322a81..000000000000
--- a/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 f4b8df86011c..fe38958640e6 100644
--- a/sysutils/nepomuk-core/pkg-plist
+++ b/sysutils/nepomuk-core/pkg-plist
@@ -2,9 +2,17 @@ bin/nepomuk-simpleresource-rcgen
 bin/nepomuk2-rcgen
 bin/nepomukbackup
 bin/nepomukcleaner
+bin/nepomukcmd
+bin/nepomukctl
+bin/nepomukfileindexer
+bin/nepomukfilewatch
 bin/nepomukindexer
+bin/nepomukmigrator
+bin/nepomuksearch
 bin/nepomukserver
 bin/nepomukservicestub
+bin/nepomukshow
+bin/nepomukstorage
 env/nepomuk-env.sh
 include/Nepomuk2/CreateResourceJob
 include/Nepomuk2/DataManagement
@@ -54,6 +62,7 @@ include/Nepomuk2/Vocabulary/PIMO
 include/Nepomuk2/Vocabulary/TMO
 include/nepomuk2/andterm.h
 include/nepomuk2/class.h
+include/nepomuk2/cleaningjob.h
 include/nepomuk2/comparisonterm.h
 include/nepomuk2/createresourcejob.h
 include/nepomuk2/datamanagement.h
@@ -94,6 +103,7 @@ include/nepomuk2/resourcetypeterm.h
 include/nepomuk2/resourcewatcher.h
 include/nepomuk2/result.h
 include/nepomuk2/resultiterator.h
+include/nepomuk2/service2.h
 include/nepomuk2/simpleresource.h
 include/nepomuk2/simpleresourcegraph.h
 include/nepomuk2/simpleterm.h
@@ -110,19 +120,24 @@ 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/nepomukepubextractor.so
 lib/kde4/nepomukexiv2extractor.so
 lib/kde4/nepomukffmpegextractor.so
-lib/kde4/nepomukfileindexer.so
-lib/kde4/nepomukfilewatch.so
+lib/kde4/nepomukmobiextractor.so
+lib/kde4/nepomukodfextractor.so
+lib/kde4/nepomukoffice2007extractor.so
+lib/kde4/nepomukofficeextractor.so
 lib/kde4/nepomukplaintextextractor.so
 lib/kde4/nepomukpopplerextractor.so
-lib/kde4/nepomukstorage.so
 lib/kde4/nepomuktaglibextractor.so
 lib/libkdeinit4_nepomukserver.so
+lib/libnepomukcleaner.so
+lib/libnepomukcleaner.so.4
+lib/libnepomukcleaner.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukcommon.so
 lib/libnepomukcore.so
-lib/libnepomukcore.so.5
-lib/libnepomukcore.so.5.0.1
+lib/libnepomukcore.so.4
+lib/libnepomukcore.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukextractor.so
 share/applications/kde4/nepomukbackup.desktop
 share/applications/kde4/nepomukcleaner.desktop
@@ -134,6 +149,7 @@ share/dbus-1/interfaces/org.kde.NepomukServer.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.FileWatch.xml
 share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
 share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
@@ -144,10 +160,15 @@ share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
 share/kde4/services/nepomukactivitiesservice.desktop
 share/kde4/services/nepomukbackupsync.desktop
+share/kde4/services/nepomukepubextractor.desktop
 share/kde4/services/nepomukexiv2extractor.desktop
 share/kde4/services/nepomukffmpegextractor.desktop
 share/kde4/services/nepomukfileindexer.desktop
 share/kde4/services/nepomukfilewatch.desktop
+share/kde4/services/nepomukmobiextractor.desktop
+share/kde4/services/nepomukodfextractor.desktop
+share/kde4/services/nepomukoffice2007extractor.desktop
+share/kde4/services/nepomukofficeextractor.desktop
 share/kde4/services/nepomukontologyloader.desktop
 share/kde4/services/nepomukplaintextextractor.desktop
 share/kde4/services/nepomukpopplerextractor.desktop
@@ -156,22 +177,24 @@ share/kde4/services/nepomukremovablestorageservice.desktop
 share/kde4/services/nepomukstorage.desktop
 share/kde4/services/nepomukstrigiservice.desktop
 share/kde4/services/nepomuktaglibextractor.desktop
+share/kde4/servicetypes/nepomukcleaningjob.desktop
 share/kde4/servicetypes/nepomukextractor.desktop
 share/kde4/servicetypes/nepomukservice.desktop
+share/kde4/servicetypes/nepomukservice2.desktop
 share/ontology/kde/kext.ontology
 share/ontology/kde/kext.trig
 share/ontology/kde/kuvo.ontology
 share/ontology/kde/kuvo.trig
 share/ontology/kde/nrio.ontology
 share/ontology/kde/nrio.trig
-@dirrm share/ontology/kde
+@dirrmtry share/ontology/kde
 @dirrmtry share/ontology
 @dirrm share/apps/nepomukstorage
 @dirrm share/apps/nepomukfilewatch
 @dirrm share/apps/fileindexerservice
 @dirrm lib/cmake/NepomukCore
 @dirrmtry lib/cmake
-@dirrm include/nepomuk2
+@dirrmtry include/nepomuk2
 @dirrm include/Nepomuk2/Vocabulary
 @dirrm include/Nepomuk2/Types
 @dirrm include/Nepomuk2/Query