3 files changed, 38 insertions, 79 deletions

diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index b68a8f6bd799..9f661dde4dde 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:	koffice-i18n-et
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
+# New ports collection makefile for:    koffice-kde4-l10n-et
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
 CATEGORIES?=	editors kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	et-
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Estonian messages and documentation for koffice
+COMMENT=	Estonian 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=	et
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo
index dcf4ef345427..bf07e1f9c77b 100644
--- a/editors/calligra-l10n-et/distinfo
+++ b/editors/calligra-l10n-et/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.3.tar.bz2) = fdc1c81ae65bec5f7e56d76bcdbaa1af
-SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.3.tar.bz2) = 352be5ba384443af75464ce56132820e170ea6f4b90076538669bb2701957594
-SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.3.tar.bz2) = 1185294
+MD5 (KDE/kde-l10n/koffice-l10n-et-2.1.0.tar.bz2) = e648bf417ce2d0a08f1f36e56c64ef0b
+SHA256 (KDE/kde-l10n/koffice-l10n-et-2.1.0.tar.bz2) = e87df3adaca598c7c888070c87fa8779f222a7624154c477b7c5c28b16fb70d7
+SIZE (KDE/kde-l10n/koffice-l10n-et-2.1.0.tar.bz2) = 956603
diff --git a/editors/calligra-l10n-et/pkg-plist b/editors/calligra-l10n-et/pkg-plist
index 94ca9632ea6b..b76c2e1d8eff 100644
--- a/editors/calligra-l10n-et/pkg-plist
+++ b/editors/calligra-l10n-et/pkg-plist
@@ -4,37 +4,12 @@ share/doc/HTML/et/karbon/index.docbook
 share/doc/HTML/et/kchart/common
 share/doc/HTML/et/kchart/index.cache.bz2
 share/doc/HTML/et/kchart/index.docbook
-share/doc/HTML/et/kexi/basics.docbook
-share/doc/HTML/et/kexi/building.docbook
-share/doc/HTML/et/kexi/common
-share/doc/HTML/et/kexi/comparing.docbook
-share/doc/HTML/et/kexi/configuration.docbook
-share/doc/HTML/et/kexi/credits.docbook
-share/doc/HTML/et/kexi/database.docbook
-share/doc/HTML/et/kexi/designingforms.docbook
-share/doc/HTML/et/kexi/enteringdataintotables.docbook
-share/doc/HTML/et/kexi/enteringdatausingforms.docbook
-share/doc/HTML/et/kexi/index.cache.bz2
-share/doc/HTML/et/kexi/index.docbook
-share/doc/HTML/et/kexi/intro.docbook
-share/doc/HTML/et/kexi/menus.docbook
-share/doc/HTML/et/kexi/querydesigning.docbook
 share/doc/HTML/et/kformula/common
 share/doc/HTML/et/kformula/index.cache.bz2
 share/doc/HTML/et/kformula/index.docbook
-share/doc/HTML/et/kivio/common
-share/doc/HTML/et/kivio/credits.docbook
-share/doc/HTML/et/kivio/index.cache.bz2
-share/doc/HTML/et/kivio/index.docbook
-share/doc/HTML/et/kivio/introduction.docbook
-share/doc/HTML/et/kivio/usage.docbook
-share/doc/HTML/et/kivio/working.docbook
 share/doc/HTML/et/koffice/common
 share/doc/HTML/et/koffice/index.cache.bz2
 share/doc/HTML/et/koffice/index.docbook
-share/doc/HTML/et/koshell/common
-share/doc/HTML/et/koshell/index.cache.bz2
-share/doc/HTML/et/koshell/index.docbook
 share/doc/HTML/et/kplato/commands.docbook
 share/doc/HTML/et/kplato/common
 share/doc/HTML/et/kplato/definitions.docbook
@@ -69,7 +44,6 @@ share/doc/HTML/et/krita/index.cache.bz2
 share/doc/HTML/et/krita/index.docbook
 share/doc/HTML/et/krita/installation.docbook
 share/doc/HTML/et/krita/introduction.docbook
-share/doc/HTML/et/krita/scripting.docbook
 share/doc/HTML/et/krita/settings.docbook
 share/doc/HTML/et/krita/tutorial-quick-starts.docbook
 share/doc/HTML/et/krita/tutorial-select-layer.docbook
@@ -100,18 +74,6 @@ share/doc/HTML/et/kspread/shortcut1.png
 share/doc/HTML/et/kspread/shortcut2.png
 share/doc/HTML/et/kspread/sort1.png
 share/doc/HTML/et/kspread/starting1.png
-share/doc/HTML/et/kugar/common
-share/doc/HTML/et/kugar/datadtd.docbook
-share/doc/HTML/et/kugar/dataref.docbook
-share/doc/HTML/et/kugar/designer.docbook
-share/doc/HTML/et/kugar/index.cache.bz2
-share/doc/HTML/et/kugar/index.docbook
-share/doc/HTML/et/kugar/progguide.docbook
-share/doc/HTML/et/kugar/starting.docbook
-share/doc/HTML/et/kugar/template-elements.docbook
-share/doc/HTML/et/kugar/template.docbook
-share/doc/HTML/et/kugar/templatedtd.docbook
-share/doc/HTML/et/kugar/tutorial.docbook
 share/doc/HTML/et/kword/a11y.docbook
 share/doc/HTML/et/kword/basics.docbook
 share/doc/HTML/et/kword/bookmarks.docbook
@@ -154,47 +116,56 @@ share/doc/HTML/et/kword/tutorial.docbook
 share/doc/HTML/et/thesaurus/common
 share/doc/HTML/et/thesaurus/index.cache.bz2
 share/doc/HTML/et/thesaurus/index.docbook
+share/locale/et/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/et/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/et/LC_MESSAGES/CalendarTool.mo
+share/locale/et/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/et/LC_MESSAGES/ChartShape.mo
+share/locale/et/LC_MESSAGES/DivineProportion.mo
+share/locale/et/LC_MESSAGES/FormulaShape.mo
+share/locale/et/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/et/LC_MESSAGES/KarbonTools.mo
+share/locale/et/LC_MESSAGES/MusicShape.mo
+share/locale/et/LC_MESSAGES/ParagraphTool.mo
+share/locale/et/LC_MESSAGES/PathShapes.mo
+share/locale/et/LC_MESSAGES/PictureShape.mo
+share/locale/et/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/et/LC_MESSAGES/TableShape.mo
+share/locale/et/LC_MESSAGES/TextShape.mo
+share/locale/et/LC_MESSAGES/VariablesPlugin.mo
 share/locale/et/LC_MESSAGES/desktop_koffice.mo
-share/locale/et/LC_MESSAGES/example.mo
 share/locale/et/LC_MESSAGES/karbon.mo
 share/locale/et/LC_MESSAGES/kchart.mo
-share/locale/et/LC_MESSAGES/kexi.mo
-share/locale/et/LC_MESSAGES/kfile_abiword.mo
-share/locale/et/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/et/LC_MESSAGES/kfile_koffice.mo
-share/locale/et/LC_MESSAGES/kfile_ooo.mo
-share/locale/et/LC_MESSAGES/kformdesigner.mo
 share/locale/et/LC_MESSAGES/kformula.mo
-share/locale/et/LC_MESSAGES/kivio.mo
+share/locale/et/LC_MESSAGES/kocolorspaces.mo
 share/locale/et/LC_MESSAGES/koconverter.mo
+share/locale/et/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/et/LC_MESSAGES/koffice-dockers.mo
+share/locale/et/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/et/LC_MESSAGES/koffice.mo
 share/locale/et/LC_MESSAGES/kofficefilters.mo
-share/locale/et/LC_MESSAGES/koproperty.mo
-share/locale/et/LC_MESSAGES/koshell.mo
 share/locale/et/LC_MESSAGES/kounavail.mo
 share/locale/et/LC_MESSAGES/kplato.mo
+share/locale/et/LC_MESSAGES/kplatolibs.mo
+share/locale/et/LC_MESSAGES/kplatowork.mo
 share/locale/et/LC_MESSAGES/kpresenter.mo
 share/locale/et/LC_MESSAGES/krita.mo
+share/locale/et/LC_MESSAGES/krossmodulekplato.mo
+share/locale/et/LC_MESSAGES/krossmodulekspread.mo
+share/locale/et/LC_MESSAGES/krossmodulekword.mo
 share/locale/et/LC_MESSAGES/kscan_plugin.mo
-share/locale/et/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/et/LC_MESSAGES/kspread.mo
-share/locale/et/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/et/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/et/LC_MESSAGES/kspreadsolver.mo
 share/locale/et/LC_MESSAGES/kthesaurus.mo
-share/locale/et/LC_MESSAGES/kugar.mo
 share/locale/et/LC_MESSAGES/kword.mo
 share/locale/et/LC_MESSAGES/thesaurus_tool.mo
 @dirrm share/doc/HTML/et/thesaurus
 @dirrm share/doc/HTML/et/kword
-@dirrm share/doc/HTML/et/kugar
 @dirrm share/doc/HTML/et/kspread
 @dirrm share/doc/HTML/et/krita
 @dirrm share/doc/HTML/et/kpresenter
 @dirrm share/doc/HTML/et/kplato
-@dirrm share/doc/HTML/et/koshell
 @dirrm share/doc/HTML/et/koffice
-@dirrm share/doc/HTML/et/kivio
 @dirrm share/doc/HTML/et/kformula
-@dirrm share/doc/HTML/et/kexi
 @dirrm share/doc/HTML/et/kchart
 @dirrm share/doc/HTML/et/karbon