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)

2 files changed, 13 insertions, 12 deletions

diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index daa5045d6955..427d8841426e 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kiten
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	japanese kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/japanese/kiten/pkg-plist b/japanese/kiten/pkg-plist
index 9fe7ce15cdf7..b5b8b19e4ac9 100644
--- a/japanese/kiten/pkg-plist
+++ b/japanese/kiten/pkg-plist
@@ -2,18 +2,18 @@ bin/kiten
 bin/kitengen
 bin/kitenkanjibrowser
 bin/kitenradselect
-include/libkiten/DictEdict/dictfileedict.h
-include/libkiten/DictEdict/entryedict.h
-include/libkiten/DictKanjidic/dictfilekanjidic.h
-include/libkiten/DictKanjidic/entrykanjidic.h
-include/libkiten/dictionarymanager.h
-include/libkiten/dictionarypreferencedialog.h
-include/libkiten/dictquery.h
-include/libkiten/entry.h
-include/libkiten/entrylist.h
-include/libkiten/historyptrlist.h
-include/libkiten/kromajiedit.h
-include/libkiten/libkitenexport.h
+include/kde4/libkiten/DictEdict/dictfileedict.h
+include/kde4/libkiten/DictEdict/entryedict.h
+include/kde4/libkiten/DictKanjidic/dictfilekanjidic.h
+include/kde4/libkiten/DictKanjidic/entrykanjidic.h
+include/kde4/libkiten/dictionarymanager.h
+include/kde4/libkiten/dictionarypreferencedialog.h
+include/kde4/libkiten/dictquery.h
+include/kde4/libkiten/entry.h
+include/kde4/libkiten/entrylist.h
+include/kde4/libkiten/historyptrlist.h
+include/kde4/libkiten/kromajiedit.h
+include/kde4/libkiten/libkitenexport.h
 lib/libkiten.so
 lib/libkiten.so.4
 lib/libkiten.so.%%KDE4_GENERIC_LIB_VERSION%%