Update to koffice 1.4.1

Changes (from 1.4.0a some already in 1.4.0b)
KOfficeCore:
* OASIS loading/saving fix for embedded objects
* Fix crash when pressing Quit in the initial startup dialog
* Fix the handling of Automatically select filename extension when
  directory was selected
KOffice UI:
* Fix typing a URL in startup dialog and clicking OK; the URL
  wasn't loaded
* Fix "Always start X with this template" behaving as if it was checked
  when it wasn't
KOffice Workspace:
* Has an icon, finally :)
KWord
* Fix crash when updating a TOC with a table inside it
* Fixes for OASIS OpenDocument support
KPresenter
* Fix painting shadows of all 2D shapes
* Fixed "copy-page has a little offset for embedded objects"
* OASIS OpenDocument fixes for polyline, polygon and regular-polygon
KSpread
* Fix crash related to obscured cells in rendering code
Krita
* Fix bugs
* Move the layers palette to the control box docker, so there's one
  docker less on screen
* Add shortcut keys for many more actions (Thanks to Alan)
* Various performance optimizations
* On selecting the crop tool when there is a selections present, crop
* Crop layer on double click
* Improved .psd loading
Kexi
* Fix compilation using gcc on some platforms
* Fix crash on startup when Kexi is started from K Menu
* Form widgets: shadow in label widgets is properly set for altered
  indenting, margins and alignment

3 files changed, 19 insertions, 25 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index ef6eb467e68..e8a51af2d8b 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.61 2005/07/17 12:29:38 markd Exp $
+# $NetBSD: Makefile,v 1.62 2005/07/25 13:05:51 markd Exp $
 
-DISTNAME=	koffice-1.4.0a
-PKGNAME=	koffice-1.4.0b
+DISTNAME=	koffice-1.4.1
 CATEGORIES=	misc kde
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.4/src/ \
-		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4/src/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.4/src/
+MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.1/src/ \
+		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4.1/src/ \
+		ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.4.1/src/
 EXTRACT_SUFX=	.tar.bz2
 
-PATCH_SITES=	http://www.koffice.org/bugfixes/
-PATCHFILES=	koffice_1.4.0_patchset_1b.diff.bz2
-
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.koffice.org/
 COMMENT=	KDE Office Suite
 
 CONFLICTS+=	koffice3-[0-9]*
 
+EXTRACT_USING=		gtar # to unpack krita/plugins/convolutionfilters properly
+			     # on NetBSD 1.6
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -44,14 +42,6 @@ LDFLAGS+=	${EXPORT_SYMBOLS_LDFLAGS}
 
 .include "options.mk"
 
-# fix odd broken untaring on NetBSD 1.6
-post-extract:
-	cd ${WRKSRC}/krita/plugins/convolutionfilters; \
-	if [ -f kis_custom_convolution_filter_configuration_widget. ]; then \
-		${MV} kis_custom_convolution_filter_configuration_widget. \
-		kis_custom_convolution_filter_configuration_widget.h; \
-	fi
-
 post-install:
 	@# The global desktop template files need to be user-writeable, or
 	@# else users won't be able to alter them after copying them to
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 62ecea6b957..8b0b37e6735 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/06/27 02:06:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/07/25 13:05:51 markd Exp $
 bin/karbon
 bin/kchart
 bin/kexi
@@ -3589,12 +3589,14 @@ share/kde/icons/crystalsvg/32x32/mimetypes/kexiproject_shortcut.png
 share/kde/icons/crystalsvg/32x32/mimetypes/kexiproject_sqlite.png
 share/kde/icons/crystalsvg/32x32/mimetypes/kexiproject_sqlite2.png
 share/kde/icons/crystalsvg/32x32/mimetypes/kugardata.png
+share/kde/icons/hicolor/128x128/apps/koshell.png
 share/kde/icons/hicolor/128x128/apps/krita.png
 share/kde/icons/hicolor/16x16/apps/karbon.png
 share/kde/icons/hicolor/16x16/apps/kchart.png
 share/kde/icons/hicolor/16x16/apps/kexi.png
 share/kde/icons/hicolor/16x16/apps/kformula.png
 share/kde/icons/hicolor/16x16/apps/kivio.png
+share/kde/icons/hicolor/16x16/apps/koshell.png
 share/kde/icons/hicolor/16x16/apps/kpresenter.png
 share/kde/icons/hicolor/16x16/apps/krita.png
 share/kde/icons/hicolor/16x16/apps/kspread.png
@@ -3604,6 +3606,7 @@ share/kde/icons/hicolor/22x22/apps/karbon.png
 share/kde/icons/hicolor/22x22/apps/kexi.png
 share/kde/icons/hicolor/22x22/apps/kformula.png
 share/kde/icons/hicolor/22x22/apps/kivio.png
+share/kde/icons/hicolor/22x22/apps/koshell.png
 share/kde/icons/hicolor/22x22/apps/kpresenter.png
 share/kde/icons/hicolor/22x22/apps/krita.png
 share/kde/icons/hicolor/22x22/apps/kspread.png
@@ -3614,6 +3617,7 @@ share/kde/icons/hicolor/32x32/apps/kchart.png
 share/kde/icons/hicolor/32x32/apps/kexi.png
 share/kde/icons/hicolor/32x32/apps/kformula.png
 share/kde/icons/hicolor/32x32/apps/kivio.png
+share/kde/icons/hicolor/32x32/apps/koshell.png
 share/kde/icons/hicolor/32x32/apps/kpresenter.png
 share/kde/icons/hicolor/32x32/apps/krita.png
 share/kde/icons/hicolor/32x32/apps/kspread.png
@@ -3624,14 +3628,17 @@ share/kde/icons/hicolor/48x48/apps/kchart.png
 share/kde/icons/hicolor/48x48/apps/kexi.png
 share/kde/icons/hicolor/48x48/apps/kformula.png
 share/kde/icons/hicolor/48x48/apps/kivio.png
+share/kde/icons/hicolor/48x48/apps/koshell.png
 share/kde/icons/hicolor/48x48/apps/kpresenter.png
 share/kde/icons/hicolor/48x48/apps/krita.png
 share/kde/icons/hicolor/48x48/apps/kspread.png
 share/kde/icons/hicolor/48x48/apps/kugar.png
 share/kde/icons/hicolor/48x48/apps/kword.png
+share/kde/icons/hicolor/64x64/apps/koshell.png
 share/kde/icons/hicolor/64x64/apps/krita.png
 share/kde/icons/hicolor/scalable/apps/karbon.svgz
 share/kde/icons/hicolor/scalable/apps/kexi.svgz
+share/kde/icons/hicolor/scalable/apps/koshell.svgz
 share/kde/icons/locolor/16x16/apps/kudesigner.png
 share/kde/icons/locolor/32x32/apps/kudesigner.png
 share/kde/mimelnk/application/x-kexiproject-shortcut.desktop
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 5e3fdeaa435..0dba0822404 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.24 2005/07/17 12:29:38 markd Exp $
+$NetBSD: distinfo,v 1.25 2005/07/25 13:05:51 markd Exp $
 
-SHA1 (koffice-1.4.0a.tar.bz2) = 8ccd90df94f2c5a06e245cf223f75112ec37652d
-RMD160 (koffice-1.4.0a.tar.bz2) = 4bf8885c618dfd513fff77f74048cc389b293a0a
-Size (koffice-1.4.0a.tar.bz2) = 19728031 bytes
-SHA1 (koffice_1.4.0_patchset_1b.diff.bz2) = 73b1262085050034e78b0d96537d564337d9bd82
-RMD160 (koffice_1.4.0_patchset_1b.diff.bz2) = c7c3c58ac0df4de99b41b5813dd7fa1174325c5b
-Size (koffice_1.4.0_patchset_1b.diff.bz2) = 34483 bytes
+SHA1 (koffice-1.4.1.tar.bz2) = 55b456beeb0be61d4ba0c16e8469f6ed6224d076
+RMD160 (koffice-1.4.1.tar.bz2) = ebbe0b7cd65142807d20337c050b144790f25c31
+Size (koffice-1.4.1.tar.bz2) = 19364338 bytes
 SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a
 SHA1 (patch-af) = e93b6e78c1965b9882778ae5afc1404627ce51e8
 SHA1 (patch-ag) = 2b73421e1ade6592e56aeb389f17397a5a4b85f2