Update to 20000829A snapshot. Disable kdenetwork2 for the time being so

I can address some of its issues (should see it marked un-broken in about
3 hours, if they're trivial enough).  It took too long to get this update
out the door... :-(

This is a rather stable version of KDE2.  Release is hoped for sometime
next month, so I'm going to try to reroll snapshots this weekend.

Also decide policy by removing the interactive requirement in qt22's
configure script.  I don't know why they bothered adding it there..

Bugged by:	*many* bug-reports, requests, etc.

12 files changed, 1116 insertions, 228 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 8bd9ce9f50d7..c7076856e8fb 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	20000724A
+PORTVERSION=	20000829A
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	http://www.physics.purdue.edu/~will/
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -17,7 +16,6 @@ LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
 		iconv.0:${PORTSDIR}/converters/iconv
 
-WRKSRC=		${WRKDIR}/koffice
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 29689accec3b..2968f603716c 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
+MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index b9623c9d9c0d..d9997a2b1000 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -1,17 +1,22 @@
-bin/graphite
 bin/kchart
 bin/killustrator
+bin/koscript
 bin/koshell
+bin/kprconverter.pl
 bin/kpresenter
-bin/kscript
 bin/kspread
 bin/kword
 include/KoApplicationIface.h
 include/KoDocumentIface.h
+include/KoViewIface.h
+include/MatrixDialog.h
+include/box.h
 include/handler.h
 include/kcoloractions.h
+include/kformula.h
+include/kformulaedit.h
+include/kformulatoolbar.h
 include/koApplication.h
-include/koBinaryStore.h
 include/koChild.h
 include/koDataTool.h
 include/koDocument.h
@@ -31,90 +36,79 @@ include/koPartSelectDia.h
 include/koQueryTrader.h
 include/koRuler.h
 include/koStore.h
-include/koStoreStream.h
+include/koStoreDevice.h
 include/koStream.h
 include/koTabChooser.h
-include/koTarStore.h
 include/koTemplateChooseDia.h
 include/koTemplateCreateDia.h
 include/koTemplates.h
 include/koView.h
-include/komlFeed.h
-include/komlFileFeed.h
-include/komlMime.h
 include/komlParser.h
-include/komlStreamFeed.h
 include/komlWriter.h
+include/matrixbox.h
 include/toolbox.h
-include/torben.h
-lib/graphite.a
-lib/graphite.la
-lib/kchart.a
 lib/kchart.la
-lib/killustrator.a
+lib/kchart.so
 lib/killustrator.la
-lib/koshell.a
+lib/killustrator.so
 lib/koshell.la
-lib/kpresenter.a
+lib/koshell.so
 lib/kpresenter.la
-lib/kspread.a
+lib/kpresenter.so
 lib/kspread.la
-lib/kword.a
+lib/kspread.so
 lib/kword.la
-lib/libasciiexport.a
+lib/kword.so
 lib/libasciiexport.la
-lib/libasciiimport.a
+lib/libasciiexport.so
 lib/libasciiimport.la
-lib/libcsvexport.a
+lib/libasciiimport.so
 lib/libcsvexport.la
-lib/libcsvexport_test.a
-lib/libcsvexport_test.la
-lib/libcsvfilter.a
-lib/libcsvfilter.la
-lib/libcsvfilterdia.a
+lib/libcsvexport.so
 lib/libcsvfilterdia.la
-lib/libgraphitepart.a
-lib/libgraphitepart.la
-lib/libhtmlexport.a
+lib/libcsvfilterdia.so
+lib/libcsvimport.la
+lib/libcsvimport.so
 lib/libhtmlexport.la
-lib/libhtmlimport.a
+lib/libhtmlexport.so
 lib/libhtmlimport.la
-lib/libkchartpart.a
+lib/libhtmlimport.so
 lib/libkchartpart.la
-lib/libkillustratorpart.a
+lib/libkchartpart.so
+lib/libkformula.la
+lib/libkformula.so.3
 lib/libkillustratorpart.la
-lib/libkodocinfopropspage.a
+lib/libkillustratorpart.so
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
 lib/libkofficecore.so.1
 lib/libkofficeui.la
 lib/libkofficeui.so.1
 lib/libkoml.la
 lib/libkoml.so.1
-lib/libkpresenterpart.a
+lib/libkoscript.la
+lib/libkoscript.so.1
 lib/libkpresenterpart.la
-lib/libkscript.la
-lib/libkscript.so.1
-lib/libkspelltool.a
+lib/libkpresenterpart.so
 lib/libkspelltool.la
-lib/libkspreadcalc.a
+lib/libkspelltool.so
 lib/libkspreadcalc.la
-lib/libkspreadpart.a
+lib/libkspreadcalc.so
 lib/libkspreadpart.la
+lib/libkspreadpart.so
 lib/libkstore.la
 lib/libkstore.so.1
-lib/libkwordpart.a
 lib/libkwordpart.la
-lib/libolefilter.a
+lib/libkwordpart.so
 lib/libolefilter.la
-share/applnk/Office/graphite.desktop
+lib/libolefilter.so
 share/applnk/Office/kchart.desktop
 share/applnk/Office/killustrator.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kword.desktop
-share/apps/graphite/graphite.rc
 share/apps/kchart/icons/locolor/22x22/actions/areas.png
 share/apps/kchart/icons/locolor/22x22/actions/bars.png
 share/apps/kchart/icons/locolor/22x22/actions/cakes.png
@@ -124,6 +118,12 @@ share/apps/kchart/icons/locolor/22x22/actions/lines.png
 share/apps/kchart/icons/locolor/22x22/actions/options.png
 share/apps/kchart/icons/locolor/22x22/actions/wizard.png
 share/apps/kchart/kchart.rc
+share/apps/kchart/pics/areasubtypebeside.png
+share/apps/kchart/pics/areasubtypedepth.png
+share/apps/kchart/pics/barsubtypebeside.png
+share/apps/kchart/pics/barsubtypedepth.png
+share/apps/kchart/pics/barsubtypelayer.png
+share/apps/kchart/pics/barsubtypepercent.png
 share/apps/killustrator/KIllustrator.rc
 share/apps/killustrator/pics/abottom.png
 share/apps/killustrator/pics/ahcenter.png
@@ -214,6 +214,8 @@ share/apps/koffice/icons/locolor/22x22/actions/part/unspecif.png
 share/apps/koffice/icons/locolor/22x22/actions/parts.png
 share/apps/koffice/icons/locolor/22x22/actions/picture.png
 share/apps/koffice/koffice_shell.rc
+share/apps/koffice/pics/koKoolBarDown.png
+share/apps/koffice/pics/koKoolBarUp.png
 share/apps/koffice/pics/koRulerFirst.png
 share/apps/koffice/pics/koRulerLeft.png
 share/apps/koffice/pics/koffice-logo.png
@@ -373,17 +375,14 @@ share/apps/kpresenter/templates/Professional/Two.desktop
 share/apps/kpresenter/templates/Screenpresentations/.directory
 share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Sand1.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
 share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Sand1.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
 share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
 share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Sand1.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
 share/apps/kspread/dtd/kspread.dtd
@@ -481,10 +480,16 @@ share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
 share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
 share/apps/kword/kword.rc
 share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/A4.png
+share/apps/kword/templates/Normal/.icon/Letter.png
 share/apps/kword/templates/Normal/.icon/PlainText.png
 share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/A4.kwt
+share/apps/kword/templates/Normal/.source/Letter.kwt
 share/apps/kword/templates/Normal/.source/PlainText.kwt
 share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/A4.desktop
+share/apps/kword/templates/Normal/Letter.desktop
 share/apps/kword/templates/Normal/PlainText.desktop
 share/apps/kword/templates/Normal/TwoColumns.desktop
 share/apps/kword/templates/Publishing/.directory
@@ -503,18 +508,42 @@ share/doc/HTML/en/doc/koffice-misc.html
 share/doc/HTML/en/doc/koffice-search-help.html
 share/doc/HTML/en/doc/koffice-search.html
 share/doc/HTML/en/doc/koffice.html
+share/doc/HTML/en/katabase/.anchors
+share/doc/HTML/en/katabase/another-section.html
+share/doc/HTML/en/katabase/compilation-and-installation.html
+share/doc/HTML/en/katabase/copyright.html
 share/doc/HTML/en/katabase/index.cvlog
 share/doc/HTML/en/katabase/index.docbook
+share/doc/HTML/en/katabase/index.html
+share/doc/HTML/en/katabase/installation.html
+share/doc/HTML/en/katabase/introduction.html
+share/doc/HTML/en/katabase/questions-and-answers.html
+share/doc/HTML/en/katabase/requirements.html
+share/doc/HTML/en/katabase/usage.html
+share/doc/HTML/en/killustrator/.anchors
+share/doc/HTML/en/killustrator/about-the-handbook.html
 share/doc/HTML/en/killustrator/align.png
 share/doc/HTML/en/killustrator/align2.png
+share/doc/HTML/en/killustrator/appendix.html
 share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
+share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/compilation-and-installation.html
+share/doc/HTML/en/killustrator/copyright.html
+share/doc/HTML/en/killustrator/drawing-2d-primitives.html
 share/doc/HTML/en/killustrator/ellipse.png
 share/doc/HTML/en/killustrator/export.png
 share/doc/HTML/en/killustrator/freehand.png
+share/doc/HTML/en/killustrator/frequently-asked-questions.html
+share/doc/HTML/en/killustrator/handling-colours.html
+share/doc/HTML/en/killustrator/history-of-killustrator.html
 share/doc/HTML/en/killustrator/index.cvlog
 share/doc/HTML/en/killustrator/index.docbook
+share/doc/HTML/en/killustrator/index.html
+share/doc/HTML/en/killustrator/installation-of-binary-packages.html
+share/doc/HTML/en/killustrator/installation.html
+share/doc/HTML/en/killustrator/introduction.html
 share/doc/HTML/en/killustrator/line.png
 share/doc/HTML/en/killustrator/logo.png
 share/doc/HTML/en/killustrator/movepoint.png
@@ -524,17 +553,170 @@ share/doc/HTML/en/killustrator/pfeil.png
 share/doc/HTML/en/killustrator/point.png
 share/doc/HTML/en/killustrator/polygon-setup.png
 share/doc/HTML/en/killustrator/polygon.png
+share/doc/HTML/en/killustrator/positioning-objects.html
 share/doc/HTML/en/killustrator/rect.png
 share/doc/HTML/en/killustrator/rmpoint.png
 share/doc/HTML/en/killustrator/save_dialog.png
 share/doc/HTML/en/killustrator/schichten.png
+share/doc/HTML/en/killustrator/system-requirements.html
 share/doc/HTML/en/killustrator/text.png
+share/doc/HTML/en/killustrator/the-layer-concept.html
+share/doc/HTML/en/killustrator/to-do.html
+share/doc/HTML/en/killustrator/transformation-of-2d-primitives.html
+share/doc/HTML/en/killustrator/undo--redo.html
+share/doc/HTML/en/killustrator/usage.html
 share/doc/HTML/en/killustrator/verteilen.png
+share/doc/HTML/en/killustrator/working-with-files.html
+share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
+share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/compilingproblems.html
+share/doc/HTML/en/koffice/customgui.html
+share/doc/HTML/en/koffice/customization.html
+share/doc/HTML/en/koffice/faq.html
+share/doc/HTML/en/koffice/firststeps.html
+share/doc/HTML/en/koffice/frombinaries.html
+share/doc/HTML/en/koffice/fromsource.html
+share/doc/HTML/en/koffice/gettingbinaries.html
+share/doc/HTML/en/koffice/gettingsource.html
+share/doc/HTML/en/koffice/glossary.html
 share/doc/HTML/en/koffice/index.docbook
+share/doc/HTML/en/koffice/index.html
+share/doc/HTML/en/koffice/installation.html
+share/doc/HTML/en/koffice/introduction.html
+share/doc/HTML/en/koffice/kparts.html
+share/doc/HTML/en/koffice/kpartstryit.html
+share/doc/HTML/en/koffice/legal.html
+share/doc/HTML/en/koffice/links.html
+share/doc/HTML/en/koffice/moreinfo.html
+share/doc/HTML/en/koffice/programmersinfo.html
+share/doc/HTML/en/koffice/todo.html
+share/doc/HTML/en/koffice/whoreads.html
+share/doc/HTML/en/kpresenter/.anchors
+share/doc/HTML/en/kpresenter/addshadow.html
+share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/credits.html
+share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
+share/doc/HTML/en/kpresenter/index.html
+share/doc/HTML/en/kpresenter/insertpage.html
+share/doc/HTML/en/kpresenter/insertpic.html
+share/doc/HTML/en/kpresenter/introduction.html
+share/doc/HTML/en/kpresenter/menuitems.html
+share/doc/HTML/en/kpresenter/options.html
+share/doc/HTML/en/kpresenter/qanda.html
+share/doc/HTML/en/kpresenter/screendesc.html
+share/doc/HTML/en/kpresenter/textcolor.html
+share/doc/HTML/en/kpresenter/todo.html
+share/doc/HTML/en/kpresenter/tutorial.html
+share/doc/HTML/en/kspread/.anchors
+share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/compilingproblems.html
+share/doc/HTML/en/kspread/credits.html
+share/doc/HTML/en/kspread/dragdrop.html
+share/doc/HTML/en/kspread/frombinaries.html
+share/doc/HTML/en/kspread/fromsource.html
+share/doc/HTML/en/kspread/fundamental.html
+share/doc/HTML/en/kspread/gettingbinaries.html
+share/doc/HTML/en/kspread/gettingsource.html
+share/doc/HTML/en/kspread/guides.html
+share/doc/HTML/en/kspread/guides2.html
+share/doc/HTML/en/kspread/guides3.html
+share/doc/HTML/en/kspread/guides4.html
 share/doc/HTML/en/kspread/index.docbook
+share/doc/HTML/en/kspread/index.html
+share/doc/HTML/en/kspread/installation.html
+share/doc/HTML/en/kspread/introduction.html
+share/doc/HTML/en/kspread/keys.html
+share/doc/HTML/en/kspread/kspreadscreen.html
+share/doc/HTML/en/kspread/loading.html
+share/doc/HTML/en/kspread/menuitems.html
+share/doc/HTML/en/kspread/options.html
+share/doc/HTML/en/kspread/printing.html
+share/doc/HTML/en/kspread/qanda.html
+share/doc/HTML/en/kspread/saving.html
+share/doc/HTML/en/kspread/themes.html
+share/doc/HTML/en/kspread/todo.html
+share/doc/HTML/en/kspread/tutorial.html
+share/doc/HTML/en/kspread/updates.html
+share/doc/HTML/en/kspread/whoreads.html
+share/doc/HTML/en/kword/.anchors
+share/doc/HTML/en/kword/addframe.html
+share/doc/HTML/en/kword/appendix.html
+share/doc/HTML/en/kword/autocorrect.html
+share/doc/HTML/en/kword/basicedittoolbar.html
+share/doc/HTML/en/kword/basicmenubar.html
+share/doc/HTML/en/kword/charformattoolbar.html
+share/doc/HTML/en/kword/clipboard.html
+share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/conventions.html
+share/doc/HTML/en/kword/credits.html
+share/doc/HTML/en/kword/datetime.html
+share/doc/HTML/en/kword/delframe.html
+share/doc/HTML/en/kword/dragdrop.html
+share/doc/HTML/en/kword/endfoot.html
+share/doc/HTML/en/kword/filedlg.html
+share/doc/HTML/en/kword/filetoolbar.html
+share/doc/HTML/en/kword/filters.html
+share/doc/HTML/en/kword/formatchar.html
+share/doc/HTML/en/kword/formatframe.html
+share/doc/HTML/en/kword/formatpara.html
+share/doc/HTML/en/kword/formulas.html
+share/doc/HTML/en/kword/framecreatetoolbar.html
+share/doc/HTML/en/kword/frames.html
+share/doc/HTML/en/kword/frameselect.html
+share/doc/HTML/en/kword/fundimental.html
+share/doc/HTML/en/kword/glossery.html
+share/doc/HTML/en/kword/graphics.html
+share/doc/HTML/en/kword/guides.html
+share/doc/HTML/en/kword/guides2.html
+share/doc/HTML/en/kword/guides3.html
+share/doc/HTML/en/kword/guides4.html
+share/doc/HTML/en/kword/headfoot.html
 share/doc/HTML/en/kword/index.docbook
+share/doc/HTML/en/kword/index.html
+share/doc/HTML/en/kword/inserttoolbar.html
+share/doc/HTML/en/kword/inskspread.html
+share/doc/HTML/en/kword/introduction.html
+share/doc/HTML/en/kword/keys.html
+share/doc/HTML/en/kword/kwordrc.html
+share/doc/HTML/en/kword/kwordscreen.html
+share/doc/HTML/en/kword/loading.html
+share/doc/HTML/en/kword/menuitems.html
+share/doc/HTML/en/kword/moveframe.html
+share/doc/HTML/en/kword/options.html
+share/doc/HTML/en/kword/pgnumber.html
+share/doc/HTML/en/kword/predefinedstyles.html
+share/doc/HTML/en/kword/printing.html
+share/doc/HTML/en/kword/qanda.html
+share/doc/HTML/en/kword/qd2.html
+share/doc/HTML/en/kword/qd3.html
+share/doc/HTML/en/kword/qd4.html
+share/doc/HTML/en/kword/qd5.html
+share/doc/HTML/en/kword/quickdirty.html
+share/doc/HTML/en/kword/resizeframe.html
+share/doc/HTML/en/kword/rulers.html
+share/doc/HTML/en/kword/saving.html
+share/doc/HTML/en/kword/searchreplace.html
+share/doc/HTML/en/kword/selcolor.html
+share/doc/HTML/en/kword/spellcheck.html
+share/doc/HTML/en/kword/styles.html
+share/doc/HTML/en/kword/tableedittoolbar.html
+share/doc/HTML/en/kword/tables.html
+share/doc/HTML/en/kword/tabstops.html
+share/doc/HTML/en/kword/tempcr.html
+share/doc/HTML/en/kword/templateintro.html
+share/doc/HTML/en/kword/textandframe.html
+share/doc/HTML/en/kword/themes.html
+share/doc/HTML/en/kword/toc.html
+share/doc/HTML/en/kword/todo.html
+share/doc/HTML/en/kword/toolbars.html
+share/doc/HTML/en/kword/tutorial.html
+share/doc/HTML/en/kword/undoredo.html
+share/doc/HTML/en/kword/updates.html
+share/doc/HTML/en/kword/whoreads.html
+share/doc/HTML/en/kword/wpvsdtp.html
+share/icons/hicolor/22x22/actions/abs.png
 share/icons/hicolor/22x22/actions/border_all.png
 share/icons/hicolor/22x22/actions/border_bottom.png
 share/icons/hicolor/22x22/actions/border_fall.png
@@ -547,10 +729,24 @@ share/icons/hicolor/22x22/actions/border_right.png
 share/icons/hicolor/22x22/actions/border_top.png
 share/icons/hicolor/22x22/actions/border_up.png
 share/icons/hicolor/22x22/actions/border_vertical.png
+share/icons/hicolor/22x22/actions/brace.png
+share/icons/hicolor/22x22/actions/brackets.png
+share/icons/hicolor/22x22/actions/frac.png
 share/icons/hicolor/22x22/actions/funct.png
+share/icons/hicolor/22x22/actions/int.png
+share/icons/hicolor/22x22/actions/lsub.png
+share/icons/hicolor/22x22/actions/lsup.png
+share/icons/hicolor/22x22/actions/matrix.png
+share/icons/hicolor/22x22/actions/paren.png
 share/icons/hicolor/22x22/actions/percent.png
 share/icons/hicolor/22x22/actions/prec_minus.png
 share/icons/hicolor/22x22/actions/prec_plus.png
+share/icons/hicolor/22x22/actions/prod.png
+share/icons/hicolor/22x22/actions/rsub.png
+share/icons/hicolor/22x22/actions/rsup.png
+share/icons/hicolor/22x22/actions/sqrt.png
+share/icons/hicolor/22x22/actions/sum.png
+share/icons/hicolor/32x32/actions/abs.png
 share/icons/hicolor/32x32/actions/border_all.png
 share/icons/hicolor/32x32/actions/border_bottom.png
 share/icons/hicolor/32x32/actions/border_fall.png
@@ -563,10 +759,23 @@ share/icons/hicolor/32x32/actions/border_right.png
 share/icons/hicolor/32x32/actions/border_top.png
 share/icons/hicolor/32x32/actions/border_up.png
 share/icons/hicolor/32x32/actions/border_vertical.png
+share/icons/hicolor/32x32/actions/brace.png
+share/icons/hicolor/32x32/actions/brackets.png
+share/icons/hicolor/32x32/actions/frac.png
 share/icons/hicolor/32x32/actions/funct.png
+share/icons/hicolor/32x32/actions/int.png
+share/icons/hicolor/32x32/actions/lsub.png
+share/icons/hicolor/32x32/actions/lsup.png
+share/icons/hicolor/32x32/actions/matrix.png
+share/icons/hicolor/32x32/actions/paren.png
 share/icons/hicolor/32x32/actions/percent.png
 share/icons/hicolor/32x32/actions/prec_minus.png
 share/icons/hicolor/32x32/actions/prec_plus.png
+share/icons/hicolor/32x32/actions/prod.png
+share/icons/hicolor/32x32/actions/rsub.png
+share/icons/hicolor/32x32/actions/rsup.png
+share/icons/hicolor/32x32/actions/sqrt.png
+share/icons/hicolor/32x32/actions/sum.png
 share/icons/hicolor/32x32/apps/kchart.png
 share/icons/hicolor/32x32/apps/killustrator.png
 share/icons/hicolor/32x32/apps/kpresenter.png
@@ -577,6 +786,7 @@ share/icons/hicolor/48x48/apps/killustrator.png
 share/icons/hicolor/48x48/apps/kpresenter.png
 share/icons/hicolor/48x48/apps/kspread.png
 share/icons/hicolor/48x48/apps/kword.png
+share/icons/locolor/16x16/actions/abs.png
 share/icons/locolor/16x16/actions/adjustcol.png
 share/icons/locolor/16x16/actions/adjustrow.png
 share/icons/locolor/16x16/actions/areas.png
@@ -594,6 +804,9 @@ share/icons/locolor/16x16/actions/border_right.png
 share/icons/locolor/16x16/actions/border_top.png
 share/icons/locolor/16x16/actions/border_up.png
 share/icons/locolor/16x16/actions/border_vertical.png
+share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/brace.png
+share/icons/locolor/16x16/actions/brackets.png
 share/icons/locolor/16x16/actions/cakes.png
 share/icons/locolor/16x16/actions/cell_edit.png
 share/icons/locolor/16x16/actions/cell_layout.png
@@ -603,32 +816,47 @@ share/icons/locolor/16x16/actions/comment.png
 share/icons/locolor/16x16/actions/data.png
 share/icons/locolor/16x16/actions/delete_table.png
 share/icons/locolor/16x16/actions/deletecell.png
+share/icons/locolor/16x16/actions/dissociatecell.png
 share/icons/locolor/16x16/actions/first_letter_upper.png
 share/icons/locolor/16x16/actions/fontsizedown.png
 share/icons/locolor/16x16/actions/fontsizeup.png
+share/icons/locolor/16x16/actions/frac.png
 share/icons/locolor/16x16/actions/funct.png
 share/icons/locolor/16x16/actions/insertcell.png
 share/icons/locolor/16x16/actions/inserttable.png
+share/icons/locolor/16x16/actions/int.png
 share/icons/locolor/16x16/actions/left.png
 share/icons/locolor/16x16/actions/lines.png
 share/icons/locolor/16x16/actions/lower.png
+share/icons/locolor/16x16/actions/lsub.png
+share/icons/locolor/16x16/actions/lsup.png
+share/icons/locolor/16x16/actions/matrix.png
+share/icons/locolor/16x16/actions/mergecell.png
 share/icons/locolor/16x16/actions/middle.png
 share/icons/locolor/16x16/actions/money.png
 share/icons/locolor/16x16/actions/multirow.png
 share/icons/locolor/16x16/actions/oscilloscope.png
+share/icons/locolor/16x16/actions/paren.png
 share/icons/locolor/16x16/actions/percent.png
 share/icons/locolor/16x16/actions/precminus.png
 share/icons/locolor/16x16/actions/precplus.png
+share/icons/locolor/16x16/actions/prod.png
 share/icons/locolor/16x16/actions/removecell.png
 share/icons/locolor/16x16/actions/removecomment.png
 share/icons/locolor/16x16/actions/resizecol.png
 share/icons/locolor/16x16/actions/resizerow.png
 share/icons/locolor/16x16/actions/right.png
+share/icons/locolor/16x16/actions/rotate.png
+share/icons/locolor/16x16/actions/rsub.png
+share/icons/locolor/16x16/actions/rsup.png
 share/icons/locolor/16x16/actions/series.png
 share/icons/locolor/16x16/actions/sort_decrease.png
 share/icons/locolor/16x16/actions/sort_incr.png
 share/icons/locolor/16x16/actions/special_paste.png
+share/icons/locolor/16x16/actions/sqrt.png
 share/icons/locolor/16x16/actions/strike_out.png
+share/icons/locolor/16x16/actions/sum.png
+share/icons/locolor/16x16/actions/top.png
 share/icons/locolor/16x16/actions/upper.png
 share/icons/locolor/16x16/actions/vertical_text.png
 share/icons/locolor/16x16/actions/wizard.png
@@ -645,7 +873,6 @@ share/icons/locolor/32x32/apps/kpresenter.png
 share/icons/locolor/32x32/apps/kspread.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kword.png
-share/mimelnk/application/x-graphite.desktop
 share/mimelnk/application/x-kchart.desktop
 share/mimelnk/application/x-killustrator.desktop
 share/mimelnk/application/x-kpresenter.desktop
@@ -654,8 +881,8 @@ share/mimelnk/application/x-kword.desktop
 share/mimelnk/text/x-csv.desktop
 share/services/kodocinfopropspage.desktop
 share/services/kspelltool.desktop
+share/services/kspread_csv_export.desktop
 share/services/kspread_csv_export_dia.desktop
-share/services/kspread_csv_export_test.desktop
 share/services/kspread_csv_import.desktop
 share/services/kspread_csv_import_dia.desktop
 share/services/kspreadcalc.desktop
@@ -671,7 +898,6 @@ share/servicetypes/kofilter.desktop
 share/servicetypes/kofilterdialog.desktop
 share/servicetypes/koplugin.desktop
 share/servicetypes/kotool.desktop
-@unexec for dir in kword kspread kpresenter killustrator katabase koffice; do rm -f %D/share/doc/HTML/en/${dir}/common;done
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kspread
 @dirrm share/doc/HTML/en/kpresenter
@@ -737,13 +963,11 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
 @dirrm share/apps/killustrator/templates/Simple
-@dirrm share/apps/killustrator/templates
 @dirrm share/apps/killustrator/pics
 @dirrm share/apps/killustrator
+@dirrm share/apps/kchart/pics
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
-@dirrm share/apps/graphite
-@dirrm share/applnk/Office
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 8bd9ce9f50d7..c7076856e8fb 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	20000724A
+PORTVERSION=	20000829A
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	http://www.physics.purdue.edu/~will/
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -17,7 +16,6 @@ LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
 		iconv.0:${PORTSDIR}/converters/iconv
 
-WRKSRC=		${WRKDIR}/koffice
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo
index 29689accec3b..2968f603716c 100644
--- a/editors/koffice-kde3/distinfo
+++ b/editors/koffice-kde3/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
+MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist
index b9623c9d9c0d..d9997a2b1000 100644
--- a/editors/koffice-kde3/pkg-plist
+++ b/editors/koffice-kde3/pkg-plist
@@ -1,17 +1,22 @@
-bin/graphite
 bin/kchart
 bin/killustrator
+bin/koscript
 bin/koshell
+bin/kprconverter.pl
 bin/kpresenter
-bin/kscript
 bin/kspread
 bin/kword
 include/KoApplicationIface.h
 include/KoDocumentIface.h
+include/KoViewIface.h
+include/MatrixDialog.h
+include/box.h
 include/handler.h
 include/kcoloractions.h
+include/kformula.h
+include/kformulaedit.h
+include/kformulatoolbar.h
 include/koApplication.h
-include/koBinaryStore.h
 include/koChild.h
 include/koDataTool.h
 include/koDocument.h
@@ -31,90 +36,79 @@ include/koPartSelectDia.h
 include/koQueryTrader.h
 include/koRuler.h
 include/koStore.h
-include/koStoreStream.h
+include/koStoreDevice.h
 include/koStream.h
 include/koTabChooser.h
-include/koTarStore.h
 include/koTemplateChooseDia.h
 include/koTemplateCreateDia.h
 include/koTemplates.h
 include/koView.h
-include/komlFeed.h
-include/komlFileFeed.h
-include/komlMime.h
 include/komlParser.h
-include/komlStreamFeed.h
 include/komlWriter.h
+include/matrixbox.h
 include/toolbox.h
-include/torben.h
-lib/graphite.a
-lib/graphite.la
-lib/kchart.a
 lib/kchart.la
-lib/killustrator.a
+lib/kchart.so
 lib/killustrator.la
-lib/koshell.a
+lib/killustrator.so
 lib/koshell.la
-lib/kpresenter.a
+lib/koshell.so
 lib/kpresenter.la
-lib/kspread.a
+lib/kpresenter.so
 lib/kspread.la
-lib/kword.a
+lib/kspread.so
 lib/kword.la
-lib/libasciiexport.a
+lib/kword.so
 lib/libasciiexport.la
-lib/libasciiimport.a
+lib/libasciiexport.so
 lib/libasciiimport.la
-lib/libcsvexport.a
+lib/libasciiimport.so
 lib/libcsvexport.la
-lib/libcsvexport_test.a
-lib/libcsvexport_test.la
-lib/libcsvfilter.a
-lib/libcsvfilter.la
-lib/libcsvfilterdia.a
+lib/libcsvexport.so
 lib/libcsvfilterdia.la
-lib/libgraphitepart.a
-lib/libgraphitepart.la
-lib/libhtmlexport.a
+lib/libcsvfilterdia.so
+lib/libcsvimport.la
+lib/libcsvimport.so
 lib/libhtmlexport.la
-lib/libhtmlimport.a
+lib/libhtmlexport.so
 lib/libhtmlimport.la
-lib/libkchartpart.a
+lib/libhtmlimport.so
 lib/libkchartpart.la
-lib/libkillustratorpart.a
+lib/libkchartpart.so
+lib/libkformula.la
+lib/libkformula.so.3
 lib/libkillustratorpart.la
-lib/libkodocinfopropspage.a
+lib/libkillustratorpart.so
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
 lib/libkofficecore.so.1
 lib/libkofficeui.la
 lib/libkofficeui.so.1
 lib/libkoml.la
 lib/libkoml.so.1
-lib/libkpresenterpart.a
+lib/libkoscript.la
+lib/libkoscript.so.1
 lib/libkpresenterpart.la
-lib/libkscript.la
-lib/libkscript.so.1
-lib/libkspelltool.a
+lib/libkpresenterpart.so
 lib/libkspelltool.la
-lib/libkspreadcalc.a
+lib/libkspelltool.so
 lib/libkspreadcalc.la
-lib/libkspreadpart.a
+lib/libkspreadcalc.so
 lib/libkspreadpart.la
+lib/libkspreadpart.so
 lib/libkstore.la
 lib/libkstore.so.1
-lib/libkwordpart.a
 lib/libkwordpart.la
-lib/libolefilter.a
+lib/libkwordpart.so
 lib/libolefilter.la
-share/applnk/Office/graphite.desktop
+lib/libolefilter.so
 share/applnk/Office/kchart.desktop
 share/applnk/Office/killustrator.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kword.desktop
-share/apps/graphite/graphite.rc
 share/apps/kchart/icons/locolor/22x22/actions/areas.png
 share/apps/kchart/icons/locolor/22x22/actions/bars.png
 share/apps/kchart/icons/locolor/22x22/actions/cakes.png
@@ -124,6 +118,12 @@ share/apps/kchart/icons/locolor/22x22/actions/lines.png
 share/apps/kchart/icons/locolor/22x22/actions/options.png
 share/apps/kchart/icons/locolor/22x22/actions/wizard.png
 share/apps/kchart/kchart.rc
+share/apps/kchart/pics/areasubtypebeside.png
+share/apps/kchart/pics/areasubtypedepth.png
+share/apps/kchart/pics/barsubtypebeside.png
+share/apps/kchart/pics/barsubtypedepth.png
+share/apps/kchart/pics/barsubtypelayer.png
+share/apps/kchart/pics/barsubtypepercent.png
 share/apps/killustrator/KIllustrator.rc
 share/apps/killustrator/pics/abottom.png
 share/apps/killustrator/pics/ahcenter.png
@@ -214,6 +214,8 @@ share/apps/koffice/icons/locolor/22x22/actions/part/unspecif.png
 share/apps/koffice/icons/locolor/22x22/actions/parts.png
 share/apps/koffice/icons/locolor/22x22/actions/picture.png
 share/apps/koffice/koffice_shell.rc
+share/apps/koffice/pics/koKoolBarDown.png
+share/apps/koffice/pics/koKoolBarUp.png
 share/apps/koffice/pics/koRulerFirst.png
 share/apps/koffice/pics/koRulerLeft.png
 share/apps/koffice/pics/koffice-logo.png
@@ -373,17 +375,14 @@ share/apps/kpresenter/templates/Professional/Two.desktop
 share/apps/kpresenter/templates/Screenpresentations/.directory
 share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Sand1.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
 share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Sand1.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
 share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
 share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Sand1.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
 share/apps/kspread/dtd/kspread.dtd
@@ -481,10 +480,16 @@ share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
 share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
 share/apps/kword/kword.rc
 share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/A4.png
+share/apps/kword/templates/Normal/.icon/Letter.png
 share/apps/kword/templates/Normal/.icon/PlainText.png
 share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/A4.kwt
+share/apps/kword/templates/Normal/.source/Letter.kwt
 share/apps/kword/templates/Normal/.source/PlainText.kwt
 share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/A4.desktop
+share/apps/kword/templates/Normal/Letter.desktop
 share/apps/kword/templates/Normal/PlainText.desktop
 share/apps/kword/templates/Normal/TwoColumns.desktop
 share/apps/kword/templates/Publishing/.directory
@@ -503,18 +508,42 @@ share/doc/HTML/en/doc/koffice-misc.html
 share/doc/HTML/en/doc/koffice-search-help.html
 share/doc/HTML/en/doc/koffice-search.html
 share/doc/HTML/en/doc/koffice.html
+share/doc/HTML/en/katabase/.anchors
+share/doc/HTML/en/katabase/another-section.html
+share/doc/HTML/en/katabase/compilation-and-installation.html
+share/doc/HTML/en/katabase/copyright.html
 share/doc/HTML/en/katabase/index.cvlog
 share/doc/HTML/en/katabase/index.docbook
+share/doc/HTML/en/katabase/index.html
+share/doc/HTML/en/katabase/installation.html
+share/doc/HTML/en/katabase/introduction.html
+share/doc/HTML/en/katabase/questions-and-answers.html
+share/doc/HTML/en/katabase/requirements.html
+share/doc/HTML/en/katabase/usage.html
+share/doc/HTML/en/killustrator/.anchors
+share/doc/HTML/en/killustrator/about-the-handbook.html
 share/doc/HTML/en/killustrator/align.png
 share/doc/HTML/en/killustrator/align2.png
+share/doc/HTML/en/killustrator/appendix.html
 share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
+share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/compilation-and-installation.html
+share/doc/HTML/en/killustrator/copyright.html
+share/doc/HTML/en/killustrator/drawing-2d-primitives.html
 share/doc/HTML/en/killustrator/ellipse.png
 share/doc/HTML/en/killustrator/export.png
 share/doc/HTML/en/killustrator/freehand.png
+share/doc/HTML/en/killustrator/frequently-asked-questions.html
+share/doc/HTML/en/killustrator/handling-colours.html
+share/doc/HTML/en/killustrator/history-of-killustrator.html
 share/doc/HTML/en/killustrator/index.cvlog
 share/doc/HTML/en/killustrator/index.docbook
+share/doc/HTML/en/killustrator/index.html
+share/doc/HTML/en/killustrator/installation-of-binary-packages.html
+share/doc/HTML/en/killustrator/installation.html
+share/doc/HTML/en/killustrator/introduction.html
 share/doc/HTML/en/killustrator/line.png
 share/doc/HTML/en/killustrator/logo.png
 share/doc/HTML/en/killustrator/movepoint.png
@@ -524,17 +553,170 @@ share/doc/HTML/en/killustrator/pfeil.png
 share/doc/HTML/en/killustrator/point.png
 share/doc/HTML/en/killustrator/polygon-setup.png
 share/doc/HTML/en/killustrator/polygon.png
+share/doc/HTML/en/killustrator/positioning-objects.html
 share/doc/HTML/en/killustrator/rect.png
 share/doc/HTML/en/killustrator/rmpoint.png
 share/doc/HTML/en/killustrator/save_dialog.png
 share/doc/HTML/en/killustrator/schichten.png
+share/doc/HTML/en/killustrator/system-requirements.html
 share/doc/HTML/en/killustrator/text.png
+share/doc/HTML/en/killustrator/the-layer-concept.html
+share/doc/HTML/en/killustrator/to-do.html
+share/doc/HTML/en/killustrator/transformation-of-2d-primitives.html
+share/doc/HTML/en/killustrator/undo--redo.html
+share/doc/HTML/en/killustrator/usage.html
 share/doc/HTML/en/killustrator/verteilen.png
+share/doc/HTML/en/killustrator/working-with-files.html
+share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
+share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/compilingproblems.html
+share/doc/HTML/en/koffice/customgui.html
+share/doc/HTML/en/koffice/customization.html
+share/doc/HTML/en/koffice/faq.html
+share/doc/HTML/en/koffice/firststeps.html
+share/doc/HTML/en/koffice/frombinaries.html
+share/doc/HTML/en/koffice/fromsource.html
+share/doc/HTML/en/koffice/gettingbinaries.html
+share/doc/HTML/en/koffice/gettingsource.html
+share/doc/HTML/en/koffice/glossary.html
 share/doc/HTML/en/koffice/index.docbook
+share/doc/HTML/en/koffice/index.html
+share/doc/HTML/en/koffice/installation.html
+share/doc/HTML/en/koffice/introduction.html
+share/doc/HTML/en/koffice/kparts.html
+share/doc/HTML/en/koffice/kpartstryit.html
+share/doc/HTML/en/koffice/legal.html
+share/doc/HTML/en/koffice/links.html
+share/doc/HTML/en/koffice/moreinfo.html
+share/doc/HTML/en/koffice/programmersinfo.html
+share/doc/HTML/en/koffice/todo.html
+share/doc/HTML/en/koffice/whoreads.html
+share/doc/HTML/en/kpresenter/.anchors
+share/doc/HTML/en/kpresenter/addshadow.html
+share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/credits.html
+share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
+share/doc/HTML/en/kpresenter/index.html
+share/doc/HTML/en/kpresenter/insertpage.html
+share/doc/HTML/en/kpresenter/insertpic.html
+share/doc/HTML/en/kpresenter/introduction.html
+share/doc/HTML/en/kpresenter/menuitems.html
+share/doc/HTML/en/kpresenter/options.html
+share/doc/HTML/en/kpresenter/qanda.html
+share/doc/HTML/en/kpresenter/screendesc.html
+share/doc/HTML/en/kpresenter/textcolor.html
+share/doc/HTML/en/kpresenter/todo.html
+share/doc/HTML/en/kpresenter/tutorial.html
+share/doc/HTML/en/kspread/.anchors
+share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/compilingproblems.html
+share/doc/HTML/en/kspread/credits.html
+share/doc/HTML/en/kspread/dragdrop.html
+share/doc/HTML/en/kspread/frombinaries.html
+share/doc/HTML/en/kspread/fromsource.html
+share/doc/HTML/en/kspread/fundamental.html
+share/doc/HTML/en/kspread/gettingbinaries.html
+share/doc/HTML/en/kspread/gettingsource.html
+share/doc/HTML/en/kspread/guides.html
+share/doc/HTML/en/kspread/guides2.html
+share/doc/HTML/en/kspread/guides3.html
+share/doc/HTML/en/kspread/guides4.html
 share/doc/HTML/en/kspread/index.docbook
+share/doc/HTML/en/kspread/index.html
+share/doc/HTML/en/kspread/installation.html
+share/doc/HTML/en/kspread/introduction.html
+share/doc/HTML/en/kspread/keys.html
+share/doc/HTML/en/kspread/kspreadscreen.html
+share/doc/HTML/en/kspread/loading.html
+share/doc/HTML/en/kspread/menuitems.html
+share/doc/HTML/en/kspread/options.html
+share/doc/HTML/en/kspread/printing.html
+share/doc/HTML/en/kspread/qanda.html
+share/doc/HTML/en/kspread/saving.html
+share/doc/HTML/en/kspread/themes.html
+share/doc/HTML/en/kspread/todo.html
+share/doc/HTML/en/kspread/tutorial.html
+share/doc/HTML/en/kspread/updates.html
+share/doc/HTML/en/kspread/whoreads.html
+share/doc/HTML/en/kword/.anchors
+share/doc/HTML/en/kword/addframe.html
+share/doc/HTML/en/kword/appendix.html
+share/doc/HTML/en/kword/autocorrect.html
+share/doc/HTML/en/kword/basicedittoolbar.html
+share/doc/HTML/en/kword/basicmenubar.html
+share/doc/HTML/en/kword/charformattoolbar.html
+share/doc/HTML/en/kword/clipboard.html
+share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/conventions.html
+share/doc/HTML/en/kword/credits.html
+share/doc/HTML/en/kword/datetime.html
+share/doc/HTML/en/kword/delframe.html
+share/doc/HTML/en/kword/dragdrop.html
+share/doc/HTML/en/kword/endfoot.html
+share/doc/HTML/en/kword/filedlg.html
+share/doc/HTML/en/kword/filetoolbar.html
+share/doc/HTML/en/kword/filters.html
+share/doc/HTML/en/kword/formatchar.html
+share/doc/HTML/en/kword/formatframe.html
+share/doc/HTML/en/kword/formatpara.html
+share/doc/HTML/en/kword/formulas.html
+share/doc/HTML/en/kword/framecreatetoolbar.html
+share/doc/HTML/en/kword/frames.html
+share/doc/HTML/en/kword/frameselect.html
+share/doc/HTML/en/kword/fundimental.html
+share/doc/HTML/en/kword/glossery.html
+share/doc/HTML/en/kword/graphics.html
+share/doc/HTML/en/kword/guides.html
+share/doc/HTML/en/kword/guides2.html
+share/doc/HTML/en/kword/guides3.html
+share/doc/HTML/en/kword/guides4.html
+share/doc/HTML/en/kword/headfoot.html
 share/doc/HTML/en/kword/index.docbook
+share/doc/HTML/en/kword/index.html
+share/doc/HTML/en/kword/inserttoolbar.html
+share/doc/HTML/en/kword/inskspread.html
+share/doc/HTML/en/kword/introduction.html
+share/doc/HTML/en/kword/keys.html
+share/doc/HTML/en/kword/kwordrc.html
+share/doc/HTML/en/kword/kwordscreen.html
+share/doc/HTML/en/kword/loading.html
+share/doc/HTML/en/kword/menuitems.html
+share/doc/HTML/en/kword/moveframe.html
+share/doc/HTML/en/kword/options.html
+share/doc/HTML/en/kword/pgnumber.html
+share/doc/HTML/en/kword/predefinedstyles.html
+share/doc/HTML/en/kword/printing.html
+share/doc/HTML/en/kword/qanda.html
+share/doc/HTML/en/kword/qd2.html
+share/doc/HTML/en/kword/qd3.html
+share/doc/HTML/en/kword/qd4.html
+share/doc/HTML/en/kword/qd5.html
+share/doc/HTML/en/kword/quickdirty.html
+share/doc/HTML/en/kword/resizeframe.html
+share/doc/HTML/en/kword/rulers.html
+share/doc/HTML/en/kword/saving.html
+share/doc/HTML/en/kword/searchreplace.html
+share/doc/HTML/en/kword/selcolor.html
+share/doc/HTML/en/kword/spellcheck.html
+share/doc/HTML/en/kword/styles.html
+share/doc/HTML/en/kword/tableedittoolbar.html
+share/doc/HTML/en/kword/tables.html
+share/doc/HTML/en/kword/tabstops.html
+share/doc/HTML/en/kword/tempcr.html
+share/doc/HTML/en/kword/templateintro.html
+share/doc/HTML/en/kword/textandframe.html
+share/doc/HTML/en/kword/themes.html
+share/doc/HTML/en/kword/toc.html
+share/doc/HTML/en/kword/todo.html
+share/doc/HTML/en/kword/toolbars.html
+share/doc/HTML/en/kword/tutorial.html
+share/doc/HTML/en/kword/undoredo.html
+share/doc/HTML/en/kword/updates.html
+share/doc/HTML/en/kword/whoreads.html
+share/doc/HTML/en/kword/wpvsdtp.html
+share/icons/hicolor/22x22/actions/abs.png
 share/icons/hicolor/22x22/actions/border_all.png
 share/icons/hicolor/22x22/actions/border_bottom.png
 share/icons/hicolor/22x22/actions/border_fall.png
@@ -547,10 +729,24 @@ share/icons/hicolor/22x22/actions/border_right.png
 share/icons/hicolor/22x22/actions/border_top.png
 share/icons/hicolor/22x22/actions/border_up.png
 share/icons/hicolor/22x22/actions/border_vertical.png
+share/icons/hicolor/22x22/actions/brace.png
+share/icons/hicolor/22x22/actions/brackets.png
+share/icons/hicolor/22x22/actions/frac.png
 share/icons/hicolor/22x22/actions/funct.png
+share/icons/hicolor/22x22/actions/int.png
+share/icons/hicolor/22x22/actions/lsub.png
+share/icons/hicolor/22x22/actions/lsup.png
+share/icons/hicolor/22x22/actions/matrix.png
+share/icons/hicolor/22x22/actions/paren.png
 share/icons/hicolor/22x22/actions/percent.png
 share/icons/hicolor/22x22/actions/prec_minus.png
 share/icons/hicolor/22x22/actions/prec_plus.png
+share/icons/hicolor/22x22/actions/prod.png
+share/icons/hicolor/22x22/actions/rsub.png
+share/icons/hicolor/22x22/actions/rsup.png
+share/icons/hicolor/22x22/actions/sqrt.png
+share/icons/hicolor/22x22/actions/sum.png
+share/icons/hicolor/32x32/actions/abs.png
 share/icons/hicolor/32x32/actions/border_all.png
 share/icons/hicolor/32x32/actions/border_bottom.png
 share/icons/hicolor/32x32/actions/border_fall.png
@@ -563,10 +759,23 @@ share/icons/hicolor/32x32/actions/border_right.png
 share/icons/hicolor/32x32/actions/border_top.png
 share/icons/hicolor/32x32/actions/border_up.png
 share/icons/hicolor/32x32/actions/border_vertical.png
+share/icons/hicolor/32x32/actions/brace.png
+share/icons/hicolor/32x32/actions/brackets.png
+share/icons/hicolor/32x32/actions/frac.png
 share/icons/hicolor/32x32/actions/funct.png
+share/icons/hicolor/32x32/actions/int.png
+share/icons/hicolor/32x32/actions/lsub.png
+share/icons/hicolor/32x32/actions/lsup.png
+share/icons/hicolor/32x32/actions/matrix.png
+share/icons/hicolor/32x32/actions/paren.png
 share/icons/hicolor/32x32/actions/percent.png
 share/icons/hicolor/32x32/actions/prec_minus.png
 share/icons/hicolor/32x32/actions/prec_plus.png
+share/icons/hicolor/32x32/actions/prod.png
+share/icons/hicolor/32x32/actions/rsub.png
+share/icons/hicolor/32x32/actions/rsup.png
+share/icons/hicolor/32x32/actions/sqrt.png
+share/icons/hicolor/32x32/actions/sum.png
 share/icons/hicolor/32x32/apps/kchart.png
 share/icons/hicolor/32x32/apps/killustrator.png
 share/icons/hicolor/32x32/apps/kpresenter.png
@@ -577,6 +786,7 @@ share/icons/hicolor/48x48/apps/killustrator.png
 share/icons/hicolor/48x48/apps/kpresenter.png
 share/icons/hicolor/48x48/apps/kspread.png
 share/icons/hicolor/48x48/apps/kword.png
+share/icons/locolor/16x16/actions/abs.png
 share/icons/locolor/16x16/actions/adjustcol.png
 share/icons/locolor/16x16/actions/adjustrow.png
 share/icons/locolor/16x16/actions/areas.png
@@ -594,6 +804,9 @@ share/icons/locolor/16x16/actions/border_right.png
 share/icons/locolor/16x16/actions/border_top.png
 share/icons/locolor/16x16/actions/border_up.png
 share/icons/locolor/16x16/actions/border_vertical.png
+share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/brace.png
+share/icons/locolor/16x16/actions/brackets.png
 share/icons/locolor/16x16/actions/cakes.png
 share/icons/locolor/16x16/actions/cell_edit.png
 share/icons/locolor/16x16/actions/cell_layout.png
@@ -603,32 +816,47 @@ share/icons/locolor/16x16/actions/comment.png
 share/icons/locolor/16x16/actions/data.png
 share/icons/locolor/16x16/actions/delete_table.png
 share/icons/locolor/16x16/actions/deletecell.png
+share/icons/locolor/16x16/actions/dissociatecell.png
 share/icons/locolor/16x16/actions/first_letter_upper.png
 share/icons/locolor/16x16/actions/fontsizedown.png
 share/icons/locolor/16x16/actions/fontsizeup.png
+share/icons/locolor/16x16/actions/frac.png
 share/icons/locolor/16x16/actions/funct.png
 share/icons/locolor/16x16/actions/insertcell.png
 share/icons/locolor/16x16/actions/inserttable.png
+share/icons/locolor/16x16/actions/int.png
 share/icons/locolor/16x16/actions/left.png
 share/icons/locolor/16x16/actions/lines.png
 share/icons/locolor/16x16/actions/lower.png
+share/icons/locolor/16x16/actions/lsub.png
+share/icons/locolor/16x16/actions/lsup.png
+share/icons/locolor/16x16/actions/matrix.png
+share/icons/locolor/16x16/actions/mergecell.png
 share/icons/locolor/16x16/actions/middle.png
 share/icons/locolor/16x16/actions/money.png
 share/icons/locolor/16x16/actions/multirow.png
 share/icons/locolor/16x16/actions/oscilloscope.png
+share/icons/locolor/16x16/actions/paren.png
 share/icons/locolor/16x16/actions/percent.png
 share/icons/locolor/16x16/actions/precminus.png
 share/icons/locolor/16x16/actions/precplus.png
+share/icons/locolor/16x16/actions/prod.png
 share/icons/locolor/16x16/actions/removecell.png
 share/icons/locolor/16x16/actions/removecomment.png
 share/icons/locolor/16x16/actions/resizecol.png
 share/icons/locolor/16x16/actions/resizerow.png
 share/icons/locolor/16x16/actions/right.png
+share/icons/locolor/16x16/actions/rotate.png
+share/icons/locolor/16x16/actions/rsub.png
+share/icons/locolor/16x16/actions/rsup.png
 share/icons/locolor/16x16/actions/series.png
 share/icons/locolor/16x16/actions/sort_decrease.png
 share/icons/locolor/16x16/actions/sort_incr.png
 share/icons/locolor/16x16/actions/special_paste.png
+share/icons/locolor/16x16/actions/sqrt.png
 share/icons/locolor/16x16/actions/strike_out.png
+share/icons/locolor/16x16/actions/sum.png
+share/icons/locolor/16x16/actions/top.png
 share/icons/locolor/16x16/actions/upper.png
 share/icons/locolor/16x16/actions/vertical_text.png
 share/icons/locolor/16x16/actions/wizard.png
@@ -645,7 +873,6 @@ share/icons/locolor/32x32/apps/kpresenter.png
 share/icons/locolor/32x32/apps/kspread.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kword.png
-share/mimelnk/application/x-graphite.desktop
 share/mimelnk/application/x-kchart.desktop
 share/mimelnk/application/x-killustrator.desktop
 share/mimelnk/application/x-kpresenter.desktop
@@ -654,8 +881,8 @@ share/mimelnk/application/x-kword.desktop
 share/mimelnk/text/x-csv.desktop
 share/services/kodocinfopropspage.desktop
 share/services/kspelltool.desktop
+share/services/kspread_csv_export.desktop
 share/services/kspread_csv_export_dia.desktop
-share/services/kspread_csv_export_test.desktop
 share/services/kspread_csv_import.desktop
 share/services/kspread_csv_import_dia.desktop
 share/services/kspreadcalc.desktop
@@ -671,7 +898,6 @@ share/servicetypes/kofilter.desktop
 share/servicetypes/kofilterdialog.desktop
 share/servicetypes/koplugin.desktop
 share/servicetypes/kotool.desktop
-@unexec for dir in kword kspread kpresenter killustrator katabase koffice; do rm -f %D/share/doc/HTML/en/${dir}/common;done
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kspread
 @dirrm share/doc/HTML/en/kpresenter
@@ -737,13 +963,11 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
 @dirrm share/apps/killustrator/templates/Simple
-@dirrm share/apps/killustrator/templates
 @dirrm share/apps/killustrator/pics
 @dirrm share/apps/killustrator
+@dirrm share/apps/kchart/pics
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
-@dirrm share/apps/graphite
-@dirrm share/applnk/Office
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 8bd9ce9f50d7..c7076856e8fb 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	20000724A
+PORTVERSION=	20000829A
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	http://www.physics.purdue.edu/~will/
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -17,7 +16,6 @@ LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
 		iconv.0:${PORTSDIR}/converters/iconv
 
-WRKSRC=		${WRKDIR}/koffice
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 29689accec3b..2968f603716c 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
+MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index b9623c9d9c0d..d9997a2b1000 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1,17 +1,22 @@
-bin/graphite
 bin/kchart
 bin/killustrator
+bin/koscript
 bin/koshell
+bin/kprconverter.pl
 bin/kpresenter
-bin/kscript
 bin/kspread
 bin/kword
 include/KoApplicationIface.h
 include/KoDocumentIface.h
+include/KoViewIface.h
+include/MatrixDialog.h
+include/box.h
 include/handler.h
 include/kcoloractions.h
+include/kformula.h
+include/kformulaedit.h
+include/kformulatoolbar.h
 include/koApplication.h
-include/koBinaryStore.h
 include/koChild.h
 include/koDataTool.h
 include/koDocument.h
@@ -31,90 +36,79 @@ include/koPartSelectDia.h
 include/koQueryTrader.h
 include/koRuler.h
 include/koStore.h
-include/koStoreStream.h
+include/koStoreDevice.h
 include/koStream.h
 include/koTabChooser.h
-include/koTarStore.h
 include/koTemplateChooseDia.h
 include/koTemplateCreateDia.h
 include/koTemplates.h
 include/koView.h
-include/komlFeed.h
-include/komlFileFeed.h
-include/komlMime.h
 include/komlParser.h
-include/komlStreamFeed.h
 include/komlWriter.h
+include/matrixbox.h
 include/toolbox.h
-include/torben.h
-lib/graphite.a
-lib/graphite.la
-lib/kchart.a
 lib/kchart.la
-lib/killustrator.a
+lib/kchart.so
 lib/killustrator.la
-lib/koshell.a
+lib/killustrator.so
 lib/koshell.la
-lib/kpresenter.a
+lib/koshell.so
 lib/kpresenter.la
-lib/kspread.a
+lib/kpresenter.so
 lib/kspread.la
-lib/kword.a
+lib/kspread.so
 lib/kword.la
-lib/libasciiexport.a
+lib/kword.so
 lib/libasciiexport.la
-lib/libasciiimport.a
+lib/libasciiexport.so
 lib/libasciiimport.la
-lib/libcsvexport.a
+lib/libasciiimport.so
 lib/libcsvexport.la
-lib/libcsvexport_test.a
-lib/libcsvexport_test.la
-lib/libcsvfilter.a
-lib/libcsvfilter.la
-lib/libcsvfilterdia.a
+lib/libcsvexport.so
 lib/libcsvfilterdia.la
-lib/libgraphitepart.a
-lib/libgraphitepart.la
-lib/libhtmlexport.a
+lib/libcsvfilterdia.so
+lib/libcsvimport.la
+lib/libcsvimport.so
 lib/libhtmlexport.la
-lib/libhtmlimport.a
+lib/libhtmlexport.so
 lib/libhtmlimport.la
-lib/libkchartpart.a
+lib/libhtmlimport.so
 lib/libkchartpart.la
-lib/libkillustratorpart.a
+lib/libkchartpart.so
+lib/libkformula.la
+lib/libkformula.so.3
 lib/libkillustratorpart.la
-lib/libkodocinfopropspage.a
+lib/libkillustratorpart.so
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
 lib/libkofficecore.so.1
 lib/libkofficeui.la
 lib/libkofficeui.so.1
 lib/libkoml.la
 lib/libkoml.so.1
-lib/libkpresenterpart.a
+lib/libkoscript.la
+lib/libkoscript.so.1
 lib/libkpresenterpart.la
-lib/libkscript.la
-lib/libkscript.so.1
-lib/libkspelltool.a
+lib/libkpresenterpart.so
 lib/libkspelltool.la
-lib/libkspreadcalc.a
+lib/libkspelltool.so
 lib/libkspreadcalc.la
-lib/libkspreadpart.a
+lib/libkspreadcalc.so
 lib/libkspreadpart.la
+lib/libkspreadpart.so
 lib/libkstore.la
 lib/libkstore.so.1
-lib/libkwordpart.a
 lib/libkwordpart.la
-lib/libolefilter.a
+lib/libkwordpart.so
 lib/libolefilter.la
-share/applnk/Office/graphite.desktop
+lib/libolefilter.so
 share/applnk/Office/kchart.desktop
 share/applnk/Office/killustrator.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kword.desktop
-share/apps/graphite/graphite.rc
 share/apps/kchart/icons/locolor/22x22/actions/areas.png
 share/apps/kchart/icons/locolor/22x22/actions/bars.png
 share/apps/kchart/icons/locolor/22x22/actions/cakes.png
@@ -124,6 +118,12 @@ share/apps/kchart/icons/locolor/22x22/actions/lines.png
 share/apps/kchart/icons/locolor/22x22/actions/options.png
 share/apps/kchart/icons/locolor/22x22/actions/wizard.png
 share/apps/kchart/kchart.rc
+share/apps/kchart/pics/areasubtypebeside.png
+share/apps/kchart/pics/areasubtypedepth.png
+share/apps/kchart/pics/barsubtypebeside.png
+share/apps/kchart/pics/barsubtypedepth.png
+share/apps/kchart/pics/barsubtypelayer.png
+share/apps/kchart/pics/barsubtypepercent.png
 share/apps/killustrator/KIllustrator.rc
 share/apps/killustrator/pics/abottom.png
 share/apps/killustrator/pics/ahcenter.png
@@ -214,6 +214,8 @@ share/apps/koffice/icons/locolor/22x22/actions/part/unspecif.png
 share/apps/koffice/icons/locolor/22x22/actions/parts.png
 share/apps/koffice/icons/locolor/22x22/actions/picture.png
 share/apps/koffice/koffice_shell.rc
+share/apps/koffice/pics/koKoolBarDown.png
+share/apps/koffice/pics/koKoolBarUp.png
 share/apps/koffice/pics/koRulerFirst.png
 share/apps/koffice/pics/koRulerLeft.png
 share/apps/koffice/pics/koffice-logo.png
@@ -373,17 +375,14 @@ share/apps/kpresenter/templates/Professional/Two.desktop
 share/apps/kpresenter/templates/Screenpresentations/.directory
 share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Sand1.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
 share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Sand1.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
 share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
 share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Sand1.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
 share/apps/kspread/dtd/kspread.dtd
@@ -481,10 +480,16 @@ share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
 share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
 share/apps/kword/kword.rc
 share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/A4.png
+share/apps/kword/templates/Normal/.icon/Letter.png
 share/apps/kword/templates/Normal/.icon/PlainText.png
 share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/A4.kwt
+share/apps/kword/templates/Normal/.source/Letter.kwt
 share/apps/kword/templates/Normal/.source/PlainText.kwt
 share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/A4.desktop
+share/apps/kword/templates/Normal/Letter.desktop
 share/apps/kword/templates/Normal/PlainText.desktop
 share/apps/kword/templates/Normal/TwoColumns.desktop
 share/apps/kword/templates/Publishing/.directory
@@ -503,18 +508,42 @@ share/doc/HTML/en/doc/koffice-misc.html
 share/doc/HTML/en/doc/koffice-search-help.html
 share/doc/HTML/en/doc/koffice-search.html
 share/doc/HTML/en/doc/koffice.html
+share/doc/HTML/en/katabase/.anchors
+share/doc/HTML/en/katabase/another-section.html
+share/doc/HTML/en/katabase/compilation-and-installation.html
+share/doc/HTML/en/katabase/copyright.html
 share/doc/HTML/en/katabase/index.cvlog
 share/doc/HTML/en/katabase/index.docbook
+share/doc/HTML/en/katabase/index.html
+share/doc/HTML/en/katabase/installation.html
+share/doc/HTML/en/katabase/introduction.html
+share/doc/HTML/en/katabase/questions-and-answers.html
+share/doc/HTML/en/katabase/requirements.html
+share/doc/HTML/en/katabase/usage.html
+share/doc/HTML/en/killustrator/.anchors
+share/doc/HTML/en/killustrator/about-the-handbook.html
 share/doc/HTML/en/killustrator/align.png
 share/doc/HTML/en/killustrator/align2.png
+share/doc/HTML/en/killustrator/appendix.html
 share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
+share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/compilation-and-installation.html
+share/doc/HTML/en/killustrator/copyright.html
+share/doc/HTML/en/killustrator/drawing-2d-primitives.html
 share/doc/HTML/en/killustrator/ellipse.png
 share/doc/HTML/en/killustrator/export.png
 share/doc/HTML/en/killustrator/freehand.png
+share/doc/HTML/en/killustrator/frequently-asked-questions.html
+share/doc/HTML/en/killustrator/handling-colours.html
+share/doc/HTML/en/killustrator/history-of-killustrator.html
 share/doc/HTML/en/killustrator/index.cvlog
 share/doc/HTML/en/killustrator/index.docbook
+share/doc/HTML/en/killustrator/index.html
+share/doc/HTML/en/killustrator/installation-of-binary-packages.html
+share/doc/HTML/en/killustrator/installation.html
+share/doc/HTML/en/killustrator/introduction.html
 share/doc/HTML/en/killustrator/line.png
 share/doc/HTML/en/killustrator/logo.png
 share/doc/HTML/en/killustrator/movepoint.png
@@ -524,17 +553,170 @@ share/doc/HTML/en/killustrator/pfeil.png
 share/doc/HTML/en/killustrator/point.png
 share/doc/HTML/en/killustrator/polygon-setup.png
 share/doc/HTML/en/killustrator/polygon.png
+share/doc/HTML/en/killustrator/positioning-objects.html
 share/doc/HTML/en/killustrator/rect.png
 share/doc/HTML/en/killustrator/rmpoint.png
 share/doc/HTML/en/killustrator/save_dialog.png
 share/doc/HTML/en/killustrator/schichten.png
+share/doc/HTML/en/killustrator/system-requirements.html
 share/doc/HTML/en/killustrator/text.png
+share/doc/HTML/en/killustrator/the-layer-concept.html
+share/doc/HTML/en/killustrator/to-do.html
+share/doc/HTML/en/killustrator/transformation-of-2d-primitives.html
+share/doc/HTML/en/killustrator/undo--redo.html
+share/doc/HTML/en/killustrator/usage.html
 share/doc/HTML/en/killustrator/verteilen.png
+share/doc/HTML/en/killustrator/working-with-files.html
+share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
+share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/compilingproblems.html
+share/doc/HTML/en/koffice/customgui.html
+share/doc/HTML/en/koffice/customization.html
+share/doc/HTML/en/koffice/faq.html
+share/doc/HTML/en/koffice/firststeps.html
+share/doc/HTML/en/koffice/frombinaries.html
+share/doc/HTML/en/koffice/fromsource.html
+share/doc/HTML/en/koffice/gettingbinaries.html
+share/doc/HTML/en/koffice/gettingsource.html
+share/doc/HTML/en/koffice/glossary.html
 share/doc/HTML/en/koffice/index.docbook
+share/doc/HTML/en/koffice/index.html
+share/doc/HTML/en/koffice/installation.html
+share/doc/HTML/en/koffice/introduction.html
+share/doc/HTML/en/koffice/kparts.html
+share/doc/HTML/en/koffice/kpartstryit.html
+share/doc/HTML/en/koffice/legal.html
+share/doc/HTML/en/koffice/links.html
+share/doc/HTML/en/koffice/moreinfo.html
+share/doc/HTML/en/koffice/programmersinfo.html
+share/doc/HTML/en/koffice/todo.html
+share/doc/HTML/en/koffice/whoreads.html
+share/doc/HTML/en/kpresenter/.anchors
+share/doc/HTML/en/kpresenter/addshadow.html
+share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/credits.html
+share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
+share/doc/HTML/en/kpresenter/index.html
+share/doc/HTML/en/kpresenter/insertpage.html
+share/doc/HTML/en/kpresenter/insertpic.html
+share/doc/HTML/en/kpresenter/introduction.html
+share/doc/HTML/en/kpresenter/menuitems.html
+share/doc/HTML/en/kpresenter/options.html
+share/doc/HTML/en/kpresenter/qanda.html
+share/doc/HTML/en/kpresenter/screendesc.html
+share/doc/HTML/en/kpresenter/textcolor.html
+share/doc/HTML/en/kpresenter/todo.html
+share/doc/HTML/en/kpresenter/tutorial.html
+share/doc/HTML/en/kspread/.anchors
+share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/compilingproblems.html
+share/doc/HTML/en/kspread/credits.html
+share/doc/HTML/en/kspread/dragdrop.html
+share/doc/HTML/en/kspread/frombinaries.html
+share/doc/HTML/en/kspread/fromsource.html
+share/doc/HTML/en/kspread/fundamental.html
+share/doc/HTML/en/kspread/gettingbinaries.html
+share/doc/HTML/en/kspread/gettingsource.html
+share/doc/HTML/en/kspread/guides.html
+share/doc/HTML/en/kspread/guides2.html
+share/doc/HTML/en/kspread/guides3.html
+share/doc/HTML/en/kspread/guides4.html
 share/doc/HTML/en/kspread/index.docbook
+share/doc/HTML/en/kspread/index.html
+share/doc/HTML/en/kspread/installation.html
+share/doc/HTML/en/kspread/introduction.html
+share/doc/HTML/en/kspread/keys.html
+share/doc/HTML/en/kspread/kspreadscreen.html
+share/doc/HTML/en/kspread/loading.html
+share/doc/HTML/en/kspread/menuitems.html
+share/doc/HTML/en/kspread/options.html
+share/doc/HTML/en/kspread/printing.html
+share/doc/HTML/en/kspread/qanda.html
+share/doc/HTML/en/kspread/saving.html
+share/doc/HTML/en/kspread/themes.html
+share/doc/HTML/en/kspread/todo.html
+share/doc/HTML/en/kspread/tutorial.html
+share/doc/HTML/en/kspread/updates.html
+share/doc/HTML/en/kspread/whoreads.html
+share/doc/HTML/en/kword/.anchors
+share/doc/HTML/en/kword/addframe.html
+share/doc/HTML/en/kword/appendix.html
+share/doc/HTML/en/kword/autocorrect.html
+share/doc/HTML/en/kword/basicedittoolbar.html
+share/doc/HTML/en/kword/basicmenubar.html
+share/doc/HTML/en/kword/charformattoolbar.html
+share/doc/HTML/en/kword/clipboard.html
+share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/conventions.html
+share/doc/HTML/en/kword/credits.html
+share/doc/HTML/en/kword/datetime.html
+share/doc/HTML/en/kword/delframe.html
+share/doc/HTML/en/kword/dragdrop.html
+share/doc/HTML/en/kword/endfoot.html
+share/doc/HTML/en/kword/filedlg.html
+share/doc/HTML/en/kword/filetoolbar.html
+share/doc/HTML/en/kword/filters.html
+share/doc/HTML/en/kword/formatchar.html
+share/doc/HTML/en/kword/formatframe.html
+share/doc/HTML/en/kword/formatpara.html
+share/doc/HTML/en/kword/formulas.html
+share/doc/HTML/en/kword/framecreatetoolbar.html
+share/doc/HTML/en/kword/frames.html
+share/doc/HTML/en/kword/frameselect.html
+share/doc/HTML/en/kword/fundimental.html
+share/doc/HTML/en/kword/glossery.html
+share/doc/HTML/en/kword/graphics.html
+share/doc/HTML/en/kword/guides.html
+share/doc/HTML/en/kword/guides2.html
+share/doc/HTML/en/kword/guides3.html
+share/doc/HTML/en/kword/guides4.html
+share/doc/HTML/en/kword/headfoot.html
 share/doc/HTML/en/kword/index.docbook
+share/doc/HTML/en/kword/index.html
+share/doc/HTML/en/kword/inserttoolbar.html
+share/doc/HTML/en/kword/inskspread.html
+share/doc/HTML/en/kword/introduction.html
+share/doc/HTML/en/kword/keys.html
+share/doc/HTML/en/kword/kwordrc.html
+share/doc/HTML/en/kword/kwordscreen.html
+share/doc/HTML/en/kword/loading.html
+share/doc/HTML/en/kword/menuitems.html
+share/doc/HTML/en/kword/moveframe.html
+share/doc/HTML/en/kword/options.html
+share/doc/HTML/en/kword/pgnumber.html
+share/doc/HTML/en/kword/predefinedstyles.html
+share/doc/HTML/en/kword/printing.html
+share/doc/HTML/en/kword/qanda.html
+share/doc/HTML/en/kword/qd2.html
+share/doc/HTML/en/kword/qd3.html
+share/doc/HTML/en/kword/qd4.html
+share/doc/HTML/en/kword/qd5.html
+share/doc/HTML/en/kword/quickdirty.html
+share/doc/HTML/en/kword/resizeframe.html
+share/doc/HTML/en/kword/rulers.html
+share/doc/HTML/en/kword/saving.html
+share/doc/HTML/en/kword/searchreplace.html
+share/doc/HTML/en/kword/selcolor.html
+share/doc/HTML/en/kword/spellcheck.html
+share/doc/HTML/en/kword/styles.html
+share/doc/HTML/en/kword/tableedittoolbar.html
+share/doc/HTML/en/kword/tables.html
+share/doc/HTML/en/kword/tabstops.html
+share/doc/HTML/en/kword/tempcr.html
+share/doc/HTML/en/kword/templateintro.html
+share/doc/HTML/en/kword/textandframe.html
+share/doc/HTML/en/kword/themes.html
+share/doc/HTML/en/kword/toc.html
+share/doc/HTML/en/kword/todo.html
+share/doc/HTML/en/kword/toolbars.html
+share/doc/HTML/en/kword/tutorial.html
+share/doc/HTML/en/kword/undoredo.html
+share/doc/HTML/en/kword/updates.html
+share/doc/HTML/en/kword/whoreads.html
+share/doc/HTML/en/kword/wpvsdtp.html
+share/icons/hicolor/22x22/actions/abs.png
 share/icons/hicolor/22x22/actions/border_all.png
 share/icons/hicolor/22x22/actions/border_bottom.png
 share/icons/hicolor/22x22/actions/border_fall.png
@@ -547,10 +729,24 @@ share/icons/hicolor/22x22/actions/border_right.png
 share/icons/hicolor/22x22/actions/border_top.png
 share/icons/hicolor/22x22/actions/border_up.png
 share/icons/hicolor/22x22/actions/border_vertical.png
+share/icons/hicolor/22x22/actions/brace.png
+share/icons/hicolor/22x22/actions/brackets.png
+share/icons/hicolor/22x22/actions/frac.png
 share/icons/hicolor/22x22/actions/funct.png
+share/icons/hicolor/22x22/actions/int.png
+share/icons/hicolor/22x22/actions/lsub.png
+share/icons/hicolor/22x22/actions/lsup.png
+share/icons/hicolor/22x22/actions/matrix.png
+share/icons/hicolor/22x22/actions/paren.png
 share/icons/hicolor/22x22/actions/percent.png
 share/icons/hicolor/22x22/actions/prec_minus.png
 share/icons/hicolor/22x22/actions/prec_plus.png
+share/icons/hicolor/22x22/actions/prod.png
+share/icons/hicolor/22x22/actions/rsub.png
+share/icons/hicolor/22x22/actions/rsup.png
+share/icons/hicolor/22x22/actions/sqrt.png
+share/icons/hicolor/22x22/actions/sum.png
+share/icons/hicolor/32x32/actions/abs.png
 share/icons/hicolor/32x32/actions/border_all.png
 share/icons/hicolor/32x32/actions/border_bottom.png
 share/icons/hicolor/32x32/actions/border_fall.png
@@ -563,10 +759,23 @@ share/icons/hicolor/32x32/actions/border_right.png
 share/icons/hicolor/32x32/actions/border_top.png
 share/icons/hicolor/32x32/actions/border_up.png
 share/icons/hicolor/32x32/actions/border_vertical.png
+share/icons/hicolor/32x32/actions/brace.png
+share/icons/hicolor/32x32/actions/brackets.png
+share/icons/hicolor/32x32/actions/frac.png
 share/icons/hicolor/32x32/actions/funct.png
+share/icons/hicolor/32x32/actions/int.png
+share/icons/hicolor/32x32/actions/lsub.png
+share/icons/hicolor/32x32/actions/lsup.png
+share/icons/hicolor/32x32/actions/matrix.png
+share/icons/hicolor/32x32/actions/paren.png
 share/icons/hicolor/32x32/actions/percent.png
 share/icons/hicolor/32x32/actions/prec_minus.png
 share/icons/hicolor/32x32/actions/prec_plus.png
+share/icons/hicolor/32x32/actions/prod.png
+share/icons/hicolor/32x32/actions/rsub.png
+share/icons/hicolor/32x32/actions/rsup.png
+share/icons/hicolor/32x32/actions/sqrt.png
+share/icons/hicolor/32x32/actions/sum.png
 share/icons/hicolor/32x32/apps/kchart.png
 share/icons/hicolor/32x32/apps/killustrator.png
 share/icons/hicolor/32x32/apps/kpresenter.png
@@ -577,6 +786,7 @@ share/icons/hicolor/48x48/apps/killustrator.png
 share/icons/hicolor/48x48/apps/kpresenter.png
 share/icons/hicolor/48x48/apps/kspread.png
 share/icons/hicolor/48x48/apps/kword.png
+share/icons/locolor/16x16/actions/abs.png
 share/icons/locolor/16x16/actions/adjustcol.png
 share/icons/locolor/16x16/actions/adjustrow.png
 share/icons/locolor/16x16/actions/areas.png
@@ -594,6 +804,9 @@ share/icons/locolor/16x16/actions/border_right.png
 share/icons/locolor/16x16/actions/border_top.png
 share/icons/locolor/16x16/actions/border_up.png
 share/icons/locolor/16x16/actions/border_vertical.png
+share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/brace.png
+share/icons/locolor/16x16/actions/brackets.png
 share/icons/locolor/16x16/actions/cakes.png
 share/icons/locolor/16x16/actions/cell_edit.png
 share/icons/locolor/16x16/actions/cell_layout.png
@@ -603,32 +816,47 @@ share/icons/locolor/16x16/actions/comment.png
 share/icons/locolor/16x16/actions/data.png
 share/icons/locolor/16x16/actions/delete_table.png
 share/icons/locolor/16x16/actions/deletecell.png
+share/icons/locolor/16x16/actions/dissociatecell.png
 share/icons/locolor/16x16/actions/first_letter_upper.png
 share/icons/locolor/16x16/actions/fontsizedown.png
 share/icons/locolor/16x16/actions/fontsizeup.png
+share/icons/locolor/16x16/actions/frac.png
 share/icons/locolor/16x16/actions/funct.png
 share/icons/locolor/16x16/actions/insertcell.png
 share/icons/locolor/16x16/actions/inserttable.png
+share/icons/locolor/16x16/actions/int.png
 share/icons/locolor/16x16/actions/left.png
 share/icons/locolor/16x16/actions/lines.png
 share/icons/locolor/16x16/actions/lower.png
+share/icons/locolor/16x16/actions/lsub.png
+share/icons/locolor/16x16/actions/lsup.png
+share/icons/locolor/16x16/actions/matrix.png
+share/icons/locolor/16x16/actions/mergecell.png
 share/icons/locolor/16x16/actions/middle.png
 share/icons/locolor/16x16/actions/money.png
 share/icons/locolor/16x16/actions/multirow.png
 share/icons/locolor/16x16/actions/oscilloscope.png
+share/icons/locolor/16x16/actions/paren.png
 share/icons/locolor/16x16/actions/percent.png
 share/icons/locolor/16x16/actions/precminus.png
 share/icons/locolor/16x16/actions/precplus.png
+share/icons/locolor/16x16/actions/prod.png
 share/icons/locolor/16x16/actions/removecell.png
 share/icons/locolor/16x16/actions/removecomment.png
 share/icons/locolor/16x16/actions/resizecol.png
 share/icons/locolor/16x16/actions/resizerow.png
 share/icons/locolor/16x16/actions/right.png
+share/icons/locolor/16x16/actions/rotate.png
+share/icons/locolor/16x16/actions/rsub.png
+share/icons/locolor/16x16/actions/rsup.png
 share/icons/locolor/16x16/actions/series.png
 share/icons/locolor/16x16/actions/sort_decrease.png
 share/icons/locolor/16x16/actions/sort_incr.png
 share/icons/locolor/16x16/actions/special_paste.png
+share/icons/locolor/16x16/actions/sqrt.png
 share/icons/locolor/16x16/actions/strike_out.png
+share/icons/locolor/16x16/actions/sum.png
+share/icons/locolor/16x16/actions/top.png
 share/icons/locolor/16x16/actions/upper.png
 share/icons/locolor/16x16/actions/vertical_text.png
 share/icons/locolor/16x16/actions/wizard.png
@@ -645,7 +873,6 @@ share/icons/locolor/32x32/apps/kpresenter.png
 share/icons/locolor/32x32/apps/kspread.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kword.png
-share/mimelnk/application/x-graphite.desktop
 share/mimelnk/application/x-kchart.desktop
 share/mimelnk/application/x-killustrator.desktop
 share/mimelnk/application/x-kpresenter.desktop
@@ -654,8 +881,8 @@ share/mimelnk/application/x-kword.desktop
 share/mimelnk/text/x-csv.desktop
 share/services/kodocinfopropspage.desktop
 share/services/kspelltool.desktop
+share/services/kspread_csv_export.desktop
 share/services/kspread_csv_export_dia.desktop
-share/services/kspread_csv_export_test.desktop
 share/services/kspread_csv_import.desktop
 share/services/kspread_csv_import_dia.desktop
 share/services/kspreadcalc.desktop
@@ -671,7 +898,6 @@ share/servicetypes/kofilter.desktop
 share/servicetypes/kofilterdialog.desktop
 share/servicetypes/koplugin.desktop
 share/servicetypes/kotool.desktop
-@unexec for dir in kword kspread kpresenter killustrator katabase koffice; do rm -f %D/share/doc/HTML/en/${dir}/common;done
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kspread
 @dirrm share/doc/HTML/en/kpresenter
@@ -737,13 +963,11 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
 @dirrm share/apps/killustrator/templates/Simple
-@dirrm share/apps/killustrator/templates
 @dirrm share/apps/killustrator/pics
 @dirrm share/apps/killustrator
+@dirrm share/apps/kchart/pics
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
-@dirrm share/apps/graphite
-@dirrm share/applnk/Office
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index 8bd9ce9f50d7..c7076856e8fb 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	20000724A
+PORTVERSION=	20000829A
 CATEGORIES=	editors kde
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	http://www.physics.purdue.edu/~will/
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -17,7 +16,6 @@ LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
 		iconv.0:${PORTSDIR}/converters/iconv
 
-WRKSRC=		${WRKDIR}/koffice
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
diff --git a/editors/koffice/distinfo b/editors/koffice/distinfo
index 29689accec3b..2968f603716c 100644
--- a/editors/koffice/distinfo
+++ b/editors/koffice/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
+MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
diff --git a/editors/koffice/pkg-plist b/editors/koffice/pkg-plist
index b9623c9d9c0d..d9997a2b1000 100644
--- a/editors/koffice/pkg-plist
+++ b/editors/koffice/pkg-plist
@@ -1,17 +1,22 @@
-bin/graphite
 bin/kchart
 bin/killustrator
+bin/koscript
 bin/koshell
+bin/kprconverter.pl
 bin/kpresenter
-bin/kscript
 bin/kspread
 bin/kword
 include/KoApplicationIface.h
 include/KoDocumentIface.h
+include/KoViewIface.h
+include/MatrixDialog.h
+include/box.h
 include/handler.h
 include/kcoloractions.h
+include/kformula.h
+include/kformulaedit.h
+include/kformulatoolbar.h
 include/koApplication.h
-include/koBinaryStore.h
 include/koChild.h
 include/koDataTool.h
 include/koDocument.h
@@ -31,90 +36,79 @@ include/koPartSelectDia.h
 include/koQueryTrader.h
 include/koRuler.h
 include/koStore.h
-include/koStoreStream.h
+include/koStoreDevice.h
 include/koStream.h
 include/koTabChooser.h
-include/koTarStore.h
 include/koTemplateChooseDia.h
 include/koTemplateCreateDia.h
 include/koTemplates.h
 include/koView.h
-include/komlFeed.h
-include/komlFileFeed.h
-include/komlMime.h
 include/komlParser.h
-include/komlStreamFeed.h
 include/komlWriter.h
+include/matrixbox.h
 include/toolbox.h
-include/torben.h
-lib/graphite.a
-lib/graphite.la
-lib/kchart.a
 lib/kchart.la
-lib/killustrator.a
+lib/kchart.so
 lib/killustrator.la
-lib/koshell.a
+lib/killustrator.so
 lib/koshell.la
-lib/kpresenter.a
+lib/koshell.so
 lib/kpresenter.la
-lib/kspread.a
+lib/kpresenter.so
 lib/kspread.la
-lib/kword.a
+lib/kspread.so
 lib/kword.la
-lib/libasciiexport.a
+lib/kword.so
 lib/libasciiexport.la
-lib/libasciiimport.a
+lib/libasciiexport.so
 lib/libasciiimport.la
-lib/libcsvexport.a
+lib/libasciiimport.so
 lib/libcsvexport.la
-lib/libcsvexport_test.a
-lib/libcsvexport_test.la
-lib/libcsvfilter.a
-lib/libcsvfilter.la
-lib/libcsvfilterdia.a
+lib/libcsvexport.so
 lib/libcsvfilterdia.la
-lib/libgraphitepart.a
-lib/libgraphitepart.la
-lib/libhtmlexport.a
+lib/libcsvfilterdia.so
+lib/libcsvimport.la
+lib/libcsvimport.so
 lib/libhtmlexport.la
-lib/libhtmlimport.a
+lib/libhtmlexport.so
 lib/libhtmlimport.la
-lib/libkchartpart.a
+lib/libhtmlimport.so
 lib/libkchartpart.la
-lib/libkillustratorpart.a
+lib/libkchartpart.so
+lib/libkformula.la
+lib/libkformula.so.3
 lib/libkillustratorpart.la
-lib/libkodocinfopropspage.a
+lib/libkillustratorpart.so
 lib/libkodocinfopropspage.la
+lib/libkodocinfopropspage.so.0
 lib/libkofficecore.la
 lib/libkofficecore.so.1
 lib/libkofficeui.la
 lib/libkofficeui.so.1
 lib/libkoml.la
 lib/libkoml.so.1
-lib/libkpresenterpart.a
+lib/libkoscript.la
+lib/libkoscript.so.1
 lib/libkpresenterpart.la
-lib/libkscript.la
-lib/libkscript.so.1
-lib/libkspelltool.a
+lib/libkpresenterpart.so
 lib/libkspelltool.la
-lib/libkspreadcalc.a
+lib/libkspelltool.so
 lib/libkspreadcalc.la
-lib/libkspreadpart.a
+lib/libkspreadcalc.so
 lib/libkspreadpart.la
+lib/libkspreadpart.so
 lib/libkstore.la
 lib/libkstore.so.1
-lib/libkwordpart.a
 lib/libkwordpart.la
-lib/libolefilter.a
+lib/libkwordpart.so
 lib/libolefilter.la
-share/applnk/Office/graphite.desktop
+lib/libolefilter.so
 share/applnk/Office/kchart.desktop
 share/applnk/Office/killustrator.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kword.desktop
-share/apps/graphite/graphite.rc
 share/apps/kchart/icons/locolor/22x22/actions/areas.png
 share/apps/kchart/icons/locolor/22x22/actions/bars.png
 share/apps/kchart/icons/locolor/22x22/actions/cakes.png
@@ -124,6 +118,12 @@ share/apps/kchart/icons/locolor/22x22/actions/lines.png
 share/apps/kchart/icons/locolor/22x22/actions/options.png
 share/apps/kchart/icons/locolor/22x22/actions/wizard.png
 share/apps/kchart/kchart.rc
+share/apps/kchart/pics/areasubtypebeside.png
+share/apps/kchart/pics/areasubtypedepth.png
+share/apps/kchart/pics/barsubtypebeside.png
+share/apps/kchart/pics/barsubtypedepth.png
+share/apps/kchart/pics/barsubtypelayer.png
+share/apps/kchart/pics/barsubtypepercent.png
 share/apps/killustrator/KIllustrator.rc
 share/apps/killustrator/pics/abottom.png
 share/apps/killustrator/pics/ahcenter.png
@@ -214,6 +214,8 @@ share/apps/koffice/icons/locolor/22x22/actions/part/unspecif.png
 share/apps/koffice/icons/locolor/22x22/actions/parts.png
 share/apps/koffice/icons/locolor/22x22/actions/picture.png
 share/apps/koffice/koffice_shell.rc
+share/apps/koffice/pics/koKoolBarDown.png
+share/apps/koffice/pics/koKoolBarUp.png
 share/apps/koffice/pics/koRulerFirst.png
 share/apps/koffice/pics/koRulerLeft.png
 share/apps/koffice/pics/koffice-logo.png
@@ -373,17 +375,14 @@ share/apps/kpresenter/templates/Professional/Two.desktop
 share/apps/kpresenter/templates/Screenpresentations/.directory
 share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Sand1.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
 share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
 share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Sand1.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
 share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
 share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Sand1.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
 share/apps/kspread/dtd/kspread.dtd
@@ -481,10 +480,16 @@ share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
 share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
 share/apps/kword/kword.rc
 share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/A4.png
+share/apps/kword/templates/Normal/.icon/Letter.png
 share/apps/kword/templates/Normal/.icon/PlainText.png
 share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/A4.kwt
+share/apps/kword/templates/Normal/.source/Letter.kwt
 share/apps/kword/templates/Normal/.source/PlainText.kwt
 share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/A4.desktop
+share/apps/kword/templates/Normal/Letter.desktop
 share/apps/kword/templates/Normal/PlainText.desktop
 share/apps/kword/templates/Normal/TwoColumns.desktop
 share/apps/kword/templates/Publishing/.directory
@@ -503,18 +508,42 @@ share/doc/HTML/en/doc/koffice-misc.html
 share/doc/HTML/en/doc/koffice-search-help.html
 share/doc/HTML/en/doc/koffice-search.html
 share/doc/HTML/en/doc/koffice.html
+share/doc/HTML/en/katabase/.anchors
+share/doc/HTML/en/katabase/another-section.html
+share/doc/HTML/en/katabase/compilation-and-installation.html
+share/doc/HTML/en/katabase/copyright.html
 share/doc/HTML/en/katabase/index.cvlog
 share/doc/HTML/en/katabase/index.docbook
+share/doc/HTML/en/katabase/index.html
+share/doc/HTML/en/katabase/installation.html
+share/doc/HTML/en/katabase/introduction.html
+share/doc/HTML/en/katabase/questions-and-answers.html
+share/doc/HTML/en/katabase/requirements.html
+share/doc/HTML/en/katabase/usage.html
+share/doc/HTML/en/killustrator/.anchors
+share/doc/HTML/en/killustrator/about-the-handbook.html
 share/doc/HTML/en/killustrator/align.png
 share/doc/HTML/en/killustrator/align2.png
+share/doc/HTML/en/killustrator/appendix.html
 share/doc/HTML/en/killustrator/bezier.png
 share/doc/HTML/en/killustrator/blend_dialog.png
+share/doc/HTML/en/killustrator/changing-the-standard-parameters.html
 share/doc/HTML/en/killustrator/colour.png
+share/doc/HTML/en/killustrator/compilation-and-installation.html
+share/doc/HTML/en/killustrator/copyright.html
+share/doc/HTML/en/killustrator/drawing-2d-primitives.html
 share/doc/HTML/en/killustrator/ellipse.png
 share/doc/HTML/en/killustrator/export.png
 share/doc/HTML/en/killustrator/freehand.png
+share/doc/HTML/en/killustrator/frequently-asked-questions.html
+share/doc/HTML/en/killustrator/handling-colours.html
+share/doc/HTML/en/killustrator/history-of-killustrator.html
 share/doc/HTML/en/killustrator/index.cvlog
 share/doc/HTML/en/killustrator/index.docbook
+share/doc/HTML/en/killustrator/index.html
+share/doc/HTML/en/killustrator/installation-of-binary-packages.html
+share/doc/HTML/en/killustrator/installation.html
+share/doc/HTML/en/killustrator/introduction.html
 share/doc/HTML/en/killustrator/line.png
 share/doc/HTML/en/killustrator/logo.png
 share/doc/HTML/en/killustrator/movepoint.png
@@ -524,17 +553,170 @@ share/doc/HTML/en/killustrator/pfeil.png
 share/doc/HTML/en/killustrator/point.png
 share/doc/HTML/en/killustrator/polygon-setup.png
 share/doc/HTML/en/killustrator/polygon.png
+share/doc/HTML/en/killustrator/positioning-objects.html
 share/doc/HTML/en/killustrator/rect.png
 share/doc/HTML/en/killustrator/rmpoint.png
 share/doc/HTML/en/killustrator/save_dialog.png
 share/doc/HTML/en/killustrator/schichten.png
+share/doc/HTML/en/killustrator/system-requirements.html
 share/doc/HTML/en/killustrator/text.png
+share/doc/HTML/en/killustrator/the-layer-concept.html
+share/doc/HTML/en/killustrator/to-do.html
+share/doc/HTML/en/killustrator/transformation-of-2d-primitives.html
+share/doc/HTML/en/killustrator/undo--redo.html
+share/doc/HTML/en/killustrator/usage.html
 share/doc/HTML/en/killustrator/verteilen.png
+share/doc/HTML/en/killustrator/working-with-files.html
+share/doc/HTML/en/killustrator/zoom-tool.html
 share/doc/HTML/en/killustrator/zoom.png
+share/doc/HTML/en/koffice/.anchors
+share/doc/HTML/en/koffice/compilingproblems.html
+share/doc/HTML/en/koffice/customgui.html
+share/doc/HTML/en/koffice/customization.html
+share/doc/HTML/en/koffice/faq.html
+share/doc/HTML/en/koffice/firststeps.html
+share/doc/HTML/en/koffice/frombinaries.html
+share/doc/HTML/en/koffice/fromsource.html
+share/doc/HTML/en/koffice/gettingbinaries.html
+share/doc/HTML/en/koffice/gettingsource.html
+share/doc/HTML/en/koffice/glossary.html
 share/doc/HTML/en/koffice/index.docbook
+share/doc/HTML/en/koffice/index.html
+share/doc/HTML/en/koffice/installation.html
+share/doc/HTML/en/koffice/introduction.html
+share/doc/HTML/en/koffice/kparts.html
+share/doc/HTML/en/koffice/kpartstryit.html
+share/doc/HTML/en/koffice/legal.html
+share/doc/HTML/en/koffice/links.html
+share/doc/HTML/en/koffice/moreinfo.html
+share/doc/HTML/en/koffice/programmersinfo.html
+share/doc/HTML/en/koffice/todo.html
+share/doc/HTML/en/koffice/whoreads.html
+share/doc/HTML/en/kpresenter/.anchors
+share/doc/HTML/en/kpresenter/addshadow.html
+share/doc/HTML/en/kpresenter/appendix.html
+share/doc/HTML/en/kpresenter/credits.html
+share/doc/HTML/en/kpresenter/guides.html
 share/doc/HTML/en/kpresenter/index.docbook
+share/doc/HTML/en/kpresenter/index.html
+share/doc/HTML/en/kpresenter/insertpage.html
+share/doc/HTML/en/kpresenter/insertpic.html
+share/doc/HTML/en/kpresenter/introduction.html
+share/doc/HTML/en/kpresenter/menuitems.html
+share/doc/HTML/en/kpresenter/options.html
+share/doc/HTML/en/kpresenter/qanda.html
+share/doc/HTML/en/kpresenter/screendesc.html
+share/doc/HTML/en/kpresenter/textcolor.html
+share/doc/HTML/en/kpresenter/todo.html
+share/doc/HTML/en/kpresenter/tutorial.html
+share/doc/HTML/en/kspread/.anchors
+share/doc/HTML/en/kspread/appendix.html
+share/doc/HTML/en/kspread/compilingproblems.html
+share/doc/HTML/en/kspread/credits.html
+share/doc/HTML/en/kspread/dragdrop.html
+share/doc/HTML/en/kspread/frombinaries.html
+share/doc/HTML/en/kspread/fromsource.html
+share/doc/HTML/en/kspread/fundamental.html
+share/doc/HTML/en/kspread/gettingbinaries.html
+share/doc/HTML/en/kspread/gettingsource.html
+share/doc/HTML/en/kspread/guides.html
+share/doc/HTML/en/kspread/guides2.html
+share/doc/HTML/en/kspread/guides3.html
+share/doc/HTML/en/kspread/guides4.html
 share/doc/HTML/en/kspread/index.docbook
+share/doc/HTML/en/kspread/index.html
+share/doc/HTML/en/kspread/installation.html
+share/doc/HTML/en/kspread/introduction.html
+share/doc/HTML/en/kspread/keys.html
+share/doc/HTML/en/kspread/kspreadscreen.html
+share/doc/HTML/en/kspread/loading.html
+share/doc/HTML/en/kspread/menuitems.html
+share/doc/HTML/en/kspread/options.html
+share/doc/HTML/en/kspread/printing.html
+share/doc/HTML/en/kspread/qanda.html
+share/doc/HTML/en/kspread/saving.html
+share/doc/HTML/en/kspread/themes.html
+share/doc/HTML/en/kspread/todo.html
+share/doc/HTML/en/kspread/tutorial.html
+share/doc/HTML/en/kspread/updates.html
+share/doc/HTML/en/kspread/whoreads.html
+share/doc/HTML/en/kword/.anchors
+share/doc/HTML/en/kword/addframe.html
+share/doc/HTML/en/kword/appendix.html
+share/doc/HTML/en/kword/autocorrect.html
+share/doc/HTML/en/kword/basicedittoolbar.html
+share/doc/HTML/en/kword/basicmenubar.html
+share/doc/HTML/en/kword/charformattoolbar.html
+share/doc/HTML/en/kword/clipboard.html
+share/doc/HTML/en/kword/columns.html
+share/doc/HTML/en/kword/conventions.html
+share/doc/HTML/en/kword/credits.html
+share/doc/HTML/en/kword/datetime.html
+share/doc/HTML/en/kword/delframe.html
+share/doc/HTML/en/kword/dragdrop.html
+share/doc/HTML/en/kword/endfoot.html
+share/doc/HTML/en/kword/filedlg.html
+share/doc/HTML/en/kword/filetoolbar.html
+share/doc/HTML/en/kword/filters.html
+share/doc/HTML/en/kword/formatchar.html
+share/doc/HTML/en/kword/formatframe.html
+share/doc/HTML/en/kword/formatpara.html
+share/doc/HTML/en/kword/formulas.html
+share/doc/HTML/en/kword/framecreatetoolbar.html
+share/doc/HTML/en/kword/frames.html
+share/doc/HTML/en/kword/frameselect.html
+share/doc/HTML/en/kword/fundimental.html
+share/doc/HTML/en/kword/glossery.html
+share/doc/HTML/en/kword/graphics.html
+share/doc/HTML/en/kword/guides.html
+share/doc/HTML/en/kword/guides2.html
+share/doc/HTML/en/kword/guides3.html
+share/doc/HTML/en/kword/guides4.html
+share/doc/HTML/en/kword/headfoot.html
 share/doc/HTML/en/kword/index.docbook
+share/doc/HTML/en/kword/index.html
+share/doc/HTML/en/kword/inserttoolbar.html
+share/doc/HTML/en/kword/inskspread.html
+share/doc/HTML/en/kword/introduction.html
+share/doc/HTML/en/kword/keys.html
+share/doc/HTML/en/kword/kwordrc.html
+share/doc/HTML/en/kword/kwordscreen.html
+share/doc/HTML/en/kword/loading.html
+share/doc/HTML/en/kword/menuitems.html
+share/doc/HTML/en/kword/moveframe.html
+share/doc/HTML/en/kword/options.html
+share/doc/HTML/en/kword/pgnumber.html
+share/doc/HTML/en/kword/predefinedstyles.html
+share/doc/HTML/en/kword/printing.html
+share/doc/HTML/en/kword/qanda.html
+share/doc/HTML/en/kword/qd2.html
+share/doc/HTML/en/kword/qd3.html
+share/doc/HTML/en/kword/qd4.html
+share/doc/HTML/en/kword/qd5.html
+share/doc/HTML/en/kword/quickdirty.html
+share/doc/HTML/en/kword/resizeframe.html
+share/doc/HTML/en/kword/rulers.html
+share/doc/HTML/en/kword/saving.html
+share/doc/HTML/en/kword/searchreplace.html
+share/doc/HTML/en/kword/selcolor.html
+share/doc/HTML/en/kword/spellcheck.html
+share/doc/HTML/en/kword/styles.html
+share/doc/HTML/en/kword/tableedittoolbar.html
+share/doc/HTML/en/kword/tables.html
+share/doc/HTML/en/kword/tabstops.html
+share/doc/HTML/en/kword/tempcr.html
+share/doc/HTML/en/kword/templateintro.html
+share/doc/HTML/en/kword/textandframe.html
+share/doc/HTML/en/kword/themes.html
+share/doc/HTML/en/kword/toc.html
+share/doc/HTML/en/kword/todo.html
+share/doc/HTML/en/kword/toolbars.html
+share/doc/HTML/en/kword/tutorial.html
+share/doc/HTML/en/kword/undoredo.html
+share/doc/HTML/en/kword/updates.html
+share/doc/HTML/en/kword/whoreads.html
+share/doc/HTML/en/kword/wpvsdtp.html
+share/icons/hicolor/22x22/actions/abs.png
 share/icons/hicolor/22x22/actions/border_all.png
 share/icons/hicolor/22x22/actions/border_bottom.png
 share/icons/hicolor/22x22/actions/border_fall.png
@@ -547,10 +729,24 @@ share/icons/hicolor/22x22/actions/border_right.png
 share/icons/hicolor/22x22/actions/border_top.png
 share/icons/hicolor/22x22/actions/border_up.png
 share/icons/hicolor/22x22/actions/border_vertical.png
+share/icons/hicolor/22x22/actions/brace.png
+share/icons/hicolor/22x22/actions/brackets.png
+share/icons/hicolor/22x22/actions/frac.png
 share/icons/hicolor/22x22/actions/funct.png
+share/icons/hicolor/22x22/actions/int.png
+share/icons/hicolor/22x22/actions/lsub.png
+share/icons/hicolor/22x22/actions/lsup.png
+share/icons/hicolor/22x22/actions/matrix.png
+share/icons/hicolor/22x22/actions/paren.png
 share/icons/hicolor/22x22/actions/percent.png
 share/icons/hicolor/22x22/actions/prec_minus.png
 share/icons/hicolor/22x22/actions/prec_plus.png
+share/icons/hicolor/22x22/actions/prod.png
+share/icons/hicolor/22x22/actions/rsub.png
+share/icons/hicolor/22x22/actions/rsup.png
+share/icons/hicolor/22x22/actions/sqrt.png
+share/icons/hicolor/22x22/actions/sum.png
+share/icons/hicolor/32x32/actions/abs.png
 share/icons/hicolor/32x32/actions/border_all.png
 share/icons/hicolor/32x32/actions/border_bottom.png
 share/icons/hicolor/32x32/actions/border_fall.png
@@ -563,10 +759,23 @@ share/icons/hicolor/32x32/actions/border_right.png
 share/icons/hicolor/32x32/actions/border_top.png
 share/icons/hicolor/32x32/actions/border_up.png
 share/icons/hicolor/32x32/actions/border_vertical.png
+share/icons/hicolor/32x32/actions/brace.png
+share/icons/hicolor/32x32/actions/brackets.png
+share/icons/hicolor/32x32/actions/frac.png
 share/icons/hicolor/32x32/actions/funct.png
+share/icons/hicolor/32x32/actions/int.png
+share/icons/hicolor/32x32/actions/lsub.png
+share/icons/hicolor/32x32/actions/lsup.png
+share/icons/hicolor/32x32/actions/matrix.png
+share/icons/hicolor/32x32/actions/paren.png
 share/icons/hicolor/32x32/actions/percent.png
 share/icons/hicolor/32x32/actions/prec_minus.png
 share/icons/hicolor/32x32/actions/prec_plus.png
+share/icons/hicolor/32x32/actions/prod.png
+share/icons/hicolor/32x32/actions/rsub.png
+share/icons/hicolor/32x32/actions/rsup.png
+share/icons/hicolor/32x32/actions/sqrt.png
+share/icons/hicolor/32x32/actions/sum.png
 share/icons/hicolor/32x32/apps/kchart.png
 share/icons/hicolor/32x32/apps/killustrator.png
 share/icons/hicolor/32x32/apps/kpresenter.png
@@ -577,6 +786,7 @@ share/icons/hicolor/48x48/apps/killustrator.png
 share/icons/hicolor/48x48/apps/kpresenter.png
 share/icons/hicolor/48x48/apps/kspread.png
 share/icons/hicolor/48x48/apps/kword.png
+share/icons/locolor/16x16/actions/abs.png
 share/icons/locolor/16x16/actions/adjustcol.png
 share/icons/locolor/16x16/actions/adjustrow.png
 share/icons/locolor/16x16/actions/areas.png
@@ -594,6 +804,9 @@ share/icons/locolor/16x16/actions/border_right.png
 share/icons/locolor/16x16/actions/border_top.png
 share/icons/locolor/16x16/actions/border_up.png
 share/icons/locolor/16x16/actions/border_vertical.png
+share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/brace.png
+share/icons/locolor/16x16/actions/brackets.png
 share/icons/locolor/16x16/actions/cakes.png
 share/icons/locolor/16x16/actions/cell_edit.png
 share/icons/locolor/16x16/actions/cell_layout.png
@@ -603,32 +816,47 @@ share/icons/locolor/16x16/actions/comment.png
 share/icons/locolor/16x16/actions/data.png
 share/icons/locolor/16x16/actions/delete_table.png
 share/icons/locolor/16x16/actions/deletecell.png
+share/icons/locolor/16x16/actions/dissociatecell.png
 share/icons/locolor/16x16/actions/first_letter_upper.png
 share/icons/locolor/16x16/actions/fontsizedown.png
 share/icons/locolor/16x16/actions/fontsizeup.png
+share/icons/locolor/16x16/actions/frac.png
 share/icons/locolor/16x16/actions/funct.png
 share/icons/locolor/16x16/actions/insertcell.png
 share/icons/locolor/16x16/actions/inserttable.png
+share/icons/locolor/16x16/actions/int.png
 share/icons/locolor/16x16/actions/left.png
 share/icons/locolor/16x16/actions/lines.png
 share/icons/locolor/16x16/actions/lower.png
+share/icons/locolor/16x16/actions/lsub.png
+share/icons/locolor/16x16/actions/lsup.png
+share/icons/locolor/16x16/actions/matrix.png
+share/icons/locolor/16x16/actions/mergecell.png
 share/icons/locolor/16x16/actions/middle.png
 share/icons/locolor/16x16/actions/money.png
 share/icons/locolor/16x16/actions/multirow.png
 share/icons/locolor/16x16/actions/oscilloscope.png
+share/icons/locolor/16x16/actions/paren.png
 share/icons/locolor/16x16/actions/percent.png
 share/icons/locolor/16x16/actions/precminus.png
 share/icons/locolor/16x16/actions/precplus.png
+share/icons/locolor/16x16/actions/prod.png
 share/icons/locolor/16x16/actions/removecell.png
 share/icons/locolor/16x16/actions/removecomment.png
 share/icons/locolor/16x16/actions/resizecol.png
 share/icons/locolor/16x16/actions/resizerow.png
 share/icons/locolor/16x16/actions/right.png
+share/icons/locolor/16x16/actions/rotate.png
+share/icons/locolor/16x16/actions/rsub.png
+share/icons/locolor/16x16/actions/rsup.png
 share/icons/locolor/16x16/actions/series.png
 share/icons/locolor/16x16/actions/sort_decrease.png
 share/icons/locolor/16x16/actions/sort_incr.png
 share/icons/locolor/16x16/actions/special_paste.png
+share/icons/locolor/16x16/actions/sqrt.png
 share/icons/locolor/16x16/actions/strike_out.png
+share/icons/locolor/16x16/actions/sum.png
+share/icons/locolor/16x16/actions/top.png
 share/icons/locolor/16x16/actions/upper.png
 share/icons/locolor/16x16/actions/vertical_text.png
 share/icons/locolor/16x16/actions/wizard.png
@@ -645,7 +873,6 @@ share/icons/locolor/32x32/apps/kpresenter.png
 share/icons/locolor/32x32/apps/kspread.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kword.png
-share/mimelnk/application/x-graphite.desktop
 share/mimelnk/application/x-kchart.desktop
 share/mimelnk/application/x-killustrator.desktop
 share/mimelnk/application/x-kpresenter.desktop
@@ -654,8 +881,8 @@ share/mimelnk/application/x-kword.desktop
 share/mimelnk/text/x-csv.desktop
 share/services/kodocinfopropspage.desktop
 share/services/kspelltool.desktop
+share/services/kspread_csv_export.desktop
 share/services/kspread_csv_export_dia.desktop
-share/services/kspread_csv_export_test.desktop
 share/services/kspread_csv_import.desktop
 share/services/kspread_csv_import_dia.desktop
 share/services/kspreadcalc.desktop
@@ -671,7 +898,6 @@ share/servicetypes/kofilter.desktop
 share/servicetypes/kofilterdialog.desktop
 share/servicetypes/koplugin.desktop
 share/servicetypes/kotool.desktop
-@unexec for dir in kword kspread kpresenter killustrator katabase koffice; do rm -f %D/share/doc/HTML/en/${dir}/common;done
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kspread
 @dirrm share/doc/HTML/en/kpresenter
@@ -737,13 +963,11 @@ share/servicetypes/kotool.desktop
 @dirrm share/apps/killustrator/templates/Simple/.source
 @dirrm share/apps/killustrator/templates/Simple/.icon
 @dirrm share/apps/killustrator/templates/Simple
-@dirrm share/apps/killustrator/templates
 @dirrm share/apps/killustrator/pics
 @dirrm share/apps/killustrator
+@dirrm share/apps/kchart/pics
 @dirrm share/apps/kchart/icons/locolor/22x22/actions
 @dirrm share/apps/kchart/icons/locolor/22x22
 @dirrm share/apps/kchart/icons/locolor
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
-@dirrm share/apps/graphite
-@dirrm share/applnk/Office