The KDE FreeBSD team is proud to announce the release of KOffice2 suite for FreeBSD. The official KOffice 2.1.0 notes can be found here

(http://www.koffice.org/news/koffice-2-1-released/)

We'd like to say thanks to all helpers, testers and submitters.

Happy Installing.

Approved by:	miwi (mentor)

13 files changed, 156 insertions, 152 deletions

diff --git a/chinese/Makefile b/chinese/Makefile
index e21e92b..f96610a 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -67,6 +67,8 @@
     SUBDIR += kde4-l10n-zh_TW
     SUBDIR += koffice-i18n-zh_CN
     SUBDIR += koffice-i18n-zh_TW
+    SUBDIR += koffice-kde4-l10n-zh_CN
+    SUBDIR += koffice-kde4-l10n-zh_TW
     SUBDIR += kon2
     SUBDIR += libchewing
     SUBDIR += libtabe
diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile
index 922b10c..34e6794 100644
--- a/chinese/calligra-l10n-zh_CN/Makefile
+++ b/chinese/calligra-l10n-zh_CN/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:    koffice-i18n-zh_CN
-# Date created:                         21 January 2004
-# Whom:                                 Brad Davis <so14k@so14k.com>
+# New ports collection makefile for:    koffice-kde4-l10n-zh_CN
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	chinese kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	zh_CN-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	chinese editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Simplified Chinese messages and documentation for koffice
+COMMENT=	Simplified Chinese 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=	zh_CN
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/chinese/calligra-l10n-zh_CN/distinfo b/chinese/calligra-l10n-zh_CN/distinfo
index 42ae49a..4510755 100644
--- a/chinese/calligra-l10n-zh_CN/distinfo
+++ b/chinese/calligra-l10n-zh_CN/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.3.tar.bz2) = a21490ebc1d0beedc565c070d4bdad25
-SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.3.tar.bz2) = c436c12c693e9b0c223413d869f1f1f5d84a1f12224de13772308c8fd3b9fa63
-SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.3.tar.bz2) = 353668
+MD5 (KDE/kde-l10n/koffice-l10n-zh_CN-2.1.0.tar.bz2) = 4a5cd6023531ad668940dd00ddd748bb
+SHA256 (KDE/kde-l10n/koffice-l10n-zh_CN-2.1.0.tar.bz2) = af53c3dbbd26376907626b258d0ca6978cc6792fd3dabe7e45e09c0eabb8ea7b
+SIZE (KDE/kde-l10n/koffice-l10n-zh_CN-2.1.0.tar.bz2) = 229432
diff --git a/chinese/calligra-l10n-zh_CN/pkg-plist b/chinese/calligra-l10n-zh_CN/pkg-plist
index a6ae7f0..ca55bc9 100644
--- a/chinese/calligra-l10n-zh_CN/pkg-plist
+++ b/chinese/calligra-l10n-zh_CN/pkg-plist
@@ -1,30 +1,42 @@
+share/locale/zh_CN/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/zh_CN/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/zh_CN/LC_MESSAGES/CalendarTool.mo
+share/locale/zh_CN/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/zh_CN/LC_MESSAGES/ChartShape.mo
+share/locale/zh_CN/LC_MESSAGES/DivineProportion.mo
+share/locale/zh_CN/LC_MESSAGES/FormulaShape.mo
+share/locale/zh_CN/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/zh_CN/LC_MESSAGES/KarbonTools.mo
+share/locale/zh_CN/LC_MESSAGES/MusicShape.mo
+share/locale/zh_CN/LC_MESSAGES/ParagraphTool.mo
+share/locale/zh_CN/LC_MESSAGES/PathShapes.mo
+share/locale/zh_CN/LC_MESSAGES/PictureShape.mo
+share/locale/zh_CN/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/zh_CN/LC_MESSAGES/TextShape.mo
+share/locale/zh_CN/LC_MESSAGES/VariablesPlugin.mo
 share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo
-share/locale/zh_CN/LC_MESSAGES/example.mo
 share/locale/zh_CN/LC_MESSAGES/karbon.mo
 share/locale/zh_CN/LC_MESSAGES/kchart.mo
-share/locale/zh_CN/LC_MESSAGES/kexi.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_abiword.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_koffice.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_ooo.mo
-share/locale/zh_CN/LC_MESSAGES/kformdesigner.mo
 share/locale/zh_CN/LC_MESSAGES/kformula.mo
-share/locale/zh_CN/LC_MESSAGES/kivio.mo
+share/locale/zh_CN/LC_MESSAGES/kocolorspaces.mo
 share/locale/zh_CN/LC_MESSAGES/koconverter.mo
+share/locale/zh_CN/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/zh_CN/LC_MESSAGES/koffice-dockers.mo
+share/locale/zh_CN/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/zh_CN/LC_MESSAGES/koffice.mo
 share/locale/zh_CN/LC_MESSAGES/kofficefilters.mo
-share/locale/zh_CN/LC_MESSAGES/koproperty.mo
-share/locale/zh_CN/LC_MESSAGES/koshell.mo
 share/locale/zh_CN/LC_MESSAGES/kounavail.mo
 share/locale/zh_CN/LC_MESSAGES/kplato.mo
+share/locale/zh_CN/LC_MESSAGES/kplatolibs.mo
+share/locale/zh_CN/LC_MESSAGES/kplatowork.mo
 share/locale/zh_CN/LC_MESSAGES/kpresenter.mo
 share/locale/zh_CN/LC_MESSAGES/krita.mo
+share/locale/zh_CN/LC_MESSAGES/krossmodulekplato.mo
+share/locale/zh_CN/LC_MESSAGES/krossmodulekspread.mo
+share/locale/zh_CN/LC_MESSAGES/krossmodulekword.mo
 share/locale/zh_CN/LC_MESSAGES/kscan_plugin.mo
-share/locale/zh_CN/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/kspread.mo
-share/locale/zh_CN/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/zh_CN/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/zh_CN/LC_MESSAGES/kspreadsolver.mo
 share/locale/zh_CN/LC_MESSAGES/kthesaurus.mo
-share/locale/zh_CN/LC_MESSAGES/kugar.mo
 share/locale/zh_CN/LC_MESSAGES/kword.mo
 share/locale/zh_CN/LC_MESSAGES/thesaurus_tool.mo
diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile
index dfb2512..251e416 100644
--- a/chinese/calligra-l10n-zh_TW/Makefile
+++ b/chinese/calligra-l10n-zh_TW/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:    koffice-i18n-zh_TW
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
+# New ports collection makefile for:    koffice-kde4-l10n-zh_TW
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	chinese kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	zh_TW-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	chinese editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Traditional Chinese messages and documentation for koffice
+COMMENT=	Traditional Chinese 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=	zh_TW
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/chinese/calligra-l10n-zh_TW/distinfo b/chinese/calligra-l10n-zh_TW/distinfo
index 64dca89..08c1f35 100644
--- a/chinese/calligra-l10n-zh_TW/distinfo
+++ b/chinese/calligra-l10n-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.3.tar.bz2) = 7c7c3787a45743ae9d06938829381d2e
-SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.3.tar.bz2) = f4c3d16903a487ea4127d7deee62b16a7b648aee92338498734da0cff88fc248
-SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.3.tar.bz2) = 365213
+MD5 (KDE/kde-l10n/koffice-l10n-zh_TW-2.1.0.tar.bz2) = b6ae48ec9cc92dd395481d0858655098
+SHA256 (KDE/kde-l10n/koffice-l10n-zh_TW-2.1.0.tar.bz2) = d5244461ca7085c802841fdf98a3000906ebea0dbff06c0c9e45b21de34c5689
+SIZE (KDE/kde-l10n/koffice-l10n-zh_TW-2.1.0.tar.bz2) = 261863
diff --git a/chinese/calligra-l10n-zh_TW/pkg-plist b/chinese/calligra-l10n-zh_TW/pkg-plist
index b84480f..d7fc0c4 100644
--- a/chinese/calligra-l10n-zh_TW/pkg-plist
+++ b/chinese/calligra-l10n-zh_TW/pkg-plist
@@ -1,30 +1,43 @@
+share/locale/zh_TW/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/zh_TW/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/CalendarTool.mo
+share/locale/zh_TW/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/zh_TW/LC_MESSAGES/ChartShape.mo
+share/locale/zh_TW/LC_MESSAGES/DivineProportion.mo
+share/locale/zh_TW/LC_MESSAGES/FormulaShape.mo
+share/locale/zh_TW/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/KarbonTools.mo
+share/locale/zh_TW/LC_MESSAGES/MusicShape.mo
+share/locale/zh_TW/LC_MESSAGES/ParagraphTool.mo
+share/locale/zh_TW/LC_MESSAGES/PathShapes.mo
+share/locale/zh_TW/LC_MESSAGES/PictureShape.mo
+share/locale/zh_TW/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/TableShape.mo
+share/locale/zh_TW/LC_MESSAGES/TextShape.mo
+share/locale/zh_TW/LC_MESSAGES/VariablesPlugin.mo
 share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo
-share/locale/zh_TW/LC_MESSAGES/example.mo
 share/locale/zh_TW/LC_MESSAGES/karbon.mo
 share/locale/zh_TW/LC_MESSAGES/kchart.mo
-share/locale/zh_TW/LC_MESSAGES/kexi.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_koffice.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_ooo.mo
-share/locale/zh_TW/LC_MESSAGES/kformdesigner.mo
 share/locale/zh_TW/LC_MESSAGES/kformula.mo
-share/locale/zh_TW/LC_MESSAGES/kivio.mo
+share/locale/zh_TW/LC_MESSAGES/kocolorspaces.mo
 share/locale/zh_TW/LC_MESSAGES/koconverter.mo
+share/locale/zh_TW/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/zh_TW/LC_MESSAGES/koffice-dockers.mo
+share/locale/zh_TW/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/zh_TW/LC_MESSAGES/koffice.mo
 share/locale/zh_TW/LC_MESSAGES/kofficefilters.mo
-share/locale/zh_TW/LC_MESSAGES/koproperty.mo
-share/locale/zh_TW/LC_MESSAGES/koshell.mo
 share/locale/zh_TW/LC_MESSAGES/kounavail.mo
 share/locale/zh_TW/LC_MESSAGES/kplato.mo
+share/locale/zh_TW/LC_MESSAGES/kplatolibs.mo
+share/locale/zh_TW/LC_MESSAGES/kplatowork.mo
 share/locale/zh_TW/LC_MESSAGES/kpresenter.mo
 share/locale/zh_TW/LC_MESSAGES/krita.mo
+share/locale/zh_TW/LC_MESSAGES/krossmodulekplato.mo
+share/locale/zh_TW/LC_MESSAGES/krossmodulekspread.mo
+share/locale/zh_TW/LC_MESSAGES/krossmodulekword.mo
 share/locale/zh_TW/LC_MESSAGES/kscan_plugin.mo
-share/locale/zh_TW/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/kspread.mo
-share/locale/zh_TW/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/zh_TW/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/zh_TW/LC_MESSAGES/kspreadsolver.mo
 share/locale/zh_TW/LC_MESSAGES/kthesaurus.mo
-share/locale/zh_TW/LC_MESSAGES/kugar.mo
 share/locale/zh_TW/LC_MESSAGES/kword.mo
 share/locale/zh_TW/LC_MESSAGES/thesaurus_tool.mo
diff --git a/chinese/koffice-kde4-l10n-zh_CN/Makefile b/chinese/koffice-kde4-l10n-zh_CN/Makefile
index 922b10c..34e6794 100644
--- a/chinese/koffice-kde4-l10n-zh_CN/Makefile
+++ b/chinese/koffice-kde4-l10n-zh_CN/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:    koffice-i18n-zh_CN
-# Date created:                         21 January 2004
-# Whom:                                 Brad Davis <so14k@so14k.com>
+# New ports collection makefile for:    koffice-kde4-l10n-zh_CN
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	chinese kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	zh_CN-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	chinese editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Simplified Chinese messages and documentation for koffice
+COMMENT=	Simplified Chinese 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=	zh_CN
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/chinese/koffice-kde4-l10n-zh_CN/distinfo b/chinese/koffice-kde4-l10n-zh_CN/distinfo
index 42ae49a..4510755 100644
--- a/chinese/koffice-kde4-l10n-zh_CN/distinfo
+++ b/chinese/koffice-kde4-l10n-zh_CN/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.3.tar.bz2) = a21490ebc1d0beedc565c070d4bdad25
-SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.3.tar.bz2) = c436c12c693e9b0c223413d869f1f1f5d84a1f12224de13772308c8fd3b9fa63
-SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.3.tar.bz2) = 353668
+MD5 (KDE/kde-l10n/koffice-l10n-zh_CN-2.1.0.tar.bz2) = 4a5cd6023531ad668940dd00ddd748bb
+SHA256 (KDE/kde-l10n/koffice-l10n-zh_CN-2.1.0.tar.bz2) = af53c3dbbd26376907626b258d0ca6978cc6792fd3dabe7e45e09c0eabb8ea7b
+SIZE (KDE/kde-l10n/koffice-l10n-zh_CN-2.1.0.tar.bz2) = 229432
diff --git a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist
index a6ae7f0..ca55bc9 100644
--- a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist
+++ b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist
@@ -1,30 +1,42 @@
+share/locale/zh_CN/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/zh_CN/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/zh_CN/LC_MESSAGES/CalendarTool.mo
+share/locale/zh_CN/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/zh_CN/LC_MESSAGES/ChartShape.mo
+share/locale/zh_CN/LC_MESSAGES/DivineProportion.mo
+share/locale/zh_CN/LC_MESSAGES/FormulaShape.mo
+share/locale/zh_CN/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/zh_CN/LC_MESSAGES/KarbonTools.mo
+share/locale/zh_CN/LC_MESSAGES/MusicShape.mo
+share/locale/zh_CN/LC_MESSAGES/ParagraphTool.mo
+share/locale/zh_CN/LC_MESSAGES/PathShapes.mo
+share/locale/zh_CN/LC_MESSAGES/PictureShape.mo
+share/locale/zh_CN/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/zh_CN/LC_MESSAGES/TextShape.mo
+share/locale/zh_CN/LC_MESSAGES/VariablesPlugin.mo
 share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo
-share/locale/zh_CN/LC_MESSAGES/example.mo
 share/locale/zh_CN/LC_MESSAGES/karbon.mo
 share/locale/zh_CN/LC_MESSAGES/kchart.mo
-share/locale/zh_CN/LC_MESSAGES/kexi.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_abiword.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_koffice.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_ooo.mo
-share/locale/zh_CN/LC_MESSAGES/kformdesigner.mo
 share/locale/zh_CN/LC_MESSAGES/kformula.mo
-share/locale/zh_CN/LC_MESSAGES/kivio.mo
+share/locale/zh_CN/LC_MESSAGES/kocolorspaces.mo
 share/locale/zh_CN/LC_MESSAGES/koconverter.mo
+share/locale/zh_CN/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/zh_CN/LC_MESSAGES/koffice-dockers.mo
+share/locale/zh_CN/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/zh_CN/LC_MESSAGES/koffice.mo
 share/locale/zh_CN/LC_MESSAGES/kofficefilters.mo
-share/locale/zh_CN/LC_MESSAGES/koproperty.mo
-share/locale/zh_CN/LC_MESSAGES/koshell.mo
 share/locale/zh_CN/LC_MESSAGES/kounavail.mo
 share/locale/zh_CN/LC_MESSAGES/kplato.mo
+share/locale/zh_CN/LC_MESSAGES/kplatolibs.mo
+share/locale/zh_CN/LC_MESSAGES/kplatowork.mo
 share/locale/zh_CN/LC_MESSAGES/kpresenter.mo
 share/locale/zh_CN/LC_MESSAGES/krita.mo
+share/locale/zh_CN/LC_MESSAGES/krossmodulekplato.mo
+share/locale/zh_CN/LC_MESSAGES/krossmodulekspread.mo
+share/locale/zh_CN/LC_MESSAGES/krossmodulekword.mo
 share/locale/zh_CN/LC_MESSAGES/kscan_plugin.mo
-share/locale/zh_CN/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/kspread.mo
-share/locale/zh_CN/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/zh_CN/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/zh_CN/LC_MESSAGES/kspreadsolver.mo
 share/locale/zh_CN/LC_MESSAGES/kthesaurus.mo
-share/locale/zh_CN/LC_MESSAGES/kugar.mo
 share/locale/zh_CN/LC_MESSAGES/kword.mo
 share/locale/zh_CN/LC_MESSAGES/thesaurus_tool.mo
diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile
index dfb2512..251e416 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/Makefile
+++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:    koffice-i18n-zh_TW
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
+# New ports collection makefile for:    koffice-kde4-l10n-zh_TW
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	chinese kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	zh_TW-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	chinese editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Traditional Chinese messages and documentation for koffice
+COMMENT=	Traditional Chinese 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=	zh_TW
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/chinese/koffice-kde4-l10n-zh_TW/distinfo b/chinese/koffice-kde4-l10n-zh_TW/distinfo
index 64dca89..08c1f35 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/distinfo
+++ b/chinese/koffice-kde4-l10n-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.3.tar.bz2) = 7c7c3787a45743ae9d06938829381d2e
-SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.3.tar.bz2) = f4c3d16903a487ea4127d7deee62b16a7b648aee92338498734da0cff88fc248
-SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.3.tar.bz2) = 365213
+MD5 (KDE/kde-l10n/koffice-l10n-zh_TW-2.1.0.tar.bz2) = b6ae48ec9cc92dd395481d0858655098
+SHA256 (KDE/kde-l10n/koffice-l10n-zh_TW-2.1.0.tar.bz2) = d5244461ca7085c802841fdf98a3000906ebea0dbff06c0c9e45b21de34c5689
+SIZE (KDE/kde-l10n/koffice-l10n-zh_TW-2.1.0.tar.bz2) = 261863
diff --git a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist
index b84480f..d7fc0c4 100644
--- a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist
+++ b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist
@@ -1,30 +1,43 @@
+share/locale/zh_TW/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/zh_TW/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/CalendarTool.mo
+share/locale/zh_TW/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/zh_TW/LC_MESSAGES/ChartShape.mo
+share/locale/zh_TW/LC_MESSAGES/DivineProportion.mo
+share/locale/zh_TW/LC_MESSAGES/FormulaShape.mo
+share/locale/zh_TW/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/KarbonTools.mo
+share/locale/zh_TW/LC_MESSAGES/MusicShape.mo
+share/locale/zh_TW/LC_MESSAGES/ParagraphTool.mo
+share/locale/zh_TW/LC_MESSAGES/PathShapes.mo
+share/locale/zh_TW/LC_MESSAGES/PictureShape.mo
+share/locale/zh_TW/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/zh_TW/LC_MESSAGES/TableShape.mo
+share/locale/zh_TW/LC_MESSAGES/TextShape.mo
+share/locale/zh_TW/LC_MESSAGES/VariablesPlugin.mo
 share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo
-share/locale/zh_TW/LC_MESSAGES/example.mo
 share/locale/zh_TW/LC_MESSAGES/karbon.mo
 share/locale/zh_TW/LC_MESSAGES/kchart.mo
-share/locale/zh_TW/LC_MESSAGES/kexi.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_koffice.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_ooo.mo
-share/locale/zh_TW/LC_MESSAGES/kformdesigner.mo
 share/locale/zh_TW/LC_MESSAGES/kformula.mo
-share/locale/zh_TW/LC_MESSAGES/kivio.mo
+share/locale/zh_TW/LC_MESSAGES/kocolorspaces.mo
 share/locale/zh_TW/LC_MESSAGES/koconverter.mo
+share/locale/zh_TW/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/zh_TW/LC_MESSAGES/koffice-dockers.mo
+share/locale/zh_TW/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/zh_TW/LC_MESSAGES/koffice.mo
 share/locale/zh_TW/LC_MESSAGES/kofficefilters.mo
-share/locale/zh_TW/LC_MESSAGES/koproperty.mo
-share/locale/zh_TW/LC_MESSAGES/koshell.mo
 share/locale/zh_TW/LC_MESSAGES/kounavail.mo
 share/locale/zh_TW/LC_MESSAGES/kplato.mo
+share/locale/zh_TW/LC_MESSAGES/kplatolibs.mo
+share/locale/zh_TW/LC_MESSAGES/kplatowork.mo
 share/locale/zh_TW/LC_MESSAGES/kpresenter.mo
 share/locale/zh_TW/LC_MESSAGES/krita.mo
+share/locale/zh_TW/LC_MESSAGES/krossmodulekplato.mo
+share/locale/zh_TW/LC_MESSAGES/krossmodulekspread.mo
+share/locale/zh_TW/LC_MESSAGES/krossmodulekword.mo
 share/locale/zh_TW/LC_MESSAGES/kscan_plugin.mo
-share/locale/zh_TW/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/kspread.mo
-share/locale/zh_TW/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/zh_TW/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/zh_TW/LC_MESSAGES/kspreadsolver.mo
 share/locale/zh_TW/LC_MESSAGES/kthesaurus.mo
-share/locale/zh_TW/LC_MESSAGES/kugar.mo
 share/locale/zh_TW/LC_MESSAGES/kword.mo
 share/locale/zh_TW/LC_MESSAGES/thesaurus_tool.mo