Please welcome Qt3/KDE3 to our ports tree. This includes work since the

original versions of these ports, so some PORTREVISIONs were bumped.  See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.

bsd.kde.mk has already been updated a few days ago to work with these.

Some patches applied to fix a few bugs were:

deskutils/kdepim3:
        [1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
        [2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
        [3] Fix compile problem with kvoctrain.
x11/kdebase3:
        [4] Fix KDM CPU usage and login bug.

Some caveats:
        * All PLISTs are broken for deinstall due to script bug that I
          didn't notice until very recently.  This will be fixed when I
          commit an update tomorrow.  These ports should still install
          perfectly fine though.  They should also deinstall without
          giving errors, but will leave directories behind.
        * You can't install this with any other version of QT or KDE
          already installed.  I am not sure the checks are 100% working,
          but fixes for these will be forthcoming.  This is mainly due
          to a policy decision made by kde@ to make QT/KDE ports install
          the way the rest of the world expects it to while also still
          conforming to FreeBSD's hier(7).  For reference on this decision,
          please consult the KDE/FreeBSD mailing list archives.  This
          decision fixes 2-year-old bug reports relating to how we handled
          this for KDE2 vs KDE1.

Submitted by:   [1] Adrian de Groot <adridg@cs.kun.nl>,
                [2] David Faure <faure@kde.org>,
                    Andy Fawcett <andy@athame.co.uk>
                    Lauri Watts <lauri@kde.org>
                [3] Lauri Watts <lauri@kde.org>
                [4] Alan Eldridge <alane@geeksrus.net>
                    Oswald Buddenhagen <ossi@kde.org>
Reviewed by:    kde

23 files changed, 355 insertions, 38 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 1b3db3e5528..0052ef8d855 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,54 +7,36 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.1.1
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-kde3
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_KDELIBS_VER=2
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_KDELIBS_VER=3
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 USE_GMAKE=	yes
 
-_NO_KDE_OBJPRELINK=	yes
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-post-patch:
-	@${PERL} -pi -e "s@Icon=killustrator@Icon=kontour@g" \
-		${WRKSRC}/templates/Illustration.desktop
-	@${PERL} -pi -e "s@KIllustrator@Kontour@g" \
-		${WRKSRC}/templates/Illustration.desktop
-
 pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@LIBPYTHON =@LIBPYTHON= ${PTHREAD_LIBS}@g"
-	${PERL} -pi -e "s@la_LIBADD =@la_LIBADD= ${PTHREAD_LIBS}@g" \
-		${WRKSRC}/kivio/plugins/*/Makefile.in
-	${PERL} -pi -e "s@Exec=kivio@Exec=env LD_PRELOAD=/usr/lib/libc_r.so kivio@g" \
-		${WRKSRC}/kivio/kiviopart/kivio.desktop
-
-post-install:
-	${MV} ${PREFIX}/bin/kivio ${PREFIX}/bin/kivio.real
-	${INSTALL_SCRIPT} ${FILESDIR}/kivio.sh ${PREFIX}/bin/kivio
+	cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
 
 .include <bsd.port.mk>
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index ef05f7f9592..a907cdc3bf6 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1 +1 @@
-MD5 (KDE/koffice-1.1.1.tar.bz2) = 7692854feb223180e00f47f850fd006a
+MD5 (KDE/koffice-1.1.1-kde3.tar.bz2) = 91ba4cbf5a16678e59d3c08f4b6fc071
diff --git a/editors/calligra/files/kivio.sh b/editors/calligra/files/kivio.sh
deleted file mode 100644
index 397df854628..00000000000
--- a/editors/calligra/files/kivio.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-env LD_PRELOAD=/usr/lib/libc_r.so kivio.real
diff --git a/editors/calligra/files/patch-abiword b/editors/calligra/files/patch-abiword
new file mode 100644
index 00000000000..c1de0bbc83a
--- /dev/null
+++ b/editors/calligra/files/patch-abiword
@@ -0,0 +1,19 @@
+Index: filters/kword/abiword/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/abiword/Makefile.am,v
+retrieving revision 1.4
+diff -u -3 -p -r1.4 Makefile.am
+--- filters/kword/abiword/Makefile.am	2001/03/22 14:02:18	1.4
++++ filters/kword/abiword/Makefile.am	2002/04/02 17:02:08
+@@ -1,9 +1,9 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
+-libabiwordimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libabiwordimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libabiwordimport_la_LIBADD = $(KOFFICE_LIBS)
+-libabiwordexport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libabiwordexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libabiwordexport_la_LIBADD = $(KOFFICE_LIBS)
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-applixgraphics b/editors/calligra/files/patch-applixgraphics
new file mode 100644
index 00000000000..f7190ea5d0d
--- /dev/null
+++ b/editors/calligra/files/patch-applixgraphics
@@ -0,0 +1,16 @@
+Index: filters/kontour/applixgraphics/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kontour/applixgraphics/Makefile.am,v
+retrieving revision 1.2.2.1
+diff -u -3 -p -r1.2.2.1 Makefile.am
+--- filters/kontour/applixgraphics/Makefile.am	2001/08/26 22:02:24	1.2.2.1
++++ filters/kontour/applixgraphics/Makefile.am	2002/04/02 17:01:46
+@@ -1,7 +1,7 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
+-libapplixgraphicimport_la_LDFLAGS	= -module -avoid-version -no-undefined 
++libapplixgraphicimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined 
+ 
+ ####### Files
+ 
diff --git a/editors/calligra/files/patch-applixword b/editors/calligra/files/patch-applixword
new file mode 100644
index 00000000000..4111db997cd
--- /dev/null
+++ b/editors/calligra/files/patch-applixword
@@ -0,0 +1,16 @@
+Index: filters/kword/applixword/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/applixword/Makefile.am,v
+retrieving revision 1.4.2.1
+diff -u -3 -p -r1.4.2.1 Makefile.am
+--- filters/kword/applixword/Makefile.am	2001/08/26 22:02:24	1.4.2.1
++++ filters/kword/applixword/Makefile.am	2002/04/02 17:02:00
+@@ -1,7 +1,7 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
+-libapplixwordimport_la_LDFLAGS	= -module -avoid-version -no-undefined 
++libapplixwordimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined 
+ 
+ ####### Files
+ 
diff --git a/editors/calligra/files/patch-ascii b/editors/calligra/files/patch-ascii
new file mode 100644
index 00000000000..355ca8ee02c
--- /dev/null
+++ b/editors/calligra/files/patch-ascii
@@ -0,0 +1,19 @@
+Index: filters/kword/ascii/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/ascii/Makefile.am,v
+retrieving revision 1.6
+diff -u -3 -p -r1.6 Makefile.am
+--- filters/kword/ascii/Makefile.am	2001/03/22 14:02:18	1.6
++++ filters/kword/ascii/Makefile.am	2002/04/02 17:01:59
+@@ -1,9 +1,9 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
+-libasciiimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libasciiimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libasciiimport_la_LIBADD = $(KOFFICE_LIBS)
+-libasciiexport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libasciiexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libasciiexport_la_LIBADD = $(KOFFICE_LIBS)
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-csv b/editors/calligra/files/patch-csv
new file mode 100644
index 00000000000..1073f254abe
--- /dev/null
+++ b/editors/calligra/files/patch-csv
@@ -0,0 +1,21 @@
+Index: filters/kspread/csv/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kspread/csv/Makefile.am,v
+retrieving revision 1.16
+diff -u -3 -p -r1.16 Makefile.am
+--- filters/kspread/csv/Makefile.am	2001/06/11 08:40:36	1.16
++++ filters/kspread/csv/Makefile.am	2002/04/02 17:01:51
+@@ -9,11 +9,11 @@ kde_module_LTLIBRARIES = libcsvimport.la
+ 
+ libcsvimport_la_SOURCES = csvimport.cc xmltree.cc csvimport_factory.cc \
+                           csvdialog.cpp dialogui.ui 
+-libcsvimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libcsvimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libcsvimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
+ 
+ libcsvexport_la_SOURCES = csvexport.cc csvexport_factory.cc
+-libcsvexport_la_LDFLAGS = -module -avoid-version -no-undefined
++libcsvexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ libcsvexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
+ 
+ METASOURCES = AUTO
diff --git a/editors/calligra/files/patch-docbook b/editors/calligra/files/patch-docbook
new file mode 100644
index 00000000000..6f51a8ae0d2
--- /dev/null
+++ b/editors/calligra/files/patch-docbook
@@ -0,0 +1,16 @@
+Index: filters/kword/docbook/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/docbook/Makefile.am,v
+retrieving revision 1.2
+diff -u -3 -p -r1.2 Makefile.am
+--- filters/kword/docbook/Makefile.am	2001/03/22 14:02:18	1.2
++++ filters/kword/docbook/Makefile.am	2002/04/02 17:02:04
+@@ -1,7 +1,7 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
+-libdocbookexport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libdocbookexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libdocbookexport_la_LIBADD = $(KOFFICE_LIBS)
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-gnumeric b/editors/calligra/files/patch-gnumeric
new file mode 100644
index 00000000000..2ea29b35491
--- /dev/null
+++ b/editors/calligra/files/patch-gnumeric
@@ -0,0 +1,21 @@
+Index: filters/kspread/gnumeric/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kspread/gnumeric/Makefile.am,v
+retrieving revision 1.2
+diff -u -3 -p -r1.2 Makefile.am
+--- filters/kspread/gnumeric/Makefile.am	2001/08/04 16:59:59	1.2
++++ filters/kspread/gnumeric/Makefile.am	2002/04/02 17:01:53
+@@ -7,11 +7,11 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/ks
+ kde_module_LTLIBRARIES = libgnumericexport.la libgnumericimport.la 
+ 
+ libgnumericexport_la_SOURCES = gnumericexport.cc gnumericexport_factory.cc
+-libgnumericexport_la_LDFLAGS = -module -avoid-version -no-undefined
++libgnumericexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ libgnumericexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
+ 
+ libgnumericimport_la_SOURCES = gnumericimport.cc gnumericimport_factory.cc
+-libgnumericimport_la_LDFLAGS = -module -avoid-version -no-undefined
++libgnumericimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ libgnumericimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
+ 
+ METASOURCES = AUTO
diff --git a/editors/calligra/files/patch-html b/editors/calligra/files/patch-html
new file mode 100644
index 00000000000..c5f96c2509f
--- /dev/null
+++ b/editors/calligra/files/patch-html
@@ -0,0 +1,16 @@
+Index: filters/kspread/html/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kspread/html/Makefile.am,v
+retrieving revision 1.2.2.1
+diff -u -3 -p -r1.2.2.1 Makefile.am
+--- filters/kspread/html/Makefile.am	2001/08/26 21:43:21	1.2.2.1
++++ filters/kspread/html/Makefile.am	2002/04/02 17:01:57
+@@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/ks
+ kde_module_LTLIBRARIES = libkspreadhtmlexport.la
+ 
+ libkspreadhtmlexport_la_SOURCES = htmlexport.cc htmlexport_factory.cc
+-libkspreadhtmlexport_la_LDFLAGS = -module -avoid-version -no-undefined
++libkspreadhtmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ libkspreadhtmlexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
+ 
+ METASOURCES = AUTO
diff --git a/editors/calligra/files/patch-html2 b/editors/calligra/files/patch-html2
new file mode 100644
index 00000000000..92eff454cc9
--- /dev/null
+++ b/editors/calligra/files/patch-html2
@@ -0,0 +1,18 @@
+Index: filters/kword/html/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/html/Makefile.am,v
+retrieving revision 2.13.2.1
+diff -u -3 -p -r2.13.2.1 Makefile.am
+--- filters/kword/html/Makefile.am	2001/08/26 21:39:01	2.13.2.1
++++ filters/kword/html/Makefile.am	2002/04/02 17:02:02
+@@ -2,8 +2,8 @@
+ 
+ INCLUDES = -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
+ 
+-libhtmlimport_la_LDFLAGS = -module -avoid-version -no-undefined
+-libhtmlexport_la_LDFLAGS = -module -avoid-version -no-undefined
++libhtmlimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
++libhtmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ 
+ libhtmlimport_la_LIBADD = $(KOFFICE_LIBS)
+ libhtmlexport_la_LIBADD = $(KOFFICE_LIBS)
diff --git a/editors/calligra/files/patch-kofficeui b/editors/calligra/files/patch-kofficeui
new file mode 100644
index 00000000000..9c9ab5c0fdc
--- /dev/null
+++ b/editors/calligra/files/patch-kofficeui
@@ -0,0 +1,16 @@
+Index: lib/kofficeui/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/lib/kofficeui/Makefile.am,v
+retrieving revision 1.43
+diff -u -3 -p -r1.43 Makefile.am
+--- lib/kofficeui/Makefile.am	2001/06/22 20:31:54	1.43
++++ lib/kofficeui/Makefile.am	2002/04/02 17:01:38
+@@ -2,7 +2,7 @@
+ 
+ KDE_CXXFLAGS = $(USE_RTTI)
+ INCLUDES = -I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore $(all_includes)
+-libkofficeui_la_LDFLAGS	= -version-info 1:0:0 -no-undefined
++libkofficeui_la_LDFLAGS	= $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkofficeui_la_LIBADD  = ../kofficecore/libkofficecore.la
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-kword b/editors/calligra/files/patch-kword
new file mode 100644
index 00000000000..ef4755fbfa3
--- /dev/null
+++ b/editors/calligra/files/patch-kword
@@ -0,0 +1,16 @@
+Index: filters/kpresenter/kword/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kpresenter/kword/Makefile.am,v
+retrieving revision 1.1.1.1.2.1
+diff -u -3 -p -r1.1.1.1.2.1 Makefile.am
+--- filters/kpresenter/kword/Makefile.am	2001/08/26 22:02:24	1.1.1.1.2.1
++++ filters/kpresenter/kword/Makefile.am	2002/04/02 17:02:11
+@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES
+ kde_module_LTLIBRARIES = libkprkword.la
+ 
+ libkprkword_la_SOURCES = kprkword.cc kprkword_factory.cc
+-libkprkword_la_LDFLAGS	= -module -avoid-version -no-undefined
++libkprkword_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libkprkword_la_LIBADD = $(KOFFICE_LIBS)
+ 
+ METASOURCES = AUTO
diff --git a/editors/calligra/files/patch-latex b/editors/calligra/files/patch-latex
new file mode 100644
index 00000000000..9423a631040
--- /dev/null
+++ b/editors/calligra/files/patch-latex
@@ -0,0 +1,19 @@
+Index: filters/kword/latex/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/latex/Makefile.am,v
+retrieving revision 1.11.2.1
+diff -u -3 -p -r1.11.2.1 Makefile.am
+--- filters/kword/latex/Makefile.am	2001/08/26 21:39:01	1.11.2.1
++++ filters/kword/latex/Makefile.am	2002/04/02 17:02:05
+@@ -1,9 +1,9 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula $(all_includes)
+-#liblateximport_la_LDFLAGS	= -module -avoid-version -no-undefined
++#liblateximport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ #liblateximport_la_LIBADD = $(KOFFICE_LIBS)
+-liblatexexport_la_LDFLAGS	= -module -avoid-version -no-undefined
++liblatexexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ liblatexexport_la_LIBADD    = $(KOFFICE_LIBS) $(top_builddir)/lib/kformula/libkformula.la
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-msod b/editors/calligra/files/patch-msod
new file mode 100644
index 00000000000..64916e0b774
--- /dev/null
+++ b/editors/calligra/files/patch-msod
@@ -0,0 +1,16 @@
+Index: filters/kontour/msod/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kontour/msod/Makefile.am,v
+retrieving revision 1.4
+diff -u -3 -p -r1.4 Makefile.am
+--- filters/kontour/msod/Makefile.am	2001/03/22 14:02:18	1.4
++++ filters/kontour/msod/Makefile.am	2002/04/02 17:01:40
+@@ -1,7 +1,7 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KWMF_INCLUDES) $(KOFFICE_INCLUDES) $(all_includes)
+-libmsodimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libmsodimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libmsodimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KWMF)
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-olefilters b/editors/calligra/files/patch-olefilters
new file mode 100644
index 00000000000..0308fe73f5e
--- /dev/null
+++ b/editors/calligra/files/patch-olefilters
@@ -0,0 +1,16 @@
+Index: filters/olefilters/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/olefilters/Makefile.am,v
+retrieving revision 1.6
+diff -u -3 -p -r1.6 Makefile.am
+--- filters/olefilters/Makefile.am	2001/03/22 14:02:17	1.6
++++ filters/olefilters/Makefile.am	2002/04/02 17:02:13
+@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/lib -
+ -I$(srcdir)/excel97 -I$(srcdir)/powerpoint97 $(KOFFICE_INCLUDES) \
+ $(KOFFICECORE_INCLUDES) $(all_includes)
+ 
+-libolefilter_la_LDFLAGS = -module -avoid-version -no-undefined
++libolefilter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ libolefilter_la_LIBADD = ./lib/libfilterbase.la ./lib/libklaola.la \
+ ./winword97/libwinword97.la ./excel97/libexcel97.la \
+ ./powerpoint97/libpowerpoint97.la $(LIB_KOFFICECORE)
diff --git a/editors/calligra/files/patch-qpro b/editors/calligra/files/patch-qpro
new file mode 100644
index 00000000000..1fda2853741
--- /dev/null
+++ b/editors/calligra/files/patch-qpro
@@ -0,0 +1,16 @@
+Index: filters/kspread/qpro/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kspread/qpro/Makefile.am,v
+retrieving revision 1.2.2.1
+diff -u -3 -p -r1.2.2.1 Makefile.am
+--- filters/kspread/qpro/Makefile.am	2001/08/26 22:02:24	1.2.2.1
++++ filters/kspread/qpro/Makefile.am	2002/04/02 17:01:55
+@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libqproimport.l
+ 
+ libqproimport_la_SOURCES = qproimport.cc qproimport_factory.cc qproformula.cc
+ 
+-libqproimport_la_LDFLAGS = -module -avoid-version -no-undefined
++libqproimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ libqproimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la \
+ 	libqpro/src/libqpro.la
+ 
diff --git a/editors/calligra/files/patch-store b/editors/calligra/files/patch-store
new file mode 100644
index 00000000000..7caf9d254b6
--- /dev/null
+++ b/editors/calligra/files/patch-store
@@ -0,0 +1,10 @@
+diff -b -p -u -r1.24 -r1.24.4.1
+--- lib/store/Makefile.am	2001/03/30 22:47:33	1.24
++++ lib/store/Makefile.am.new	2002/04/02 14:55:00	1.24.4.1
+@@ -7,5 +7,5 @@ INCLUDES = $(all_includes)
+ 
+ libkstore_la_LIBADD = $(LIB_KSYCOCA)
+ libkstore_la_SOURCES = koStore.cc
+-libkstore_la_LDFLAGS = -version-info 1:0:0 $(KDE_LDFLAGS) -no-undefined
++libkstore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 $(KDE_LDFLAGS) -no-undefined
+ include_HEADERS = koStore.h koStoreDevice.h
diff --git a/editors/calligra/files/patch-svg b/editors/calligra/files/patch-svg
new file mode 100644
index 00000000000..2e3e745fc8f
--- /dev/null
+++ b/editors/calligra/files/patch-svg
@@ -0,0 +1,21 @@
+Index: filters/kontour/svg/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kontour/svg/Makefile.am,v
+retrieving revision 1.4
+diff -u -3 -p -r1.4 Makefile.am
+--- filters/kontour/svg/Makefile.am	2001/08/05 06:53:30	1.4
++++ filters/kontour/svg/Makefile.am	2002/04/02 17:01:49
+@@ -7,11 +7,11 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/ko
+ kde_module_LTLIBRARIES = libsvgimport.la libsvgexport.la
+ 
+ libsvgimport_la_SOURCES = svgimport.cc svgimport_factory.cc basicshapes.h basicshapes.cc datatypes.h datatypes.cc path.h path.cc transform.h transform.cc style.h style.cc text.h text.cc svgmain.h svgmain.cc
+-libsvgimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libsvgimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libsvgimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kontour/libkontourpart.la
+ 
+ libsvgexport_la_SOURCES = svgexport.cc svgexport_factory.cc
+-libsvgexport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libsvgexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libsvgexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kontour/libkontourpart.la
+ 
+ METASOURCES = AUTO
diff --git a/editors/calligra/files/patch-wmf b/editors/calligra/files/patch-wmf
new file mode 100644
index 00000000000..21cc07574df
--- /dev/null
+++ b/editors/calligra/files/patch-wmf
@@ -0,0 +1,16 @@
+Index: filters/kontour/wmf/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kontour/wmf/Makefile.am,v
+retrieving revision 1.4
+diff -u -3 -p -r1.4 Makefile.am
+--- filters/kontour/wmf/Makefile.am	2001/03/22 14:02:18	1.4
++++ filters/kontour/wmf/Makefile.am	2002/04/02 17:01:41
+@@ -1,7 +1,7 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KWMF_INCLUDES) $(KOFFICE_INCLUDES) $(all_includes)
+-libwmfimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libwmfimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KWMF)
+ 
+ ####### Files
diff --git a/editors/calligra/files/patch-xfig b/editors/calligra/files/patch-xfig
new file mode 100644
index 00000000000..9084799e801
--- /dev/null
+++ b/editors/calligra/files/patch-xfig
@@ -0,0 +1,16 @@
+Index: filters/kontour/xfig/Makefile.am
+===================================================================
+RCS file: /home/kde/koffice/filters/kontour/xfig/Makefile.am,v
+retrieving revision 1.3
+diff -u -3 -p -r1.3 Makefile.am
+--- filters/kontour/xfig/Makefile.am	2001/07/16 19:19:48	1.3
++++ filters/kontour/xfig/Makefile.am	2002/04/02 17:01:48
+@@ -1,7 +1,7 @@
+ ####### General stuff
+ 
+ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(top_srcdir)/kontour $(all_includes)
+-libxfigimport_la_LDFLAGS	= -module -avoid-version -no-undefined
++libxfigimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
+ libxfigimport_la_LIBADD = $(KOFFICE_LIBS) ../../../kontour/libkontourpart.la
+ 
+ ####### Files
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 4904d5240f0..92d9870a8a0 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -206,7 +206,6 @@ share/apps/kchart/icons/hicolor/22x22/actions/hilo.png
 share/apps/kchart/icons/hicolor/22x22/actions/lines.png
 share/apps/kchart/icons/hicolor/22x22/actions/lines3d.png
 share/apps/kchart/icons/hicolor/22x22/actions/options.png
-share/apps/kchart/icons/hicolor/22x22/actions/polar.png
 share/apps/kchart/icons/hicolor/22x22/actions/ring.png
 share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
 share/apps/kchart/icons/locolor/16x16/actions/areas.png
@@ -1536,6 +1535,19 @@ share/templates/Illustration.desktop
 share/templates/Presentation.desktop
 share/templates/SpreadSheet.desktop
 share/templates/TextDocument.desktop
+@dirrm share/templates/.source
+@dirrm share/templates
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/22x22/apps
+@dirrm share/icons/locolor/22x22
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/22x22/mimetypes
+@dirrm share/icons/hicolor/22x22/apps
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
 @dirrm share/doc/HTML/en/kspread
@@ -1664,3 +1676,4 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
 @dirrm share/applnk/Office
+@dirrm share/applnk