Update koffice to 1.6.2

Although this is a maintenance release, there are some new features in
Krita (new filters and a smudge paint operation) and Kexi (a new User
Mode to deploy Kexi applications). Many bugs were fixed.

4 files changed, 48 insertions, 27 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 7549fcdcda4..0d26328cfb6 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.91 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.92 2007/02/27 12:04:28 markd Exp $
 
-DISTNAME=	koffice-1.6.1
-PKGREVISION=	4
+DISTNAME=	koffice-1.6.2
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.1/src/}
 EXTRACT_SUFX=	.tar.bz2
 
-PATCH_SITES=	ftp://ftp.kde.org/pub/kde/security_patches/
-PATCHFILES=	koffce-xpdf-CVE-2007-0104.diff
-
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.koffice.org/
 COMMENT=	KDE Office Suite
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 4214b5a5d67..56cb0da4b27 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.24 2007/01/26 04:25:46 markd Exp $
+@comment $NetBSD: PLIST,v 1.25 2007/02/27 12:04:28 markd Exp $
 bin/karbon
 bin/kchart
 bin/kexi
+bin/kexi_add_column
+bin/kexi_add_column_gui
+bin/kexi_delete_column
+bin/kexi_delete_column_gui
 bin/kformula
 bin/kivio
 bin/koconverter
@@ -114,30 +118,40 @@ include/Kolinewidthaction.h
 include/Koversiondialog.h
 include/kcoloractions.h
 include/kdchart_export.h
+include/kexidb/admin.h
+include/kexidb/alter.h
 include/kexidb/connection.h
 include/kexidb/connectiondata.h
 include/kexidb/cursor.h
+include/kexidb/dbobjectnamevalidator.h
+include/kexidb/dbproperties.h
 include/kexidb/driver.h
+include/kexidb/driver_p.h
 include/kexidb/drivermanager.h
 include/kexidb/error.h
 include/kexidb/expression.h
 include/kexidb/field.h
 include/kexidb/fieldlist.h
+include/kexidb/fieldvalidator.h
 include/kexidb/global.h
 include/kexidb/indexschema.h
 include/kexidb/kexidb_export.h
 include/kexidb/keximigrate.h
 include/kexidb/keximigratedata.h
+include/kexidb/lookupfieldschema.h
 include/kexidb/migratemanager.h
+include/kexidb/msghandler.h
 include/kexidb/object.h
-include/kexidb/parser.h
 include/kexidb/preparedstatement.h
 include/kexidb/queryschema.h
 include/kexidb/queryschemaparameter.h
 include/kexidb/relationship.h
+include/kexidb/roweditbuffer.h
 include/kexidb/schemadata.h
+include/kexidb/simplecommandlineapp.h
 include/kexidb/tableschema.h
 include/kexidb/transaction.h
+include/kexidb/utils.h
 include/kexiutils/identifier.h
 include/kexiutils/kexiutils_export.h
 include/kexiutils/longlongvalidator.h
@@ -354,6 +368,7 @@ lib/kde3/kritablurfilter.la
 lib/kde3/kritabumpmap.la
 lib/kde3/kritacimg.la
 lib/kde3/kritacmykplugin.la
+lib/kde3/kritacolorify.la
 lib/kde3/kritacolorrange.la
 lib/kde3/kritacolorsfilters.la
 lib/kde3/kritacolorspaceconversion.la
@@ -600,8 +615,19 @@ lib/libkwmailmerge_interface.la
 lib/libkwmf.la
 lib/libkwordexportfilters.la
 lib/libkwordprivate.la
+share/applications/kde/karbon.desktop
+share/applications/kde/kchart.desktop
+share/applications/kde/kexi.desktop
+share/applications/kde/kformula.desktop
 share/applications/kde/kivio.desktop
+share/applications/kde/koshell.desktop
+share/applications/kde/kplato.desktop
+share/applications/kde/kpresenter.desktop
 share/applications/kde/krita.desktop
+share/applications/kde/kspread.desktop
+share/applications/kde/kudesigner.desktop
+share/applications/kde/kugar.desktop
+share/applications/kde/kword.desktop
 share/doc/kde/HTML/en/karbon/common
 share/doc/kde/HTML/en/karbon/index.cache.bz2
 share/doc/kde/HTML/en/karbon/index.docbook
@@ -1568,17 +1594,6 @@ share/kde/applnk/.hidden/krita_png.desktop
 share/kde/applnk/.hidden/krita_raw.desktop
 share/kde/applnk/.hidden/krita_tiff.desktop
 share/kde/applnk/Office/KThesaurus.desktop
-share/kde/applnk/Office/karbon.desktop
-share/kde/applnk/Office/kchart.desktop
-share/kde/applnk/Office/kexi.desktop
-share/kde/applnk/Office/kformula.desktop
-share/kde/applnk/Office/koshell.desktop
-share/kde/applnk/Office/kplato.desktop
-share/kde/applnk/Office/kpresenter.desktop
-share/kde/applnk/Office/kspread.desktop
-share/kde/applnk/Office/kudesigner.desktop
-share/kde/applnk/Office/kugar.desktop
-share/kde/applnk/Office/kword.desktop
 share/kde/apps/karbon/gradients/allcolors.kgr
 share/kde/apps/karbon/gradients/simple.kgr
 share/kde/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png
@@ -1777,11 +1792,13 @@ share/kde/apps/kchart/templates/chart/.source/BarChart.chrt
 share/kde/apps/kchart/templates/chart/.source/Empty.chrt
 share/kde/apps/kchart/templates/chart/BarChart.desktop
 share/kde/apps/kchart/templates/chart/Empty.desktop
+share/kde/apps/kexi/examples/Simple_Database.kexi
 share/kde/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/add_field.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/aopos2grid.png
+share/kde/apps/kexi/icons/crystalsvg/16x16/actions/autofield.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/autonumber.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png
 share/kde/apps/kexi/icons/crystalsvg/16x16/actions/button.png
@@ -1847,6 +1864,7 @@ share/kde/apps/kexi/icons/crystalsvg/22x22/actions/aoshortest.png
 share/kde/apps/kexi/icons/crystalsvg/22x22/actions/aotallest.png
 share/kde/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png
 share/kde/apps/kexi/icons/crystalsvg/22x22/actions/aowidest.png
+share/kde/apps/kexi/icons/crystalsvg/22x22/actions/autofield.png
 share/kde/apps/kexi/icons/crystalsvg/22x22/actions/business_user.png
 share/kde/apps/kexi/icons/crystalsvg/22x22/actions/button.png
 share/kde/apps/kexi/icons/crystalsvg/22x22/actions/check.png
@@ -4666,6 +4684,7 @@ share/kde/services/kritablurfilter.desktop
 share/kde/services/kritabumpmapfilter.desktop
 share/kde/services/kritacimg.desktop
 share/kde/services/kritacmykplugin.desktop
+share/kde/services/kritacolorifyfilter.desktop
 share/kde/services/kritacolorrange.desktop
 share/kde/services/kritacolorsfilter.desktop
 share/kde/services/kritacolorspaceconversion.desktop
@@ -4793,6 +4812,8 @@ share/kde/templates/Illustration.desktop
 share/kde/templates/Presentation.desktop
 share/kde/templates/SpreadSheet.desktop
 share/kde/templates/TextDocument.desktop
+share/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh
+share/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh
 @comment in kde: @dirrm share/kde/templates/.source
 @comment in kde: @dirrm share/kde/templates
 @comment in kde: @dirrm share/kde/servicetypes
@@ -5071,6 +5092,7 @@ share/kde/templates/TextDocument.desktop
 @dirrm share/kde/apps/kexi/icons/crystalsvg/128x128
 @dirrm share/kde/apps/kexi/icons/crystalsvg
 @dirrm share/kde/apps/kexi/icons
+@dirrm share/kde/apps/kexi/examples
 @dirrm share/kde/apps/kexi
 @dirrm share/kde/apps/kchart/templates/chart/.source
 @dirrm share/kde/apps/kchart/templates/chart
@@ -5123,6 +5145,7 @@ share/kde/templates/TextDocument.desktop
 @dirrm share/kde/apps/karbon
 @comment in kde: @dirrm share/kde/apps
 @comment in kde: @dirrm share/kde/applnk/Office
+@comment in kde: @dirrm share/kde/applnk/.hidden
 @comment in kde: @dirrm share/icons/locolor/32x32/apps
 @comment in kde: @dirrm share/icons/locolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
@@ -5132,6 +5155,7 @@ share/kde/templates/TextDocument.desktop
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in kde: @dirrm share/icons/crystalsvg/scalable/apps
 @comment in kde: @dirrm share/icons/crystalsvg/64x64/apps
 @comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 8e8f61725bd..4c3e74d6143 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.38 2007/01/17 10:35:40 markd Exp $
+$NetBSD: distinfo,v 1.39 2007/02/27 12:04:28 markd Exp $
 
 SHA1 (koffce-xpdf-CVE-2007-0104.diff) = bef37ffafbae9a509363f7bc63806ab7162576b9
 RMD160 (koffce-xpdf-CVE-2007-0104.diff) = 1ea990a06dfdc709362a6cb0fbb69851da86a3d6
 Size (koffce-xpdf-CVE-2007-0104.diff) = 3185 bytes
-SHA1 (koffice-1.6.1.tar.bz2) = 891fb0a28ec3c4b070c4d6c2eae7fee1d2e37761
-RMD160 (koffice-1.6.1.tar.bz2) = ee4fa84a53f92035c0ab9427e0acb18feca701db
-Size (koffice-1.6.1.tar.bz2) = 56999028 bytes
-SHA1 (patch-aa) = b2067b1feaade8850440e49443791c365f37d91a
+SHA1 (koffice-1.6.2.tar.bz2) = a6a0dcc254f7a7f90d7e5b31f6ebecd54800f211
+RMD160 (koffice-1.6.2.tar.bz2) = fb4ef5870870d80481a4a9d2864199428f495460
+Size (koffice-1.6.2.tar.bz2) = 57049103 bytes
 SHA1 (patch-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503
 SHA1 (patch-ac) = 9681410530872d5389f00567f50c4baab9eb8ff2
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
diff --git a/misc/koffice/l10n.mk b/misc/koffice/l10n.mk
index 1559b0815d8..4885c263585 100644
--- a/misc/koffice/l10n.mk
+++ b/misc/koffice/l10n.mk
@@ -1,4 +1,4 @@
-# $NetBSD: l10n.mk,v 1.1 2006/12/03 04:03:06 markd Exp $
+# $NetBSD: l10n.mk,v 1.2 2007/02/27 12:04:28 markd Exp $
 #
 
 # This file provides useful defaults for the l10n packages of koffice.
@@ -12,7 +12,7 @@
 #	The full name of the language (e.g. German, Brasilian)
 #
 
-KOFFICE_VERSION?=	1.6.1
+KOFFICE_VERSION?=	1.6.2
 
 DISTNAME=	koffice-l10n-${KOFFICE_LANGCODE}-${KOFFICE_VERSION}
 CATEGORIES=	misc kde
@@ -23,11 +23,12 @@ MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.koffice.org/
 COMMENT=	${KOFFICE_LANGUAGE} language pack for KOffice
 
-BUILD_DEPENDS+=	kdelibs>=3:../../x11/kdelibs3
 CONFLICTS+=	koffice-i18n-${KOFFICE_LANGCODE}-[0-9]*
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake msgfmt
+BUILDLINK_DEPMETHOD.qt3-libs=	build
+BUILDLINK_DEPMETHOD.kdelibs=	build
 
 SUBST_CLASSES+=		ko
 SUBST_MESSAGE.ko=	Dont try to install kdgantt.po
@@ -36,3 +37,4 @@ SUBST_FILES.ko=		messages/koffice/Makefile.in
 SUBST_SED.ko=		-e 's/ kdgantt / /'
 
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"