Update to KDE 3.4.3 / KOffice 1.4.2

author: Michael Nottebrock <lofi@FreeBSD.org> 2005-11-05 11:19:58 +0000
committer: Michael Nottebrock <lofi@FreeBSD.org> 2005-11-05 11:19:58 +0000
commit: de94e0e1609a9f2a40be0bdc9592002fe3464557 (patch)
tree: e63a7473b09ed1d3956224c6f37079320c4da68e /editors
parent: b3fc541cf1e8cc80c15b4d48188487501618ae39 (diff)
download: ports-de94e0e1609a9f2a40be0bdc9592002fe3464557.tar.gz
ports-de94e0e1609a9f2a40be0bdc9592002fe3464557.zip
174 files changed, 232 insertions, 1519 deletions
diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile
index c808f08c15d9..8dff88d8c5e0 100644
--- a/editors/calligra-l10n-ca/Makefile
+++ b/editors/calligra-l10n-ca/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-ca/distinfo b/editors/calligra-l10n-ca/distinfo
index e9095875041f..7b80cf922bb3 100644
--- a/editors/calligra-l10n-ca/distinfo
+++ b/editors/calligra-l10n-ca/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = f011aa527e4b476f18f1fda9a043f81b
-SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = 398993
+MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 8a546eec2897af073bb564edf7150b6d
+SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 438905
diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist
index 15777b9fa82a..6e9f90e752e1 100644
--- a/editors/calligra-l10n-ca/pkg-plist
+++ b/editors/calligra-l10n-ca/pkg-plist
@@ -3,7 +3,6 @@ share/locale/ca/LC_MESSAGES/desktop_koffice.mo
 share/locale/ca/LC_MESSAGES/example.mo
 share/locale/ca/LC_MESSAGES/karbon.mo
 share/locale/ca/LC_MESSAGES/kchart.mo
-share/locale/ca/LC_MESSAGES/kdgantt.mo
 share/locale/ca/LC_MESSAGES/kexi.mo
 share/locale/ca/LC_MESSAGES/kfile_koffice.mo
 share/locale/ca/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile
index 777caf826434..6bb6a53dc73d 100644
--- a/editors/calligra-l10n-da/Makefile
+++ b/editors/calligra-l10n-da/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-da/distinfo b/editors/calligra-l10n-da/distinfo
index 27e41f263826..192366d647a7 100644
--- a/editors/calligra-l10n-da/distinfo
+++ b/editors/calligra-l10n-da/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 3bcda6ccf32a2b0916f5de47981be655
-SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 817010
+MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = f6c3b0afcb299519f0663aa5a3ff3362
+SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = 832248
diff --git a/editors/calligra-l10n-da/pkg-plist b/editors/calligra-l10n-da/pkg-plist
index f271ee0cb26a..3286121a5d36 100644
--- a/editors/calligra-l10n-da/pkg-plist
+++ b/editors/calligra-l10n-da/pkg-plist
@@ -97,7 +97,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo
 share/locale/da/LC_MESSAGES/example.mo
 share/locale/da/LC_MESSAGES/karbon.mo
 share/locale/da/LC_MESSAGES/kchart.mo
-share/locale/da/LC_MESSAGES/kdgantt.mo
 share/locale/da/LC_MESSAGES/kexi.mo
 share/locale/da/LC_MESSAGES/kfile_koffice.mo
 share/locale/da/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile
index 7d336f886918..146148c97201 100644
--- a/editors/calligra-l10n-el/Makefile
+++ b/editors/calligra-l10n-el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-el/distinfo b/editors/calligra-l10n-el/distinfo
index a74b83b25980..a9d9e8e5310c 100644
--- a/editors/calligra-l10n-el/distinfo
+++ b/editors/calligra-l10n-el/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-el-1.4.1.tar.bz2) = a744de5d6e97a25257a809f7a0f79a11
-SIZE (KDE/kde-i18n/koffice-l10n-el-1.4.1.tar.bz2) = 347282
+MD5 (KDE/kde-i18n/koffice-l10n-el-1.4.2.tar.bz2) = 1aa341393b7ade4037ddeed77c73cacf
+SIZE (KDE/kde-i18n/koffice-l10n-el-1.4.2.tar.bz2) = 368866
diff --git a/editors/calligra-l10n-el/pkg-plist b/editors/calligra-l10n-el/pkg-plist
index 83a53fa3da59..1ddd73d733e2 100644
--- a/editors/calligra-l10n-el/pkg-plist
+++ b/editors/calligra-l10n-el/pkg-plist
@@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo
 share/locale/el/LC_MESSAGES/example.mo
 share/locale/el/LC_MESSAGES/karbon.mo
 share/locale/el/LC_MESSAGES/kchart.mo
-share/locale/el/LC_MESSAGES/kdgantt.mo
 share/locale/el/LC_MESSAGES/kexi.mo
 share/locale/el/LC_MESSAGES/kfile_koffice.mo
 share/locale/el/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile
index 7916c90cc49b..cb356c8a2c49 100644
--- a/editors/calligra-l10n-en_GB/Makefile
+++ b/editors/calligra-l10n-en_GB/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-en_GB/distinfo b/editors/calligra-l10n-en_GB/distinfo
index 1e7a7de96be3..6de3019ef676 100644
--- a/editors/calligra-l10n-en_GB/distinfo
+++ b/editors/calligra-l10n-en_GB/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.4.1.tar.bz2) = deaaf836cce7efcd9c83d800a6b4e51b
-SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.4.1.tar.bz2) = 351631
+MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.4.2.tar.bz2) = caf59bd82ac94ccbeaa4b907c218defa
+SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.4.2.tar.bz2) = 364462
diff --git a/editors/calligra-l10n-en_GB/pkg-plist b/editors/calligra-l10n-en_GB/pkg-plist
index 60ad7182dcc5..626c455e0547 100644
--- a/editors/calligra-l10n-en_GB/pkg-plist
+++ b/editors/calligra-l10n-en_GB/pkg-plist
@@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo
 share/locale/en_GB/LC_MESSAGES/example.mo
 share/locale/en_GB/LC_MESSAGES/karbon.mo
 share/locale/en_GB/LC_MESSAGES/kchart.mo
-share/locale/en_GB/LC_MESSAGES/kdgantt.mo
 share/locale/en_GB/LC_MESSAGES/kexi.mo
 share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo
 share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile
index 65dd3cc5b320..473b8227a676 100644
--- a/editors/calligra-l10n-es/Makefile
+++ b/editors/calligra-l10n-es/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-es/distinfo b/editors/calligra-l10n-es/distinfo
index f11ea54de491..cc9ac4c7bbd2 100644
--- a/editors/calligra-l10n-es/distinfo
+++ b/editors/calligra-l10n-es/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-es-1.4.1.tar.bz2) = 3872dfdfb6b12532218daf8f61f94282
-SIZE (KDE/kde-i18n/koffice-l10n-es-1.4.1.tar.bz2) = 832641
+MD5 (KDE/kde-i18n/koffice-l10n-es-1.4.2.tar.bz2) = 0f429120c8b27d1208f020a353aeb88d
+SIZE (KDE/kde-i18n/koffice-l10n-es-1.4.2.tar.bz2) = 852702
diff --git a/editors/calligra-l10n-es/pkg-plist b/editors/calligra-l10n-es/pkg-plist
index 3f22735c1f58..6a87c5743e2b 100644
--- a/editors/calligra-l10n-es/pkg-plist
+++ b/editors/calligra-l10n-es/pkg-plist
@@ -97,7 +97,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo
 share/locale/es/LC_MESSAGES/example.mo
 share/locale/es/LC_MESSAGES/karbon.mo
 share/locale/es/LC_MESSAGES/kchart.mo
-share/locale/es/LC_MESSAGES/kdgantt.mo
 share/locale/es/LC_MESSAGES/kexi.mo
 share/locale/es/LC_MESSAGES/kfile_koffice.mo
 share/locale/es/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index e1f2565032a1..ddc3ae77e030 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo
index 82460c6b5a87..0404c5fef4a2 100644
--- a/editors/calligra-l10n-et/distinfo
+++ b/editors/calligra-l10n-et/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-et-1.4.1.tar.bz2) = 0ecd275357b76d245b2367a1925bda59
-SIZE (KDE/kde-i18n/koffice-l10n-et-1.4.1.tar.bz2) = 934319
+MD5 (KDE/kde-i18n/koffice-l10n-et-1.4.2.tar.bz2) = 1ac8201573602a69e7d00b3332cb3bec
+SIZE (KDE/kde-i18n/koffice-l10n-et-1.4.2.tar.bz2) = 953648
diff --git a/editors/calligra-l10n-et/pkg-plist b/editors/calligra-l10n-et/pkg-plist
index 46ca9f60458b..88de1f2ad477 100644
--- a/editors/calligra-l10n-et/pkg-plist
+++ b/editors/calligra-l10n-et/pkg-plist
@@ -102,7 +102,6 @@ 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/kdgantt.mo
 share/locale/et/LC_MESSAGES/kexi.mo
 share/locale/et/LC_MESSAGES/kfile_koffice.mo
 share/locale/et/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile
index 27e740a8cda2..d9d9f31b872b 100644
--- a/editors/calligra-l10n-it/Makefile
+++ b/editors/calligra-l10n-it/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-it/distinfo b/editors/calligra-l10n-it/distinfo
index cc063d07bdfc..12d194ba47e9 100644
--- a/editors/calligra-l10n-it/distinfo
+++ b/editors/calligra-l10n-it/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-it-1.4.1.tar.bz2) = cac43b60ea3d01cfa0ac337bc0a296be
-SIZE (KDE/kde-i18n/koffice-l10n-it-1.4.1.tar.bz2) = 1163009
+MD5 (KDE/kde-i18n/koffice-l10n-it-1.4.2.tar.bz2) = 62609f289dc1ed216c7d075045159a04
+SIZE (KDE/kde-i18n/koffice-l10n-it-1.4.2.tar.bz2) = 1117301
diff --git a/editors/calligra-l10n-it/pkg-plist b/editors/calligra-l10n-it/pkg-plist
index d542f01e5767..81b25f9231ac 100644
--- a/editors/calligra-l10n-it/pkg-plist
+++ b/editors/calligra-l10n-it/pkg-plist
@@ -109,7 +109,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo
 share/locale/it/LC_MESSAGES/example.mo
 share/locale/it/LC_MESSAGES/karbon.mo
 share/locale/it/LC_MESSAGES/kchart.mo
-share/locale/it/LC_MESSAGES/kdgantt.mo
 share/locale/it/LC_MESSAGES/kexi.mo
 share/locale/it/LC_MESSAGES/kfile_koffice.mo
 share/locale/it/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile
index 6d7bc2bd7d0b..e3262c390916 100644
--- a/editors/calligra-l10n-nb/Makefile
+++ b/editors/calligra-l10n-nb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo
index 0e87cac24a15..5c901a999bba 100644
--- a/editors/calligra-l10n-nb/distinfo
+++ b/editors/calligra-l10n-nb/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nb-1.4.1.tar.bz2) = 0d9c12a3881861377130801a3a431dd2
-SIZE (KDE/kde-i18n/koffice-l10n-nb-1.4.1.tar.bz2) = 375589
+MD5 (KDE/kde-i18n/koffice-l10n-nb-1.4.2.tar.bz2) = 9d8c327b3e6567d90258cec8b0694a2c
+SIZE (KDE/kde-i18n/koffice-l10n-nb-1.4.2.tar.bz2) = 413430
diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist
index 956fefc9e7dd..f49640d1e6f6 100644
--- a/editors/calligra-l10n-nb/pkg-plist
+++ b/editors/calligra-l10n-nb/pkg-plist
@@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo
 share/locale/nb/LC_MESSAGES/example.mo
 share/locale/nb/LC_MESSAGES/karbon.mo
 share/locale/nb/LC_MESSAGES/kchart.mo
-share/locale/nb/LC_MESSAGES/kdgantt.mo
 share/locale/nb/LC_MESSAGES/kexi.mo
 share/locale/nb/LC_MESSAGES/kfile_koffice.mo
 share/locale/nb/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile
index 50adebbd7cd8..822ca8c3d745 100644
--- a/editors/calligra-l10n-nl/Makefile
+++ b/editors/calligra-l10n-nl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-nl/distinfo b/editors/calligra-l10n-nl/distinfo
index 6d9e08e72462..57795240013d 100644
--- a/editors/calligra-l10n-nl/distinfo
+++ b/editors/calligra-l10n-nl/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nl-1.4.1.tar.bz2) = a960e30b5bd883ed71ada339f238bb38
-SIZE (KDE/kde-i18n/koffice-l10n-nl-1.4.1.tar.bz2) = 2999096
+MD5 (KDE/kde-i18n/koffice-l10n-nl-1.4.2.tar.bz2) = 6328a285565add97cd55413e52541050
+SIZE (KDE/kde-i18n/koffice-l10n-nl-1.4.2.tar.bz2) = 3025440
diff --git a/editors/calligra-l10n-nl/pkg-plist b/editors/calligra-l10n-nl/pkg-plist
index 96ec65b7af7e..b2778a6912b3 100644
--- a/editors/calligra-l10n-nl/pkg-plist
+++ b/editors/calligra-l10n-nl/pkg-plist
@@ -400,7 +400,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo
 share/locale/nl/LC_MESSAGES/example.mo
 share/locale/nl/LC_MESSAGES/karbon.mo
 share/locale/nl/LC_MESSAGES/kchart.mo
-share/locale/nl/LC_MESSAGES/kdgantt.mo
 share/locale/nl/LC_MESSAGES/kexi.mo
 share/locale/nl/LC_MESSAGES/kfile_koffice.mo
 share/locale/nl/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile
index d7a7a37327cd..d60518676c78 100644
--- a/editors/calligra-l10n-sv/Makefile
+++ b/editors/calligra-l10n-sv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/calligra-l10n-sv/distinfo b/editors/calligra-l10n-sv/distinfo
index 38a77adb1c1d..9fcfa70ef146 100644
--- a/editors/calligra-l10n-sv/distinfo
+++ b/editors/calligra-l10n-sv/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sv-1.4.1.tar.bz2) = 58ffb4991e48caa73f434f30ca2b4761
-SIZE (KDE/kde-i18n/koffice-l10n-sv-1.4.1.tar.bz2) = 4778663
+MD5 (KDE/kde-i18n/koffice-l10n-sv-1.4.2.tar.bz2) = 897218187ef83afcd99406b62e352e69
+SIZE (KDE/kde-i18n/koffice-l10n-sv-1.4.2.tar.bz2) = 4783393
diff --git a/editors/calligra-l10n-sv/pkg-plist b/editors/calligra-l10n-sv/pkg-plist
index b9b93eaac8bb..e062905acaf2 100644
--- a/editors/calligra-l10n-sv/pkg-plist
+++ b/editors/calligra-l10n-sv/pkg-plist
@@ -366,7 +366,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo
 share/locale/sv/LC_MESSAGES/example.mo
 share/locale/sv/LC_MESSAGES/karbon.mo
 share/locale/sv/LC_MESSAGES/kchart.mo
-share/locale/sv/LC_MESSAGES/kdgantt.mo
 share/locale/sv/LC_MESSAGES/kexi.mo
 share/locale/sv/LC_MESSAGES/kfile_koffice.mo
 share/locale/sv/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 977d29a6f36a..7268cb65796b 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -30,7 +30,7 @@ RUN_DEPENDS+=\
 	${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \
 	${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW
 
-.for LANG in af bg br bs ca cs cy da el en_GB eo es et fa fi hsb it \
+.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi hsb it \
 	lo lt lv mt nb nl nn se sk sl sr sr@Latn sv ta tg th tr ven xh zu
 RUN_DEPENDS+=\
 ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG}
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index dd9fb61c41ef..185bec6793ac 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -53,14 +52,13 @@ CONFIGURE_ARGS+=--with-pgsqlincdir=${PG_INCDIR} --with-pgsqllibdir=${PG_LIBDIR}
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
 .endif
 
-post-patch:
-	@env TZ=UTC ${TOUCH} -t 200507191955.36 ${WRKSRC}/config.h.in
-
 post-configure:
 .if ${OSVERSION} < 500035
 	${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \
 	-e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \
 		${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \
+		${WRKSRC}/kchart/Makefile \
+		${WRKSRC}/kchart/kdchart/Makefile \
 		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
 		${WRKSRC}/kexi/migration/pqxx/Makefile
 .endif
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 7f9ee95864a2..61d5478c3f57 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/koffice/koffice-1.4.1.tar.bz2) = 91a7b68757addc5934c5a8209a4926d5
-SIZE (KDE/koffice/koffice-1.4.1.tar.bz2) = 19364338
+MD5 (KDE/koffice/koffice-1.4.2.tar.bz2) = 6b456fb7d54c84b11396b27a96ae0cf8
+SIZE (KDE/koffice/koffice-1.4.2.tar.bz2) = 19486852
diff --git a/editors/calligra/files/patch-filters_kword_rtf_import-rtfimport_tokenizer b/editors/calligra/files/patch-filters_kword_rtf_import-rtfimport_tokenizer
deleted file mode 100644
index 78be2fe6f9ce..000000000000
--- a/editors/calligra/files/patch-filters_kword_rtf_import-rtfimport_tokenizer
+++ /dev/null
@@ -1,325 +0,0 @@
-Index: filters/kword/rtf/import/rtfimport_tokenizer.cpp
-===================================================================
---- filters/kword/rtf/import/rtfimport_tokenizer.cpp	(revision 463235)
-+++ filters/kword/rtf/import/rtfimport_tokenizer.cpp	(working copy)
-@@ -16,7 +16,7 @@
- 
- RTFTokenizer::RTFTokenizer()
- {
--    tokenText.resize( 4112 );
-+    tokenText.resize( 4113 );
-     fileBuffer.resize( 4096 );
-     infile = 0L;
- }
-@@ -30,8 +30,25 @@
-     fileBufferPtr = 0L;
-     fileBufferEnd = 0L;
-     infile = in;
-+    type = RTFTokenizer::PlainText;
- }
- 
-+int RTFTokenizer::nextChar()
-+{
-+    if ( fileBufferPtr == fileBufferEnd ) {
-+        int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+        fileBufferPtr = ( uchar* ) fileBuffer.data();
-+        fileBufferEnd = fileBufferPtr;
-+
-+        if ( n <= 0 )
-+            return -1;
-+
-+        fileBufferEnd = fileBufferPtr + n;
-+    }
-+    return *fileBufferPtr++;
-+}
-+
-+
- /**
-  * Reads the next token.
-  */
-@@ -42,22 +59,15 @@
-     if (!infile)
- 	return;
- 
--    do
--    {
--	if (fileBufferPtr == fileBufferEnd)
--	{
--	    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+    do {
-+        int n = nextChar();
- 
--	    if (n <= 0)
--	    {
--		// Return CloseGroup on EOF
--		ch = '}';
--		break;
--	    }
--	    fileBufferPtr = (uchar *)fileBuffer.data();
--	    fileBufferEnd = (fileBufferPtr + n);
--	}
--	ch = *fileBufferPtr++;
-+        if ( n <= 0 ) {
-+            ch = '}';
-+            break;
-+        }
-+
-+        ch = n;
-     }
-     while (ch == '\n' || ch == '\r' && ch != 0);
- 
-@@ -67,6 +77,7 @@
- 
-     uchar *_text = (uchar *)text;
- 
-+
-     if (ch == '{')
- 	type = RTFTokenizer::OpenGroup;
-     else if (ch == '}')
-@@ -75,20 +86,14 @@
-     {
- 	type = RTFTokenizer::ControlWord;
- 
--	if (fileBufferPtr == fileBufferEnd)
--	{
--	    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+        int n = nextChar();
- 
--	    if (n <= 0)
--	    {
--		// Return CloseGroup on EOF
--		type = RTFTokenizer::CloseGroup;
--		return;
--	    }
--	    fileBufferPtr = (uchar *)fileBuffer.data();
--	    fileBufferEnd = (fileBufferPtr + n);
--	}
--	ch = *fileBufferPtr++;
-+        if ( n <= 0 ) {
-+            // Return CloseGroup on EOF
-+            type = RTFTokenizer::CloseGroup;
-+            return;
-+        }
-+	ch = n;
- 
- 	// Type is either control word or control symbol
- 	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
-@@ -96,64 +101,41 @@
- 	    int v = 0;
- 
- 	    // Read alphabetic string (command)
--	    while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
-+	    while (_text < ( uchar* )tokenText.data()+tokenText.size()-3 && 
-+                  ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) )
- 	    {
- 		*_text++ = ch;
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
-+                int n = nextChar();
-+                if ( n <= 0 ) {
-+                    ch = ' ';
-+                    break;
-+                }
-+                ch = n;
- 	    }
- 
- 	    // Read numeric parameter (param)
- 	    bool isneg = (ch == '-');
- 
--	    if (isneg)
--	    {
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--		    if (n <= 0)
--		    {
--			// Return CloseGroup on EOF
--			type = RTFTokenizer::CloseGroup;
--			return;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
-+	    if (isneg) {
-+                int n = nextChar();
-+                if ( n <= 0 ) {
-+                    type = RTFTokenizer::CloseGroup;
-+                    return;
-+                }
-+		ch = n;
- 	    }
--	    while (ch >= '0' && ch <= '9')
--	    {
-+
-+	    while (ch >= '0' && ch <= '9') {
- 		v	 = (10 * v) + ch - '0';
- 		hasParam = true;
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+                int n = nextChar();
- 
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
--	    }
-+                if ( n <= 0 )
-+                    n = ' ';
-+                ch = n;
-+            }
- 	    value = isneg ? -v : v;
- 
- 	    // If delimiter is a space, it's part of the control word
-@@ -163,7 +145,7 @@
- 	    }
- 
-             *_text = 0; // Just put an end of string for the test, it can then be over-written again
--            if ( !qstrncmp( tokenText.data()+1, "bin", 4 ) ) // Test the NULL too to avoid catching keywords starting with "bin"
-+            if ( !memcmp( tokenText.data()+1, "bin", 4 ) )
-             {   // We have \bin, so we need to read the bytes
-                 kdDebug(30515) << "Token:" << tokenText << endl;
-                 if (value > 0)
-@@ -173,26 +155,15 @@
-                     binaryData.resize(value);
-                     for (int i=0; i<value; i++)
-                     {
--                        if (fileBufferPtr == fileBufferEnd)
--                        {
--                            const int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--                            if (n <= 0)
--                            {
--                                kdError(30515) << "\\bin stream hit end of file." << endl;
--                                type = RTFTokenizer::CloseGroup;
--                                break;
--                            }
--                            fileBufferPtr = (uchar *)fileBuffer.data();
--                            fileBufferEnd = (fileBufferPtr + n);
-+                        int n = nextChar();
-+                        if ( n <= 0 ) {
-+                            type = RTFTokenizer::CloseGroup;
-+                            break;
-                         }
--                        binaryData[i]=*fileBufferPtr++;
-+
-+                        binaryData[i] = n;
-                     }
-                 }
--                else
--                {
--                    kdError(30515) << "\\bin with negative value skipping" << endl;
--                }
-             }
- 
- 	}
-@@ -200,19 +171,13 @@
- 	{
- 	    type = RTFTokenizer::ControlWord;
- 	    *_text++ = ch;
--	    if (fileBufferPtr == fileBufferEnd)
--	    {
--		int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
- 
--		if (n <= 0)
--		{
--		    // Return CloseGroup on EOF
--		    type = RTFTokenizer::CloseGroup;
--		    return;
--		}
--		fileBufferPtr = (uchar *)fileBuffer.data();
--		fileBufferEnd = (fileBufferPtr + n);
--	    }
-+            int n = nextChar();
-+
-+            if ( n <= 0 ) {
-+                type = RTFTokenizer::CloseGroup;
-+                return;
-+            }
- 	    ch = *fileBufferPtr++;
- 	    for(int i=0;i<2;i++)
- 	    {
-@@ -220,22 +185,16 @@
- 		value<<=4;
- 		value=value|((ch + ((ch & 16) ? 0 : 9)) & 0xf);
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+                int n = nextChar();
- 
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
-+                if ( n <= 0 ) {
-+                    ch = ' ';
-+                    break;
-+                }
- 		ch = *fileBufferPtr++;
- 	    }
--		--fileBufferPtr;
--	    }
-+            --fileBufferPtr;
-+        }
- 	else
- 	{
- 	    type = RTFTokenizer::ControlWord;
-@@ -248,14 +207,16 @@
- 
- 	// Everything until next backslash, opener or closer
- 	while ( ch != '\\' && ch != '{' && ch != '}' && ch != '\n' &&
--		ch != '\r' && fileBufferPtr <= fileBufferEnd )
-+		ch != '\r')
- 	{
- 	    *_text++ = ch;
-+            if(fileBufferPtr >= fileBufferEnd)
-+                break;
- 	    ch = *fileBufferPtr++;
- 	}
--
--	// Give back last char
--	--fileBufferPtr;
-+        if(fileBufferPtr < fileBufferEnd)
-+          --fileBufferPtr; // give back the last char
-     }
-     *_text++ = 0;
-+
- }
-Index: filters/kword/rtf/import/rtfimport_tokenizer.h
-===================================================================
---- filters/kword/rtf/import/rtfimport_tokenizer.h	(revision 463235)
-+++ filters/kword/rtf/import/rtfimport_tokenizer.h	(working copy)
-@@ -50,6 +50,8 @@
- 
-     // tokenizer (private) data
- private:
-+    int nextChar();
-+
-     QFile *infile;
-     QByteArray fileBuffer;
-     QCString tokenText;
diff --git a/editors/calligra/files/patch-kpresenter-imageEffectBase.ui b/editors/calligra/files/patch-kpresenter-imageEffectBase.ui
deleted file mode 100644
index 30cc64533dac..000000000000
--- a/editors/calligra/files/patch-kpresenter-imageEffectBase.ui
+++ /dev/null
@@ -1,23 +0,0 @@
---- kpresenter/imageEffectBase.ui.orig	Fri Sep 16 18:02:09 2005
-+++ kpresenter/imageEffectBase.ui	Fri Sep 16 18:02:24 2005
-@@ -1461,20 +1461,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>kcolorbutton.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui b/editors/calligra/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui
deleted file mode 100644
index 13b35119f744..000000000000
--- a/editors/calligra/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig	Thu Sep 15 12:38:33 2005
-+++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui	Thu Sep 15 12:38:52 2005
-@@ -265,7 +265,4 @@
-     <tabstop>radioPerceptual</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kiscmbidlist.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui b/editors/calligra/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui
deleted file mode 100644
index 5daa5a578d1c..000000000000
--- a/editors/calligra/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig	Thu Sep 15 12:36:52 2005
-+++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui	Thu Sep 15 12:37:07 2005
-@@ -186,7 +186,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kismatrixwidget.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui b/editors/calligra/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui
deleted file mode 100644
index 73a75418a8f8..000000000000
--- a/editors/calligra/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/screenshot/ksnapshotwidget.ui.orig	Thu Sep 15 12:30:37 2005
-+++ krita/plugins/screenshot/ksnapshotwidget.ui	Thu Sep 15 12:30:56 2005
-@@ -332,7 +332,4 @@
- <pixmapfunction>SmallIconSet</pixmapfunction>
- <layoutdefaults spacing="6" margin="11"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
--<includehints>
--    <includehint>ksnapshotthumb.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_ui-kis_previewwidgetbase.ui b/editors/calligra/files/patch-krita_ui-kis_previewwidgetbase.ui
deleted file mode 100644
index cc47b73ac622..000000000000
--- a/editors/calligra/files/patch-krita_ui-kis_previewwidgetbase.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/kis_previewwidgetbase.ui.orig	Thu Sep 15 18:26:35 2005
-+++ krita/ui/kis_previewwidgetbase.ui	Thu Sep 15 18:26:43 2005
-@@ -201,8 +201,4 @@
-     </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kispreviewview.h</includehint>
--    <includehint>kispreviewview.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_ui-wdgcolorsettings.ui b/editors/calligra/files/patch-krita_ui-wdgcolorsettings.ui
deleted file mode 100644
index 26e6a62d0f28..000000000000
--- a/editors/calligra/files/patch-krita_ui-wdgcolorsettings.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdgcolorsettings.ui.orig	Thu Sep 15 18:25:18 2005
-+++ krita/ui/wdgcolorsettings.ui	Thu Sep 15 18:25:26 2005
-@@ -361,8 +361,4 @@
-     <tabstop>radioPerceptual</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kiscmbidlist.h</includehint>
--    <includehint>kiscmbidlist.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_ui-wdglayerbox.ui b/editors/calligra/files/patch-krita_ui-wdglayerbox.ui
deleted file mode 100644
index 3731c16a580a..000000000000
--- a/editors/calligra/files/patch-krita_ui-wdglayerbox.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdglayerbox.ui.orig	Thu Sep 15 21:07:24 2005
-+++ krita/ui/wdglayerbox.ui	Thu Sep 15 21:09:24 2005
-@@ -250,8 +250,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kiscmbcomposite.h</includehint>
--    <includehint>knuminput.h</includehint>
-     <includehint>knuminput.h</includehint>
-     <includehint>klistbox.h</includehint>
- </includehints>
diff --git a/editors/calligra/files/patch-krita_ui-wdgnewimage.ui b/editors/calligra/files/patch-krita_ui-wdgnewimage.ui
deleted file mode 100644
index 80cd21454be2..000000000000
--- a/editors/calligra/files/patch-krita_ui-wdgnewimage.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdgnewimage.ui.orig	Thu Sep 15 18:22:50 2005
-+++ krita/ui/wdgnewimage.ui	Thu Sep 15 18:23:08 2005
-@@ -319,8 +319,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>knuminput.h</includehint>
--    <includehint>knuminput.h</includehint>
--    <includehint>kiscmbidlist.h</includehint>
-     <includehint>kcolorcombo.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/calligra/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui b/editors/calligra/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui
deleted file mode 100644
index 83d940e4cd16..000000000000
--- a/editors/calligra/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/widgets/kis_wdg_autogradient.ui.orig	Thu Sep 15 12:28:25 2005
-+++ krita/ui/widgets/kis_wdg_autogradient.ui	Thu Sep 15 12:28:43 2005
-@@ -406,8 +406,6 @@
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kisgradientsliderwidget.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
-     <includehint>kcolorbutton.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index d8e94f3f81bc..13735f8f01b8 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -590,19 +590,20 @@ lib/libkwordexportfilters.la
 lib/libkwordexportfilters.so
 lib/libkwordexportfilters.so.1
 share/applications/kde/kexi.desktop
+share/applications/kde/kformdesigner.desktop
 share/applications/kde/kivio.desktop
+share/applications/kde/krita.desktop
 share/applnk/Office/KThesaurus.desktop
 share/applnk/Office/karbon.desktop
 share/applnk/Office/kchart.desktop
 share/applnk/Office/kformula.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
-share/applnk/Office/krita.desktop
+share/applnk/Office/krita_magick.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kudesigner.desktop
 share/applnk/Office/kugar.desktop
 share/applnk/Office/kword.desktop
-share/applnk/Utilities/kformdesigner.desktop
 share/apps/karbon/gradients/allcolors.kgr
 share/apps/karbon/gradients/simple.kgr
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png
@@ -945,6 +946,7 @@ share/apps/kivio/icons/crystalsvg/22x22/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_bold.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_italic.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_under.png
+share/apps/kivio/icons/crystalsvg/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/open_stencilset.png
 share/apps/kivio/icons/crystalsvg/32x32/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/48x48/actions/template_basicflow.png
@@ -1007,6 +1009,7 @@ share/apps/kivio/icons/hicolor/22x22/actions/font_bold.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_italic.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_under.png
 share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png
+share/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/hicolor/22x22/actions/linestyle.png
 share/apps/kivio/icons/hicolor/22x22/actions/linewidth.png
 share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png
@@ -4041,12 +4044,10 @@ share/templates/TextDocument.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
 @dirrm share/services/kformdesigner
 @dirrm share/services/kexi
-@dirrm share/icons/hicolor/scalable/apps
-@dirrm share/icons/hicolor/scalable
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
diff --git a/editors/kate-plugins/distinfo b/editors/kate-plugins/distinfo
index 69acc35f4900..3b447b06efca 100644
--- a/editors/kate-plugins/distinfo
+++ b/editors/kate-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeaddons-3.4.2.tar.bz2) = af4fc7fa0dde8894b9d9582ecef7df2a
-SIZE (KDE/kdeaddons-3.4.2.tar.bz2) = 1591335
+MD5 (KDE/kdeaddons-3.4.3.tar.bz2) = e927d60e94adba69e78f82d82305f4ce
+SIZE (KDE/kdeaddons-3.4.3.tar.bz2) = 1593317
diff --git a/editors/kate-plugins/pkg-plist b/editors/kate-plugins/pkg-plist
index 9e8c700a094a..6cd3a8824dc3 100644
--- a/editors/kate-plugins/pkg-plist
+++ b/editors/kate-plugins/pkg-plist
@@ -24,7 +24,7 @@ lib/kde3/katexmltoolsplugin.la
 lib/kde3/katexmltoolsplugin.so
 lib/kde3/libkatetabbarextensionplugin.la
 lib/kde3/libkatetabbarextensionplugin.so
-share/applications/kdeaddons-kate-plugins-3.4.2
+share/applications/kdeaddons-kate-plugins-3.4.3
 share/applnk/.hidden/katefll.desktop
 share/apps/kate/plugins/katecppsymbolviewer/ui.rc
 share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate
diff --git a/editors/koffice-i18n-bg/Makefile b/editors/koffice-i18n-bg/Makefile
index 23ea53df2166..8b9827d6fd12 100644
--- a/editors/koffice-i18n-bg/Makefile
+++ b/editors/koffice-i18n-bg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-bg/distinfo b/editors/koffice-i18n-bg/distinfo
index 9e2af90be649..3115d9da8724 100644
--- a/editors/koffice-i18n-bg/distinfo
+++ b/editors/koffice-i18n-bg/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-bg-1.4.1.tar.bz2) = 445f35bf43b60c7799df116bd90957ad
-SIZE (KDE/kde-i18n/koffice-l10n-bg-1.4.1.tar.bz2) = 372483
+MD5 (KDE/kde-i18n/koffice-l10n-bg-1.4.2.tar.bz2) = ad980947860046ca4d5e0c8b23b7d3ab
+SIZE (KDE/kde-i18n/koffice-l10n-bg-1.4.2.tar.bz2) = 376676
diff --git a/editors/koffice-i18n-bg/pkg-plist b/editors/koffice-i18n-bg/pkg-plist
index 411e09fc23f1..0363e3a5f35e 100644
--- a/editors/koffice-i18n-bg/pkg-plist
+++ b/editors/koffice-i18n-bg/pkg-plist
@@ -2,7 +2,6 @@ share/locale/bg/LC_MESSAGES/desktop_koffice.mo
 share/locale/bg/LC_MESSAGES/example.mo
 share/locale/bg/LC_MESSAGES/karbon.mo
 share/locale/bg/LC_MESSAGES/kchart.mo
-share/locale/bg/LC_MESSAGES/kdgantt.mo
 share/locale/bg/LC_MESSAGES/kexi.mo
 share/locale/bg/LC_MESSAGES/kfile_koffice.mo
 share/locale/bg/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-bs/pkg-plist b/editors/koffice-i18n-bs/pkg-plist
index a370d9989c3b..8f108b47ee20 100644
--- a/editors/koffice-i18n-bs/pkg-plist
+++ b/editors/koffice-i18n-bs/pkg-plist
@@ -25,5 +25,3 @@ share/locale/bs/LC_MESSAGES/kwordlatexfilter.mo
 share/locale/bs/LC_MESSAGES/olefilterswinword97filter.mo
 share/locale/bs/LC_MESSAGES/xsltexportfilter.mo
 share/locale/bs/LC_MESSAGES/xsltimportfilter.mo
-@dirrm share/locale/bs/LC_MESSAGES
-@dirrm share/locale/bs
diff --git a/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile
index c808f08c15d9..8dff88d8c5e0 100644
--- a/editors/koffice-i18n-ca/Makefile
+++ b/editors/koffice-i18n-ca/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ca/distinfo b/editors/koffice-i18n-ca/distinfo
index e9095875041f..7b80cf922bb3 100644
--- a/editors/koffice-i18n-ca/distinfo
+++ b/editors/koffice-i18n-ca/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = f011aa527e4b476f18f1fda9a043f81b
-SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = 398993
+MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 8a546eec2897af073bb564edf7150b6d
+SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 438905
diff --git a/editors/koffice-i18n-ca/pkg-plist b/editors/koffice-i18n-ca/pkg-plist
index 15777b9fa82a..6e9f90e752e1 100644
--- a/editors/koffice-i18n-ca/pkg-plist
+++ b/editors/koffice-i18n-ca/pkg-plist
@@ -3,7 +3,6 @@ share/locale/ca/LC_MESSAGES/desktop_koffice.mo
 share/locale/ca/LC_MESSAGES/example.mo
 share/locale/ca/LC_MESSAGES/karbon.mo
 share/locale/ca/LC_MESSAGES/kchart.mo
-share/locale/ca/LC_MESSAGES/kdgantt.mo
 share/locale/ca/LC_MESSAGES/kexi.mo
 share/locale/ca/LC_MESSAGES/kfile_koffice.mo
 share/locale/ca/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile
index 8d4644493988..63f033b00609 100644
--- a/editors/koffice-i18n-cs/Makefile
+++ b/editors/koffice-i18n-cs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-cs/distinfo b/editors/koffice-i18n-cs/distinfo
index 86adbdf21810..21f4e6a86e0a 100644
--- a/editors/koffice-i18n-cs/distinfo
+++ b/editors/koffice-i18n-cs/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-cs-1.4.1.tar.bz2) = 8b56e381765bece8a32fec3b67e881c2
-SIZE (KDE/kde-i18n/koffice-l10n-cs-1.4.1.tar.bz2) = 356807
+MD5 (KDE/kde-i18n/koffice-l10n-cs-1.4.2.tar.bz2) = 58e6c355e478ab459e6f0a5c86662f36
+SIZE (KDE/kde-i18n/koffice-l10n-cs-1.4.2.tar.bz2) = 396202
diff --git a/editors/koffice-i18n-cs/pkg-plist b/editors/koffice-i18n-cs/pkg-plist
index e6945bd8aff1..23aeec68aa88 100644
--- a/editors/koffice-i18n-cs/pkg-plist
+++ b/editors/koffice-i18n-cs/pkg-plist
@@ -3,7 +3,6 @@ share/locale/cs/LC_MESSAGES/desktop_koffice.mo
 share/locale/cs/LC_MESSAGES/example.mo
 share/locale/cs/LC_MESSAGES/karbon.mo
 share/locale/cs/LC_MESSAGES/kchart.mo
-share/locale/cs/LC_MESSAGES/kdgantt.mo
 share/locale/cs/LC_MESSAGES/kexi.mo
 share/locale/cs/LC_MESSAGES/kfile_koffice.mo
 share/locale/cs/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-cy/Makefile b/editors/koffice-i18n-cy/Makefile
index 2aba846da685..66d214aea807 100644
--- a/editors/koffice-i18n-cy/Makefile
+++ b/editors/koffice-i18n-cy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-cy/distinfo b/editors/koffice-i18n-cy/distinfo
index 31972f6790ea..f9d781e41cd1 100644
--- a/editors/koffice-i18n-cy/distinfo
+++ b/editors/koffice-i18n-cy/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-cy-1.4.1.tar.bz2) = e15377d70faef67a91a361b421b8be84
-SIZE (KDE/kde-i18n/koffice-l10n-cy-1.4.1.tar.bz2) = 385160
+MD5 (KDE/kde-i18n/koffice-l10n-cy-1.4.2.tar.bz2) = ed0c069797a89680d49bd396f80e94e1
+SIZE (KDE/kde-i18n/koffice-l10n-cy-1.4.2.tar.bz2) = 411106
diff --git a/editors/koffice-i18n-cy/pkg-plist b/editors/koffice-i18n-cy/pkg-plist
index c3b5ba2f121c..77e207d60111 100644
--- a/editors/koffice-i18n-cy/pkg-plist
+++ b/editors/koffice-i18n-cy/pkg-plist
@@ -2,7 +2,6 @@ share/locale/cy/LC_MESSAGES/desktop_koffice.mo
 share/locale/cy/LC_MESSAGES/example.mo
 share/locale/cy/LC_MESSAGES/karbon.mo
 share/locale/cy/LC_MESSAGES/kchart.mo
-share/locale/cy/LC_MESSAGES/kdgantt.mo
 share/locale/cy/LC_MESSAGES/kexi.mo
 share/locale/cy/LC_MESSAGES/kfile_koffice.mo
 share/locale/cy/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile
index 777caf826434..6bb6a53dc73d 100644
--- a/editors/koffice-i18n-da/Makefile
+++ b/editors/koffice-i18n-da/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-da/distinfo b/editors/koffice-i18n-da/distinfo
index 27e41f263826..192366d647a7 100644
--- a/editors/koffice-i18n-da/distinfo
+++ b/editors/koffice-i18n-da/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 3bcda6ccf32a2b0916f5de47981be655
-SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 817010
+MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = f6c3b0afcb299519f0663aa5a3ff3362
+SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = 832248
diff --git a/editors/koffice-i18n-da/pkg-plist b/editors/koffice-i18n-da/pkg-plist
index f271ee0cb26a..3286121a5d36 100644
--- a/editors/koffice-i18n-da/pkg-plist
+++ b/editors/koffice-i18n-da/pkg-plist
@@ -97,7 +97,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo
 share/locale/da/LC_MESSAGES/example.mo
 share/locale/da/LC_MESSAGES/karbon.mo
 share/locale/da/LC_MESSAGES/kchart.mo
-share/locale/da/LC_MESSAGES/kdgantt.mo
 share/locale/da/LC_MESSAGES/kexi.mo
 share/locale/da/LC_MESSAGES/kfile_koffice.mo
 share/locale/da/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile
index 7d336f886918..146148c97201 100644
--- a/editors/koffice-i18n-el/Makefile
+++ b/editors/koffice-i18n-el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-el/distinfo b/editors/koffice-i18n-el/distinfo
index a74b83b25980..a9d9e8e5310c 100644
--- a/editors/koffice-i18n-el/distinfo
+++ b/editors/koffice-i18n-el/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-el-1.4.1.tar.bz2) = a744de5d6e97a25257a809f7a0f79a11
-SIZE (KDE/kde-i18n/koffice-l10n-el-1.4.1.tar.bz2) = 347282
+MD5 (KDE/kde-i18n/koffice-l10n-el-1.4.2.tar.bz2) = 1aa341393b7ade4037ddeed77c73cacf
+SIZE (KDE/kde-i18n/koffice-l10n-el-1.4.2.tar.bz2) = 368866
diff --git a/editors/koffice-i18n-el/pkg-plist b/editors/koffice-i18n-el/pkg-plist
index 83a53fa3da59..1ddd73d733e2 100644
--- a/editors/koffice-i18n-el/pkg-plist
+++ b/editors/koffice-i18n-el/pkg-plist
@@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo
 share/locale/el/LC_MESSAGES/example.mo
 share/locale/el/LC_MESSAGES/karbon.mo
 share/locale/el/LC_MESSAGES/kchart.mo
-share/locale/el/LC_MESSAGES/kdgantt.mo
 share/locale/el/LC_MESSAGES/kexi.mo
 share/locale/el/LC_MESSAGES/kfile_koffice.mo
 share/locale/el/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile
index 7916c90cc49b..cb356c8a2c49 100644
--- a/editors/koffice-i18n-en_GB/Makefile
+++ b/editors/koffice-i18n-en_GB/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-en_GB/distinfo b/editors/koffice-i18n-en_GB/distinfo
index 1e7a7de96be3..6de3019ef676 100644
--- a/editors/koffice-i18n-en_GB/distinfo
+++ b/editors/koffice-i18n-en_GB/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.4.1.tar.bz2) = deaaf836cce7efcd9c83d800a6b4e51b
-SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.4.1.tar.bz2) = 351631
+MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.4.2.tar.bz2) = caf59bd82ac94ccbeaa4b907c218defa
+SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.4.2.tar.bz2) = 364462
diff --git a/editors/koffice-i18n-en_GB/pkg-plist b/editors/koffice-i18n-en_GB/pkg-plist
index 60ad7182dcc5..626c455e0547 100644
--- a/editors/koffice-i18n-en_GB/pkg-plist
+++ b/editors/koffice-i18n-en_GB/pkg-plist
@@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo
 share/locale/en_GB/LC_MESSAGES/example.mo
 share/locale/en_GB/LC_MESSAGES/karbon.mo
 share/locale/en_GB/LC_MESSAGES/kchart.mo
-share/locale/en_GB/LC_MESSAGES/kdgantt.mo
 share/locale/en_GB/LC_MESSAGES/kexi.mo
 share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo
 share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile
index 65dd3cc5b320..473b8227a676 100644
--- a/editors/koffice-i18n-es/Makefile
+++ b/editors/koffice-i18n-es/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-es/distinfo b/editors/koffice-i18n-es/distinfo
index f11ea54de491..cc9ac4c7bbd2 100644
--- a/editors/koffice-i18n-es/distinfo
+++ b/editors/koffice-i18n-es/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-es-1.4.1.tar.bz2) = 3872dfdfb6b12532218daf8f61f94282
-SIZE (KDE/kde-i18n/koffice-l10n-es-1.4.1.tar.bz2) = 832641
+MD5 (KDE/kde-i18n/koffice-l10n-es-1.4.2.tar.bz2) = 0f429120c8b27d1208f020a353aeb88d
+SIZE (KDE/kde-i18n/koffice-l10n-es-1.4.2.tar.bz2) = 852702
diff --git a/editors/koffice-i18n-es/pkg-plist b/editors/koffice-i18n-es/pkg-plist
index 3f22735c1f58..6a87c5743e2b 100644
--- a/editors/koffice-i18n-es/pkg-plist
+++ b/editors/koffice-i18n-es/pkg-plist
@@ -97,7 +97,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo
 share/locale/es/LC_MESSAGES/example.mo
 share/locale/es/LC_MESSAGES/karbon.mo
 share/locale/es/LC_MESSAGES/kchart.mo
-share/locale/es/LC_MESSAGES/kdgantt.mo
 share/locale/es/LC_MESSAGES/kexi.mo
 share/locale/es/LC_MESSAGES/kfile_koffice.mo
 share/locale/es/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile
index e1f2565032a1..ddc3ae77e030 100644
--- a/editors/koffice-i18n-et/Makefile
+++ b/editors/koffice-i18n-et/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-et/distinfo b/editors/koffice-i18n-et/distinfo
index 82460c6b5a87..0404c5fef4a2 100644
--- a/editors/koffice-i18n-et/distinfo
+++ b/editors/koffice-i18n-et/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-et-1.4.1.tar.bz2) = 0ecd275357b76d245b2367a1925bda59
-SIZE (KDE/kde-i18n/koffice-l10n-et-1.4.1.tar.bz2) = 934319
+MD5 (KDE/kde-i18n/koffice-l10n-et-1.4.2.tar.bz2) = 1ac8201573602a69e7d00b3332cb3bec
+SIZE (KDE/kde-i18n/koffice-l10n-et-1.4.2.tar.bz2) = 953648
diff --git a/editors/koffice-i18n-et/pkg-plist b/editors/koffice-i18n-et/pkg-plist
index 46ca9f60458b..88de1f2ad477 100644
--- a/editors/koffice-i18n-et/pkg-plist
+++ b/editors/koffice-i18n-et/pkg-plist
@@ -102,7 +102,6 @@ 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/kdgantt.mo
 share/locale/et/LC_MESSAGES/kexi.mo
 share/locale/et/LC_MESSAGES/kfile_koffice.mo
 share/locale/et/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-eu/Makefile b/editors/koffice-i18n-eu/Makefile
new file mode 100644
index 000000000000..6a585d96ef93
--- /dev/null
+++ b/editors/koffice-i18n-eu/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	koffice-i18n-eu
+# Date created:                         20 October 2005
+# Whom:                                 Michael Nottebrock <lofi@freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	koffice-i18n
+PORTVERSION=	1.4.2
+CATEGORIES?=	misc kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
+PKGNAMEPREFIX=	eu-
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Basque messages and documentation for koffice
+
+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"
+
+.include <bsd.port.mk>
diff --git a/editors/koffice-i18n-eu/distinfo b/editors/koffice-i18n-eu/distinfo
new file mode 100644
index 000000000000..4d5608dbde18
--- /dev/null
+++ b/editors/koffice-i18n-eu/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kde-i18n/koffice-l10n-eu-1.4.2.tar.bz2) = f8417721a49dd23f20115e102b0a8204
+SIZE (KDE/kde-i18n/koffice-l10n-eu-1.4.2.tar.bz2) = 399804
diff --git a/editors/koffice-i18n-eu/pkg-descr b/editors/koffice-i18n-eu/pkg-descr
new file mode 100644
index 000000000000..9cb0386755e8
--- /dev/null
+++ b/editors/koffice-i18n-eu/pkg-descr
@@ -0,0 +1,3 @@
+Localized messages and documentation for koffice.
+
+WWW: http://koffice.kde.org/
diff --git a/editors/koffice-i18n-eu/pkg-plist b/editors/koffice-i18n-eu/pkg-plist
new file mode 100644
index 000000000000..be8bcb06d82a
--- /dev/null
+++ b/editors/koffice-i18n-eu/pkg-plist
@@ -0,0 +1,27 @@
+share/locale/eu/LC_MESSAGES/desktop_koffice.mo
+share/locale/eu/LC_MESSAGES/example.mo
+share/locale/eu/LC_MESSAGES/karbon.mo
+share/locale/eu/LC_MESSAGES/kchart.mo
+share/locale/eu/LC_MESSAGES/kexi.mo
+share/locale/eu/LC_MESSAGES/kfile_koffice.mo
+share/locale/eu/LC_MESSAGES/kfile_ooo.mo
+share/locale/eu/LC_MESSAGES/kformdesigner.mo
+share/locale/eu/LC_MESSAGES/kformula.mo
+share/locale/eu/LC_MESSAGES/kivio.mo
+share/locale/eu/LC_MESSAGES/koconverter.mo
+share/locale/eu/LC_MESSAGES/koffice.mo
+share/locale/eu/LC_MESSAGES/kofficefilters.mo
+share/locale/eu/LC_MESSAGES/koshell.mo
+share/locale/eu/LC_MESSAGES/kounavail.mo
+share/locale/eu/LC_MESSAGES/kplato.mo
+share/locale/eu/LC_MESSAGES/kpresenter.mo
+share/locale/eu/LC_MESSAGES/krita.mo
+share/locale/eu/LC_MESSAGES/kscan_plugin.mo
+share/locale/eu/LC_MESSAGES/kscreenshot_plugin.mo
+share/locale/eu/LC_MESSAGES/kspread.mo
+share/locale/eu/LC_MESSAGES/kspreadcalc_calc.mo
+share/locale/eu/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/eu/LC_MESSAGES/kthesaurus.mo
+share/locale/eu/LC_MESSAGES/kugar.mo
+share/locale/eu/LC_MESSAGES/kword.mo
+share/locale/eu/LC_MESSAGES/thesaurus_tool.mo
diff --git a/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile
index c077b7247cca..4770a83a5b9b 100644
--- a/editors/koffice-i18n-fi/Makefile
+++ b/editors/koffice-i18n-fi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-fi/distinfo b/editors/koffice-i18n-fi/distinfo
index 0721c4fc80f9..f768f11fcf5b 100644
--- a/editors/koffice-i18n-fi/distinfo
+++ b/editors/koffice-i18n-fi/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-fi-1.4.1.tar.bz2) = a2e26094907dc77365266c215183c587
-SIZE (KDE/kde-i18n/koffice-l10n-fi-1.4.1.tar.bz2) = 360475
+MD5 (KDE/kde-i18n/koffice-l10n-fi-1.4.2.tar.bz2) = b4925a3bd6db8b6b787b0313e3695371
+SIZE (KDE/kde-i18n/koffice-l10n-fi-1.4.2.tar.bz2) = 397433
diff --git a/editors/koffice-i18n-fi/pkg-plist b/editors/koffice-i18n-fi/pkg-plist
index b03d7c60526a..d5262b17af50 100644
--- a/editors/koffice-i18n-fi/pkg-plist
+++ b/editors/koffice-i18n-fi/pkg-plist
@@ -2,7 +2,6 @@ share/locale/fi/LC_MESSAGES/desktop_koffice.mo
 share/locale/fi/LC_MESSAGES/example.mo
 share/locale/fi/LC_MESSAGES/karbon.mo
 share/locale/fi/LC_MESSAGES/kchart.mo
-share/locale/fi/LC_MESSAGES/kdgantt.mo
 share/locale/fi/LC_MESSAGES/kexi.mo
 share/locale/fi/LC_MESSAGES/kfile_koffice.mo
 share/locale/fi/LC_MESSAGES/kfile_ooo.mo
@@ -14,11 +13,14 @@ share/locale/fi/LC_MESSAGES/koffice.mo
 share/locale/fi/LC_MESSAGES/kofficefilters.mo
 share/locale/fi/LC_MESSAGES/koshell.mo
 share/locale/fi/LC_MESSAGES/kounavail.mo
+share/locale/fi/LC_MESSAGES/kplato.mo
 share/locale/fi/LC_MESSAGES/kpresenter.mo
 share/locale/fi/LC_MESSAGES/krita.mo
 share/locale/fi/LC_MESSAGES/kscan_plugin.mo
+share/locale/fi/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/fi/LC_MESSAGES/kspread.mo
 share/locale/fi/LC_MESSAGES/kspreadcalc_calc.mo
+share/locale/fi/LC_MESSAGES/kspreadinsertcalendar.mo
 share/locale/fi/LC_MESSAGES/kthesaurus.mo
 share/locale/fi/LC_MESSAGES/kugar.mo
 share/locale/fi/LC_MESSAGES/kword.mo
diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile
index 27e740a8cda2..d9d9f31b872b 100644
--- a/editors/koffice-i18n-it/Makefile
+++ b/editors/koffice-i18n-it/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-it/distinfo b/editors/koffice-i18n-it/distinfo
index cc063d07bdfc..12d194ba47e9 100644
--- a/editors/koffice-i18n-it/distinfo
+++ b/editors/koffice-i18n-it/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-it-1.4.1.tar.bz2) = cac43b60ea3d01cfa0ac337bc0a296be
-SIZE (KDE/kde-i18n/koffice-l10n-it-1.4.1.tar.bz2) = 1163009
+MD5 (KDE/kde-i18n/koffice-l10n-it-1.4.2.tar.bz2) = 62609f289dc1ed216c7d075045159a04
+SIZE (KDE/kde-i18n/koffice-l10n-it-1.4.2.tar.bz2) = 1117301
diff --git a/editors/koffice-i18n-it/pkg-plist b/editors/koffice-i18n-it/pkg-plist
index d542f01e5767..81b25f9231ac 100644
--- a/editors/koffice-i18n-it/pkg-plist
+++ b/editors/koffice-i18n-it/pkg-plist
@@ -109,7 +109,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo
 share/locale/it/LC_MESSAGES/example.mo
 share/locale/it/LC_MESSAGES/karbon.mo
 share/locale/it/LC_MESSAGES/kchart.mo
-share/locale/it/LC_MESSAGES/kdgantt.mo
 share/locale/it/LC_MESSAGES/kexi.mo
 share/locale/it/LC_MESSAGES/kfile_koffice.mo
 share/locale/it/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile
index 6d7bc2bd7d0b..e3262c390916 100644
--- a/editors/koffice-i18n-nb/Makefile
+++ b/editors/koffice-i18n-nb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-nb/distinfo b/editors/koffice-i18n-nb/distinfo
index 0e87cac24a15..5c901a999bba 100644
--- a/editors/koffice-i18n-nb/distinfo
+++ b/editors/koffice-i18n-nb/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nb-1.4.1.tar.bz2) = 0d9c12a3881861377130801a3a431dd2
-SIZE (KDE/kde-i18n/koffice-l10n-nb-1.4.1.tar.bz2) = 375589
+MD5 (KDE/kde-i18n/koffice-l10n-nb-1.4.2.tar.bz2) = 9d8c327b3e6567d90258cec8b0694a2c
+SIZE (KDE/kde-i18n/koffice-l10n-nb-1.4.2.tar.bz2) = 413430
diff --git a/editors/koffice-i18n-nb/pkg-plist b/editors/koffice-i18n-nb/pkg-plist
index 956fefc9e7dd..f49640d1e6f6 100644
--- a/editors/koffice-i18n-nb/pkg-plist
+++ b/editors/koffice-i18n-nb/pkg-plist
@@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo
 share/locale/nb/LC_MESSAGES/example.mo
 share/locale/nb/LC_MESSAGES/karbon.mo
 share/locale/nb/LC_MESSAGES/kchart.mo
-share/locale/nb/LC_MESSAGES/kdgantt.mo
 share/locale/nb/LC_MESSAGES/kexi.mo
 share/locale/nb/LC_MESSAGES/kfile_koffice.mo
 share/locale/nb/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile
index 50adebbd7cd8..822ca8c3d745 100644
--- a/editors/koffice-i18n-nl/Makefile
+++ b/editors/koffice-i18n-nl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-nl/distinfo b/editors/koffice-i18n-nl/distinfo
index 6d9e08e72462..57795240013d 100644
--- a/editors/koffice-i18n-nl/distinfo
+++ b/editors/koffice-i18n-nl/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nl-1.4.1.tar.bz2) = a960e30b5bd883ed71ada339f238bb38
-SIZE (KDE/kde-i18n/koffice-l10n-nl-1.4.1.tar.bz2) = 2999096
+MD5 (KDE/kde-i18n/koffice-l10n-nl-1.4.2.tar.bz2) = 6328a285565add97cd55413e52541050
+SIZE (KDE/kde-i18n/koffice-l10n-nl-1.4.2.tar.bz2) = 3025440
diff --git a/editors/koffice-i18n-nl/pkg-plist b/editors/koffice-i18n-nl/pkg-plist
index 96ec65b7af7e..b2778a6912b3 100644
--- a/editors/koffice-i18n-nl/pkg-plist
+++ b/editors/koffice-i18n-nl/pkg-plist
@@ -400,7 +400,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo
 share/locale/nl/LC_MESSAGES/example.mo
 share/locale/nl/LC_MESSAGES/karbon.mo
 share/locale/nl/LC_MESSAGES/kchart.mo
-share/locale/nl/LC_MESSAGES/kdgantt.mo
 share/locale/nl/LC_MESSAGES/kexi.mo
 share/locale/nl/LC_MESSAGES/kfile_koffice.mo
 share/locale/nl/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile
index a9f901646404..b2187ee598c8 100644
--- a/editors/koffice-i18n-nn/Makefile
+++ b/editors/koffice-i18n-nn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-nn/distinfo b/editors/koffice-i18n-nn/distinfo
index 7a3f6582541c..8488f7168547 100644
--- a/editors/koffice-i18n-nn/distinfo
+++ b/editors/koffice-i18n-nn/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nn-1.4.1.tar.bz2) = 7e55ada0f26bc0125ae26ab7c7b1eae2
-SIZE (KDE/kde-i18n/koffice-l10n-nn-1.4.1.tar.bz2) = 372458
+MD5 (KDE/kde-i18n/koffice-l10n-nn-1.4.2.tar.bz2) = 2e52095b2c9c879e101d274888d49fcc
+SIZE (KDE/kde-i18n/koffice-l10n-nn-1.4.2.tar.bz2) = 409225
diff --git a/editors/koffice-i18n-nn/pkg-plist b/editors/koffice-i18n-nn/pkg-plist
index 088c36b382c0..d43125d989de 100644
--- a/editors/koffice-i18n-nn/pkg-plist
+++ b/editors/koffice-i18n-nn/pkg-plist
@@ -3,7 +3,6 @@ share/locale/nn/LC_MESSAGES/desktop_koffice.mo
 share/locale/nn/LC_MESSAGES/example.mo
 share/locale/nn/LC_MESSAGES/karbon.mo
 share/locale/nn/LC_MESSAGES/kchart.mo
-share/locale/nn/LC_MESSAGES/kdgantt.mo
 share/locale/nn/LC_MESSAGES/kexi.mo
 share/locale/nn/LC_MESSAGES/kfile_koffice.mo
 share/locale/nn/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile
index 783891e33a4a..ae3914c007fb 100644
--- a/editors/koffice-i18n-sl/Makefile
+++ b/editors/koffice-i18n-sl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sl/distinfo b/editors/koffice-i18n-sl/distinfo
index ad923f837cae..ef240ae022c3 100644
--- a/editors/koffice-i18n-sl/distinfo
+++ b/editors/koffice-i18n-sl/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sl-1.4.1.tar.bz2) = 3c27784f5630ca6f3b0cfbae89271176
-SIZE (KDE/kde-i18n/koffice-l10n-sl-1.4.1.tar.bz2) = 362804
+MD5 (KDE/kde-i18n/koffice-l10n-sl-1.4.2.tar.bz2) = 6d85c8b3f84b892471fd3cadd00aba37
+SIZE (KDE/kde-i18n/koffice-l10n-sl-1.4.2.tar.bz2) = 399962
diff --git a/editors/koffice-i18n-sl/pkg-plist b/editors/koffice-i18n-sl/pkg-plist
index 69b57d831179..cf4837e926fd 100644
--- a/editors/koffice-i18n-sl/pkg-plist
+++ b/editors/koffice-i18n-sl/pkg-plist
@@ -10,7 +10,6 @@ share/locale/sl/LC_MESSAGES/desktop_koffice.mo
 share/locale/sl/LC_MESSAGES/example.mo
 share/locale/sl/LC_MESSAGES/karbon.mo
 share/locale/sl/LC_MESSAGES/kchart.mo
-share/locale/sl/LC_MESSAGES/kdgantt.mo
 share/locale/sl/LC_MESSAGES/kexi.mo
 share/locale/sl/LC_MESSAGES/kfile_koffice.mo
 share/locale/sl/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile
index fe0b67efab8f..982b9e9c4f2b 100644
--- a/editors/koffice-i18n-sr/Makefile
+++ b/editors/koffice-i18n-sr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sr/distinfo b/editors/koffice-i18n-sr/distinfo
index 650f9ec572c8..cccccef3e88d 100644
--- a/editors/koffice-i18n-sr/distinfo
+++ b/editors/koffice-i18n-sr/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sr-1.4.1.tar.bz2) = f49d2141aa8bd2c68f0ab892cdc4e1a8
-SIZE (KDE/kde-i18n/koffice-l10n-sr-1.4.1.tar.bz2) = 367804
+MD5 (KDE/kde-i18n/koffice-l10n-sr-1.4.2.tar.bz2) = 97d0fa5fdb458bbe5c8ef5317e15ed5c
+SIZE (KDE/kde-i18n/koffice-l10n-sr-1.4.2.tar.bz2) = 379682
diff --git a/editors/koffice-i18n-sr/pkg-plist b/editors/koffice-i18n-sr/pkg-plist
index 8baaf7a1526c..e28ac43bb4b6 100644
--- a/editors/koffice-i18n-sr/pkg-plist
+++ b/editors/koffice-i18n-sr/pkg-plist
@@ -2,7 +2,6 @@ share/locale/sr/LC_MESSAGES/desktop_koffice.mo
 share/locale/sr/LC_MESSAGES/example.mo
 share/locale/sr/LC_MESSAGES/karbon.mo
 share/locale/sr/LC_MESSAGES/kchart.mo
-share/locale/sr/LC_MESSAGES/kdgantt.mo
 share/locale/sr/LC_MESSAGES/kexi.mo
 share/locale/sr/LC_MESSAGES/kfile_koffice.mo
 share/locale/sr/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-sr@Latn/Makefile b/editors/koffice-i18n-sr@Latn/Makefile
index e82309d76fab..71c678a915c8 100644
--- a/editors/koffice-i18n-sr@Latn/Makefile
+++ b/editors/koffice-i18n-sr@Latn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sr@Latn/distinfo b/editors/koffice-i18n-sr@Latn/distinfo
index b0930fd14b10..c65e766cd93f 100644
--- a/editors/koffice-i18n-sr@Latn/distinfo
+++ b/editors/koffice-i18n-sr@Latn/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.1.tar.bz2) = 41fecc81a0bfbce8eaf5f40e978be3fe
-SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.1.tar.bz2) = 374513
+MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.2.tar.bz2) = 65e7e7939b3d538913ddcec261741f75
+SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.2.tar.bz2) = 406186
diff --git a/editors/koffice-i18n-sr@Latn/pkg-plist b/editors/koffice-i18n-sr@Latn/pkg-plist
index 8514992a5898..a869912f69b2 100644
--- a/editors/koffice-i18n-sr@Latn/pkg-plist
+++ b/editors/koffice-i18n-sr@Latn/pkg-plist
@@ -2,7 +2,6 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo
 share/locale/sr@Latn/LC_MESSAGES/example.mo
 share/locale/sr@Latn/LC_MESSAGES/karbon.mo
 share/locale/sr@Latn/LC_MESSAGES/kchart.mo
-share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo
 share/locale/sr@Latn/LC_MESSAGES/kexi.mo
 share/locale/sr@Latn/LC_MESSAGES/kfile_koffice.mo
 share/locale/sr@Latn/LC_MESSAGES/kfile_ooo.mo
@@ -26,6 +25,3 @@ share/locale/sr@Latn/LC_MESSAGES/kthesaurus.mo
 share/locale/sr@Latn/LC_MESSAGES/kugar.mo
 share/locale/sr@Latn/LC_MESSAGES/kword.mo
 share/locale/sr@Latn/LC_MESSAGES/thesaurus_tool.mo
-@dirrm share/locale/sr@Latn/LC_MESSAGES
-@dirrm share/locale/sr@Latn
-@dirrm share/locale
diff --git a/editors/koffice-i18n-sr_Latn/Makefile b/editors/koffice-i18n-sr_Latn/Makefile
index e82309d76fab..71c678a915c8 100644
--- a/editors/koffice-i18n-sr_Latn/Makefile
+++ b/editors/koffice-i18n-sr_Latn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sr_Latn/distinfo b/editors/koffice-i18n-sr_Latn/distinfo
index b0930fd14b10..c65e766cd93f 100644
--- a/editors/koffice-i18n-sr_Latn/distinfo
+++ b/editors/koffice-i18n-sr_Latn/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.1.tar.bz2) = 41fecc81a0bfbce8eaf5f40e978be3fe
-SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.1.tar.bz2) = 374513
+MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.2.tar.bz2) = 65e7e7939b3d538913ddcec261741f75
+SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.4.2.tar.bz2) = 406186
diff --git a/editors/koffice-i18n-sr_Latn/pkg-plist b/editors/koffice-i18n-sr_Latn/pkg-plist
index 8514992a5898..a869912f69b2 100644
--- a/editors/koffice-i18n-sr_Latn/pkg-plist
+++ b/editors/koffice-i18n-sr_Latn/pkg-plist
@@ -2,7 +2,6 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo
 share/locale/sr@Latn/LC_MESSAGES/example.mo
 share/locale/sr@Latn/LC_MESSAGES/karbon.mo
 share/locale/sr@Latn/LC_MESSAGES/kchart.mo
-share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo
 share/locale/sr@Latn/LC_MESSAGES/kexi.mo
 share/locale/sr@Latn/LC_MESSAGES/kfile_koffice.mo
 share/locale/sr@Latn/LC_MESSAGES/kfile_ooo.mo
@@ -26,6 +25,3 @@ share/locale/sr@Latn/LC_MESSAGES/kthesaurus.mo
 share/locale/sr@Latn/LC_MESSAGES/kugar.mo
 share/locale/sr@Latn/LC_MESSAGES/kword.mo
 share/locale/sr@Latn/LC_MESSAGES/thesaurus_tool.mo
-@dirrm share/locale/sr@Latn/LC_MESSAGES
-@dirrm share/locale/sr@Latn
-@dirrm share/locale
diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile
index d7a7a37327cd..d60518676c78 100644
--- a/editors/koffice-i18n-sv/Makefile
+++ b/editors/koffice-i18n-sv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-sv/distinfo b/editors/koffice-i18n-sv/distinfo
index 38a77adb1c1d..9fcfa70ef146 100644
--- a/editors/koffice-i18n-sv/distinfo
+++ b/editors/koffice-i18n-sv/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sv-1.4.1.tar.bz2) = 58ffb4991e48caa73f434f30ca2b4761
-SIZE (KDE/kde-i18n/koffice-l10n-sv-1.4.1.tar.bz2) = 4778663
+MD5 (KDE/kde-i18n/koffice-l10n-sv-1.4.2.tar.bz2) = 897218187ef83afcd99406b62e352e69
+SIZE (KDE/kde-i18n/koffice-l10n-sv-1.4.2.tar.bz2) = 4783393
diff --git a/editors/koffice-i18n-sv/pkg-plist b/editors/koffice-i18n-sv/pkg-plist
index b9b93eaac8bb..e062905acaf2 100644
--- a/editors/koffice-i18n-sv/pkg-plist
+++ b/editors/koffice-i18n-sv/pkg-plist
@@ -366,7 +366,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo
 share/locale/sv/LC_MESSAGES/example.mo
 share/locale/sv/LC_MESSAGES/karbon.mo
 share/locale/sv/LC_MESSAGES/kchart.mo
-share/locale/sv/LC_MESSAGES/kdgantt.mo
 share/locale/sv/LC_MESSAGES/kexi.mo
 share/locale/sv/LC_MESSAGES/kfile_koffice.mo
 share/locale/sv/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-ta/Makefile b/editors/koffice-i18n-ta/Makefile
index f1f558ed240f..59b2689743be 100644
--- a/editors/koffice-i18n-ta/Makefile
+++ b/editors/koffice-i18n-ta/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-ta/distinfo b/editors/koffice-i18n-ta/distinfo
index 8d67117e3bf5..b81b8a4e57ba 100644
--- a/editors/koffice-i18n-ta/distinfo
+++ b/editors/koffice-i18n-ta/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-ta-1.4.1.tar.bz2) = 43e954db7f2af6f4c4f34a85a31e33d2
-SIZE (KDE/kde-i18n/koffice-l10n-ta-1.4.1.tar.bz2) = 360591
+MD5 (KDE/kde-i18n/koffice-l10n-ta-1.4.2.tar.bz2) = 2c55f413ec8e02a667e37d967186dc86
+SIZE (KDE/kde-i18n/koffice-l10n-ta-1.4.2.tar.bz2) = 364788
diff --git a/editors/koffice-i18n-ta/pkg-plist b/editors/koffice-i18n-ta/pkg-plist
index f39130a1695f..ef03e2184db8 100644
--- a/editors/koffice-i18n-ta/pkg-plist
+++ b/editors/koffice-i18n-ta/pkg-plist
@@ -2,7 +2,6 @@ share/locale/ta/LC_MESSAGES/desktop_koffice.mo
 share/locale/ta/LC_MESSAGES/example.mo
 share/locale/ta/LC_MESSAGES/karbon.mo
 share/locale/ta/LC_MESSAGES/kchart.mo
-share/locale/ta/LC_MESSAGES/kdgantt.mo
 share/locale/ta/LC_MESSAGES/kexi.mo
 share/locale/ta/LC_MESSAGES/kfile_koffice.mo
 share/locale/ta/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n-tg/Makefile b/editors/koffice-i18n-tg/Makefile
index f267299df739..35a883343953 100644
--- a/editors/koffice-i18n-tg/Makefile
+++ b/editors/koffice-i18n-tg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-i18n-tg/distinfo b/editors/koffice-i18n-tg/distinfo
index cd731232eeb2..199454fafe7a 100644
--- a/editors/koffice-i18n-tg/distinfo
+++ b/editors/koffice-i18n-tg/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-tg-1.4.1.tar.bz2) = 2e35a578c8afb853ef5c23e71c2d575e
-SIZE (KDE/kde-i18n/koffice-l10n-tg-1.4.1.tar.bz2) = 372707
+MD5 (KDE/kde-i18n/koffice-l10n-tg-1.4.2.tar.bz2) = c10cd70d7f1a9a397f768002625ad6f9
+SIZE (KDE/kde-i18n/koffice-l10n-tg-1.4.2.tar.bz2) = 376879
diff --git a/editors/koffice-i18n-tg/pkg-plist b/editors/koffice-i18n-tg/pkg-plist
index 59c5aa39d4b1..6ae073cd8e70 100644
--- a/editors/koffice-i18n-tg/pkg-plist
+++ b/editors/koffice-i18n-tg/pkg-plist
@@ -2,7 +2,6 @@ share/locale/tg/LC_MESSAGES/desktop_koffice.mo
 share/locale/tg/LC_MESSAGES/example.mo
 share/locale/tg/LC_MESSAGES/karbon.mo
 share/locale/tg/LC_MESSAGES/kchart.mo
-share/locale/tg/LC_MESSAGES/kdgantt.mo
 share/locale/tg/LC_MESSAGES/kexi.mo
 share/locale/tg/LC_MESSAGES/kfile_koffice.mo
 share/locale/tg/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile
index 977d29a6f36a..7268cb65796b 100644
--- a/editors/koffice-i18n/Makefile
+++ b/editors/koffice-i18n/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -30,7 +30,7 @@ RUN_DEPENDS+=\
 	${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \
 	${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW
 
-.for LANG in af bg br bs ca cs cy da el en_GB eo es et fa fi hsb it \
+.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi hsb it \
 	lo lt lv mt nb nl nn se sk sl sr sr@Latn sv ta tg th tr ven xh zu
 RUN_DEPENDS+=\
 ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG}
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index dd9fb61c41ef..185bec6793ac 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -53,14 +52,13 @@ CONFIGURE_ARGS+=--with-pgsqlincdir=${PG_INCDIR} --with-pgsqllibdir=${PG_LIBDIR}
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
 .endif
 
-post-patch:
-	@env TZ=UTC ${TOUCH} -t 200507191955.36 ${WRKSRC}/config.h.in
-
 post-configure:
 .if ${OSVERSION} < 500035
 	${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \
 	-e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \
 		${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \
+		${WRKSRC}/kchart/Makefile \
+		${WRKSRC}/kchart/kdchart/Makefile \
 		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
 		${WRKSRC}/kexi/migration/pqxx/Makefile
 .endif
diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo
index 7f9ee95864a2..61d5478c3f57 100644
--- a/editors/koffice-kde3/distinfo
+++ b/editors/koffice-kde3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/koffice/koffice-1.4.1.tar.bz2) = 91a7b68757addc5934c5a8209a4926d5
-SIZE (KDE/koffice/koffice-1.4.1.tar.bz2) = 19364338
+MD5 (KDE/koffice/koffice-1.4.2.tar.bz2) = 6b456fb7d54c84b11396b27a96ae0cf8
+SIZE (KDE/koffice/koffice-1.4.2.tar.bz2) = 19486852
diff --git a/editors/koffice-kde3/files/patch-filters_kword_rtf_import-rtfimport_tokenizer b/editors/koffice-kde3/files/patch-filters_kword_rtf_import-rtfimport_tokenizer
deleted file mode 100644
index 78be2fe6f9ce..000000000000
--- a/editors/koffice-kde3/files/patch-filters_kword_rtf_import-rtfimport_tokenizer
+++ /dev/null
@@ -1,325 +0,0 @@
-Index: filters/kword/rtf/import/rtfimport_tokenizer.cpp
-===================================================================
---- filters/kword/rtf/import/rtfimport_tokenizer.cpp	(revision 463235)
-+++ filters/kword/rtf/import/rtfimport_tokenizer.cpp	(working copy)
-@@ -16,7 +16,7 @@
- 
- RTFTokenizer::RTFTokenizer()
- {
--    tokenText.resize( 4112 );
-+    tokenText.resize( 4113 );
-     fileBuffer.resize( 4096 );
-     infile = 0L;
- }
-@@ -30,8 +30,25 @@
-     fileBufferPtr = 0L;
-     fileBufferEnd = 0L;
-     infile = in;
-+    type = RTFTokenizer::PlainText;
- }
- 
-+int RTFTokenizer::nextChar()
-+{
-+    if ( fileBufferPtr == fileBufferEnd ) {
-+        int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+        fileBufferPtr = ( uchar* ) fileBuffer.data();
-+        fileBufferEnd = fileBufferPtr;
-+
-+        if ( n <= 0 )
-+            return -1;
-+
-+        fileBufferEnd = fileBufferPtr + n;
-+    }
-+    return *fileBufferPtr++;
-+}
-+
-+
- /**
-  * Reads the next token.
-  */
-@@ -42,22 +59,15 @@
-     if (!infile)
- 	return;
- 
--    do
--    {
--	if (fileBufferPtr == fileBufferEnd)
--	{
--	    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+    do {
-+        int n = nextChar();
- 
--	    if (n <= 0)
--	    {
--		// Return CloseGroup on EOF
--		ch = '}';
--		break;
--	    }
--	    fileBufferPtr = (uchar *)fileBuffer.data();
--	    fileBufferEnd = (fileBufferPtr + n);
--	}
--	ch = *fileBufferPtr++;
-+        if ( n <= 0 ) {
-+            ch = '}';
-+            break;
-+        }
-+
-+        ch = n;
-     }
-     while (ch == '\n' || ch == '\r' && ch != 0);
- 
-@@ -67,6 +77,7 @@
- 
-     uchar *_text = (uchar *)text;
- 
-+
-     if (ch == '{')
- 	type = RTFTokenizer::OpenGroup;
-     else if (ch == '}')
-@@ -75,20 +86,14 @@
-     {
- 	type = RTFTokenizer::ControlWord;
- 
--	if (fileBufferPtr == fileBufferEnd)
--	{
--	    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+        int n = nextChar();
- 
--	    if (n <= 0)
--	    {
--		// Return CloseGroup on EOF
--		type = RTFTokenizer::CloseGroup;
--		return;
--	    }
--	    fileBufferPtr = (uchar *)fileBuffer.data();
--	    fileBufferEnd = (fileBufferPtr + n);
--	}
--	ch = *fileBufferPtr++;
-+        if ( n <= 0 ) {
-+            // Return CloseGroup on EOF
-+            type = RTFTokenizer::CloseGroup;
-+            return;
-+        }
-+	ch = n;
- 
- 	// Type is either control word or control symbol
- 	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
-@@ -96,64 +101,41 @@
- 	    int v = 0;
- 
- 	    // Read alphabetic string (command)
--	    while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
-+	    while (_text < ( uchar* )tokenText.data()+tokenText.size()-3 && 
-+                  ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) )
- 	    {
- 		*_text++ = ch;
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
-+                int n = nextChar();
-+                if ( n <= 0 ) {
-+                    ch = ' ';
-+                    break;
-+                }
-+                ch = n;
- 	    }
- 
- 	    // Read numeric parameter (param)
- 	    bool isneg = (ch == '-');
- 
--	    if (isneg)
--	    {
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--		    if (n <= 0)
--		    {
--			// Return CloseGroup on EOF
--			type = RTFTokenizer::CloseGroup;
--			return;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
-+	    if (isneg) {
-+                int n = nextChar();
-+                if ( n <= 0 ) {
-+                    type = RTFTokenizer::CloseGroup;
-+                    return;
-+                }
-+		ch = n;
- 	    }
--	    while (ch >= '0' && ch <= '9')
--	    {
-+
-+	    while (ch >= '0' && ch <= '9') {
- 		v	 = (10 * v) + ch - '0';
- 		hasParam = true;
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+                int n = nextChar();
- 
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
--	    }
-+                if ( n <= 0 )
-+                    n = ' ';
-+                ch = n;
-+            }
- 	    value = isneg ? -v : v;
- 
- 	    // If delimiter is a space, it's part of the control word
-@@ -163,7 +145,7 @@
- 	    }
- 
-             *_text = 0; // Just put an end of string for the test, it can then be over-written again
--            if ( !qstrncmp( tokenText.data()+1, "bin", 4 ) ) // Test the NULL too to avoid catching keywords starting with "bin"
-+            if ( !memcmp( tokenText.data()+1, "bin", 4 ) )
-             {   // We have \bin, so we need to read the bytes
-                 kdDebug(30515) << "Token:" << tokenText << endl;
-                 if (value > 0)
-@@ -173,26 +155,15 @@
-                     binaryData.resize(value);
-                     for (int i=0; i<value; i++)
-                     {
--                        if (fileBufferPtr == fileBufferEnd)
--                        {
--                            const int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--                            if (n <= 0)
--                            {
--                                kdError(30515) << "\\bin stream hit end of file." << endl;
--                                type = RTFTokenizer::CloseGroup;
--                                break;
--                            }
--                            fileBufferPtr = (uchar *)fileBuffer.data();
--                            fileBufferEnd = (fileBufferPtr + n);
-+                        int n = nextChar();
-+                        if ( n <= 0 ) {
-+                            type = RTFTokenizer::CloseGroup;
-+                            break;
-                         }
--                        binaryData[i]=*fileBufferPtr++;
-+
-+                        binaryData[i] = n;
-                     }
-                 }
--                else
--                {
--                    kdError(30515) << "\\bin with negative value skipping" << endl;
--                }
-             }
- 
- 	}
-@@ -200,19 +171,13 @@
- 	{
- 	    type = RTFTokenizer::ControlWord;
- 	    *_text++ = ch;
--	    if (fileBufferPtr == fileBufferEnd)
--	    {
--		int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
- 
--		if (n <= 0)
--		{
--		    // Return CloseGroup on EOF
--		    type = RTFTokenizer::CloseGroup;
--		    return;
--		}
--		fileBufferPtr = (uchar *)fileBuffer.data();
--		fileBufferEnd = (fileBufferPtr + n);
--	    }
-+            int n = nextChar();
-+
-+            if ( n <= 0 ) {
-+                type = RTFTokenizer::CloseGroup;
-+                return;
-+            }
- 	    ch = *fileBufferPtr++;
- 	    for(int i=0;i<2;i++)
- 	    {
-@@ -220,22 +185,16 @@
- 		value<<=4;
- 		value=value|((ch + ((ch & 16) ? 0 : 9)) & 0xf);
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+                int n = nextChar();
- 
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
-+                if ( n <= 0 ) {
-+                    ch = ' ';
-+                    break;
-+                }
- 		ch = *fileBufferPtr++;
- 	    }
--		--fileBufferPtr;
--	    }
-+            --fileBufferPtr;
-+        }
- 	else
- 	{
- 	    type = RTFTokenizer::ControlWord;
-@@ -248,14 +207,16 @@
- 
- 	// Everything until next backslash, opener or closer
- 	while ( ch != '\\' && ch != '{' && ch != '}' && ch != '\n' &&
--		ch != '\r' && fileBufferPtr <= fileBufferEnd )
-+		ch != '\r')
- 	{
- 	    *_text++ = ch;
-+            if(fileBufferPtr >= fileBufferEnd)
-+                break;
- 	    ch = *fileBufferPtr++;
- 	}
--
--	// Give back last char
--	--fileBufferPtr;
-+        if(fileBufferPtr < fileBufferEnd)
-+          --fileBufferPtr; // give back the last char
-     }
-     *_text++ = 0;
-+
- }
-Index: filters/kword/rtf/import/rtfimport_tokenizer.h
-===================================================================
---- filters/kword/rtf/import/rtfimport_tokenizer.h	(revision 463235)
-+++ filters/kword/rtf/import/rtfimport_tokenizer.h	(working copy)
-@@ -50,6 +50,8 @@
- 
-     // tokenizer (private) data
- private:
-+    int nextChar();
-+
-     QFile *infile;
-     QByteArray fileBuffer;
-     QCString tokenText;
diff --git a/editors/koffice-kde3/files/patch-kpresenter-imageEffectBase.ui b/editors/koffice-kde3/files/patch-kpresenter-imageEffectBase.ui
deleted file mode 100644
index 30cc64533dac..000000000000
--- a/editors/koffice-kde3/files/patch-kpresenter-imageEffectBase.ui
+++ /dev/null
@@ -1,23 +0,0 @@
---- kpresenter/imageEffectBase.ui.orig	Fri Sep 16 18:02:09 2005
-+++ kpresenter/imageEffectBase.ui	Fri Sep 16 18:02:24 2005
-@@ -1461,20 +1461,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>kcolorbutton.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui b/editors/koffice-kde3/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui
deleted file mode 100644
index 13b35119f744..000000000000
--- a/editors/koffice-kde3/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig	Thu Sep 15 12:38:33 2005
-+++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui	Thu Sep 15 12:38:52 2005
-@@ -265,7 +265,4 @@
-     <tabstop>radioPerceptual</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kiscmbidlist.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui b/editors/koffice-kde3/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui
deleted file mode 100644
index 5daa5a578d1c..000000000000
--- a/editors/koffice-kde3/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig	Thu Sep 15 12:36:52 2005
-+++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui	Thu Sep 15 12:37:07 2005
-@@ -186,7 +186,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kismatrixwidget.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui b/editors/koffice-kde3/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui
deleted file mode 100644
index 73a75418a8f8..000000000000
--- a/editors/koffice-kde3/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/screenshot/ksnapshotwidget.ui.orig	Thu Sep 15 12:30:37 2005
-+++ krita/plugins/screenshot/ksnapshotwidget.ui	Thu Sep 15 12:30:56 2005
-@@ -332,7 +332,4 @@
- <pixmapfunction>SmallIconSet</pixmapfunction>
- <layoutdefaults spacing="6" margin="11"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
--<includehints>
--    <includehint>ksnapshotthumb.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_ui-kis_previewwidgetbase.ui b/editors/koffice-kde3/files/patch-krita_ui-kis_previewwidgetbase.ui
deleted file mode 100644
index cc47b73ac622..000000000000
--- a/editors/koffice-kde3/files/patch-krita_ui-kis_previewwidgetbase.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/kis_previewwidgetbase.ui.orig	Thu Sep 15 18:26:35 2005
-+++ krita/ui/kis_previewwidgetbase.ui	Thu Sep 15 18:26:43 2005
-@@ -201,8 +201,4 @@
-     </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kispreviewview.h</includehint>
--    <includehint>kispreviewview.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_ui-wdgcolorsettings.ui b/editors/koffice-kde3/files/patch-krita_ui-wdgcolorsettings.ui
deleted file mode 100644
index 26e6a62d0f28..000000000000
--- a/editors/koffice-kde3/files/patch-krita_ui-wdgcolorsettings.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdgcolorsettings.ui.orig	Thu Sep 15 18:25:18 2005
-+++ krita/ui/wdgcolorsettings.ui	Thu Sep 15 18:25:26 2005
-@@ -361,8 +361,4 @@
-     <tabstop>radioPerceptual</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kiscmbidlist.h</includehint>
--    <includehint>kiscmbidlist.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_ui-wdglayerbox.ui b/editors/koffice-kde3/files/patch-krita_ui-wdglayerbox.ui
deleted file mode 100644
index 3731c16a580a..000000000000
--- a/editors/koffice-kde3/files/patch-krita_ui-wdglayerbox.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdglayerbox.ui.orig	Thu Sep 15 21:07:24 2005
-+++ krita/ui/wdglayerbox.ui	Thu Sep 15 21:09:24 2005
-@@ -250,8 +250,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kiscmbcomposite.h</includehint>
--    <includehint>knuminput.h</includehint>
-     <includehint>knuminput.h</includehint>
-     <includehint>klistbox.h</includehint>
- </includehints>
diff --git a/editors/koffice-kde3/files/patch-krita_ui-wdgnewimage.ui b/editors/koffice-kde3/files/patch-krita_ui-wdgnewimage.ui
deleted file mode 100644
index 80cd21454be2..000000000000
--- a/editors/koffice-kde3/files/patch-krita_ui-wdgnewimage.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdgnewimage.ui.orig	Thu Sep 15 18:22:50 2005
-+++ krita/ui/wdgnewimage.ui	Thu Sep 15 18:23:08 2005
-@@ -319,8 +319,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>knuminput.h</includehint>
--    <includehint>knuminput.h</includehint>
--    <includehint>kiscmbidlist.h</includehint>
-     <includehint>kcolorcombo.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/koffice-kde3/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui b/editors/koffice-kde3/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui
deleted file mode 100644
index 83d940e4cd16..000000000000
--- a/editors/koffice-kde3/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/widgets/kis_wdg_autogradient.ui.orig	Thu Sep 15 12:28:25 2005
-+++ krita/ui/widgets/kis_wdg_autogradient.ui	Thu Sep 15 12:28:43 2005
-@@ -406,8 +406,6 @@
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kisgradientsliderwidget.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
-     <includehint>kcolorbutton.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist
index d8e94f3f81bc..13735f8f01b8 100644
--- a/editors/koffice-kde3/pkg-plist
+++ b/editors/koffice-kde3/pkg-plist
@@ -590,19 +590,20 @@ lib/libkwordexportfilters.la
 lib/libkwordexportfilters.so
 lib/libkwordexportfilters.so.1
 share/applications/kde/kexi.desktop
+share/applications/kde/kformdesigner.desktop
 share/applications/kde/kivio.desktop
+share/applications/kde/krita.desktop
 share/applnk/Office/KThesaurus.desktop
 share/applnk/Office/karbon.desktop
 share/applnk/Office/kchart.desktop
 share/applnk/Office/kformula.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
-share/applnk/Office/krita.desktop
+share/applnk/Office/krita_magick.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kudesigner.desktop
 share/applnk/Office/kugar.desktop
 share/applnk/Office/kword.desktop
-share/applnk/Utilities/kformdesigner.desktop
 share/apps/karbon/gradients/allcolors.kgr
 share/apps/karbon/gradients/simple.kgr
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png
@@ -945,6 +946,7 @@ share/apps/kivio/icons/crystalsvg/22x22/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_bold.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_italic.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_under.png
+share/apps/kivio/icons/crystalsvg/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/open_stencilset.png
 share/apps/kivio/icons/crystalsvg/32x32/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/48x48/actions/template_basicflow.png
@@ -1007,6 +1009,7 @@ share/apps/kivio/icons/hicolor/22x22/actions/font_bold.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_italic.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_under.png
 share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png
+share/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/hicolor/22x22/actions/linestyle.png
 share/apps/kivio/icons/hicolor/22x22/actions/linewidth.png
 share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png
@@ -4041,12 +4044,10 @@ share/templates/TextDocument.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
 @dirrm share/services/kformdesigner
 @dirrm share/services/kexi
-@dirrm share/icons/hicolor/scalable/apps
-@dirrm share/icons/hicolor/scalable
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
diff --git a/editors/koffice-kde4-l10n-ca/Makefile b/editors/koffice-kde4-l10n-ca/Makefile
index c808f08c15d9..8dff88d8c5e0 100644
--- a/editors/koffice-kde4-l10n-ca/Makefile
+++ b/editors/koffice-kde4-l10n-ca/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-ca/distinfo b/editors/koffice-kde4-l10n-ca/distinfo
index e9095875041f..7b80cf922bb3 100644
--- a/editors/koffice-kde4-l10n-ca/distinfo
+++ b/editors/koffice-kde4-l10n-ca/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = f011aa527e4b476f18f1fda9a043f81b
-SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = 398993
+MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 8a546eec2897af073bb564edf7150b6d
+SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 438905
diff --git a/editors/koffice-kde4-l10n-ca/pkg-plist b/editors/koffice-kde4-l10n-ca/pkg-plist
index 15777b9fa82a..6e9f90e752e1 100644
--- a/editors/koffice-kde4-l10n-ca/pkg-plist
+++ b/editors/koffice-kde4-l10n-ca/pkg-plist
@@ -3,7 +3,6 @@ share/locale/ca/LC_MESSAGES/desktop_koffice.mo
 share/locale/ca/LC_MESSAGES/example.mo
 share/locale/ca/LC_MESSAGES/karbon.mo
 share/locale/ca/LC_MESSAGES/kchart.mo
-share/locale/ca/LC_MESSAGES/kdgantt.mo
 share/locale/ca/LC_MESSAGES/kexi.mo
 share/locale/ca/LC_MESSAGES/kfile_koffice.mo
 share/locale/ca/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile
index 777caf826434..6bb6a53dc73d 100644
--- a/editors/koffice-kde4-l10n-da/Makefile
+++ b/editors/koffice-kde4-l10n-da/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-da/distinfo b/editors/koffice-kde4-l10n-da/distinfo
index 27e41f263826..192366d647a7 100644
--- a/editors/koffice-kde4-l10n-da/distinfo
+++ b/editors/koffice-kde4-l10n-da/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 3bcda6ccf32a2b0916f5de47981be655
-SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 817010
+MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = f6c3b0afcb299519f0663aa5a3ff3362
+SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = 832248
diff --git a/editors/koffice-kde4-l10n-da/pkg-plist b/editors/koffice-kde4-l10n-da/pkg-plist
index f271ee0cb26a..3286121a5d36 100644
--- a/editors/koffice-kde4-l10n-da/pkg-plist
+++ b/editors/koffice-kde4-l10n-da/pkg-plist
@@ -97,7 +97,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo
 share/locale/da/LC_MESSAGES/example.mo
 share/locale/da/LC_MESSAGES/karbon.mo
 share/locale/da/LC_MESSAGES/kchart.mo
-share/locale/da/LC_MESSAGES/kdgantt.mo
 share/locale/da/LC_MESSAGES/kexi.mo
 share/locale/da/LC_MESSAGES/kfile_koffice.mo
 share/locale/da/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile
index 7d336f886918..146148c97201 100644
--- a/editors/koffice-kde4-l10n-el/Makefile
+++ b/editors/koffice-kde4-l10n-el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-el/distinfo b/editors/koffice-kde4-l10n-el/distinfo
index a74b83b25980..a9d9e8e5310c 100644
--- a/editors/koffice-kde4-l10n-el/distinfo
+++ b/editors/koffice-kde4-l10n-el/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-el-1.4.1.tar.bz2) = a744de5d6e97a25257a809f7a0f79a11
-SIZE (KDE/kde-i18n/koffice-l10n-el-1.4.1.tar.bz2) = 347282
+MD5 (KDE/kde-i18n/koffice-l10n-el-1.4.2.tar.bz2) = 1aa341393b7ade4037ddeed77c73cacf
+SIZE (KDE/kde-i18n/koffice-l10n-el-1.4.2.tar.bz2) = 368866
diff --git a/editors/koffice-kde4-l10n-el/pkg-plist b/editors/koffice-kde4-l10n-el/pkg-plist
index 83a53fa3da59..1ddd73d733e2 100644
--- a/editors/koffice-kde4-l10n-el/pkg-plist
+++ b/editors/koffice-kde4-l10n-el/pkg-plist
@@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo
 share/locale/el/LC_MESSAGES/example.mo
 share/locale/el/LC_MESSAGES/karbon.mo
 share/locale/el/LC_MESSAGES/kchart.mo
-share/locale/el/LC_MESSAGES/kdgantt.mo
 share/locale/el/LC_MESSAGES/kexi.mo
 share/locale/el/LC_MESSAGES/kfile_koffice.mo
 share/locale/el/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile
index 7916c90cc49b..cb356c8a2c49 100644
--- a/editors/koffice-kde4-l10n-en_GB/Makefile
+++ b/editors/koffice-kde4-l10n-en_GB/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-en_GB/distinfo b/editors/koffice-kde4-l10n-en_GB/distinfo
index 1e7a7de96be3..6de3019ef676 100644
--- a/editors/koffice-kde4-l10n-en_GB/distinfo
+++ b/editors/koffice-kde4-l10n-en_GB/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.4.1.tar.bz2) = deaaf836cce7efcd9c83d800a6b4e51b
-SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.4.1.tar.bz2) = 351631
+MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.4.2.tar.bz2) = caf59bd82ac94ccbeaa4b907c218defa
+SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.4.2.tar.bz2) = 364462
diff --git a/editors/koffice-kde4-l10n-en_GB/pkg-plist b/editors/koffice-kde4-l10n-en_GB/pkg-plist
index 60ad7182dcc5..626c455e0547 100644
--- a/editors/koffice-kde4-l10n-en_GB/pkg-plist
+++ b/editors/koffice-kde4-l10n-en_GB/pkg-plist
@@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo
 share/locale/en_GB/LC_MESSAGES/example.mo
 share/locale/en_GB/LC_MESSAGES/karbon.mo
 share/locale/en_GB/LC_MESSAGES/kchart.mo
-share/locale/en_GB/LC_MESSAGES/kdgantt.mo
 share/locale/en_GB/LC_MESSAGES/kexi.mo
 share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo
 share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile
index 65dd3cc5b320..473b8227a676 100644
--- a/editors/koffice-kde4-l10n-es/Makefile
+++ b/editors/koffice-kde4-l10n-es/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-es/distinfo b/editors/koffice-kde4-l10n-es/distinfo
index f11ea54de491..cc9ac4c7bbd2 100644
--- a/editors/koffice-kde4-l10n-es/distinfo
+++ b/editors/koffice-kde4-l10n-es/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-es-1.4.1.tar.bz2) = 3872dfdfb6b12532218daf8f61f94282
-SIZE (KDE/kde-i18n/koffice-l10n-es-1.4.1.tar.bz2) = 832641
+MD5 (KDE/kde-i18n/koffice-l10n-es-1.4.2.tar.bz2) = 0f429120c8b27d1208f020a353aeb88d
+SIZE (KDE/kde-i18n/koffice-l10n-es-1.4.2.tar.bz2) = 852702
diff --git a/editors/koffice-kde4-l10n-es/pkg-plist b/editors/koffice-kde4-l10n-es/pkg-plist
index 3f22735c1f58..6a87c5743e2b 100644
--- a/editors/koffice-kde4-l10n-es/pkg-plist
+++ b/editors/koffice-kde4-l10n-es/pkg-plist
@@ -97,7 +97,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo
 share/locale/es/LC_MESSAGES/example.mo
 share/locale/es/LC_MESSAGES/karbon.mo
 share/locale/es/LC_MESSAGES/kchart.mo
-share/locale/es/LC_MESSAGES/kdgantt.mo
 share/locale/es/LC_MESSAGES/kexi.mo
 share/locale/es/LC_MESSAGES/kfile_koffice.mo
 share/locale/es/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile
index e1f2565032a1..ddc3ae77e030 100644
--- a/editors/koffice-kde4-l10n-et/Makefile
+++ b/editors/koffice-kde4-l10n-et/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-et/distinfo b/editors/koffice-kde4-l10n-et/distinfo
index 82460c6b5a87..0404c5fef4a2 100644
--- a/editors/koffice-kde4-l10n-et/distinfo
+++ b/editors/koffice-kde4-l10n-et/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-et-1.4.1.tar.bz2) = 0ecd275357b76d245b2367a1925bda59
-SIZE (KDE/kde-i18n/koffice-l10n-et-1.4.1.tar.bz2) = 934319
+MD5 (KDE/kde-i18n/koffice-l10n-et-1.4.2.tar.bz2) = 1ac8201573602a69e7d00b3332cb3bec
+SIZE (KDE/kde-i18n/koffice-l10n-et-1.4.2.tar.bz2) = 953648
diff --git a/editors/koffice-kde4-l10n-et/pkg-plist b/editors/koffice-kde4-l10n-et/pkg-plist
index 46ca9f60458b..88de1f2ad477 100644
--- a/editors/koffice-kde4-l10n-et/pkg-plist
+++ b/editors/koffice-kde4-l10n-et/pkg-plist
@@ -102,7 +102,6 @@ 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/kdgantt.mo
 share/locale/et/LC_MESSAGES/kexi.mo
 share/locale/et/LC_MESSAGES/kfile_koffice.mo
 share/locale/et/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile
index 27e740a8cda2..d9d9f31b872b 100644
--- a/editors/koffice-kde4-l10n-it/Makefile
+++ b/editors/koffice-kde4-l10n-it/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-it/distinfo b/editors/koffice-kde4-l10n-it/distinfo
index cc063d07bdfc..12d194ba47e9 100644
--- a/editors/koffice-kde4-l10n-it/distinfo
+++ b/editors/koffice-kde4-l10n-it/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-it-1.4.1.tar.bz2) = cac43b60ea3d01cfa0ac337bc0a296be
-SIZE (KDE/kde-i18n/koffice-l10n-it-1.4.1.tar.bz2) = 1163009
+MD5 (KDE/kde-i18n/koffice-l10n-it-1.4.2.tar.bz2) = 62609f289dc1ed216c7d075045159a04
+SIZE (KDE/kde-i18n/koffice-l10n-it-1.4.2.tar.bz2) = 1117301
diff --git a/editors/koffice-kde4-l10n-it/pkg-plist b/editors/koffice-kde4-l10n-it/pkg-plist
index d542f01e5767..81b25f9231ac 100644
--- a/editors/koffice-kde4-l10n-it/pkg-plist
+++ b/editors/koffice-kde4-l10n-it/pkg-plist
@@ -109,7 +109,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo
 share/locale/it/LC_MESSAGES/example.mo
 share/locale/it/LC_MESSAGES/karbon.mo
 share/locale/it/LC_MESSAGES/kchart.mo
-share/locale/it/LC_MESSAGES/kdgantt.mo
 share/locale/it/LC_MESSAGES/kexi.mo
 share/locale/it/LC_MESSAGES/kfile_koffice.mo
 share/locale/it/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile
index 6d7bc2bd7d0b..e3262c390916 100644
--- a/editors/koffice-kde4-l10n-nb/Makefile
+++ b/editors/koffice-kde4-l10n-nb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-nb/distinfo b/editors/koffice-kde4-l10n-nb/distinfo
index 0e87cac24a15..5c901a999bba 100644
--- a/editors/koffice-kde4-l10n-nb/distinfo
+++ b/editors/koffice-kde4-l10n-nb/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nb-1.4.1.tar.bz2) = 0d9c12a3881861377130801a3a431dd2
-SIZE (KDE/kde-i18n/koffice-l10n-nb-1.4.1.tar.bz2) = 375589
+MD5 (KDE/kde-i18n/koffice-l10n-nb-1.4.2.tar.bz2) = 9d8c327b3e6567d90258cec8b0694a2c
+SIZE (KDE/kde-i18n/koffice-l10n-nb-1.4.2.tar.bz2) = 413430
diff --git a/editors/koffice-kde4-l10n-nb/pkg-plist b/editors/koffice-kde4-l10n-nb/pkg-plist
index 956fefc9e7dd..f49640d1e6f6 100644
--- a/editors/koffice-kde4-l10n-nb/pkg-plist
+++ b/editors/koffice-kde4-l10n-nb/pkg-plist
@@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo
 share/locale/nb/LC_MESSAGES/example.mo
 share/locale/nb/LC_MESSAGES/karbon.mo
 share/locale/nb/LC_MESSAGES/kchart.mo
-share/locale/nb/LC_MESSAGES/kdgantt.mo
 share/locale/nb/LC_MESSAGES/kexi.mo
 share/locale/nb/LC_MESSAGES/kfile_koffice.mo
 share/locale/nb/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile
index 50adebbd7cd8..822ca8c3d745 100644
--- a/editors/koffice-kde4-l10n-nl/Makefile
+++ b/editors/koffice-kde4-l10n-nl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-nl/distinfo b/editors/koffice-kde4-l10n-nl/distinfo
index 6d9e08e72462..57795240013d 100644
--- a/editors/koffice-kde4-l10n-nl/distinfo
+++ b/editors/koffice-kde4-l10n-nl/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-nl-1.4.1.tar.bz2) = a960e30b5bd883ed71ada339f238bb38
-SIZE (KDE/kde-i18n/koffice-l10n-nl-1.4.1.tar.bz2) = 2999096
+MD5 (KDE/kde-i18n/koffice-l10n-nl-1.4.2.tar.bz2) = 6328a285565add97cd55413e52541050
+SIZE (KDE/kde-i18n/koffice-l10n-nl-1.4.2.tar.bz2) = 3025440
diff --git a/editors/koffice-kde4-l10n-nl/pkg-plist b/editors/koffice-kde4-l10n-nl/pkg-plist
index 96ec65b7af7e..b2778a6912b3 100644
--- a/editors/koffice-kde4-l10n-nl/pkg-plist
+++ b/editors/koffice-kde4-l10n-nl/pkg-plist
@@ -400,7 +400,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo
 share/locale/nl/LC_MESSAGES/example.mo
 share/locale/nl/LC_MESSAGES/karbon.mo
 share/locale/nl/LC_MESSAGES/kchart.mo
-share/locale/nl/LC_MESSAGES/kdgantt.mo
 share/locale/nl/LC_MESSAGES/kexi.mo
 share/locale/nl/LC_MESSAGES/kfile_koffice.mo
 share/locale/nl/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile
index d7a7a37327cd..d60518676c78 100644
--- a/editors/koffice-kde4-l10n-sv/Makefile
+++ b/editors/koffice-kde4-l10n-sv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n
diff --git a/editors/koffice-kde4-l10n-sv/distinfo b/editors/koffice-kde4-l10n-sv/distinfo
index 38a77adb1c1d..9fcfa70ef146 100644
--- a/editors/koffice-kde4-l10n-sv/distinfo
+++ b/editors/koffice-kde4-l10n-sv/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/koffice-l10n-sv-1.4.1.tar.bz2) = 58ffb4991e48caa73f434f30ca2b4761
-SIZE (KDE/kde-i18n/koffice-l10n-sv-1.4.1.tar.bz2) = 4778663
+MD5 (KDE/kde-i18n/koffice-l10n-sv-1.4.2.tar.bz2) = 897218187ef83afcd99406b62e352e69
+SIZE (KDE/kde-i18n/koffice-l10n-sv-1.4.2.tar.bz2) = 4783393
diff --git a/editors/koffice-kde4-l10n-sv/pkg-plist b/editors/koffice-kde4-l10n-sv/pkg-plist
index b9b93eaac8bb..e062905acaf2 100644
--- a/editors/koffice-kde4-l10n-sv/pkg-plist
+++ b/editors/koffice-kde4-l10n-sv/pkg-plist
@@ -366,7 +366,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo
 share/locale/sv/LC_MESSAGES/example.mo
 share/locale/sv/LC_MESSAGES/karbon.mo
 share/locale/sv/LC_MESSAGES/kchart.mo
-share/locale/sv/LC_MESSAGES/kdgantt.mo
 share/locale/sv/LC_MESSAGES/kexi.mo
 share/locale/sv/LC_MESSAGES/kfile_koffice.mo
 share/locale/sv/LC_MESSAGES/kfile_ooo.mo
diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile
index 977d29a6f36a..7268cb65796b 100644
--- a/editors/koffice-kde4-l10n/Makefile
+++ b/editors/koffice-kde4-l10n/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -30,7 +30,7 @@ RUN_DEPENDS+=\
 	${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \
 	${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW
 
-.for LANG in af bg br bs ca cs cy da el en_GB eo es et fa fi hsb it \
+.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi hsb it \
 	lo lt lv mt nb nl nn se sk sl sr sr@Latn sv ta tg th tr ven xh zu
 RUN_DEPENDS+=\
 ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG}
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index dd9fb61c41ef..185bec6793ac 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
@@ -53,14 +52,13 @@ CONFIGURE_ARGS+=--with-pgsqlincdir=${PG_INCDIR} --with-pgsqllibdir=${PG_LIBDIR}
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
 .endif
 
-post-patch:
-	@env TZ=UTC ${TOUCH} -t 200507191955.36 ${WRKSRC}/config.h.in
-
 post-configure:
 .if ${OSVERSION} < 500035
 	${REINPLACE_CMD} -e 's|\(^CPPFLAGS =.*\)|\1 -I${LOCALBASE}/include/stlport|g' \
 	-e 's|\(^LDFLAGS =.*\)|\1 -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}|g' \
 		${WRKSRC}/filters/kspread/excel/sidewinder/Makefile \
+		${WRKSRC}/kchart/Makefile \
+		${WRKSRC}/kchart/kdchart/Makefile \
 		${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \
 		${WRKSRC}/kexi/migration/pqxx/Makefile
 .endif
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 7f9ee95864a2..61d5478c3f57 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/koffice/koffice-1.4.1.tar.bz2) = 91a7b68757addc5934c5a8209a4926d5
-SIZE (KDE/koffice/koffice-1.4.1.tar.bz2) = 19364338
+MD5 (KDE/koffice/koffice-1.4.2.tar.bz2) = 6b456fb7d54c84b11396b27a96ae0cf8
+SIZE (KDE/koffice/koffice-1.4.2.tar.bz2) = 19486852
diff --git a/editors/koffice-kde4/files/patch-filters_kword_rtf_import-rtfimport_tokenizer b/editors/koffice-kde4/files/patch-filters_kword_rtf_import-rtfimport_tokenizer
deleted file mode 100644
index 78be2fe6f9ce..000000000000
--- a/editors/koffice-kde4/files/patch-filters_kword_rtf_import-rtfimport_tokenizer
+++ /dev/null
@@ -1,325 +0,0 @@
-Index: filters/kword/rtf/import/rtfimport_tokenizer.cpp
-===================================================================
---- filters/kword/rtf/import/rtfimport_tokenizer.cpp	(revision 463235)
-+++ filters/kword/rtf/import/rtfimport_tokenizer.cpp	(working copy)
-@@ -16,7 +16,7 @@
- 
- RTFTokenizer::RTFTokenizer()
- {
--    tokenText.resize( 4112 );
-+    tokenText.resize( 4113 );
-     fileBuffer.resize( 4096 );
-     infile = 0L;
- }
-@@ -30,8 +30,25 @@
-     fileBufferPtr = 0L;
-     fileBufferEnd = 0L;
-     infile = in;
-+    type = RTFTokenizer::PlainText;
- }
- 
-+int RTFTokenizer::nextChar()
-+{
-+    if ( fileBufferPtr == fileBufferEnd ) {
-+        int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+        fileBufferPtr = ( uchar* ) fileBuffer.data();
-+        fileBufferEnd = fileBufferPtr;
-+
-+        if ( n <= 0 )
-+            return -1;
-+
-+        fileBufferEnd = fileBufferPtr + n;
-+    }
-+    return *fileBufferPtr++;
-+}
-+
-+
- /**
-  * Reads the next token.
-  */
-@@ -42,22 +59,15 @@
-     if (!infile)
- 	return;
- 
--    do
--    {
--	if (fileBufferPtr == fileBufferEnd)
--	{
--	    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+    do {
-+        int n = nextChar();
- 
--	    if (n <= 0)
--	    {
--		// Return CloseGroup on EOF
--		ch = '}';
--		break;
--	    }
--	    fileBufferPtr = (uchar *)fileBuffer.data();
--	    fileBufferEnd = (fileBufferPtr + n);
--	}
--	ch = *fileBufferPtr++;
-+        if ( n <= 0 ) {
-+            ch = '}';
-+            break;
-+        }
-+
-+        ch = n;
-     }
-     while (ch == '\n' || ch == '\r' && ch != 0);
- 
-@@ -67,6 +77,7 @@
- 
-     uchar *_text = (uchar *)text;
- 
-+
-     if (ch == '{')
- 	type = RTFTokenizer::OpenGroup;
-     else if (ch == '}')
-@@ -75,20 +86,14 @@
-     {
- 	type = RTFTokenizer::ControlWord;
- 
--	if (fileBufferPtr == fileBufferEnd)
--	{
--	    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+        int n = nextChar();
- 
--	    if (n <= 0)
--	    {
--		// Return CloseGroup on EOF
--		type = RTFTokenizer::CloseGroup;
--		return;
--	    }
--	    fileBufferPtr = (uchar *)fileBuffer.data();
--	    fileBufferEnd = (fileBufferPtr + n);
--	}
--	ch = *fileBufferPtr++;
-+        if ( n <= 0 ) {
-+            // Return CloseGroup on EOF
-+            type = RTFTokenizer::CloseGroup;
-+            return;
-+        }
-+	ch = n;
- 
- 	// Type is either control word or control symbol
- 	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
-@@ -96,64 +101,41 @@
- 	    int v = 0;
- 
- 	    // Read alphabetic string (command)
--	    while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
-+	    while (_text < ( uchar* )tokenText.data()+tokenText.size()-3 && 
-+                  ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) )
- 	    {
- 		*_text++ = ch;
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
-+                int n = nextChar();
-+                if ( n <= 0 ) {
-+                    ch = ' ';
-+                    break;
-+                }
-+                ch = n;
- 	    }
- 
- 	    // Read numeric parameter (param)
- 	    bool isneg = (ch == '-');
- 
--	    if (isneg)
--	    {
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--		    if (n <= 0)
--		    {
--			// Return CloseGroup on EOF
--			type = RTFTokenizer::CloseGroup;
--			return;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
-+	    if (isneg) {
-+                int n = nextChar();
-+                if ( n <= 0 ) {
-+                    type = RTFTokenizer::CloseGroup;
-+                    return;
-+                }
-+		ch = n;
- 	    }
--	    while (ch >= '0' && ch <= '9')
--	    {
-+
-+	    while (ch >= '0' && ch <= '9') {
- 		v	 = (10 * v) + ch - '0';
- 		hasParam = true;
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+                int n = nextChar();
- 
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
--		ch = *fileBufferPtr++;
--	    }
-+                if ( n <= 0 )
-+                    n = ' ';
-+                ch = n;
-+            }
- 	    value = isneg ? -v : v;
- 
- 	    // If delimiter is a space, it's part of the control word
-@@ -163,7 +145,7 @@
- 	    }
- 
-             *_text = 0; // Just put an end of string for the test, it can then be over-written again
--            if ( !qstrncmp( tokenText.data()+1, "bin", 4 ) ) // Test the NULL too to avoid catching keywords starting with "bin"
-+            if ( !memcmp( tokenText.data()+1, "bin", 4 ) )
-             {   // We have \bin, so we need to read the bytes
-                 kdDebug(30515) << "Token:" << tokenText << endl;
-                 if (value > 0)
-@@ -173,26 +155,15 @@
-                     binaryData.resize(value);
-                     for (int i=0; i<value; i++)
-                     {
--                        if (fileBufferPtr == fileBufferEnd)
--                        {
--                            const int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
--
--                            if (n <= 0)
--                            {
--                                kdError(30515) << "\\bin stream hit end of file." << endl;
--                                type = RTFTokenizer::CloseGroup;
--                                break;
--                            }
--                            fileBufferPtr = (uchar *)fileBuffer.data();
--                            fileBufferEnd = (fileBufferPtr + n);
-+                        int n = nextChar();
-+                        if ( n <= 0 ) {
-+                            type = RTFTokenizer::CloseGroup;
-+                            break;
-                         }
--                        binaryData[i]=*fileBufferPtr++;
-+
-+                        binaryData[i] = n;
-                     }
-                 }
--                else
--                {
--                    kdError(30515) << "\\bin with negative value skipping" << endl;
--                }
-             }
- 
- 	}
-@@ -200,19 +171,13 @@
- 	{
- 	    type = RTFTokenizer::ControlWord;
- 	    *_text++ = ch;
--	    if (fileBufferPtr == fileBufferEnd)
--	    {
--		int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
- 
--		if (n <= 0)
--		{
--		    // Return CloseGroup on EOF
--		    type = RTFTokenizer::CloseGroup;
--		    return;
--		}
--		fileBufferPtr = (uchar *)fileBuffer.data();
--		fileBufferEnd = (fileBufferPtr + n);
--	    }
-+            int n = nextChar();
-+
-+            if ( n <= 0 ) {
-+                type = RTFTokenizer::CloseGroup;
-+                return;
-+            }
- 	    ch = *fileBufferPtr++;
- 	    for(int i=0;i<2;i++)
- 	    {
-@@ -220,22 +185,16 @@
- 		value<<=4;
- 		value=value|((ch + ((ch & 16) ? 0 : 9)) & 0xf);
- 
--		if (fileBufferPtr == fileBufferEnd)
--		{
--		    int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() );
-+                int n = nextChar();
- 
--		    if (n <= 0)
--		    {
--			ch = ' ';
--			break;
--		    }
--		    fileBufferPtr = (uchar *)fileBuffer.data();
--		    fileBufferEnd = (fileBufferPtr + n);
--		}
-+                if ( n <= 0 ) {
-+                    ch = ' ';
-+                    break;
-+                }
- 		ch = *fileBufferPtr++;
- 	    }
--		--fileBufferPtr;
--	    }
-+            --fileBufferPtr;
-+        }
- 	else
- 	{
- 	    type = RTFTokenizer::ControlWord;
-@@ -248,14 +207,16 @@
- 
- 	// Everything until next backslash, opener or closer
- 	while ( ch != '\\' && ch != '{' && ch != '}' && ch != '\n' &&
--		ch != '\r' && fileBufferPtr <= fileBufferEnd )
-+		ch != '\r')
- 	{
- 	    *_text++ = ch;
-+            if(fileBufferPtr >= fileBufferEnd)
-+                break;
- 	    ch = *fileBufferPtr++;
- 	}
--
--	// Give back last char
--	--fileBufferPtr;
-+        if(fileBufferPtr < fileBufferEnd)
-+          --fileBufferPtr; // give back the last char
-     }
-     *_text++ = 0;
-+
- }
-Index: filters/kword/rtf/import/rtfimport_tokenizer.h
-===================================================================
---- filters/kword/rtf/import/rtfimport_tokenizer.h	(revision 463235)
-+++ filters/kword/rtf/import/rtfimport_tokenizer.h	(working copy)
-@@ -50,6 +50,8 @@
- 
-     // tokenizer (private) data
- private:
-+    int nextChar();
-+
-     QFile *infile;
-     QByteArray fileBuffer;
-     QCString tokenText;
diff --git a/editors/koffice-kde4/files/patch-kpresenter-imageEffectBase.ui b/editors/koffice-kde4/files/patch-kpresenter-imageEffectBase.ui
deleted file mode 100644
index 30cc64533dac..000000000000
--- a/editors/koffice-kde4/files/patch-kpresenter-imageEffectBase.ui
+++ /dev/null
@@ -1,23 +0,0 @@
---- kpresenter/imageEffectBase.ui.orig	Fri Sep 16 18:02:09 2005
-+++ kpresenter/imageEffectBase.ui	Fri Sep 16 18:02:24 2005
-@@ -1461,20 +1461,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>kcolorbutton.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
--    <includehint>kdoublenuminput.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui b/editors/koffice-kde4/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui
deleted file mode 100644
index 13b35119f744..000000000000
--- a/editors/koffice-kde4/files/patch-krita_plugins_colorspaceconversion-wdgconvertcolorspace.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui.orig	Thu Sep 15 12:38:33 2005
-+++ krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui	Thu Sep 15 12:38:52 2005
-@@ -265,7 +265,4 @@
-     <tabstop>radioPerceptual</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kiscmbidlist.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui b/editors/koffice-kde4/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui
deleted file mode 100644
index 5daa5a578d1c..000000000000
--- a/editors/koffice-kde4/files/patch-krita_plugins_convolutionfilters-kis_custom_convolution_filter_configuration_base_widget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui.orig	Thu Sep 15 12:36:52 2005
-+++ krita/plugins/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui	Thu Sep 15 12:37:07 2005
-@@ -186,7 +186,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kismatrixwidget.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui b/editors/koffice-kde4/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui
deleted file mode 100644
index 73a75418a8f8..000000000000
--- a/editors/koffice-kde4/files/patch-krita_plugins_screenshot-ksnapshotwidget.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/plugins/screenshot/ksnapshotwidget.ui.orig	Thu Sep 15 12:30:37 2005
-+++ krita/plugins/screenshot/ksnapshotwidget.ui	Thu Sep 15 12:30:56 2005
-@@ -332,7 +332,4 @@
- <pixmapfunction>SmallIconSet</pixmapfunction>
- <layoutdefaults spacing="6" margin="11"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
--<includehints>
--    <includehint>ksnapshotthumb.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_ui-kis_previewwidgetbase.ui b/editors/koffice-kde4/files/patch-krita_ui-kis_previewwidgetbase.ui
deleted file mode 100644
index cc47b73ac622..000000000000
--- a/editors/koffice-kde4/files/patch-krita_ui-kis_previewwidgetbase.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/kis_previewwidgetbase.ui.orig	Thu Sep 15 18:26:35 2005
-+++ krita/ui/kis_previewwidgetbase.ui	Thu Sep 15 18:26:43 2005
-@@ -201,8 +201,4 @@
-     </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kispreviewview.h</includehint>
--    <includehint>kispreviewview.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_ui-wdgcolorsettings.ui b/editors/koffice-kde4/files/patch-krita_ui-wdgcolorsettings.ui
deleted file mode 100644
index 26e6a62d0f28..000000000000
--- a/editors/koffice-kde4/files/patch-krita_ui-wdgcolorsettings.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdgcolorsettings.ui.orig	Thu Sep 15 18:25:18 2005
-+++ krita/ui/wdgcolorsettings.ui	Thu Sep 15 18:25:26 2005
-@@ -361,8 +361,4 @@
-     <tabstop>radioPerceptual</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kiscmbidlist.h</includehint>
--    <includehint>kiscmbidlist.h</includehint>
--</includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_ui-wdglayerbox.ui b/editors/koffice-kde4/files/patch-krita_ui-wdglayerbox.ui
deleted file mode 100644
index 3731c16a580a..000000000000
--- a/editors/koffice-kde4/files/patch-krita_ui-wdglayerbox.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdglayerbox.ui.orig	Thu Sep 15 21:07:24 2005
-+++ krita/ui/wdglayerbox.ui	Thu Sep 15 21:09:24 2005
-@@ -250,8 +250,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kiscmbcomposite.h</includehint>
--    <includehint>knuminput.h</includehint>
-     <includehint>knuminput.h</includehint>
-     <includehint>klistbox.h</includehint>
- </includehints>
diff --git a/editors/koffice-kde4/files/patch-krita_ui-wdgnewimage.ui b/editors/koffice-kde4/files/patch-krita_ui-wdgnewimage.ui
deleted file mode 100644
index 80cd21454be2..000000000000
--- a/editors/koffice-kde4/files/patch-krita_ui-wdgnewimage.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/wdgnewimage.ui.orig	Thu Sep 15 18:22:50 2005
-+++ krita/ui/wdgnewimage.ui	Thu Sep 15 18:23:08 2005
-@@ -319,8 +319,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>knuminput.h</includehint>
--    <includehint>knuminput.h</includehint>
--    <includehint>kiscmbidlist.h</includehint>
-     <includehint>kcolorcombo.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/koffice-kde4/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui b/editors/koffice-kde4/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui
deleted file mode 100644
index 83d940e4cd16..000000000000
--- a/editors/koffice-kde4/files/patch-krita_ui_widgets-kis_wdg_autogradient.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/widgets/kis_wdg_autogradient.ui.orig	Thu Sep 15 12:28:25 2005
-+++ krita/ui/widgets/kis_wdg_autogradient.ui	Thu Sep 15 12:28:43 2005
-@@ -406,8 +406,6 @@
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kisgradientsliderwidget.h</includehint>
--    <includehint>kcolorbutton.h</includehint>
-     <includehint>kcolorbutton.h</includehint>
- </includehints>
- </UI>
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index d8e94f3f81bc..13735f8f01b8 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -590,19 +590,20 @@ lib/libkwordexportfilters.la
 lib/libkwordexportfilters.so
 lib/libkwordexportfilters.so.1
 share/applications/kde/kexi.desktop
+share/applications/kde/kformdesigner.desktop
 share/applications/kde/kivio.desktop
+share/applications/kde/krita.desktop
 share/applnk/Office/KThesaurus.desktop
 share/applnk/Office/karbon.desktop
 share/applnk/Office/kchart.desktop
 share/applnk/Office/kformula.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
-share/applnk/Office/krita.desktop
+share/applnk/Office/krita_magick.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kudesigner.desktop
 share/applnk/Office/kugar.desktop
 share/applnk/Office/kword.desktop
-share/applnk/Utilities/kformdesigner.desktop
 share/apps/karbon/gradients/allcolors.kgr
 share/apps/karbon/gradients/simple.kgr
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png
@@ -945,6 +946,7 @@ share/apps/kivio/icons/crystalsvg/22x22/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_bold.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_italic.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_under.png
+share/apps/kivio/icons/crystalsvg/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/open_stencilset.png
 share/apps/kivio/icons/crystalsvg/32x32/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/48x48/actions/template_basicflow.png
@@ -1007,6 +1009,7 @@ share/apps/kivio/icons/hicolor/22x22/actions/font_bold.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_italic.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_under.png
 share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png
+share/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/hicolor/22x22/actions/linestyle.png
 share/apps/kivio/icons/hicolor/22x22/actions/linewidth.png
 share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png
@@ -4041,12 +4044,10 @@ share/templates/TextDocument.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
 @dirrm share/services/kformdesigner
 @dirrm share/services/kexi
-@dirrm share/icons/hicolor/scalable/apps
-@dirrm share/icons/hicolor/scalable
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
diff --git a/editors/vimpart/distinfo b/editors/vimpart/distinfo
index 69acc35f4900..3b447b06efca 100644
--- a/editors/vimpart/distinfo
+++ b/editors/vimpart/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeaddons-3.4.2.tar.bz2) = af4fc7fa0dde8894b9d9582ecef7df2a
-SIZE (KDE/kdeaddons-3.4.2.tar.bz2) = 1591335
+MD5 (KDE/kdeaddons-3.4.3.tar.bz2) = e927d60e94adba69e78f82d82305f4ce
+SIZE (KDE/kdeaddons-3.4.3.tar.bz2) = 1593317
diff --git a/editors/vimpart/pkg-plist b/editors/vimpart/pkg-plist
index 74bca2e216c8..d3364191dffc 100644
--- a/editors/vimpart/pkg-plist
+++ b/editors/vimpart/pkg-plist
@@ -6,7 +6,7 @@ lib/libxvim.la
 lib/libxvim.so
 lib/libxvim.so.0
 share/applications/kde/kcmvim.desktop
-share/applications/kdeaddons-vimpart-3.4.2
+share/applications/kdeaddons-vimpart-3.4.3
 share/apps/kcontrol/pics/kvim.png
 share/apps/vimpart/kvim.vim
 share/apps/vimpart/vimpartui.rc
author	Michael Nottebrock <lofi@FreeBSD.org>	2005-11-05 11:19:58 +0000
committer	Michael Nottebrock <lofi@FreeBSD.org>	2005-11-05 11:19:58 +0000
commit	de94e0e1609a9f2a40be0bdc9592002fe3464557 (patch)
tree	e63a7473b09ed1d3956224c6f37079320c4da68e /editors
parent	b3fc541cf1e8cc80c15b4d48188487501618ae39 (diff)
download	ports-de94e0e1609a9f2a40be0bdc9592002fe3464557.tar.gz ports-de94e0e1609a9f2a40be0bdc9592002fe3464557.zip