Update koffice to 1.6.1.

Since this is a maintenance release, only two of the components,
Krita and Kexi, added new features.

* New Krita Feature and Many Bugfixes
Krita, the image editing application of KOffice has gotten a new Color
Level filter. Among the bugfixes can be mentioned the wrong warning
telling the user that unsharp mask filter didn't work even though it did.

* New Kexi Features and Many Bugfixes
Kexi, the desktop database application competing with MS Access, is the
other application in KOffice that got new features in this release. Among
them can be mentioned a new combo box taking advantage of the database
relationships, and parameter queries. These features developed as an answer
to user's demand, will make programming database solutions much easier.

* Security Fix in Powerpoint Import Filter
There is a security issue in the import filter for Powerpoint .ppt files
that is fixed with this release.

* Bugfixes For Most Other Components

5 files changed, 71 insertions, 20 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 43d09179706..227d5bcb7f6 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2006/10/17 09:33:15 markd Exp $
+# $NetBSD: Makefile,v 1.87 2006/12/03 04:03:06 markd Exp $
 
-DISTNAME=	koffice-1.6.0
+DISTNAME=	koffice-1.6.1
 CATEGORIES=	misc kde
-MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.0/src/}
+MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.1/src/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 2b792c7d0f3..b4005f1522c 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2006/10/17 09:33:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2006/12/03 04:03:06 markd Exp $
 bin/karbon
 bin/kchart
 bin/kexi
@@ -20,19 +20,25 @@ bin/kudesigner
 bin/kugar
 bin/kword
 include/KDChartAxisParams.h
+include/KDChartAxisParamsWrapper.h
 include/KDChartCustomBox.h
+include/KDChartCustomBoxWrapper.h
 include/KDChartDataIntern.h
 include/KDChartDataRegion.h
 include/KDChartEnums.h
 include/KDChartGlobal.h
 include/KDChartListTable.h
+include/KDChartObjectFactory.h
 include/KDChartParams.h
+include/KDChartParamsWrapper.h
 include/KDChartPropertySet.h
 include/KDChartTable.h
 include/KDChartTableBase.h
+include/KDChartTableDataWrapper.h
 include/KDChartTextPiece.h
 include/KDChartVectorTable.h
 include/KDChartWidget.h
+include/KDChartWrapperFactory.h
 include/KDFrame.h
 include/KDFrameProfileSection.h
 include/KoApplication.h
@@ -127,12 +133,15 @@ 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/schemadata.h
 include/kexidb/tableschema.h
 include/kexidb/transaction.h
 include/kexiutils/identifier.h
 include/kexiutils/kexiutils_export.h
+include/kexiutils/longlongvalidator.h
+include/kexiutils/styleproxy.h
 include/kexiutils/tristate.h
 include/kexiutils/utils.h
 include/kexiutils/validator.h
@@ -232,6 +241,7 @@ include/kis_progress_display_interface.h
 include/kis_progress_subject.h
 include/kis_rect.h
 include/kis_resource.h
+include/kis_scale_visitor.h
 include/kis_selection.h
 include/kis_shared_ptr_vector.h
 include/kis_substrate.h
@@ -362,6 +372,7 @@ lib/kde3/kritahistogramdocker.la
 lib/kde3/kritaimageenhancement.la
 lib/kde3/kritaimagesize.la
 lib/kde3/kritalenscorrectionfilter.la
+lib/kde3/kritalevelfilter.la
 lib/kde3/kritamodifyselection.la
 lib/kde3/kritanoisefilter.la
 lib/kde3/kritaoilpaintfilter.la
@@ -1422,6 +1433,13 @@ share/doc/kde/HTML/en/kword/zoom.png
 share/doc/kde/HTML/en/thesaurus/common
 share/doc/kde/HTML/en/thesaurus/index.cache.bz2
 share/doc/kde/HTML/en/thesaurus/index.docbook
+share/kde/applnk/.hidden/krita_jpeg.desktop
+share/kde/applnk/.hidden/krita_magick.desktop
+share/kde/applnk/.hidden/krita_openexr.desktop
+share/kde/applnk/.hidden/krita_pdf.desktop
+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
@@ -1430,13 +1448,6 @@ 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/krita_jpeg.desktop
-share/kde/applnk/Office/krita_magick.desktop
-share/kde/applnk/Office/krita_openexr.desktop
-share/kde/applnk/Office/krita_pdf.desktop
-share/kde/applnk/Office/krita_png.desktop
-share/kde/applnk/Office/krita_raw.desktop
-share/kde/applnk/Office/krita_tiff.desktop
 share/kde/applnk/Office/kspread.desktop
 share/kde/applnk/Office/kudesigner.desktop
 share/kde/applnk/Office/kugar.desktop
@@ -4011,6 +4022,7 @@ share/kde/apps/krita/profiles/PAL.icm
 share/kde/apps/krita/profiles/SMPTE-C.icm
 share/kde/apps/krita/profiles/WideGamut.icm
 share/kde/apps/krita/profiles/cmyk.icm
+share/kde/apps/krita/profiles/fogra27l.icm
 share/kde/apps/krita/profiles/lcmslabi.icm
 share/kde/apps/krita/profiles/lcmsxyzi.icm
 share/kde/apps/krita/profiles/monoscnr.icm
@@ -4672,6 +4684,7 @@ share/kde/services/kritahistogramdocker.desktop
 share/kde/services/kritaimageenhancement.desktop
 share/kde/services/kritaimagesize.desktop
 share/kde/services/kritalenscorrectionfilter.desktop
+share/kde/services/kritalevelfilter.desktop
 share/kde/services/kritamodifyselection.desktop
 share/kde/services/kritanoisefilter.desktop
 share/kde/services/kritaoilpaintfilter.desktop
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index ace929411a4..9a3f78c0f73 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.33 2006/10/17 09:33:15 markd Exp $
+$NetBSD: distinfo,v 1.34 2006/12/03 04:03:06 markd Exp $
 
-SHA1 (koffice-1.6.0.tar.bz2) = e34d57d0941884496bd3f99b85787697fb55692e
-RMD160 (koffice-1.6.0.tar.bz2) = be09c18005eb33f6dc35ab0359cc97a8a658ce7c
-Size (koffice-1.6.0.tar.bz2) = 56718478 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-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843
 SHA1 (patch-ai) = d12fa21d16a1bb11af9b35d65e5dfa9538a635b7
 SHA1 (patch-aj) = 2cbe0c00dbb0b3b52f15caaf5b925bc68e1f55b8
-SHA1 (patch-ak) = 6aebf5300ffcb3d1adcfa274f080c63b0c3a4270
+SHA1 (patch-ak) = 5738bb6b043f8657c473c4d14e2c74d97d4974f8
 SHA1 (patch-al) = 806334757d3ebca4515738e87454a30d9dd26e53
 SHA1 (patch-am) = 022be8c44e0eaa3cab3404da48a4259f1dc3499c
 SHA1 (patch-ao) = 7d976c4f3094635f984fc70964589a863e914be7
diff --git a/misc/koffice/l10n.mk b/misc/koffice/l10n.mk
new file mode 100644
index 00000000000..1559b0815d8
--- /dev/null
+++ b/misc/koffice/l10n.mk
@@ -0,0 +1,38 @@
+# $NetBSD: l10n.mk,v 1.1 2006/12/03 04:03:06 markd Exp $
+#
+
+# This file provides useful defaults for the l10n packages of koffice.
+#
+# The following variables shall be defined when using this file.
+#
+# KOFFICE_LANGCODE
+#	The language code (e.g. de, pt_BR)
+#
+# KOFFICE_LANGUAGE
+#	The full name of the language (e.g. German, Brasilian)
+#
+
+KOFFICE_VERSION?=	1.6.1
+
+DISTNAME=	koffice-l10n-${KOFFICE_LANGCODE}-${KOFFICE_VERSION}
+CATEGORIES=	misc kde
+MASTER_SITES=	${MASTER_SITE_KDE:=koffice-${KOFFICE_VERSION}/src/koffice-l10n/}
+EXTRACT_SUFX=	.tar.bz2
+
+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
+
+SUBST_CLASSES+=		ko
+SUBST_MESSAGE.ko=	Dont try to install kdgantt.po
+SUBST_STAGE.ko=		pre-configure
+SUBST_FILES.ko=		messages/koffice/Makefile.in
+SUBST_SED.ko=		-e 's/ kdgantt / /'
+
+.include "../../meta-pkgs/kde3/kde3.mk"
diff --git a/misc/koffice/patches/patch-ak b/misc/koffice/patches/patch-ak
index 44b0a14523e..72d2521aa00 100644
--- a/misc/koffice/patches/patch-ak
+++ b/misc/koffice/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.4 2006/04/12 12:37:35 markd Exp $
+$NetBSD: patch-ak,v 1.5 2006/12/03 04:03:06 markd Exp $
 
---- krita/data/profiles/Makefile.in.orig	2006-04-04 05:30:37.000000000 +1200
+--- krita/data/profiles/Makefile.in.orig	2006-11-19 11:17:14.000000000 +1300
 +++ krita/data/profiles/Makefile.in
-@@ -523,7 +523,7 @@ x_libraries = @x_libraries@
+@@ -547,7 +547,7 @@ x_libraries = @x_libraries@
  xdg_appsdir = @xdg_appsdir@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
 -kritaprofilesdir = $(prefix)/share/apps/krita/profiles
 +kritaprofilesdir = $(kde_datadir)/krita/profiles
- kritaprofiles_DATA = Adobe.icm Apple.icm CIE.icm CMY.icm cmyk.icm ColorMatch.icm lcmslabi.icm lcmsxyzi.icm monoscnr.icm NTSC.icm PAL.icm SMPTE-C.icm srgb_color_space_profile.icm sRGB.icm srgbspac.icm tifflab8spac.icm WideGamut.icm ycc601.icm ycc709.icm 
+ kritaprofiles_DATA = Adobe.icm Apple.icm CIE.icm CMY.icm cmyk.icm ColorMatch.icm fogra27l.icm lcmslabi.icm lcmsxyzi.icm monoscnr.icm NTSC.icm PAL.icm SMPTE-C.icm srgb_color_space_profile.icm sRGB.icm srgbspac.icm tifflab8spac.icm WideGamut.icm ycc601.icm ycc709.icm
  #>- all: all-am
  #>+ 1