3 files changed, 121 insertions, 38 deletions

diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index 4bb97d88b7a7..36743197c45f 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:	koffice-i18n-uk
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
+# New ports collection makefile for:    koffice-kde4-l10n-uk
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	ukrainian kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	uk-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	ukrainian editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Ukrainian messages and documentation for koffice
+COMMENT=	Ukrainian messages and documentation for KOffice2
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
-USE_KDELIBS_VER=3
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-KDE_I18N=	yes
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+KOFFICE2_L10N=	uk
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/ukrainian/calligra-l10n/distinfo b/ukrainian/calligra-l10n/distinfo
index ce7fb460b4b5..96260f9e25b7 100644
--- a/ukrainian/calligra-l10n/distinfo
+++ b/ukrainian/calligra-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.3.tar.bz2) = f8a50375d4f280131a27e0bdfb0deb83
-SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.3.tar.bz2) = 8a3091d161651a9b43dc8962ccc28c68408a71692826b694380226b6a053176e
-SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.3.tar.bz2) = 361135
+MD5 (KDE/kde-l10n/koffice-l10n-uk-2.1.0.tar.bz2) = f58ee92e635dcef89b9c5115ebf7dc0e
+SHA256 (KDE/kde-l10n/koffice-l10n-uk-2.1.0.tar.bz2) = 71745e73a0337f3db2b2597fac3090c7fc81376cf0ba72466d58112e23994d9d
+SIZE (KDE/kde-l10n/koffice-l10n-uk-2.1.0.tar.bz2) = 658595
diff --git a/ukrainian/calligra-l10n/pkg-plist b/ukrainian/calligra-l10n/pkg-plist
index 9e7a5cb201d0..86b824008aa7 100644
--- a/ukrainian/calligra-l10n/pkg-plist
+++ b/ukrainian/calligra-l10n/pkg-plist
@@ -1,30 +1,125 @@
+share/doc/HTML/uk/karbon/common
+share/doc/HTML/uk/karbon/index.cache.bz2
+share/doc/HTML/uk/karbon/index.docbook
+share/doc/HTML/uk/kchart/common
+share/doc/HTML/uk/kchart/index.cache.bz2
+share/doc/HTML/uk/kchart/index.docbook
+share/doc/HTML/uk/kformula/common
+share/doc/HTML/uk/kformula/index.cache.bz2
+share/doc/HTML/uk/kformula/index.docbook
+share/doc/HTML/uk/koffice/common
+share/doc/HTML/uk/koffice/index.cache.bz2
+share/doc/HTML/uk/koffice/index.docbook
+share/doc/HTML/uk/kplato/commands.docbook
+share/doc/HTML/uk/kplato/common
+share/doc/HTML/uk/kplato/definitions.docbook
+share/doc/HTML/uk/kplato/index.cache.bz2
+share/doc/HTML/uk/kplato/index.docbook
+share/doc/HTML/uk/kplato/mainwindow.docbook
+share/doc/HTML/uk/kplato/options.docbook
+share/doc/HTML/uk/kplato/wbs.docbook
+share/doc/HTML/uk/kpresenter/a11y.docbook
+share/doc/HTML/uk/kpresenter/common
+share/doc/HTML/uk/kpresenter/faq.docbook
+share/doc/HTML/uk/kpresenter/great-presentations.docbook
+share/doc/HTML/uk/kpresenter/guides.docbook
+share/doc/HTML/uk/kpresenter/index.cache.bz2
+share/doc/HTML/uk/kpresenter/index.docbook
+share/doc/HTML/uk/kpresenter/menus.docbook
+share/doc/HTML/uk/kpresenter/options.docbook
+share/doc/HTML/uk/kpresenter/screen.docbook
+share/doc/HTML/uk/kpresenter/tutorial.docbook
+share/doc/HTML/uk/krita/commands-dialogs.docbook
+share/doc/HTML/uk/krita/commands-menus.docbook
+share/doc/HTML/uk/krita/commands-palettes.docbook
+share/doc/HTML/uk/krita/commands-toolbars.docbook
+share/doc/HTML/uk/krita/commands.docbook
+share/doc/HTML/uk/krita/common
+share/doc/HTML/uk/krita/credits.docbook
+share/doc/HTML/uk/krita/developers-plugins.docbook
+share/doc/HTML/uk/krita/developers-scripting.docbook
+share/doc/HTML/uk/krita/developers.docbook
+share/doc/HTML/uk/krita/faq.docbook
+share/doc/HTML/uk/krita/index.cache.bz2
+share/doc/HTML/uk/krita/index.docbook
+share/doc/HTML/uk/krita/installation.docbook
+share/doc/HTML/uk/krita/introduction.docbook
+share/doc/HTML/uk/krita/settings.docbook
+share/doc/HTML/uk/krita/tutorial-quick-starts.docbook
+share/doc/HTML/uk/krita/tutorial-select-layer.docbook
+share/doc/HTML/uk/krita/tutorial-starting.docbook
+share/doc/HTML/uk/krita/tutorial-tablet.docbook
+share/doc/HTML/uk/krita/tutorial.docbook
+share/doc/HTML/uk/krita/using-colorspaces.docbook
+share/doc/HTML/uk/krita/using-filters.docbook
+share/doc/HTML/uk/krita/using-images.docbook
+share/doc/HTML/uk/krita/using-layers.docbook
+share/doc/HTML/uk/krita/using-selections.docbook
+share/doc/HTML/uk/krita/using-views.docbook
+share/doc/HTML/uk/kspread/a11y.docbook
+share/doc/HTML/uk/kspread/advanced.docbook
+share/doc/HTML/uk/kspread/basics.docbook
+share/doc/HTML/uk/kspread/commands.docbook
+share/doc/HTML/uk/kspread/common
+share/doc/HTML/uk/kspread/config.docbook
+share/doc/HTML/uk/kspread/configdialog.docbook
+share/doc/HTML/uk/kspread/faq.docbook
+share/doc/HTML/uk/kspread/format.docbook
+share/doc/HTML/uk/kspread/importexport.docbook
+share/doc/HTML/uk/kspread/index.cache.bz2
+share/doc/HTML/uk/kspread/index.docbook
+share/doc/HTML/uk/thesaurus/common
+share/doc/HTML/uk/thesaurus/index.cache.bz2
+share/doc/HTML/uk/thesaurus/index.docbook
+share/locale/uk/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/uk/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/uk/LC_MESSAGES/CalendarTool.mo
+share/locale/uk/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/uk/LC_MESSAGES/ChartShape.mo
+share/locale/uk/LC_MESSAGES/DivineProportion.mo
+share/locale/uk/LC_MESSAGES/FormulaShape.mo
+share/locale/uk/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/uk/LC_MESSAGES/KarbonTools.mo
+share/locale/uk/LC_MESSAGES/MusicShape.mo
+share/locale/uk/LC_MESSAGES/ParagraphTool.mo
+share/locale/uk/LC_MESSAGES/PathShapes.mo
+share/locale/uk/LC_MESSAGES/PictureShape.mo
+share/locale/uk/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/uk/LC_MESSAGES/TableShape.mo
+share/locale/uk/LC_MESSAGES/TextShape.mo
+share/locale/uk/LC_MESSAGES/VariablesPlugin.mo
 share/locale/uk/LC_MESSAGES/desktop_koffice.mo
-share/locale/uk/LC_MESSAGES/example.mo
 share/locale/uk/LC_MESSAGES/karbon.mo
 share/locale/uk/LC_MESSAGES/kchart.mo
-share/locale/uk/LC_MESSAGES/kexi.mo
-share/locale/uk/LC_MESSAGES/kfile_abiword.mo
-share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/uk/LC_MESSAGES/kfile_koffice.mo
-share/locale/uk/LC_MESSAGES/kfile_ooo.mo
-share/locale/uk/LC_MESSAGES/kformdesigner.mo
 share/locale/uk/LC_MESSAGES/kformula.mo
-share/locale/uk/LC_MESSAGES/kivio.mo
+share/locale/uk/LC_MESSAGES/kocolorspaces.mo
 share/locale/uk/LC_MESSAGES/koconverter.mo
+share/locale/uk/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/uk/LC_MESSAGES/koffice-dockers.mo
+share/locale/uk/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/uk/LC_MESSAGES/koffice.mo
 share/locale/uk/LC_MESSAGES/kofficefilters.mo
-share/locale/uk/LC_MESSAGES/koproperty.mo
-share/locale/uk/LC_MESSAGES/koshell.mo
 share/locale/uk/LC_MESSAGES/kounavail.mo
 share/locale/uk/LC_MESSAGES/kplato.mo
+share/locale/uk/LC_MESSAGES/kplatolibs.mo
+share/locale/uk/LC_MESSAGES/kplatowork.mo
 share/locale/uk/LC_MESSAGES/kpresenter.mo
 share/locale/uk/LC_MESSAGES/krita.mo
+share/locale/uk/LC_MESSAGES/krossmodulekplato.mo
+share/locale/uk/LC_MESSAGES/krossmodulekspread.mo
+share/locale/uk/LC_MESSAGES/krossmodulekword.mo
 share/locale/uk/LC_MESSAGES/kscan_plugin.mo
-share/locale/uk/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/uk/LC_MESSAGES/kspread.mo
-share/locale/uk/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/uk/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/uk/LC_MESSAGES/kspreadsolver.mo
 share/locale/uk/LC_MESSAGES/kthesaurus.mo
-share/locale/uk/LC_MESSAGES/kugar.mo
 share/locale/uk/LC_MESSAGES/kword.mo
 share/locale/uk/LC_MESSAGES/thesaurus_tool.mo
+@dirrm share/doc/HTML/uk/thesaurus
+@dirrm share/doc/HTML/uk/kspread
+@dirrm share/doc/HTML/uk/krita
+@dirrm share/doc/HTML/uk/kpresenter
+@dirrm share/doc/HTML/uk/kplato
+@dirrm share/doc/HTML/uk/koffice
+@dirrm share/doc/HTML/uk/kformula
+@dirrm share/doc/HTML/uk/kchart
+@dirrm share/doc/HTML/uk/karbon