5 files changed, 73 insertions, 38 deletions

diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile
index 69277cd12070..8dccf508a052 100644
--- a/editors/kate-plugin-pate/Makefile
+++ b/editors/kate-plugin-pate/Makefile
@@ -2,10 +2,8 @@
 
 PORTNAME=	kate-plugin-pate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DISTNAME=	kate-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
@@ -23,9 +21,8 @@ USE_PYTHON=	yes
 DISTINFO_FILE=	${PORTSDIR}/editors/kate/distinfo
 
 # cmake.mk doesn't allow to overwrite BUILD_WRKSRC for out-of-source builds
-_pate_WRKSRC=	${BUILD_WRKSRC}/kate/plugins/pate
+_pate_WRKSRC=	${BUILD_WRKSRC}/addons/kate/pate
 
-NO_STAGE=	yes
 do-build:
 	cd ${_pate_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
diff --git a/editors/kate-plugin-pate/pkg-plist b/editors/kate-plugin-pate/pkg-plist
index d3c1e15c274e..0f0de9897909 100644
--- a/editors/kate-plugin-pate/pkg-plist
+++ b/editors/kate-plugin-pate/pkg-plist
@@ -1,41 +1,67 @@
-lib/kde4/pateplugin.so
+lib/kde4/katepateplugin.so
 %%PYTHON_SITELIBDIR%%/PyKate4/__init__.py
 %%PYTHON_SITELIBDIR%%/PyKate4/kate.so
 share/apps/kate/pate/block.py
-share/apps/kate/pate/close_tag.py
+share/apps/kate/pate/color_tools.py
+share/apps/kate/pate/color_tools_toolview.ui
 share/apps/kate/pate/commentar.py
-share/apps/kate/pate/console/config.ui
-share/apps/kate/pate/console/console.py
-share/apps/kate/pate/expand.py
-share/apps/kate/pate/expand/all.expand
-share/apps/kate/pate/expand/text_css.expand
-share/apps/kate/pate/expand/text_html.expand
-share/apps/kate/pate/expand/text_x-c++hdr.expand
-share/apps/kate/pate/expand/text_x-c++src.expand
-share/apps/kate/pate/expand/text_x-chdr.expand
-share/apps/kate/pate/expand/text_x-python.expand
+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/format.py
 share/apps/kate/pate/gid/config.ui
 share/apps/kate/pate/gid/gid.py
 share/apps/kate/pate/gid/idutils.py
 share/apps/kate/pate/gid/tool.ui
 share/apps/kate/pate/libkatepate/__init__.py
+share/apps/kate/pate/libkatepate/autocomplete.py
 share/apps/kate/pate/libkatepate/common.py
+share/apps/kate/pate/libkatepate/compat.py
+share/apps/kate/pate/libkatepate/debug.py
 share/apps/kate/pate/libkatepate/decorators.py
+share/apps/kate/pate/libkatepate/errors.py
+share/apps/kate/pate/libkatepate/menu.py
 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/tools.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_console_classic/config.ui
+share/apps/kate/pate/python_console_classic/python_console_classic.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
+share/apps/kate/pate/python_utils/python_checkers/__init__.py
+share/apps/kate/pate/python_utils/python_checkers/all_checker.py
+share/apps/kate/pate/python_utils/python_checkers/parse_checker.py
+share/apps/kate/pate/python_utils/python_checkers/pep8_checker.py
+share/apps/kate/pate/python_utils/python_checkers/pyflakes_checker.py
+share/apps/kate/pate/python_utils/python_checkers/utils.py
+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/xml_pretty.py
+share/apps/kate/pate/xml_pretty.ui
 share/apps/kate/plugins/pate/kate/__init__.py
 share/apps/kate/plugins/pate/kate/gui.py
 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/expand
-@dirrm share/apps/kate/pate/console
+@dirrm share/apps/kate/pate/django_utils
 @dirrm share/apps/kate/pate
 @dirrm share/apps/kate
 @dirrm %%PYTHON_SITELIBDIR%%/PyKate4
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 09969261df0a..cc84964cea20 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -3,18 +3,14 @@
 
 PORTNAME=	kate
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	editors 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=	Basic editor framework for the KDE system
 
-LIB_DEPENDS=	qjson.0:${PORTSDIR}/devel/qjson
-
-CONFLICTS=	kdebase-4.[0-6].* kdelibs-4.[0-6].* kdesdk-4.[0-6].*
+LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4 kactivities
@@ -24,10 +20,7 @@ USE_QT4=	dbus gui script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
-MAN1=		kate.1
-
 # editors/kate-plugin-pate installs pate
 CMAKE_ARGS+=	-DBUILD_pate=off
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/editors/kate/distinfo b/editors/kate/distinfo
index 0531d0056680..8fec49c1101d 100644
--- a/editors/kate/distinfo
+++ b/editors/kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kate-4.10.5.tar.xz) = cd60a87321e97e9eba588ed6e3858185d1de06ae3960848386faa9b9b987fb73
-SIZE (KDE/4.10.5/kate-4.10.5.tar.xz) = 2590252
+SHA256 (KDE/4.12.2/kate-4.12.2.tar.xz) = 7db7631252832f63716d9d1d3567588b7e6ec0ea958d117373db78d559f51c91
+SIZE (KDE/4.12.2/kate-4.12.2.tar.xz) = 2642644
diff --git a/editors/kate/pkg-plist b/editors/kate/pkg-plist
index f2df6ad94276..c4c6e7c9aa46 100644
--- a/editors/kate/pkg-plist
+++ b/editors/kate/pkg-plist
@@ -10,6 +10,7 @@ include/kate_export.h
 lib/kde4/kate_kttsd.so
 lib/kde4/katebacktracebrowserplugin.so
 lib/kde4/katebuildplugin.so
+lib/kde4/katecloseexceptplugin.so
 lib/kde4/katectagsplugin.so
 lib/kde4/katefilebrowserplugin.so
 lib/kde4/katefiletemplates.so
@@ -36,16 +37,16 @@ lib/kde4/ktexteditor_iconinserter.so
 lib/kde4/ktexteditor_insertfile.so
 lib/kde4/plasma_applet_katesession.so
 lib/libkateinterfaces.so
-lib/libkateinterfaces.so.5
-lib/libkateinterfaces.so.5.0.1
+lib/libkateinterfaces.so.4
+lib/libkateinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkatepartinterfaces.so
-lib/libkatepartinterfaces.so.5
-lib/libkatepartinterfaces.so.5.0.1
+lib/libkatepartinterfaces.so.4
+lib/libkatepartinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkdeinit4_kate.so
 lib/libkdeinit4_kwrite.so
+man/man1/kate.1.gz
 share/applications/kde4/kate.desktop
 share/applications/kde4/kwrite.desktop
-share/apps/kate/icons/hicolor/16x16/actions/null.png
 share/apps/kate/icons/hicolor/16x16/actions/sql-field-pk.png
 share/apps/kate/icons/hicolor/16x16/actions/sql-field-red.png
 share/apps/kate/icons/hicolor/16x16/actions/sql-field.png
@@ -55,7 +56,9 @@ share/apps/kate/kateui.rc
 share/apps/kate/plugins/filetree/ui.rc
 share/apps/kate/plugins/kate_kttsd/ui.rc
 share/apps/kate/plugins/katebuild/ui.rc
+share/apps/kate/plugins/katecloseexceptplugin/ui.rc
 share/apps/kate/plugins/katectags/ui.rc
+share/apps/kate/plugins/katefiletemplates/templates/FindXXX.cmake.katetemplate
 share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate
 share/apps/kate/plugins/katefiletemplates/templates/cppgpl.hh.katetemplate
 share/apps/kate/plugins/katefiletemplates/templates/cpplgpl.cpp.katetemplate
@@ -92,10 +95,12 @@ share/apps/katepart/script/indentation/haskell.js
 share/apps/katepart/script/indentation/lilypond.js
 share/apps/katepart/script/indentation/lisp.js
 share/apps/katepart/script/indentation/lua.js
+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/cursor.js
+share/apps/katepart/script/libraries/documentcursor.js
 share/apps/katepart/script/libraries/emmet/editor_interface.js
 share/apps/katepart/script/libraries/emmet/lib.js
 share/apps/katepart/script/libraries/range.js
@@ -140,6 +145,7 @@ share/apps/katepart/syntax/coffee.xml
 share/apps/katepart/syntax/coldfusion.xml
 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
@@ -148,6 +154,7 @@ share/apps/katepart/syntax/css-php.xml
 share/apps/katepart/syntax/css.xml
 share/apps/katepart/syntax/cubescript.xml
 share/apps/katepart/syntax/cue.xml
+share/apps/katepart/syntax/curry.xml
 share/apps/katepart/syntax/d.xml
 share/apps/katepart/syntax/debianchangelog.xml
 share/apps/katepart/syntax/debiancontrol.xml
@@ -177,9 +184,11 @@ share/apps/katepart/syntax/gcc.xml
 share/apps/katepart/syntax/gdb.xml
 share/apps/katepart/syntax/gdl.xml
 share/apps/katepart/syntax/gettext.xml
+share/apps/katepart/syntax/git-rebase.xml
 share/apps/katepart/syntax/glosstex.xml
 share/apps/katepart/syntax/glsl.xml
 share/apps/katepart/syntax/gnuassembler.xml
+share/apps/katepart/syntax/gnuplot.xml
 share/apps/katepart/syntax/go.xml
 share/apps/katepart/syntax/grammar.xml
 share/apps/katepart/syntax/haml.xml
@@ -197,9 +206,11 @@ share/apps/katepart/syntax/java.xml
 share/apps/katepart/syntax/javadoc.xml
 share/apps/katepart/syntax/javascript-php.xml
 share/apps/katepart/syntax/javascript.xml
+share/apps/katepart/syntax/jira.xml
 share/apps/katepart/syntax/json.xml
 share/apps/katepart/syntax/jsp.xml
 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/language.dtd
@@ -209,6 +220,7 @@ share/apps/katepart/syntax/ldif.xml
 share/apps/katepart/syntax/less.xml
 share/apps/katepart/syntax/lex.xml
 share/apps/katepart/syntax/lilypond.xml
+share/apps/katepart/syntax/literate-curry.xml
 share/apps/katepart/syntax/literate-haskell.xml
 share/apps/katepart/syntax/logtalk.xml
 share/apps/katepart/syntax/lpc.xml
@@ -234,6 +246,7 @@ share/apps/katepart/syntax/modelines.xml
 share/apps/katepart/syntax/modula-2.xml
 share/apps/katepart/syntax/monobasic.xml
 share/apps/katepart/syntax/mup.xml
+share/apps/katepart/syntax/nagios.xml
 share/apps/katepart/syntax/nasm.xml
 share/apps/katepart/syntax/nemerle.xml
 share/apps/katepart/syntax/nesc.xml
@@ -244,6 +257,7 @@ share/apps/katepart/syntax/ocaml.xml
 share/apps/katepart/syntax/octave.xml
 share/apps/katepart/syntax/oors.xml
 share/apps/katepart/syntax/opal.xml
+share/apps/katepart/syntax/opencl.xml
 share/apps/katepart/syntax/pango.xml
 share/apps/katepart/syntax/pascal.xml
 share/apps/katepart/syntax/perl.xml
@@ -257,8 +271,10 @@ share/apps/katepart/syntax/povray.xml
 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/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
@@ -305,6 +321,7 @@ share/apps/katepart/syntax/uscript.xml
 share/apps/katepart/syntax/vala.xml
 share/apps/katepart/syntax/valgrind-suppression.xml
 share/apps/katepart/syntax/varnish.xml
+share/apps/katepart/syntax/varnishtest.xml
 share/apps/katepart/syntax/vcard.xml
 share/apps/katepart/syntax/velocity.xml
 share/apps/katepart/syntax/vera.xml
@@ -352,6 +369,7 @@ share/doc/HTML/en/kate/common
 share/doc/HTML/en/kate/configdialog01.png
 share/doc/HTML/en/kate/configuring-part.docbook
 share/doc/HTML/en/kate/configuring.docbook
+share/doc/HTML/en/kate/development.docbook
 share/doc/HTML/en/kate/fundamentals.docbook
 share/doc/HTML/en/kate/gdb-call-stack.png
 share/doc/HTML/en/kate/gdb-io.png
@@ -365,7 +383,6 @@ share/doc/HTML/en/kate/index.docbook
 share/doc/HTML/en/kate/kate.png
 share/doc/HTML/en/kate/line-modification-system.png
 share/doc/HTML/en/kate/man-kate.1.docbook
-share/doc/HTML/en/kate/mdi.docbook
 share/doc/HTML/en/kate/menus.docbook
 share/doc/HTML/en/kate/minimap.png
 share/doc/HTML/en/kate/part.docbook
@@ -385,16 +402,17 @@ share/doc/HTML/en/kwrite/index.docbook
 share/doc/HTML/en/kwrite/menus.docbook
 share/icons/hicolor/128x128/apps/kate.png
 share/icons/hicolor/16x16/apps/kate.png
+share/icons/hicolor/22x22/actions/debug-kategdb.png
 share/icons/hicolor/22x22/apps/kate.png
 share/icons/hicolor/32x32/apps/kate.png
 share/icons/hicolor/48x48/apps/kate.png
 share/icons/hicolor/64x64/apps/kate.png
 share/icons/hicolor/scalable/apps/kate.svgz
 share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz
-share/icons/oxygen/16x16/actions/debug.png
 share/kde4/services/kate_kttsd.desktop
 share/kde4/services/katebacktracebrowserplugin.desktop
 share/kde4/services/katebuildplugin.desktop
+share/kde4/services/katecloseexceptplugin.desktop
 share/kde4/services/katectagsplugin.desktop
 share/kde4/services/katefilebrowserplugin.desktop
 share/kde4/services/katefiletemplates.desktop
@@ -453,6 +471,7 @@ share/kde4/servicetypes/kateplugin.desktop
 @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