* Use a separate patches directory as we use a different distfile from

  koffice.
* buildlink1 -> buildlink2.
* PLIST corrections to avoid conflict with kdelibs3.

19 files changed, 457 insertions, 29 deletions

diff --git a/misc/koffice3/Makefile b/misc/koffice3/Makefile
index d52a885326b..3a63ebb16f7 100644
--- a/misc/koffice3/Makefile
+++ b/misc/koffice3/Makefile
@@ -1,26 +1,23 @@
-# $NetBSD: Makefile,v 1.4 2002/09/20 11:44:16 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/06 03:36:19 jlam Exp $
 
-DISTNAME=       koffice
-PKGNAME=        koffice3-${VERSION}          
+.include "../koffice/Makefile.common"
+
+DISTNAME=       koffice-${VERSION}
+PKGNAME=        ${DISTNAME:S/^koffice/koffice3/}
 MASTER_SITES=   ftp://ftp.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src/ \
                 ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src/ \
                 ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.1.1-kde3/src/
-DISTFILES=      ${DISTNAME}-${VERSION}-kde3.tar.bz2
+DISTFILES=      ${DISTNAME}-kde3.tar.bz2
  
 .include "../../x11/kde3/Makefile.kde3"
 
 MAINTAINER=     jschauma@netbsd.org
+
+USE_BUILDLINK2=	# defined
 PTHREAD_OPTS+=	require
 
-WRKSRC= ${WRKDIR}/${DISTNAME}-${VERSION}
-PATCHDIR=       ../../misc/koffice/patches
-DESCR_SRC=      ../../misc/koffice/DESCR
+.include "../../x11/kde3/buildlink2.mk"
+.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
-USE_BUILDLINK_ONLY=	# defined
-  
-.include "../../x11/kde3/buildlink.mk"
-.include "../../x11/kdebase3/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
-.include "../../misc/koffice/Makefile.common"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice3/PLIST b/misc/koffice3/PLIST
index 2d0c8746b8c..76e878f3b8f 100644
--- a/misc/koffice3/PLIST
+++ b/misc/koffice3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/20 19:31:22 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/06 03:36:19 jlam Exp $
 bin/filter_wrapper
 bin/kchart
 bin/kformula
@@ -1506,13 +1506,7 @@ share/kde/icons/hicolor/48x48/mimetypes/kugardata.png
 share/kde/icons/locolor/16x16/apps/kspreadcalc.png
 share/kde/icons/locolor/22x22/apps/kspreadcalc.png
 share/kde/icons/locolor/32x32/apps/kspreadcalc.png
-share/kde/mimelnk/application/x-abiword.desktop
-share/kde/mimelnk/application/x-quattropro.desktop
-share/kde/mimelnk/image/x-msod.desktop
 share/kde/mimelnk/image/x-svg.desktop
-share/kde/mimelnk/image/x-wmf.desktop
-share/kde/mimelnk/image/x-xfig.desktop
-share/kde/mimelnk/text/x-csv.desktop
 share/kde/mimelnk/text/x-gnumeric.desktop
 share/kde/services/ki_rtf_export.desktop
 share/kde/services/killustrator_applixgraphic_import.desktop
diff --git a/misc/koffice3/distinfo b/misc/koffice3/distinfo
index ddb635e11c2..e924f16cfca 100644
--- a/misc/koffice3/distinfo
+++ b/misc/koffice3/distinfo
@@ -1,11 +1,20 @@
-$NetBSD: distinfo,v 1.1 2002/06/28 00:35:12 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2002/10/06 03:36:19 jlam Exp $
 
 SHA1 (koffice-1.1.1-kde3.tar.bz2) = c2eeec46daac8a672cf11565fdf3dfdd899300f3
 Size (koffice-1.1.1-kde3.tar.bz2) = 8792363 bytes
-SHA1 (patch-aa) = 30f7d7db5e8492be148573b88d207f1da9971c5c
-SHA1 (patch-ab) = f0369c5f34b2fb5f370d2245ed78d01bce11d999
-SHA1 (patch-ac) = 786543aed389f0fc56dee9a13c6fb4cbc47c226a
-SHA1 (patch-ad) = 80299e8438ae050e415b6a1897f5efc8d2b6d37d
-SHA1 (patch-ae) = a048cbbbf51dc51dc0a7c47f783adb4e44d0e66d
-SHA1 (patch-af) = 95abb2d03f8607787a0f1069d7721d47b1f111ca
-SHA1 (patch-ag) = b3707ef85e564921f41a76c9c1f3c29dcd877d86
+SHA1 (patch-aa) = e359388b2fa49869b48b7b44db532466dc1e1920
+SHA1 (patch-ab) = 141fcac4661ac76fe1461cc50fbcd379831e093e
+SHA1 (patch-ac) = f31f2c9c777874e3a17740335f028e654d5539a9
+SHA1 (patch-ad) = 0c343fab3df4b73be17eba34f84c76f4dcf82d9a
+SHA1 (patch-ae) = 2518ceefade558b983f0559aab3b2ab32d5c55ae
+SHA1 (patch-af) = c4e9914c19e63ee6ca6bfa0ff70cdd1167fc0084
+SHA1 (patch-ag) = f7cf5b6932719c26383b5fb06c96fa1bd40d4804
+SHA1 (patch-ah) = 3a7a6cd2fcfad3636980da59ad89bc4848ecf71b
+SHA1 (patch-ai) = 6b681486d5ab49281f7a1096f240ea93349f87e8
+SHA1 (patch-aj) = 2463997c381825347f294f06d80b3c0a37d5ea0a
+SHA1 (patch-ak) = 551e4d1b748156f9e86b3468def01e9dc8e98655
+SHA1 (patch-al) = a4b78fa6592f088fe9e0f4f3e6881614a4882385
+SHA1 (patch-am) = eb66871d7d2f36f9b8d97c8bfd9b24a2988d6243
+SHA1 (patch-an) = 71b75582d79bd73c193a31401873b65d30f8129c
+SHA1 (patch-ao) = ea38f9553ee5a6e1c79913b4845859803da93fd6
+SHA1 (patch-ap) = 7999e24457d672c1dead6e05883c2adf0fe8dc75
diff --git a/misc/koffice3/patches/patch-aa b/misc/koffice3/patches/patch-aa
new file mode 100644
index 00000000000..701ce42d629
--- /dev/null
+++ b/misc/koffice3/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/10/06 03:36:20 jlam Exp $
+
+--- filters/kontour/msod/Makefile.in.orig	Sat Oct  5 06:09:22 2002
++++ filters/kontour/msod/Makefile.in
+@@ -253,7 +253,7 @@ noinst_HEADERS = msodimport.h msodimport
+ 
+ service_DATA = killustrator_msod_import.desktop
+ servicedir = $(kde_servicesdir)
+-data_DATA = x-msod.desktop
++data_DATA = # x-msod.desktop (already installed by kdelibs3)
+ datadir = $(kde_mimedir)/image
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
diff --git a/misc/koffice3/patches/patch-ab b/misc/koffice3/patches/patch-ab
new file mode 100644
index 00000000000..b530e6924fb
--- /dev/null
+++ b/misc/koffice3/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/10/06 03:36:20 jlam Exp $
+
+--- filters/kontour/wmf/Makefile.in.orig	Sat Oct  5 06:09:22 2002
++++ filters/kontour/wmf/Makefile.in
+@@ -253,7 +253,7 @@ noinst_HEADERS = wmfimport.h wmfimport_f
+ 
+ service_DATA = killustrator_wmf_import.desktop
+ servicedir = $(kde_servicesdir)
+-data_DATA = x-wmf.desktop
++data_DATA = # x-wmf.desktop (already installed by kdelibs3)
+ datadir = $(kde_mimedir)/image
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
diff --git a/misc/koffice3/patches/patch-ac b/misc/koffice3/patches/patch-ac
new file mode 100644
index 00000000000..3486cbe7718
--- /dev/null
+++ b/misc/koffice3/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/10/06 03:36:20 jlam Exp $
+
+--- filters/kontour/xfig/Makefile.in.orig	Sat Oct  5 06:09:22 2002
++++ filters/kontour/xfig/Makefile.in
+@@ -253,7 +253,7 @@ noinst_HEADERS = xfigimport.h xfigimport
+ 
+ service_DATA = killustrator_xfig_import.desktop
+ servicedir = $(kde_servicesdir)
+-data_DATA = x-xfig.desktop
++data_DATA = # x-xfig.desktop (already installed by kdelibs3)
+ datadir = $(kde_mimedir)/image
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
diff --git a/misc/koffice3/patches/patch-ad b/misc/koffice3/patches/patch-ad
new file mode 100644
index 00000000000..482053b1c16
--- /dev/null
+++ b/misc/koffice3/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/10/06 03:36:20 jlam Exp $
+
+--- filters/kspread/csv/Makefile.in.orig	Sat Oct  5 06:09:22 2002
++++ filters/kspread/csv/Makefile.in
+@@ -261,7 +261,7 @@ service_DATA = kspread_csv_import.deskto
+ 
+ servicedir = $(kde_servicesdir)
+ 
+-data_DATA = x-csv.desktop
++data_DATA = # x-csv.desktop (already installed by kdelibs3)
+ datadir = $(kde_mimedir)/text
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
diff --git a/misc/koffice3/patches/patch-ae b/misc/koffice3/patches/patch-ae
new file mode 100644
index 00000000000..e3393b4b46f
--- /dev/null
+++ b/misc/koffice3/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/10/06 03:36:20 jlam Exp $
+
+--- filters/kspread/qpro/Makefile.in.orig	Sat Oct  5 06:09:22 2002
++++ filters/kspread/qpro/Makefile.in
+@@ -258,7 +258,7 @@ libqproimport_la_LIBADD = $(KOFFICE_LIBS
+ service_DATA = kspread_qpro_import.desktop
+ servicedir = $(kde_servicesdir)
+ 
+-kdemime_DATA = x-quattropro.desktop
++kdemime_DATA = # x-quattropro.desktop (already installed by kdelibs3)
+ kdemimedir = $(kde_mimedir)/application
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
diff --git a/misc/koffice3/patches/patch-af b/misc/koffice3/patches/patch-af
new file mode 100644
index 00000000000..dc14587b7b9
--- /dev/null
+++ b/misc/koffice3/patches/patch-af
@@ -0,0 +1,68 @@
+$NetBSD: patch-af,v 1.1 2002/10/06 03:36:21 jlam Exp $
+
+--- filters/kspread/qpro/libqpro/qpro/formula.h.orig	Fri May 25 14:47:33 2001
++++ filters/kspread/qpro/libqpro/qpro/formula.h
+@@ -53,50 +53,37 @@ public:
+    char* formula();
+ 
+ 
+-   static void binaryOperand(QpFormula& pThis, const char* pOper)
+-                      {pThis.binaryOperandReal(pOper);}
++   static void binaryOperand(QpFormula& pThis, const char* pOper);
+ 
+-   static void floatFunc(QpFormula& pThis, const char* pFunc)
+-                      {pThis.floatFuncReal(pFunc);}
++   static void floatFunc(QpFormula& pThis, const char* pFunc);
+ 
+    void               formulaStart(const char* pFirstChar);
+ 
+-   static void absKludge(QpFormula& pThis, const char* pFunc)
+-                      {pThis.absKludgeReal(pFunc);}
++   static void absKludge(QpFormula& pThis, const char* pFunc);
+ 
+-   static void func0(QpFormula& pThis, const char* pFunc)
+-                      {pThis.func0Real(pFunc);}
++   static void func0(QpFormula& pThis, const char* pFunc);
+ 
+-   static void func1(QpFormula& pThis, const char* pFunc)
+-                      {pThis.func1Real(pFunc);}
++   static void func1(QpFormula& pThis, const char* pFunc);
+ 
+-   static void func2(QpFormula& pThis, const char* pFunc)
+-                      {pThis.func2Real(pFunc);}
++   static void func2(QpFormula& pThis, const char* pFunc);
+ 
+-   static void func3(QpFormula& pThis, const char* pFunc)
+-                      {pThis.func3Real(pFunc);}
++   static void func3(QpFormula& pThis, const char* pFunc);
+ 
+-   static void func4(QpFormula& pThis, const char* pFunc)
+-                      {pThis.func4Real(pFunc);}
++   static void func4(QpFormula& pThis, const char* pFunc);
+ 
+-   static void funcV(QpFormula& pThis, const char* pFunc)
+-                      {pThis.funcVReal(pFunc);}
++   static void funcV(QpFormula& pThis, const char* pFunc);
+ 
+-   static void intFunc(QpFormula& pThis, const char* pFunc)
+-                      {pThis.intFuncReal(pFunc);}
++   static void intFunc(QpFormula& pThis, const char* pFunc);
+ 
+    void               dropLeadingAt(int pBool=-1);
+ 
+-   static void ref(QpFormula& pThis, const char* pFunc)
+-                      {pThis.refReal(pFunc);}
++   static void ref(QpFormula& pThis, const char* pFunc);
+ 
+    void               replaceFunc(QpFormulaConv* pFuncEntry);
+ 
+-   static void stringFunc(QpFormula& pThis, const char* pFunc)
+-                      {pThis.stringFuncReal(pFunc);}
++   static void stringFunc(QpFormula& pThis, const char* pFunc);
+ 
+-   static void unaryOperand(QpFormula& pThis, const char* pOper)
+-                      {pThis.unaryOperandReal(pOper);}
++   static void unaryOperand(QpFormula& pThis, const char* pOper);
+ 
+ protected:
+    char*              cArgSeparator;
diff --git a/misc/koffice3/patches/patch-ag b/misc/koffice3/patches/patch-ag
new file mode 100644
index 00000000000..d193e0b89a3
--- /dev/null
+++ b/misc/koffice3/patches/patch-ag
@@ -0,0 +1,89 @@
+$NetBSD: patch-ag,v 1.1 2002/10/06 03:36:21 jlam Exp $
+
+--- filters/kspread/qpro/libqpro/src/formula.cc.orig	Wed Jun 27 01:43:31 2001
++++ filters/kspread/qpro/libqpro/src/formula.cc
+@@ -320,6 +320,84 @@ QpFormula::~QpFormula()
+ }
+ 
+ void
++QpFormula::binaryOperand(QpFormula& pThis, const char* pOper)
++{
++    pThis.binaryOperandReal(pOper);
++}
++
++void
++QpFormula::floatFunc(QpFormula& pThis, const char* pFunc)
++{
++    pThis.floatFuncReal(pFunc);
++}
++
++void
++QpFormula::absKludge(QpFormula& pThis, const char* pFunc)
++{
++    pThis.absKludgeReal(pFunc);
++}
++
++void
++QpFormula::func0(QpFormula& pThis, const char* pFunc)
++{
++    pThis.func0Real(pFunc);
++}
++
++void
++QpFormula::func1(QpFormula& pThis, const char* pFunc)
++{
++    pThis.func1Real(pFunc);
++}
++
++void
++QpFormula::func2(QpFormula& pThis, const char* pFunc)
++{
++    pThis.func2Real(pFunc);
++}
++
++void
++QpFormula::func3(QpFormula& pThis, const char* pFunc)
++{
++    pThis.func3Real(pFunc);
++}
++
++void
++QpFormula::func4(QpFormula& pThis, const char* pFunc)
++{
++    pThis.func4Real(pFunc);
++}
++
++void
++QpFormula::funcV(QpFormula& pThis, const char* pFunc)
++{
++    pThis.funcVReal(pFunc);
++}
++
++void
++QpFormula::intFunc(QpFormula& pThis, const char* pFunc)
++{
++    pThis.intFuncReal(pFunc);
++}
++
++void
++QpFormula::ref(QpFormula& pThis, const char* pFunc)
++{
++    pThis.refReal(pFunc);
++}
++
++void
++QpFormula::stringFunc(QpFormula& pThis, const char* pFunc)
++{
++    pThis.stringFuncReal(pFunc);
++}
++
++void
++QpFormula::unaryOperand(QpFormula& pThis, const char* pOper)
++{
++    pThis.unaryOperandReal(pOper);
++}
++
++void
+ QpFormula::argSeparator(const char* pArg)
+ {
+    delete [] cArgSeparator;
diff --git a/misc/koffice3/patches/patch-ah b/misc/koffice3/patches/patch-ah
new file mode 100644
index 00000000000..8b1643b98bf
--- /dev/null
+++ b/misc/koffice3/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2002/10/06 03:36:21 jlam Exp $
+
+--- filters/kword/abiword/Makefile.in.orig	Sat Oct  5 06:09:22 2002
++++ filters/kword/abiword/Makefile.in
+@@ -261,7 +261,7 @@ noinst_HEADERS = abiwordimport.h abiword
+ service_DATA = kword_abiword_import.desktop kword_abiword_export.desktop
+ servicedir = $(kde_servicesdir)
+ 
+-kdemime_DATA = x-abiword.desktop
++kdemime_DATA = # x-abiword.desktop (already installed by kdelibs3)
+ kdemimedir = $(kde_mimedir)/application
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
diff --git a/misc/koffice3/patches/patch-ai b/misc/koffice3/patches/patch-ai
new file mode 100644
index 00000000000..a287267210d
--- /dev/null
+++ b/misc/koffice3/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/10/06 03:36:21 jlam Exp $
+
+--- kchart/kdchart/KDChartData.h.orig	Mon Dec 10 15:01:12 2001
++++ kchart/kdchart/KDChartData.h
+@@ -12,7 +12,7 @@
+ 
+ #include <qstring.h>
+ #include <qdatetime.h>
+-#ifdef unix
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <values.h>
+ #else
+ #include <float.h>
diff --git a/misc/koffice3/patches/patch-aj b/misc/koffice3/patches/patch-aj
new file mode 100644
index 00000000000..e3808a92d93
--- /dev/null
+++ b/misc/koffice3/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2002/10/06 03:36:21 jlam Exp $
+
+--- kchart/kdchart/KDChartTable.h.orig	Mon Dec 10 03:53:35 2001
++++ kchart/kdchart/KDChartTable.h
+@@ -28,9 +28,17 @@ Copyright (C) 1998, 1999, 2000 Torben We
+ #define MAXDOUBLE DBL_MAX
+ #define MINDOUBLE DBL_MIN
+ #else
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <values.h>
++#endif
+ #include <limits.h>
+ #include <math.h>
++#ifdef DBL_MAX
++#define MAXDOUBLE DBL_MAX
++#endif
++#ifdef DBL_MIN
++#define MINDOUBLE DBL_MIN
++#endif
+ #endif
+ 
+ #if defined SUN7 || ( defined HP11_aCC && defined HP1100 )
diff --git a/misc/koffice3/patches/patch-ak b/misc/koffice3/patches/patch-ak
new file mode 100644
index 00000000000..23f2665db0b
--- /dev/null
+++ b/misc/koffice3/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2002/10/06 03:36:22 jlam Exp $
+
+--- kchart/kdchart/Makefile.in.orig	Fri Mar 29 07:17:42 2002
++++ kchart/kdchart/Makefile.in
+@@ -95,7 +95,7 @@ JAVAC = @JAVAC@
+ JAVAH = @JAVAH@
+ JVMLIBS = @JVMLIBS@
+ KDECONFIG = @KDECONFIG@
+-KDE_CXXFLAGS = @KDE_CXXFLAGS@
++KDE_CXXFLAGS = @KDE_CXXFLAGS@ $(OPTIMIZATION_BUG_CXXFLAGS)
+ KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
+ KDE_INCLUDES = @KDE_INCLUDES@
+ KDE_LDFLAGS = @KDE_LDFLAGS@
diff --git a/misc/koffice3/patches/patch-al b/misc/koffice3/patches/patch-al
new file mode 100644
index 00000000000..20880114fa9
--- /dev/null
+++ b/misc/koffice3/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/10/06 03:36:22 jlam Exp $
+
+--- kformula/pics/Makefile.in.orig	Fri Mar 29 07:17:42 2002
++++ kformula/pics/Makefile.in
+@@ -235,7 +235,7 @@ qt_libraries = @qt_libraries@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-datadir = $(prefix)/share/apps/kformula/pics
++datadir = $(kde_datadir)/kformula/pics
+ 
+ data_DATA = kformula2-1.png mini-symbols.png enlarge.png     kformula2-2.png mini-frac.png mini-vspace.png frac-vline.png     kformula2-3.png mini-integral.png mini-xy.png kformula1-0.png     kformula3-2.png mini-root.png reduce.png kformula2-0.png     mini-bra.png mini-rootindex.png reduceall.png greek.png enlargeall.png     enlargenext.png par1.xbm par2.xbm par3.xbm index0.png index1.png index2.png     index3.png index.png indexsw.png nextsw.png childrensw.png elementsw.png     split.png matrix.png Ilower.png Ihigher.png upalign.png downalign.png midalign.png     midline.png delimiter.png insrow.png inscol.png remrow.png remcol.png rootindex.png     bold.png italic.png underl.png near.png far.png leftalign.png rightalign.png centralign.png     pixmap.png Slower.png Shigher.png
+ 
diff --git a/misc/koffice3/patches/patch-am b/misc/koffice3/patches/patch-am
new file mode 100644
index 00000000000..b3e92c39cbe
--- /dev/null
+++ b/misc/koffice3/patches/patch-am
@@ -0,0 +1,30 @@
+$NetBSD: patch-am,v 1.1 2002/10/06 03:36:22 jlam Exp $
+
+--- kword/kwdoc.cc.orig	Mon Mar 25 15:11:32 2002
++++ kword/kwdoc.cc
+@@ -97,10 +97,12 @@ KWChild::~KWChild()
+ {
+ }
+ 
+-KoDocument *KWChild::hitTest( const QPoint &, const QWMatrix & )
++KoDocument *KWChild::hitTest( const QPoint &p, const QWMatrix &m )
+ {
+-  // Disable part-manager magic for part activation, KWord does it itself.
+-  return 0L;
++  // This was meant to disable part activation on RMB ... but it breaks
++  // part activation with LMB
++  //return 0L;
++  return KoDocumentChild::hitTest( p, m );
+ }
+ 
+ /******************************************************************/
+@@ -287,8 +289,7 @@ void KWDocument::setZoomAndResolution( i
+ 
+ KoDocument *KWDocument::hitTest( const QPoint &pos, const QWMatrix &matrix )
+ {
+-    // Disable part-manager magic for part activation, KWord does it itself.
+-    return 0L;
++    return KoDocument::hitTest( pos, matrix );
+ }
+ 
+ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint )
diff --git a/misc/koffice3/patches/patch-an b/misc/koffice3/patches/patch-an
new file mode 100644
index 00000000000..7dd5f8cd52b
--- /dev/null
+++ b/misc/koffice3/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/10/06 03:36:22 jlam Exp $
+
+--- kword/kwdoc.h.orig	Mon Mar 18 05:24:01 2002
++++ kword/kwdoc.h
+@@ -124,6 +124,8 @@ public:
+     void processImageRequests();
+     void processAnchorRequests();
+ 
++    virtual KoDocument *hitTest( const QPoint &pos, const QWMatrix &matrix );
++
+     int syntaxVersion( ) const { return m_syntaxVersion; }
+ 
+     // Called by KWFrame*'s loading code to emit correct progress info
diff --git a/misc/koffice3/patches/patch-ao b/misc/koffice3/patches/patch-ao
new file mode 100644
index 00000000000..f19f61dfbc7
--- /dev/null
+++ b/misc/koffice3/patches/patch-ao
@@ -0,0 +1,59 @@
+$NetBSD: patch-ao,v 1.1 2002/10/06 03:36:23 jlam Exp $
+
+--- lib/kformula/elementindex.h.orig	Sun May 27 12:07:03 2001
++++ lib/kformula/elementindex.h
+@@ -30,7 +30,54 @@ KFORMULA_NAMESPACE_BEGIN
+ 
+ class ElementIndex;
+ 
++#if defined(__GNUC__)
++#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)
++/*
++ * We add a quick 'n' dirty inline implementation of auto_ptr for older
++ * releases of GCC, which don't include an auto_ptr implementation in
++ * <memory>.
++ */
++
++template <class T> class auto_ptr {
++private:
++	T* _ptr;
++
++public:
++	typedef T element_type;
++	explicit auto_ptr(T* p = 0) : _ptr(p) {}
++	auto_ptr(auto_ptr& a) : _ptr(a.release()) {}
++	template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {}
++	auto_ptr& operator=(auto_ptr& a) {
++		if (&a != this) {
++			delete _ptr;
++			_ptr = a.release();
++		}
++		return *this;
++	}
++	template <class T1>
++	auto_ptr& operator=(auto_ptr<T1>& a) {
++		if (a.get() != this->get()) {
++			delete _ptr;
++			_ptr = a.release();
++		}
++		return *this;
++	}
++	~auto_ptr() { delete _ptr; }
++
++	T& operator*() const { return *_ptr; }
++	T* operator->() const { return _ptr; }
++	T* get() const { return _ptr; }
++	T* release() { T* tmp = _ptr; _ptr = 0; return tmp; }
++	void reset(T* p = 0) { delete _ptr; _ptr = p; }
++};
++
++typedef auto_ptr<ElementIndex> ElementIndexPtr;
++#else
+ typedef std::auto_ptr<ElementIndex> ElementIndexPtr;
++#endif
++#else
++typedef std::auto_ptr<ElementIndex> ElementIndexPtr;
++#endif
+ 
+ 
+ /**
diff --git a/misc/koffice3/patches/patch-ap b/misc/koffice3/patches/patch-ap
new file mode 100644
index 00000000000..c0bdbdb87f6
--- /dev/null
+++ b/misc/koffice3/patches/patch-ap
@@ -0,0 +1,30 @@
+$NetBSD: patch-ap,v 1.1 2002/10/06 03:36:23 jlam Exp $
+
+--- qt3stuff/qrichtext.cpp.orig	Wed Mar 27 06:14:54 2002
++++ qt3stuff/qrichtext.cpp
+@@ -1054,19 +1054,21 @@ void QTextCursor::gotoWordRight()
+     QTextString *s = string->string();
+     bool allowSame = FALSE;
+     for ( int i = idx; i < (int)s->length(); ++i ) {
+-	if ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' ||
+-	     s->at( i ).c == ',' || s->at( i ).c == ':' || s->at( i ).c == ';' ) {
++       if ( ! ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' ||
++            s->at( i ).c == ',' || s->at( i ).c == ':' || s->at( i ).c == ';' ) ) {
+ 	    if ( !allowSame )
+ 		continue;
+ 	    idx = i;
+ 	    return;
+ 	}
+-	if ( !allowSame && !( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' ||
++       if ( !allowSame && ( s->at( i ).c.isSpace() || s->at( i ).c == '\t' || s->at( i ).c == '.' ||
+ 			      s->at( i ).c == ',' || s->at( i ).c == ':' || s->at( i ).c == ';'  ) )
+ 	    allowSame = TRUE;
+     }
+ 
+-    if ( string->next() ) {
++    if ( idx < ((int)s->length()-1) ) {
++        gotoLineEnd();
++    } else if ( string->next() ) {
+ 	string = string->next();
+ 	while ( !string->isVisible() )
+ 	    string = string->next();