The KDE/FreeBSD team is pleased to announce Calligra Suite 2.4.2, KDE

graphic art and office suite.

Information on this release can be found here:
http://www.calligra.org/news/calligra-2-4-2-released

Information on Calligra Project can be found in its first ever release
announcement:
http://www.calligra.org/news/calligra-2-4-released

Consequently, KOffice 2 has been removed from the ports collection.

As usual, we would like to thank all testers and contributors.

9 files changed, 67 insertions, 159 deletions

diff --git a/russian/Makefile b/russian/Makefile
index aa81444920fb..565dcb815e8e 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -8,6 +8,7 @@
     SUBDIR += aspell
     SUBDIR += bugzilla-ru
     SUBDIR += bugzilla3-ru
+    SUBDIR += calligra-l10n
     SUBDIR += d1489
     SUBDIR += eric4
     SUBDIR += fortune-bashorgru
@@ -20,7 +21,6 @@
     SUBDIR += kde3-i18n
     SUBDIR += kde4-l10n
     SUBDIR += koffice-i18n
-    SUBDIR += koffice-kde4-l10n
     SUBDIR += koi2koi
     SUBDIR += koi8r-ps
     SUBDIR += ksocrat
diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile
index 1af5a91d9246..e4c91c15e532 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-l10n
-PORTVERSION=	${KOFFICE2_VERSION}
-PORTREVISION=	1
-CATEGORIES=	russian editors kde
+PORTNAME=	calligra-l10n
+PORTVERSION=	${CALLIGRA_VERSION}
+CATEGORIES?=	russian editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Russian messages and documentation for KOffice2
+COMMENT=	Russian messages and documentation for Calligra
 
-KOFFICE2_L10N=	ru
+CALLIGRA_L10N=	ru
 
-.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
+.include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/russian/calligra-l10n/distinfo b/russian/calligra-l10n/distinfo
index b8b3dcd93629..21c7bbb2fbf5 100644
--- a/russian/calligra-l10n/distinfo
+++ b/russian/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ru-2.3.2.tar.bz2) = 93e1eddb925dd5e739a4fa704069394c8519c242e5c1b7ba5bf412633d4d790c
-SIZE (KDE/koffice-l10n/koffice-l10n-ru-2.3.2.tar.bz2) = 558576
+SHA256 (KDE/calligra-l10n/calligra-l10n-ru-2.4.2.tar.bz2) = 8a7e54ebfaa9dedb2ac599373e4ae08588f1bf5889223b4e4cbe152782c25046
+SIZE (KDE/calligra-l10n/calligra-l10n-ru-2.4.2.tar.bz2) = 582200
diff --git a/russian/calligra-l10n/pkg-descr b/russian/calligra-l10n/pkg-descr
index dfedc574a987..b8f8785a6a78 100644
--- a/russian/calligra-l10n/pkg-descr
+++ b/russian/calligra-l10n/pkg-descr
@@ -1,3 +1,3 @@
-Localized messages and documentation for koffice.
+Localized messages and documentation for Calligra.
 
-WWW:	http://koffice.kde.org
+WWW: http://calligra.org
diff --git a/russian/calligra-l10n/pkg-plist b/russian/calligra-l10n/pkg-plist
index c6d5bb27c6c8..1d2f8effe34f 100644
--- a/russian/calligra-l10n/pkg-plist
+++ b/russian/calligra-l10n/pkg-plist
@@ -1,28 +1,19 @@
-share/doc/HTML/ru/kchart/common
-share/doc/HTML/ru/kchart/index.cache.bz2
-share/doc/HTML/ru/kchart/index.docbook
-share/doc/HTML/ru/kivio/common
-share/doc/HTML/ru/kivio/credits.docbook
-share/doc/HTML/ru/kivio/index.cache.bz2
-share/doc/HTML/ru/kivio/index.docbook
-share/doc/HTML/ru/kivio/introduction.docbook
-share/doc/HTML/ru/kivio/usage.docbook
-share/doc/HTML/ru/kivio/working.docbook
-share/doc/HTML/ru/koffice/common
-share/doc/HTML/ru/koffice/index.cache.bz2
-share/doc/HTML/ru/koffice/index.docbook
-share/doc/HTML/ru/kspread/a11y.docbook
-share/doc/HTML/ru/kspread/advanced.docbook
-share/doc/HTML/ru/kspread/basics.docbook
-share/doc/HTML/ru/kspread/commands.docbook
-share/doc/HTML/ru/kspread/common
-share/doc/HTML/ru/kspread/config.docbook
-share/doc/HTML/ru/kspread/configdialog.docbook
-share/doc/HTML/ru/kspread/faq.docbook
-share/doc/HTML/ru/kspread/format.docbook
-share/doc/HTML/ru/kspread/importexport.docbook
-share/doc/HTML/ru/kspread/index.cache.bz2
-share/doc/HTML/ru/kspread/index.docbook
+share/apps/calligra/autocorrect/ru_RU.xml
+share/doc/HTML/ru/calligra/common
+share/doc/HTML/ru/calligra/index.cache.bz2
+share/doc/HTML/ru/calligra/index.docbook
+share/doc/HTML/ru/sheets/a11y.docbook
+share/doc/HTML/ru/sheets/advanced.docbook
+share/doc/HTML/ru/sheets/basics.docbook
+share/doc/HTML/ru/sheets/commands.docbook
+share/doc/HTML/ru/sheets/common
+share/doc/HTML/ru/sheets/config.docbook
+share/doc/HTML/ru/sheets/configdialog.docbook
+share/doc/HTML/ru/sheets/faq.docbook
+share/doc/HTML/ru/sheets/format.docbook
+share/doc/HTML/ru/sheets/importexport.docbook
+share/doc/HTML/ru/sheets/index.cache.bz2
+share/doc/HTML/ru/sheets/index.docbook
 share/doc/HTML/ru/thesaurus/common
 share/doc/HTML/ru/thesaurus/index.cache.bz2
 share/doc/HTML/ru/thesaurus/index.docbook
@@ -30,48 +21,67 @@ share/locale/ru/LC_MESSAGES/ArtisticTextShape.mo
 share/locale/ru/LC_MESSAGES/AutocorrectPlugin.mo
 share/locale/ru/LC_MESSAGES/CalendarTool.mo
 share/locale/ru/LC_MESSAGES/ChangecasePlugin.mo
-share/locale/ru/LC_MESSAGES/ChartPlugin.mo
 share/locale/ru/LC_MESSAGES/ChartShape.mo
-share/locale/ru/LC_MESSAGES/DivineProportion.mo
+share/locale/ru/LC_MESSAGES/CommentShape.mo
 share/locale/ru/LC_MESSAGES/FormulaShape.mo
+share/locale/ru/LC_MESSAGES/FreOffice.mo
 share/locale/ru/LC_MESSAGES/KarbonTools.mo
+share/locale/ru/LC_MESSAGES/KexiRelationDesignShapePlugin.mo
+share/locale/ru/LC_MESSAGES/MapShape.mo
 share/locale/ru/LC_MESSAGES/MusicShape.mo
 share/locale/ru/LC_MESSAGES/ParagraphTool.mo
 share/locale/ru/LC_MESSAGES/PathShapes.mo
 share/locale/ru/LC_MESSAGES/PictureShape.mo
 share/locale/ru/LC_MESSAGES/PluginShape.mo
-share/locale/ru/LC_MESSAGES/ShapePlugin.mo
 share/locale/ru/LC_MESSAGES/SpellCheckPlugin.mo
 share/locale/ru/LC_MESSAGES/TableShape.mo
 share/locale/ru/LC_MESSAGES/TextShape.mo
+share/locale/ru/LC_MESSAGES/TreeShape.mo
 share/locale/ru/LC_MESSAGES/VariablesPlugin.mo
+share/locale/ru/LC_MESSAGES/VectorShape.mo
 share/locale/ru/LC_MESSAGES/VideoShape.mo
-share/locale/ru/LC_MESSAGES/desktop_koffice.mo
+share/locale/ru/LC_MESSAGES/braindump.mo
+share/locale/ru/LC_MESSAGES/calligra-defaulttools.mo
+share/locale/ru/LC_MESSAGES/calligra-dockers.mo
+share/locale/ru/LC_MESSAGES/calligra-opener.mo
+share/locale/ru/LC_MESSAGES/calligra.mo
+share/locale/ru/LC_MESSAGES/calligrafilters.mo
+share/locale/ru/LC_MESSAGES/desktop_calligra.mo
+share/locale/ru/LC_MESSAGES/flow.mo
+share/locale/ru/LC_MESSAGES/googledocs_plugin.mo
 share/locale/ru/LC_MESSAGES/karbon.mo
-share/locale/ru/LC_MESSAGES/kchart.mo
 share/locale/ru/LC_MESSAGES/kexi.mo
-share/locale/ru/LC_MESSAGES/kformula.mo
+share/locale/ru/LC_MESSAGES/kformdesigner_mapbrowser.mo
+share/locale/ru/LC_MESSAGES/kformdesigner_webbrowser.mo
+share/locale/ru/LC_MESSAGES/koabstraction.mo
 share/locale/ru/LC_MESSAGES/kocolorspaces.mo
 share/locale/ru/LC_MESSAGES/koconverter.mo
-share/locale/ru/LC_MESSAGES/koffice-defaulttools.mo
-share/locale/ru/LC_MESSAGES/koffice-dockers.mo
-share/locale/ru/LC_MESSAGES/koffice.mo
-share/locale/ru/LC_MESSAGES/kofficefilters.mo
 share/locale/ru/LC_MESSAGES/koproperty.mo
+share/locale/ru/LC_MESSAGES/koreport_barcodeplugin.mo
+share/locale/ru/LC_MESSAGES/koreport_chartplugin.mo
+share/locale/ru/LC_MESSAGES/koreport_mapsplugin.mo
+share/locale/ru/LC_MESSAGES/koreport_shapeplugin.mo
+share/locale/ru/LC_MESSAGES/koreport_webplugin.mo
 share/locale/ru/LC_MESSAGES/kounavail.mo
-share/locale/ru/LC_MESSAGES/kplato.mo
-share/locale/ru/LC_MESSAGES/kplatowork.mo
-share/locale/ru/LC_MESSAGES/kpresenter.mo
 share/locale/ru/LC_MESSAGES/krita.mo
-share/locale/ru/LC_MESSAGES/krossmodulekspread.mo
+share/locale/ru/LC_MESSAGES/krossmoduleplan.mo
+share/locale/ru/LC_MESSAGES/krossmoduletables.mo
+share/locale/ru/LC_MESSAGES/krossmodulewords.mo
 share/locale/ru/LC_MESSAGES/kscan_plugin.mo
-share/locale/ru/LC_MESSAGES/kspread.mo
-share/locale/ru/LC_MESSAGES/kspreadsolver.mo
 share/locale/ru/LC_MESSAGES/kthesaurus.mo
-share/locale/ru/LC_MESSAGES/kword.mo
+share/locale/ru/LC_MESSAGES/okularGenerator_odp.mo
+share/locale/ru/LC_MESSAGES/plan.mo
+share/locale/ru/LC_MESSAGES/planlibs.mo
+share/locale/ru/LC_MESSAGES/planrcpsplugin.mo
+share/locale/ru/LC_MESSAGES/plantjplugin.mo
+share/locale/ru/LC_MESSAGES/planwork.mo
+share/locale/ru/LC_MESSAGES/sheets.mo
+share/locale/ru/LC_MESSAGES/stage.mo
+share/locale/ru/LC_MESSAGES/tablessolver.mo
 share/locale/ru/LC_MESSAGES/thesaurus_tool.mo
+share/locale/ru/LC_MESSAGES/words.mo
 @dirrm share/doc/HTML/ru/thesaurus
-@dirrm share/doc/HTML/ru/kspread
-@dirrm share/doc/HTML/ru/koffice
-@dirrm share/doc/HTML/ru/kivio
-@dirrm share/doc/HTML/ru/kchart
+@dirrm share/doc/HTML/ru/sheets
+@dirrm share/doc/HTML/ru/calligra
+@dirrmtry share/apps/calligra/autocorrect
+@dirrmtry share/apps/calligra
diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile
deleted file mode 100644
index 1af5a91d9246..000000000000
--- a/russian/koffice-kde4-l10n/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:    koffice-i18n-ru
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	koffice-l10n
-PORTVERSION=	${KOFFICE2_VERSION}
-PORTREVISION=	1
-CATEGORIES=	russian editors kde
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Russian messages and documentation for KOffice2
-
-KOFFICE2_L10N=	ru
-
-.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
-.include <bsd.port.mk>
diff --git a/russian/koffice-kde4-l10n/distinfo b/russian/koffice-kde4-l10n/distinfo
deleted file mode 100644
index b8b3dcd93629..000000000000
--- a/russian/koffice-kde4-l10n/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/koffice-l10n/koffice-l10n-ru-2.3.2.tar.bz2) = 93e1eddb925dd5e739a4fa704069394c8519c242e5c1b7ba5bf412633d4d790c
-SIZE (KDE/koffice-l10n/koffice-l10n-ru-2.3.2.tar.bz2) = 558576
diff --git a/russian/koffice-kde4-l10n/pkg-descr b/russian/koffice-kde4-l10n/pkg-descr
deleted file mode 100644
index dfedc574a987..000000000000
--- a/russian/koffice-kde4-l10n/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Localized messages and documentation for koffice.
-
-WWW:	http://koffice.kde.org
diff --git a/russian/koffice-kde4-l10n/pkg-plist b/russian/koffice-kde4-l10n/pkg-plist
deleted file mode 100644
index c6d5bb27c6c8..000000000000
--- a/russian/koffice-kde4-l10n/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-share/doc/HTML/ru/kchart/common
-share/doc/HTML/ru/kchart/index.cache.bz2
-share/doc/HTML/ru/kchart/index.docbook
-share/doc/HTML/ru/kivio/common
-share/doc/HTML/ru/kivio/credits.docbook
-share/doc/HTML/ru/kivio/index.cache.bz2
-share/doc/HTML/ru/kivio/index.docbook
-share/doc/HTML/ru/kivio/introduction.docbook
-share/doc/HTML/ru/kivio/usage.docbook
-share/doc/HTML/ru/kivio/working.docbook
-share/doc/HTML/ru/koffice/common
-share/doc/HTML/ru/koffice/index.cache.bz2
-share/doc/HTML/ru/koffice/index.docbook
-share/doc/HTML/ru/kspread/a11y.docbook
-share/doc/HTML/ru/kspread/advanced.docbook
-share/doc/HTML/ru/kspread/basics.docbook
-share/doc/HTML/ru/kspread/commands.docbook
-share/doc/HTML/ru/kspread/common
-share/doc/HTML/ru/kspread/config.docbook
-share/doc/HTML/ru/kspread/configdialog.docbook
-share/doc/HTML/ru/kspread/faq.docbook
-share/doc/HTML/ru/kspread/format.docbook
-share/doc/HTML/ru/kspread/importexport.docbook
-share/doc/HTML/ru/kspread/index.cache.bz2
-share/doc/HTML/ru/kspread/index.docbook
-share/doc/HTML/ru/thesaurus/common
-share/doc/HTML/ru/thesaurus/index.cache.bz2
-share/doc/HTML/ru/thesaurus/index.docbook
-share/locale/ru/LC_MESSAGES/ArtisticTextShape.mo
-share/locale/ru/LC_MESSAGES/AutocorrectPlugin.mo
-share/locale/ru/LC_MESSAGES/CalendarTool.mo
-share/locale/ru/LC_MESSAGES/ChangecasePlugin.mo
-share/locale/ru/LC_MESSAGES/ChartPlugin.mo
-share/locale/ru/LC_MESSAGES/ChartShape.mo
-share/locale/ru/LC_MESSAGES/DivineProportion.mo
-share/locale/ru/LC_MESSAGES/FormulaShape.mo
-share/locale/ru/LC_MESSAGES/KarbonTools.mo
-share/locale/ru/LC_MESSAGES/MusicShape.mo
-share/locale/ru/LC_MESSAGES/ParagraphTool.mo
-share/locale/ru/LC_MESSAGES/PathShapes.mo
-share/locale/ru/LC_MESSAGES/PictureShape.mo
-share/locale/ru/LC_MESSAGES/PluginShape.mo
-share/locale/ru/LC_MESSAGES/ShapePlugin.mo
-share/locale/ru/LC_MESSAGES/SpellCheckPlugin.mo
-share/locale/ru/LC_MESSAGES/TableShape.mo
-share/locale/ru/LC_MESSAGES/TextShape.mo
-share/locale/ru/LC_MESSAGES/VariablesPlugin.mo
-share/locale/ru/LC_MESSAGES/VideoShape.mo
-share/locale/ru/LC_MESSAGES/desktop_koffice.mo
-share/locale/ru/LC_MESSAGES/karbon.mo
-share/locale/ru/LC_MESSAGES/kchart.mo
-share/locale/ru/LC_MESSAGES/kexi.mo
-share/locale/ru/LC_MESSAGES/kformula.mo
-share/locale/ru/LC_MESSAGES/kocolorspaces.mo
-share/locale/ru/LC_MESSAGES/koconverter.mo
-share/locale/ru/LC_MESSAGES/koffice-defaulttools.mo
-share/locale/ru/LC_MESSAGES/koffice-dockers.mo
-share/locale/ru/LC_MESSAGES/koffice.mo
-share/locale/ru/LC_MESSAGES/kofficefilters.mo
-share/locale/ru/LC_MESSAGES/koproperty.mo
-share/locale/ru/LC_MESSAGES/kounavail.mo
-share/locale/ru/LC_MESSAGES/kplato.mo
-share/locale/ru/LC_MESSAGES/kplatowork.mo
-share/locale/ru/LC_MESSAGES/kpresenter.mo
-share/locale/ru/LC_MESSAGES/krita.mo
-share/locale/ru/LC_MESSAGES/krossmodulekspread.mo
-share/locale/ru/LC_MESSAGES/kscan_plugin.mo
-share/locale/ru/LC_MESSAGES/kspread.mo
-share/locale/ru/LC_MESSAGES/kspreadsolver.mo
-share/locale/ru/LC_MESSAGES/kthesaurus.mo
-share/locale/ru/LC_MESSAGES/kword.mo
-share/locale/ru/LC_MESSAGES/thesaurus_tool.mo
-@dirrm share/doc/HTML/ru/thesaurus
-@dirrm share/doc/HTML/ru/kspread
-@dirrm share/doc/HTML/ru/koffice
-@dirrm share/doc/HTML/ru/kivio
-@dirrm share/doc/HTML/ru/kchart