Remove patch file that should have gone with the last update.

Fix build on NetBSD 1.6:
   1.6's tar misnamed a file when unpacking (!?) so fix up if this
   happens.
   g++'s vector template doesn't have an at() method but what we actually
   want is back() (which it does have) so use it.

4 files changed, 24 insertions, 15 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index e7dd6e2b479..b4a93ae5fb1 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/06/27 02:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.60 2005/07/17 12:24:20 markd Exp $
 
 DISTNAME=	koffice-1.4.0a
 CATEGORIES=	misc kde
@@ -40,6 +40,14 @@ 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/distinfo b/misc/koffice/distinfo
index 9d507867bad..7bfda1e63b2 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/06/27 02:06:45 markd Exp $
+$NetBSD: distinfo,v 1.23 2005/07/17 12:24:20 markd Exp $
 
 SHA1 (koffice-1.4.0a.tar.bz2) = 8ccd90df94f2c5a06e245cf223f75112ec37652d
 RMD160 (koffice-1.4.0a.tar.bz2) = 4bf8885c618dfd513fff77f74048cc389b293a0a
@@ -11,3 +11,4 @@ SHA1 (patch-ai) = 8687c4e7c765372906543bad6b0df8b0404ae57f
 SHA1 (patch-aj) = ac38387f0d77c74cc706ef9101e84eb9f6013b41
 SHA1 (patch-ak) = f077c819a33c642f30d6b2a00d581b911f3bbec9
 SHA1 (patch-al) = a234cdc2a1aa3d5c92993d464edc336c3ccc1dbc
+SHA1 (patch-am) = 7b23a60d7bac76421d5ec14279b3ab454af2165d
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
deleted file mode 100644
index c00bdc4b08d..00000000000
--- a/misc/koffice/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/05/04 11:47:30 markd Exp $
-
---- filters/karbon/msod/msodimport.cc.orig	2004-04-12 21:18:28.000000000 +1200
-+++ filters/karbon/msod/msodimport.cc
-@@ -30,7 +30,7 @@ DESCRIPTION
- #include <qpointarray.h>
- 
- typedef KGenericFactory<MSODImport, KoFilter> MSODImportFactory;
--K_EXPORT_COMPONENT_FACTORY( libmsodimport, MSODImportFactory( "karbonmsodimport" ) )
-+K_EXPORT_COMPONENT_FACTORY( libkarbonmsodimport, MSODImportFactory( "karbonmsodimport" ) )
- 
- const int MSODImport::s_area = 30505;
- 
diff --git a/misc/koffice/patches/patch-am b/misc/koffice/patches/patch-am
new file mode 100644
index 00000000000..24e522ef9f9
--- /dev/null
+++ b/misc/koffice/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2005/07/17 12:24:20 markd Exp $
+
+--- filters/kspread/excel/sidewinder/excel.cpp.orig	Mon Jul 18 11:17:42 2005
++++ filters/kspread/excel/sidewinder/excel.cpp
+@@ -5499,7 +5499,7 @@ void mergeTokens( UStringStack* stack, i
+   {
+ 	count--;
+     
+-    UString last = stack->at( stack->size()-1 );
++    UString last = stack->back();
+     UString tmp = last;
+     tmp.append( s1 );
+     s1 = tmp;