7 files changed, 94 insertions, 78 deletions

diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile
index 868753a39dd6..9a5326746dd0 100644
--- a/editors/kate-plugin-pate/Makefile
+++ b/editors/kate-plugin-pate/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kate-plugin-pate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DISTNAME=	kate-${PORTVERSION}
@@ -12,7 +11,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Support for Python plugins in Kate
 
 USES=		cmake:outsource python tar:xz
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4 kate \
+USE_KDE4=	kdelibs kdeprefix automoc4 kate \
 		pykde4_build pykde4_run
 USE_QT4=	gui webkit \
 		moc_build qmake_build rcc_build uic_build
diff --git a/editors/kate-plugin-pate/files/patch-addons__kate__pate__src__version_checker.h b/editors/kate-plugin-pate/files/patch-addons__kate__pate__src__version_checker.h
new file mode 100644
index 000000000000..c2a515da5337
--- /dev/null
+++ b/editors/kate-plugin-pate/files/patch-addons__kate__pate__src__version_checker.h
@@ -0,0 +1,16 @@
+--- addons/kate/pate/src/version_checker.h.orig	2014-09-16 02:55:37.897246249 +0200
++++ addons/kate/pate/src/version_checker.h	2014-09-16 02:58:31.732234283 +0200
+@@ -24,6 +24,13 @@
+ # include <QtCore/QStringList>
+ # include <QtCore/QtGlobal>
+ 
++# ifdef major
++#  undef major
++# endif
++# ifdef minor
++#  undef minor
++# endif
++
+ namespace Pate {
+ 
+ /**
diff --git a/editors/kate-plugin-pate/pkg-plist b/editors/kate-plugin-pate/pkg-plist
index 0f0de9897909..61d325682564 100644
--- a/editors/kate-plugin-pate/pkg-plist
+++ b/editors/kate-plugin-pate/pkg-plist
@@ -2,18 +2,22 @@ lib/kde4/katepateplugin.so
 %%PYTHON_SITELIBDIR%%/PyKate4/__init__.py
 %%PYTHON_SITELIBDIR%%/PyKate4/kate.so
 share/apps/kate/pate/block.py
-share/apps/kate/pate/color_tools.py
-share/apps/kate/pate/color_tools_toolview.ui
+share/apps/kate/pate/block_ui.rc
+share/apps/kate/pate/color_tools/__init__.py
+share/apps/kate/pate/color_tools/color_chooser.py
+share/apps/kate/pate/color_tools/color_palette.py
+share/apps/kate/pate/color_tools/color_swatcher.py
+share/apps/kate/pate/color_tools/color_tools_toolview.ui
+share/apps/kate/pate/color_tools/color_tools_ui.rc
+share/apps/kate/pate/color_tools/utils.py
 share/apps/kate/pate/commentar.py
-share/apps/kate/pate/commentar_config.ui
-share/apps/kate/pate/django_utils/django_settings.py
-share/apps/kate/pate/django_utils/django_snippets.py
-share/apps/kate/pate/django_utils/django_template.py
-share/apps/kate/pate/django_utils/django_utils.py
-share/apps/kate/pate/django_utils/django_utils.ui
+share/apps/kate/pate/commentar.ui
+share/apps/kate/pate/commentar_ui.rc
 share/apps/kate/pate/format.py
+share/apps/kate/pate/format_ui.rc
+share/apps/kate/pate/gid/__init__.py
 share/apps/kate/pate/gid/config.ui
-share/apps/kate/pate/gid/gid.py
+share/apps/kate/pate/gid/gid_ui.rc
 share/apps/kate/pate/gid/idutils.py
 share/apps/kate/pate/gid/tool.ui
 share/apps/kate/pate/libkatepate/__init__.py
@@ -28,11 +32,14 @@ share/apps/kate/pate/libkatepate/pred.py
 share/apps/kate/pate/libkatepate/project_utils.py
 share/apps/kate/pate/libkatepate/selection.py
 share/apps/kate/pate/libkatepate/text.py
-share/apps/kate/pate/libkatepate/ui.py
+share/apps/kate/pate/python_autocomplete/__init__.py
 share/apps/kate/pate/python_autocomplete/python_autocomplete.py
 share/apps/kate/pate/python_autocomplete/python_autocomplete_parse.py
+share/apps/kate/pate/python_autocomplete_jedi.py
+share/apps/kate/pate/python_console_classic/__init__.py
 share/apps/kate/pate/python_console_classic/config.ui
 share/apps/kate/pate/python_console_classic/python_console_classic.py
+share/apps/kate/pate/python_console_ipython/__init__.py
 share/apps/kate/pate/python_console_ipython/python_console_ipython.css
 share/apps/kate/pate/python_console_ipython/python_console_ipython.py
 share/apps/kate/pate/python_console_ipython/python_console_ipython.ui
@@ -46,24 +53,33 @@ share/apps/kate/pate/python_utils/python_settings.py
 share/apps/kate/pate/python_utils/python_snippets.py
 share/apps/kate/pate/python_utils/python_utils.py
 share/apps/kate/pate/python_utils/python_utils.ui
+share/apps/kate/pate/try_open_file.py
+share/apps/kate/pate/try_open_file_ui.rc
 share/apps/kate/pate/xml_pretty.py
 share/apps/kate/pate/xml_pretty.ui
+share/apps/kate/pate/xml_pretty_ui.rc
+share/apps/kate/plugins/katepateplugin/ui.rc
 share/apps/kate/plugins/pate/kate/__init__.py
-share/apps/kate/plugins/pate/kate/gui.py
+share/apps/kate/plugins/pate/kate/api.py
+share/apps/kate/plugins/pate/kate/configuration.py
+share/apps/kate/plugins/pate/kate/decorators.py
+share/apps/kate/plugins/pate/kate/document/__init__.py
+share/apps/kate/plugins/pate/kate/document/decorators.py
+share/apps/kate/plugins/pate/kate/document_view_helpers.py
+share/apps/kate/plugins/pate/kate/ui.py
+share/apps/kate/plugins/pate/kate/view/__init__.py
+share/apps/kate/plugins/pate/kate/view/decorators.py
+share/kde4/services/katepate_block.desktop
+share/kde4/services/katepate_color_tools.desktop
+share/kde4/services/katepate_commentar.desktop
+share/kde4/services/katepate_format.desktop
+share/kde4/services/katepate_gid.desktop
+share/kde4/services/katepate_python_autocomplete.desktop
+share/kde4/services/katepate_python_autocomplete_jedi.desktop
+share/kde4/services/katepate_python_console_classic.desktop
+share/kde4/services/katepate_python_console_ipython.desktop
+share/kde4/services/katepate_python_utils.desktop
+share/kde4/services/katepate_try_open_file.desktop
+share/kde4/services/katepate_xml_pretty.desktop
 share/kde4/services/pate.desktop
-@dirrm share/apps/kate/plugins/pate/kate
-@dirrm share/apps/kate/plugins/pate
-@dirrm share/apps/kate/plugins
-@dirrm share/apps/kate/pate/python_utils/python_checkers
-@dirrm share/apps/kate/pate/python_utils
-@dirrm share/apps/kate/pate/python_console_ipython
-@dirrm share/apps/kate/pate/python_console_classic
-@dirrm share/apps/kate/pate/python_autocomplete
-@dirrm share/apps/kate/pate/libkatepate
-@dirrm share/apps/kate/pate/gid
-@dirrm share/apps/kate/pate/django_utils
-@dirrm share/apps/kate/pate
-@dirrm share/apps/kate
-@dirrm %%PYTHON_SITELIBDIR%%/PyKate4
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
+share/kde4/servicetypes/katepythonplugin.desktop
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index ff5f8d2f6dc5..e784312a62c9 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -13,7 +12,7 @@ COMMENT=	Basic editor framework for the KDE system
 
 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4 kactivities
+USE_KDE4=	kdelibs kdeprefix automoc4 kactivities
 USES=		cmake:outsource gettext perl5 tar:xz
 USE_PERL5=	build
 USE_QT4=	dbus gui script sql webkit xml \
diff --git a/editors/kate/distinfo b/editors/kate/distinfo
index d26b5557e3b6..c02829a7efca 100644
--- a/editors/kate/distinfo
+++ b/editors/kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kate-4.12.5.tar.xz) = 217fb7c9751d553791b1729f6bbc0661a3edf3e69b9c4da762afb40065c339ed
-SIZE (KDE/4.12.5/kate-4.12.5.tar.xz) = 2643296
+SHA256 (KDE/4.14.2/kate-4.14.2.tar.xz) = dc154f675e6cce3dbf0d74c20d434c11bb11c0549176940f68b93186757375dc
+SIZE (KDE/4.14.2/kate-4.14.2.tar.xz) = 2765308
diff --git a/editors/kate/files/patch-CMakeLists.txt b/editors/kate/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ad0cdf1d8550
--- /dev/null
+++ b/editors/kate/files/patch-CMakeLists.txt
@@ -0,0 +1,14 @@
+--- ./CMakeLists.txt.orig	2014-07-15 19:22:46.000000000 +0200
++++ ./CMakeLists.txt	2014-07-15 19:23:01.000000000 +0200
+	
+	Do not enforce building of tests
+
+@@ -26,7 +26,7 @@
+ configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ # enforce build of tests
+-set (KDE4_BUILD_TESTS "ON" CACHE "BOOL" "Enable building of tests" FORCE)
++# set (KDE4_BUILD_TESTS "ON" CACHE "BOOL" "Enable building of tests" FORCE)
+ 
+ # KDE/QT definitions we want
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
diff --git a/editors/kate/pkg-plist b/editors/kate/pkg-plist
index c4c6e7c9aa46..c8b633a5e681 100644
--- a/editors/kate/pkg-plist
+++ b/editors/kate/pkg-plist
@@ -21,6 +21,7 @@ lib/kde4/katemailfilesplugin.so
 lib/kde4/kateopenheaderplugin.so
 lib/kde4/katepart.so
 lib/kde4/kateprojectplugin.so
+lib/kde4/katereplicodeplugin.so
 lib/kde4/katesearchplugin.so
 lib/kde4/katesnippetsplugin.so
 lib/kde4/katesqlplugin.so
@@ -35,6 +36,7 @@ lib/kde4/ktexteditor_exporter.so
 lib/kde4/ktexteditor_hlselection.so
 lib/kde4/ktexteditor_iconinserter.so
 lib/kde4/ktexteditor_insertfile.so
+lib/kde4/ktexteditor_lumen.so
 lib/kde4/plasma_applet_katesession.so
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.4
@@ -71,6 +73,7 @@ share/apps/kate/plugins/kategdb/ui.rc
 share/apps/kate/plugins/katekonsole/ui.rc
 share/apps/kate/plugins/katemailfiles/ui.rc
 share/apps/kate/plugins/kateopenheader/ui.rc
+share/apps/kate/plugins/katereplicodeplugin/ui.rc
 share/apps/kate/plugins/katesearch/ui.rc
 share/apps/kate/plugins/katesql/ui.rc
 share/apps/kate/plugins/katesymbolviewer/ui.rc
@@ -79,6 +82,7 @@ share/apps/kate/plugins/katetabify/ui.rc
 share/apps/kate/plugins/katetextfilter/ui.rc
 share/apps/kate/plugins/katexmlcheck/ui.rc
 share/apps/kate/plugins/katexmltools/ui.rc
+share/apps/kate/plugins/project/kateproject.example
 share/apps/kate/plugins/project/ui.rc
 share/apps/kate/tips
 share/apps/katepart/katepartsimpleui.rc
@@ -89,9 +93,12 @@ share/apps/katepart/script/commands/quickcoding.js
 share/apps/katepart/script/commands/utils.js
 share/apps/katepart/script/files/quickcoding/cpp/a.template
 share/apps/katepart/script/files/quickcoding/cpp/c.template
+share/apps/katepart/script/indentation/ada.js
+share/apps/katepart/script/indentation/cmake.js
 share/apps/katepart/script/indentation/cppstyle.js
 share/apps/katepart/script/indentation/cstyle.js
 share/apps/katepart/script/indentation/haskell.js
+share/apps/katepart/script/indentation/latex.js
 share/apps/katepart/script/indentation/lilypond.js
 share/apps/katepart/script/indentation/lisp.js
 share/apps/katepart/script/indentation/lua.js
@@ -99,6 +106,7 @@ share/apps/katepart/script/indentation/pascal.js
 share/apps/katepart/script/indentation/python.js
 share/apps/katepart/script/indentation/ruby.js
 share/apps/katepart/script/indentation/xml.js
+share/apps/katepart/script/libraries/cmake_indenter_config.js
 share/apps/katepart/script/libraries/cursor.js
 share/apps/katepart/script/libraries/documentcursor.js
 share/apps/katepart/script/libraries/emmet/editor_interface.js
@@ -106,10 +114,12 @@ share/apps/katepart/script/libraries/emmet/lib.js
 share/apps/katepart/script/libraries/range.js
 share/apps/katepart/script/libraries/string.js
 share/apps/katepart/script/libraries/underscore.js
+share/apps/katepart/script/libraries/utils.js
 share/apps/katepart/syntax/abap.xml
 share/apps/katepart/syntax/abc.xml
 share/apps/katepart/syntax/actionscript.xml
 share/apps/katepart/syntax/ada.xml
+share/apps/katepart/syntax/agda.xml
 share/apps/katepart/syntax/ahdl.xml
 share/apps/katepart/syntax/ahk.xml
 share/apps/katepart/syntax/alert.xml
@@ -147,7 +157,6 @@ share/apps/katepart/syntax/commonlisp.xml
 share/apps/katepart/syntax/component-pascal.xml
 share/apps/katepart/syntax/context.xml
 share/apps/katepart/syntax/cpp.xml
-share/apps/katepart/syntax/cpp11.xml
 share/apps/katepart/syntax/crk.xml
 share/apps/katepart/syntax/cs.xml
 share/apps/katepart/syntax/css-php.xml
@@ -201,6 +210,7 @@ share/apps/katepart/syntax/idl.xml
 share/apps/katepart/syntax/ilerpg.xml
 share/apps/katepart/syntax/inform.xml
 share/apps/katepart/syntax/ini.xml
+share/apps/katepart/syntax/isocpp.xml
 share/apps/katepart/syntax/jam.xml
 share/apps/katepart/syntax/java.xml
 share/apps/katepart/syntax/javadoc.xml
@@ -213,6 +223,7 @@ share/apps/katepart/syntax/julia.xml
 share/apps/katepart/syntax/k.xml
 share/apps/katepart/syntax/katetemplate.xml
 share/apps/katepart/syntax/kbasic.xml
+share/apps/katepart/syntax/kconfig.xml
 share/apps/katepart/syntax/language.dtd
 share/apps/katepart/syntax/latex.xml
 share/apps/katepart/syntax/ld.xml
@@ -234,6 +245,7 @@ share/apps/katepart/syntax/mako.xml
 share/apps/katepart/syntax/mandoc.xml
 share/apps/katepart/syntax/markdown.xml
 share/apps/katepart/syntax/mason.xml
+share/apps/katepart/syntax/mathematica.xml
 share/apps/katepart/syntax/matlab.xml
 share/apps/katepart/syntax/maxima.xml
 share/apps/katepart/syntax/mediawiki.xml
@@ -272,18 +284,18 @@ share/apps/katepart/syntax/ppd.xml
 share/apps/katepart/syntax/progress.xml
 share/apps/katepart/syntax/prolog.xml
 share/apps/katepart/syntax/protobuf.xml
+share/apps/katepart/syntax/puppet.xml
 share/apps/katepart/syntax/purebasic.xml
 share/apps/katepart/syntax/python.xml
 share/apps/katepart/syntax/q.xml
 share/apps/katepart/syntax/qmake.xml
 share/apps/katepart/syntax/qml.xml
-share/apps/katepart/syntax/qt4.xml
 share/apps/katepart/syntax/r.xml
 share/apps/katepart/syntax/rapidq.xml
 share/apps/katepart/syntax/relaxng.xml
 share/apps/katepart/syntax/relaxngcompact.xml
+share/apps/katepart/syntax/replicode.xml
 share/apps/katepart/syntax/rest.xml
-share/apps/katepart/syntax/restructuredtext.xml
 share/apps/katepart/syntax/rexx.xml
 share/apps/katepart/syntax/rhtml.xml
 share/apps/katepart/syntax/rib.xml
@@ -423,6 +435,7 @@ share/kde4/services/katemailfilesplugin.desktop
 share/kde4/services/kateopenheader.desktop
 share/kde4/services/katepart.desktop
 share/kde4/services/kateprojectplugin.desktop
+share/kde4/services/katereplicodeplugin.desktop
 share/kde4/services/katesearch.desktop
 share/kde4/services/katesnippetsplugin.desktop
 share/kde4/services/katesql.desktop
@@ -438,47 +451,6 @@ share/kde4/services/ktexteditor_exporter.desktop
 share/kde4/services/ktexteditor_hlselection.desktop
 share/kde4/services/ktexteditor_iconinserter.desktop
 share/kde4/services/ktexteditor_insertfile.desktop
+share/kde4/services/ktexteditor_lumen.desktop
 share/kde4/services/plasma-applet-katesession.desktop
 share/kde4/servicetypes/kateplugin.desktop
-@dirrm share/doc/HTML/en/kwrite
-@dirrm share/doc/HTML/en/kate
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktexteditor_insertfile
-@dirrm share/apps/ktexteditor_iconinserter
-@dirrm share/apps/ktexteditor_exporter
-@dirrmtry share/apps/katexmltools
-@dirrm share/apps/katepart/script/libraries/emmet
-@dirrm share/apps/katepart/script/libraries
-@dirrm share/apps/katepart/script/indentation
-@dirrm share/apps/katepart/script/files/quickcoding/cpp
-@dirrm share/apps/katepart/script/files/quickcoding
-@dirrm share/apps/katepart/script/files
-@dirrm share/apps/katepart/script/commands
-@dirrm share/apps/katepart/script
-@dirrm share/apps/kate/plugins/project
-@dirrm share/apps/kate/plugins/katexmltools
-@dirrm share/apps/kate/plugins/katexmlcheck
-@dirrm share/apps/kate/plugins/katetextfilter
-@dirrm share/apps/kate/plugins/katetabify
-@dirrm share/apps/kate/plugins/katetabbarextension
-@dirrm share/apps/kate/plugins/katesymbolviewer
-@dirrm share/apps/kate/plugins/katesql
-@dirrm share/apps/kate/plugins/katesearch
-@dirrm share/apps/kate/plugins/kateopenheader
-@dirrm share/apps/kate/plugins/katemailfiles
-@dirrm share/apps/kate/plugins/katekonsole
-@dirrm share/apps/kate/plugins/kategdb
-@dirrm share/apps/kate/plugins/katefiletemplates/templates
-@dirrm share/apps/kate/plugins/katefiletemplates
-@dirrm share/apps/kate/plugins/katectags
-@dirrm share/apps/kate/plugins/katecloseexceptplugin
-@dirrm share/apps/kate/plugins/katebuild
-@dirrm share/apps/kate/plugins/kate_kttsd
-@dirrm share/apps/kate/plugins/filetree
-@dirrmtry share/apps/kate/plugins
-@dirrm share/apps/kate/icons/hicolor/16x16/actions
-@dirrm share/apps/kate/icons/hicolor/16x16
-@dirrm share/apps/kate/icons/hicolor
-@dirrm share/apps/kate/icons
-@dirrmtry share/apps/kate
-@dirrmtry include/kate