Change header installation location for kdelibs4-based ports.

Install x11/kdelibs4's headers into include/kde4 instead of include (which
consequently causes several other ports to have their installation paths
changed too).

The idea behind this is to reduce path conflicts between KDE4 ports and the
upcoming KDE Frameworks 5 ports that will be installed into include/KF5. If
we continue installing the KDE4 headers into include/, we can end up in a
situation like this:

    c++ [...] -I/usr/local/include -I/usr/local/include/KF5 file.cpp

If the KDE4 and KF5 versions of a port have the same headers, the KDE4 port
will unintentionally be picked up first and the build will fail.

Most of this huge patch is just PORTREVISION bumps, pkg-plist changes and a
few patches to FooConfig.cmake files to make them look into the kde4/
subdirectory in include/.

Changes which don't fit into the above are:
- deskutils/kdepimlibs4: Import an upstream patch to remove some double
  semicolons that cause base GCC to fail. They have always been present, but
  since the faulty header was referenced via -isystem /usr/local/include
  this never caused any problems.
- devel/subversion, devel/subversion18: Update patch-configure. The current
  kwallet changes there date back to 2011 (r272490), at a time when the
  build could fail when both KDE3 and KDE4 were installed. Replace those
  bits with a change I've submitted upstream to use the kde4-config program
  to determine where KDE4's headers and libraries are installed instead of
  assuming the headers are always in include/.

Once again, huge thanks to Tobias Berner <tcberner@gmail.com> for being the
first one to notice this problem when working on the KDE Frameworks 5 ports,
coming up with the solution and bugging me until I had time to work on this
and ask for the exp-run :-)

PR:		207906 (exp-run)

12 files changed, 265 insertions, 261 deletions

diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
index 800a068e3633..bea0d193b239 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	baloo-widgets
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/sysutils/baloo-widgets/pkg-plist b/sysutils/baloo-widgets/pkg-plist
index fe38ca439641..31bd66756997 100644
--- a/sysutils/baloo-widgets/pkg-plist
+++ b/sysutils/baloo-widgets/pkg-plist
@@ -1,7 +1,7 @@
-include/baloo/filemetadataconfigwidget.h
-include/baloo/filemetadatawidget.h
-include/baloo/tagwidget.h
-include/baloo/widgets_export.h
+include/kde4/baloo/filemetadataconfigwidget.h
+include/kde4/baloo/filemetadatawidget.h
+include/kde4/baloo/tagwidget.h
+include/kde4/baloo/widgets_export.h
 lib/cmake/BalooWidgets/BalooWidgetsConfig.cmake
 lib/cmake/BalooWidgets/BalooWidgetsConfigVersion.cmake
 lib/cmake/BalooWidgets/BalooWidgetsTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile
index eb1386f32da7..735c9ce4eb20 100644
--- a/sysutils/baloo/Makefile
+++ b/sysutils/baloo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	baloo
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/sysutils/baloo/pkg-plist b/sysutils/baloo/pkg-plist
index fa3269638050..b965a13e0537 100644
--- a/sysutils/baloo/pkg-plist
+++ b/sysutils/baloo/pkg-plist
@@ -6,30 +6,30 @@ bin/balooctl
 bin/baloosearch
 bin/balooshow
 etc/dbus-1/system.d/org.kde.baloo.filewatch.conf
-include/baloo/completionproposal.h
-include/baloo/core_export.h
-include/baloo/file.h
-include/baloo/file_export.h
-include/baloo/filefetchjob.h
-include/baloo/filemodifyjob.h
-include/baloo/filemonitor.h
-include/baloo/indexerconfig.h
-include/baloo/pim/contactcompleter.h
-include/baloo/pim/contactquery.h
-include/baloo/pim/emailquery.h
-include/baloo/pim/notequery.h
-include/baloo/pim/pim_export.h
-include/baloo/pim/query.h
-include/baloo/pim/resultiterator.h
-include/baloo/query.h
-include/baloo/queryparser.h
-include/baloo/queryparser_export.h
-include/baloo/queryrunnable.h
-include/baloo/result.h
-include/baloo/resultiterator.h
-include/baloo/searchstore.h
-include/baloo/taglistjob.h
-include/baloo/term.h
+include/kde4/baloo/completionproposal.h
+include/kde4/baloo/core_export.h
+include/kde4/baloo/file.h
+include/kde4/baloo/file_export.h
+include/kde4/baloo/filefetchjob.h
+include/kde4/baloo/filemodifyjob.h
+include/kde4/baloo/filemonitor.h
+include/kde4/baloo/indexerconfig.h
+include/kde4/baloo/pim/contactcompleter.h
+include/kde4/baloo/pim/contactquery.h
+include/kde4/baloo/pim/emailquery.h
+include/kde4/baloo/pim/notequery.h
+include/kde4/baloo/pim/pim_export.h
+include/kde4/baloo/pim/query.h
+include/kde4/baloo/pim/resultiterator.h
+include/kde4/baloo/query.h
+include/kde4/baloo/queryparser.h
+include/kde4/baloo/queryparser_export.h
+include/kde4/baloo/queryrunnable.h
+include/kde4/baloo/result.h
+include/kde4/baloo/resultiterator.h
+include/kde4/baloo/searchstore.h
+include/kde4/baloo/taglistjob.h
+include/kde4/baloo/term.h
 lib/cmake/Baloo/BalooConfig.cmake
 lib/cmake/Baloo/BalooConfigVersion.cmake
 lib/cmake/Baloo/BalooTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 8eb3ee62bb38..8f930cdcf3d8 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 DISTFILES=	${DISTNAME}a${EXTRACT_SUFX}
diff --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist
index 00b253b230b6..4187bdf12dd5 100644
--- a/sysutils/k3b-kde4/pkg-plist
+++ b/sysutils/k3b-kde4/pkg-plist
@@ -1,121 +1,121 @@
 bin/k3b
-include/k3b_export.h
-include/k3bactivepipe.h
-include/k3baudiocdtrackdrag.h
-include/k3baudiocdtracksource.h
-include/k3baudiocuefilewritingjob.h
-include/k3baudiodatasource.h
-include/k3baudiodatasourceiterator.h
-include/k3baudiodecoder.h
-include/k3baudiodoc.h
-include/k3baudioencoder.h
-include/k3baudiofile.h
-include/k3baudiofileanalyzerjob.h
-include/k3baudiojob.h
-include/k3baudiotrack.h
-include/k3baudiozerodata.h
-include/k3bbinimagewritingjob.h
-include/k3bblankingjob.h
-include/k3bbootitem.h
-include/k3bbusywidget.h
-include/k3bcdcopyjob.h
-include/k3bcddb.h
-include/k3bcdparanoialib.h
-include/k3bcdrdaowriter.h
-include/k3bcdrecordwriter.h
-include/k3bcdtext.h
-include/k3bcdtextvalidator.h
-include/k3bchecksumpipe.h
-include/k3bclonejob.h
-include/k3bcore.h
-include/k3bcuefileparser.h
-include/k3bdatadoc.h
-include/k3bdataitem.h
-include/k3bdatajob.h
-include/k3bdefaultexternalprograms.h
-include/k3bdevice.h
-include/k3bdevice_export.h
-include/k3bdevicecombobox.h
-include/k3bdeviceglobals.h
-include/k3bdevicehandler.h
-include/k3bdevicemanager.h
-include/k3bdeviceselectiondialog.h
-include/k3bdevicetypes.h
-include/k3bdiritem.h
-include/k3bdirsizejob.h
-include/k3bdiskinfo.h
-include/k3bdoc.h
-include/k3bdvdcopyjob.h
-include/k3bdvdformattingjob.h
-include/k3bexceptions.h
-include/k3bexternalbinmanager.h
-include/k3bfileitem.h
-include/k3bfilesplitter.h
-include/k3bfilesysteminfo.h
-include/k3bglobals.h
-include/k3bglobalsettings.h
-include/k3bgrowisofswriter.h
-include/k3bimagefilereader.h
-include/k3binffilewriter.h
-include/k3bintmapcombobox.h
-include/k3bintvalidator.h
-include/k3biso9660.h
-include/k3biso9660backend.h
-include/k3biso9660imagewritingjob.h
-include/k3bisooptions.h
-include/k3bjob.h
-include/k3bjobhandler.h
-include/k3blistview.h
-include/k3blistviewitemanimator.h
-include/k3bmd5job.h
-include/k3bmediacache.h
-include/k3bmedium.h
-include/k3bmetawriter.h
-include/k3bmixeddoc.h
-include/k3bmixedjob.h
-include/k3bmovixdoc.h
-include/k3bmovixfileitem.h
-include/k3bmovixjob.h
-include/k3bmsf.h
-include/k3bmsfedit.h
-include/k3bmultichoicedialog.h
-include/k3bplugin.h
-include/k3bpluginconfigwidget.h
-include/k3bpluginmanager.h
-include/k3bprocess.h
-include/k3bprogressdialog.h
-include/k3bprojectplugin.h
-include/k3bpushbutton.h
-include/k3brawaudiodatasource.h
-include/k3brichtextlabel.h
-include/k3bsignalwaiter.h
-include/k3bsimplejobhandler.h
-include/k3bstdguiitems.h
-include/k3bstringutils.h
-include/k3bthreadjob.h
-include/k3bthreadwidget.h
-include/k3bthroughputestimator.h
-include/k3btoc.h
-include/k3btocfilewriter.h
-include/k3btrack.h
-include/k3bvalidators.h
-include/k3bvcddoc.h
-include/k3bvcdjob.h
-include/k3bvcdoptions.h
-include/k3bverificationjob.h
-include/k3bversion.h
-%%LIBDVDREAD%%include/k3bvideodvd.h
-%%LIBDVDREAD%%include/k3bvideodvdaudiostream.h
-include/k3bvideodvddoc.h
-include/k3bvideodvdjob.h
-%%LIBDVDREAD%%include/k3bvideodvdptt.h
-%%LIBDVDREAD%%include/k3bvideodvdsubpicturestream.h
-%%LIBDVDREAD%%include/k3bvideodvdtime.h
-%%LIBDVDREAD%%include/k3bvideodvdtitle.h
-include/k3bvideodvdtitledetectclippingjob.h
-include/k3bvideodvdtitletranscodingjob.h
-%%LIBDVDREAD%%include/k3bvideodvdvideostream.h
-include/k3bwavefilewriter.h
+include/kde4/k3b_export.h
+include/kde4/k3bactivepipe.h
+include/kde4/k3baudiocdtrackdrag.h
+include/kde4/k3baudiocdtracksource.h
+include/kde4/k3baudiocuefilewritingjob.h
+include/kde4/k3baudiodatasource.h
+include/kde4/k3baudiodatasourceiterator.h
+include/kde4/k3baudiodecoder.h
+include/kde4/k3baudiodoc.h
+include/kde4/k3baudioencoder.h
+include/kde4/k3baudiofile.h
+include/kde4/k3baudiofileanalyzerjob.h
+include/kde4/k3baudiojob.h
+include/kde4/k3baudiotrack.h
+include/kde4/k3baudiozerodata.h
+include/kde4/k3bbinimagewritingjob.h
+include/kde4/k3bblankingjob.h
+include/kde4/k3bbootitem.h
+include/kde4/k3bbusywidget.h
+include/kde4/k3bcdcopyjob.h
+include/kde4/k3bcddb.h
+include/kde4/k3bcdparanoialib.h
+include/kde4/k3bcdrdaowriter.h
+include/kde4/k3bcdrecordwriter.h
+include/kde4/k3bcdtext.h
+include/kde4/k3bcdtextvalidator.h
+include/kde4/k3bchecksumpipe.h
+include/kde4/k3bclonejob.h
+include/kde4/k3bcore.h
+include/kde4/k3bcuefileparser.h
+include/kde4/k3bdatadoc.h
+include/kde4/k3bdataitem.h
+include/kde4/k3bdatajob.h
+include/kde4/k3bdefaultexternalprograms.h
+include/kde4/k3bdevice.h
+include/kde4/k3bdevice_export.h
+include/kde4/k3bdevicecombobox.h
+include/kde4/k3bdeviceglobals.h
+include/kde4/k3bdevicehandler.h
+include/kde4/k3bdevicemanager.h
+include/kde4/k3bdeviceselectiondialog.h
+include/kde4/k3bdevicetypes.h
+include/kde4/k3bdiritem.h
+include/kde4/k3bdirsizejob.h
+include/kde4/k3bdiskinfo.h
+include/kde4/k3bdoc.h
+include/kde4/k3bdvdcopyjob.h
+include/kde4/k3bdvdformattingjob.h
+include/kde4/k3bexceptions.h
+include/kde4/k3bexternalbinmanager.h
+include/kde4/k3bfileitem.h
+include/kde4/k3bfilesplitter.h
+include/kde4/k3bfilesysteminfo.h
+include/kde4/k3bglobals.h
+include/kde4/k3bglobalsettings.h
+include/kde4/k3bgrowisofswriter.h
+include/kde4/k3bimagefilereader.h
+include/kde4/k3binffilewriter.h
+include/kde4/k3bintmapcombobox.h
+include/kde4/k3bintvalidator.h
+include/kde4/k3biso9660.h
+include/kde4/k3biso9660backend.h
+include/kde4/k3biso9660imagewritingjob.h
+include/kde4/k3bisooptions.h
+include/kde4/k3bjob.h
+include/kde4/k3bjobhandler.h
+include/kde4/k3blistview.h
+include/kde4/k3blistviewitemanimator.h
+include/kde4/k3bmd5job.h
+include/kde4/k3bmediacache.h
+include/kde4/k3bmedium.h
+include/kde4/k3bmetawriter.h
+include/kde4/k3bmixeddoc.h
+include/kde4/k3bmixedjob.h
+include/kde4/k3bmovixdoc.h
+include/kde4/k3bmovixfileitem.h
+include/kde4/k3bmovixjob.h
+include/kde4/k3bmsf.h
+include/kde4/k3bmsfedit.h
+include/kde4/k3bmultichoicedialog.h
+include/kde4/k3bplugin.h
+include/kde4/k3bpluginconfigwidget.h
+include/kde4/k3bpluginmanager.h
+include/kde4/k3bprocess.h
+include/kde4/k3bprogressdialog.h
+include/kde4/k3bprojectplugin.h
+include/kde4/k3bpushbutton.h
+include/kde4/k3brawaudiodatasource.h
+include/kde4/k3brichtextlabel.h
+include/kde4/k3bsignalwaiter.h
+include/kde4/k3bsimplejobhandler.h
+include/kde4/k3bstdguiitems.h
+include/kde4/k3bstringutils.h
+include/kde4/k3bthreadjob.h
+include/kde4/k3bthreadwidget.h
+include/kde4/k3bthroughputestimator.h
+include/kde4/k3btoc.h
+include/kde4/k3btocfilewriter.h
+include/kde4/k3btrack.h
+include/kde4/k3bvalidators.h
+include/kde4/k3bvcddoc.h
+include/kde4/k3bvcdjob.h
+include/kde4/k3bvcdoptions.h
+include/kde4/k3bverificationjob.h
+include/kde4/k3bversion.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvd.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvdaudiostream.h
+include/kde4/k3bvideodvddoc.h
+include/kde4/k3bvideodvdjob.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvdptt.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvdsubpicturestream.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvdtime.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvdtitle.h
+include/kde4/k3bvideodvdtitledetectclippingjob.h
+include/kde4/k3bvideodvdtitletranscodingjob.h
+%%LIBDVDREAD%%include/kde4/k3bvideodvdvideostream.h
+include/kde4/k3bwavefilewriter.h
 %%TAGLIB%%lib/kde4/k3baudiometainforenamerplugin.so
 lib/kde4/k3baudioprojectcddbplugin.so
 lib/kde4/k3bexternalencoder.so
diff --git a/sysutils/kfilemetadata/Makefile b/sysutils/kfilemetadata/Makefile
index 4fd835ad27c7..d8f801fd21dd 100644
--- a/sysutils/kfilemetadata/Makefile
+++ b/sysutils/kfilemetadata/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kfilemetadata
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/sysutils/kfilemetadata/pkg-plist b/sysutils/kfilemetadata/pkg-plist
index 2edea3c4012e..270f521585fc 100644
--- a/sysutils/kfilemetadata/pkg-plist
+++ b/sysutils/kfilemetadata/pkg-plist
@@ -1,11 +1,11 @@
-include/kfilemetadata/extractionresult.h
-include/kfilemetadata/extractorplugin.h
-include/kfilemetadata/extractorpluginmanager.h
-include/kfilemetadata/kfilemetadata_export.h
-include/kfilemetadata/properties.h
-include/kfilemetadata/propertyinfo.h
-include/kfilemetadata/typeinfo.h
-include/kfilemetadata/types.h
+include/kde4/kfilemetadata/extractionresult.h
+include/kde4/kfilemetadata/extractorplugin.h
+include/kde4/kfilemetadata/extractorpluginmanager.h
+include/kde4/kfilemetadata/kfilemetadata_export.h
+include/kde4/kfilemetadata/properties.h
+include/kde4/kfilemetadata/propertyinfo.h
+include/kde4/kfilemetadata/typeinfo.h
+include/kde4/kfilemetadata/types.h
 lib/cmake/KFileMetaData/KFileMetaDataConfig.cmake
 lib/cmake/KFileMetaData/KFileMetaDataTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KFileMetaData/KFileMetaDataTargetsWithPrefix.cmake
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index b42c90f671ae..e28bd548db3c 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nepomuk-core
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/sysutils/nepomuk-core/pkg-plist b/sysutils/nepomuk-core/pkg-plist
index f5645eb1ebf3..13652306dcfa 100644
--- a/sysutils/nepomuk-core/pkg-plist
+++ b/sysutils/nepomuk-core/pkg-plist
@@ -15,107 +15,107 @@ bin/nepomukservicestub
 bin/nepomukshow
 bin/nepomukstorage
 env/nepomuk-env.sh
-include/Nepomuk2/CreateResourceJob
-include/Nepomuk2/DataManagement
-include/Nepomuk2/DescribeResourcesJob
-include/Nepomuk2/File
-include/Nepomuk2/Query/AndTerm
-include/Nepomuk2/Query/ComparisonTerm
-include/Nepomuk2/Query/FileQuery
-include/Nepomuk2/Query/GroupTerm
-include/Nepomuk2/Query/LiteralTerm
-include/Nepomuk2/Query/NegationTerm
-include/Nepomuk2/Query/OptionalTerm
-include/Nepomuk2/Query/OrTerm
-include/Nepomuk2/Query/Query
-include/Nepomuk2/Query/QueryParser
-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
-include/Nepomuk2/Resource
-include/Nepomuk2/ResourceManager
-include/Nepomuk2/ResourceWatcher
-include/Nepomuk2/Service
-include/Nepomuk2/SimpleResource
-include/Nepomuk2/SimpleResourceGraph
-include/Nepomuk2/StoreResourcesJob
-include/Nepomuk2/Tag
-include/Nepomuk2/Types/Class
-include/Nepomuk2/Types/Literal
-include/Nepomuk2/Types/Ontology
-include/Nepomuk2/Types/Property
-include/Nepomuk2/Variant
-include/Nepomuk2/Vocabulary/NCAL
-include/Nepomuk2/Vocabulary/NCO
-include/Nepomuk2/Vocabulary/NDO
-include/Nepomuk2/Vocabulary/NEXIF
-include/Nepomuk2/Vocabulary/NFO
-include/Nepomuk2/Vocabulary/NIE
-include/Nepomuk2/Vocabulary/NMM
-include/Nepomuk2/Vocabulary/NMO
-include/Nepomuk2/Vocabulary/NUAO
-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
-include/nepomuk2/describeresourcesjob.h
-include/nepomuk2/entity.h
-include/nepomuk2/file.h
-include/nepomuk2/filequery.h
-include/nepomuk2/groupterm.h
-include/nepomuk2/literal.h
-include/nepomuk2/literalterm.h
-include/nepomuk2/ncal.h
-include/nepomuk2/nco.h
-include/nepomuk2/ndo.h
-include/nepomuk2/negationterm.h
-include/nepomuk2/nepomuk_export.h
-include/nepomuk2/nepomukservice.h
-include/nepomuk2/nepomukversion.h
-include/nepomuk2/nexif.h
-include/nepomuk2/nfo.h
-include/nepomuk2/nie.h
-include/nepomuk2/nmm.h
-include/nepomuk2/nmo.h
-include/nepomuk2/nuao.h
-include/nepomuk2/ontology.h
-include/nepomuk2/optionalterm.h
-include/nepomuk2/orterm.h
-include/nepomuk2/pimo.h
-include/nepomuk2/property.h
-include/nepomuk2/query.h
-include/nepomuk2/queryinterface.h
-include/nepomuk2/queryparser.h
-include/nepomuk2/queryserviceclient.h
-include/nepomuk2/queryserviceinterface.h
-include/nepomuk2/resource.h
-include/nepomuk2/resourcemanager.h
-include/nepomuk2/resourceterm.h
-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
-include/nepomuk2/standardqueries.h
-include/nepomuk2/storeresourcesjob.h
-include/nepomuk2/tag.h
-include/nepomuk2/term.h
-include/nepomuk2/tmo.h
-include/nepomuk2/utils.h
-include/nepomuk2/variant.h
-include/nepomuk2/vocabulary.h
+include/kde4/Nepomuk2/CreateResourceJob
+include/kde4/Nepomuk2/DataManagement
+include/kde4/Nepomuk2/DescribeResourcesJob
+include/kde4/Nepomuk2/File
+include/kde4/Nepomuk2/Query/AndTerm
+include/kde4/Nepomuk2/Query/ComparisonTerm
+include/kde4/Nepomuk2/Query/FileQuery
+include/kde4/Nepomuk2/Query/GroupTerm
+include/kde4/Nepomuk2/Query/LiteralTerm
+include/kde4/Nepomuk2/Query/NegationTerm
+include/kde4/Nepomuk2/Query/OptionalTerm
+include/kde4/Nepomuk2/Query/OrTerm
+include/kde4/Nepomuk2/Query/Query
+include/kde4/Nepomuk2/Query/QueryParser
+include/kde4/Nepomuk2/Query/QueryServiceClient
+include/kde4/Nepomuk2/Query/ResourceTerm
+include/kde4/Nepomuk2/Query/ResourceTypeTerm
+include/kde4/Nepomuk2/Query/Result
+include/kde4/Nepomuk2/Query/ResultIterator
+include/kde4/Nepomuk2/Query/SimpleTerm
+include/kde4/Nepomuk2/Query/StandardQuery
+include/kde4/Nepomuk2/Query/Term
+include/kde4/Nepomuk2/Resource
+include/kde4/Nepomuk2/ResourceManager
+include/kde4/Nepomuk2/ResourceWatcher
+include/kde4/Nepomuk2/Service
+include/kde4/Nepomuk2/SimpleResource
+include/kde4/Nepomuk2/SimpleResourceGraph
+include/kde4/Nepomuk2/StoreResourcesJob
+include/kde4/Nepomuk2/Tag
+include/kde4/Nepomuk2/Types/Class
+include/kde4/Nepomuk2/Types/Literal
+include/kde4/Nepomuk2/Types/Ontology
+include/kde4/Nepomuk2/Types/Property
+include/kde4/Nepomuk2/Variant
+include/kde4/Nepomuk2/Vocabulary/NCAL
+include/kde4/Nepomuk2/Vocabulary/NCO
+include/kde4/Nepomuk2/Vocabulary/NDO
+include/kde4/Nepomuk2/Vocabulary/NEXIF
+include/kde4/Nepomuk2/Vocabulary/NFO
+include/kde4/Nepomuk2/Vocabulary/NIE
+include/kde4/Nepomuk2/Vocabulary/NMM
+include/kde4/Nepomuk2/Vocabulary/NMO
+include/kde4/Nepomuk2/Vocabulary/NUAO
+include/kde4/Nepomuk2/Vocabulary/PIMO
+include/kde4/Nepomuk2/Vocabulary/TMO
+include/kde4/nepomuk2/andterm.h
+include/kde4/nepomuk2/class.h
+include/kde4/nepomuk2/cleaningjob.h
+include/kde4/nepomuk2/comparisonterm.h
+include/kde4/nepomuk2/createresourcejob.h
+include/kde4/nepomuk2/datamanagement.h
+include/kde4/nepomuk2/describeresourcesjob.h
+include/kde4/nepomuk2/entity.h
+include/kde4/nepomuk2/file.h
+include/kde4/nepomuk2/filequery.h
+include/kde4/nepomuk2/groupterm.h
+include/kde4/nepomuk2/literal.h
+include/kde4/nepomuk2/literalterm.h
+include/kde4/nepomuk2/ncal.h
+include/kde4/nepomuk2/nco.h
+include/kde4/nepomuk2/ndo.h
+include/kde4/nepomuk2/negationterm.h
+include/kde4/nepomuk2/nepomuk_export.h
+include/kde4/nepomuk2/nepomukservice.h
+include/kde4/nepomuk2/nepomukversion.h
+include/kde4/nepomuk2/nexif.h
+include/kde4/nepomuk2/nfo.h
+include/kde4/nepomuk2/nie.h
+include/kde4/nepomuk2/nmm.h
+include/kde4/nepomuk2/nmo.h
+include/kde4/nepomuk2/nuao.h
+include/kde4/nepomuk2/ontology.h
+include/kde4/nepomuk2/optionalterm.h
+include/kde4/nepomuk2/orterm.h
+include/kde4/nepomuk2/pimo.h
+include/kde4/nepomuk2/property.h
+include/kde4/nepomuk2/query.h
+include/kde4/nepomuk2/queryinterface.h
+include/kde4/nepomuk2/queryparser.h
+include/kde4/nepomuk2/queryserviceclient.h
+include/kde4/nepomuk2/queryserviceinterface.h
+include/kde4/nepomuk2/resource.h
+include/kde4/nepomuk2/resourcemanager.h
+include/kde4/nepomuk2/resourceterm.h
+include/kde4/nepomuk2/resourcetypeterm.h
+include/kde4/nepomuk2/resourcewatcher.h
+include/kde4/nepomuk2/result.h
+include/kde4/nepomuk2/resultiterator.h
+include/kde4/nepomuk2/service2.h
+include/kde4/nepomuk2/simpleresource.h
+include/kde4/nepomuk2/simpleresourcegraph.h
+include/kde4/nepomuk2/simpleterm.h
+include/kde4/nepomuk2/standardqueries.h
+include/kde4/nepomuk2/storeresourcesjob.h
+include/kde4/nepomuk2/tag.h
+include/kde4/nepomuk2/term.h
+include/kde4/nepomuk2/tmo.h
+include/kde4/nepomuk2/utils.h
+include/kde4/nepomuk2/variant.h
+include/kde4/nepomuk2/vocabulary.h
 lib/cmake/NepomukCore/Nepomuk2AddOntologyClasses.cmake
 lib/cmake/NepomukCore/NepomukCoreConfig.cmake
 lib/cmake/NepomukCore/NepomukCoreConfigVersion.cmake
diff --git a/sysutils/nepomuk-widgets/Makefile b/sysutils/nepomuk-widgets/Makefile
index 491eb74cc083..7cedbd29aafd 100644
--- a/sysutils/nepomuk-widgets/Makefile
+++ b/sysutils/nepomuk-widgets/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	nepomuk-widgets
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/sysutils/nepomuk-widgets/pkg-plist b/sysutils/nepomuk-widgets/pkg-plist
index fc58e26ce79b..4ff2e1cf963c 100644
--- a/sysutils/nepomuk-widgets/pkg-plist
+++ b/sysutils/nepomuk-widgets/pkg-plist
@@ -1,8 +1,8 @@
-include/nepomuk2/filemetadataconfigwidget.h
-include/nepomuk2/filemetadatawidget.h
-include/nepomuk2/nepomukwidgets_export.h
-include/nepomuk2/resourcemodel.h
-include/nepomuk2/tagwidget.h
+include/kde4/nepomuk2/filemetadataconfigwidget.h
+include/kde4/nepomuk2/filemetadatawidget.h
+include/kde4/nepomuk2/nepomukwidgets_export.h
+include/kde4/nepomuk2/resourcemodel.h
+include/kde4/nepomuk2/tagwidget.h
 lib/cmake/NepomukWidgets/NepomukWidgetsConfig.cmake
 lib/cmake/NepomukWidgets/NepomukWidgetsConfigVersion.cmake
 lib/cmake/NepomukWidgets/NepomukWidgetsTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake