aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2000-07-29 10:44:58 +0800
committerwill <will@FreeBSD.org>2000-07-29 10:44:58 +0800
commit866418e857e7080ce1cfa1fbe749c79049a0a7c6 (patch)
treee9129c87b067d09454a8b779e48479221c54be0c /editors
parent3a4bac246da6c0ae26f0942d851bf17637de83d0 (diff)
downloadfreebsd-ports-gnome-866418e857e7080ce1cfa1fbe749c79049a0a7c6.tar.gz
freebsd-ports-gnome-866418e857e7080ce1cfa1fbe749c79049a0a7c6.tar.zst
freebsd-ports-gnome-866418e857e7080ce1cfa1fbe749c79049a0a7c6.zip
Update to 20000724A (custom-rolled snapshot). Rejoice, because now
Konqueror can load HTML documents, KOffice works semi-well, and KDE2 in general seems less buggy. Only kdeutils was left out of this mega-update. However, it should return soon. :-) The massive reduction in patches is mostly the result of using perl regex replacement. This reduces the amount of time it will take in the future to upgrade these ports, and load on the repository. QT 2.2.0beta0 (aka qt-copy) is officially enabled for the express purpose of allowing KDE2 to compile. It is available in the qt22 port. Additionally, GIF support is re-enabled in both Qt2 ports, so that people can now read GIF images. GIF support is enabled through an internal GIF reader in Qt, and requires no patented libraries. Special effort was made to ensure that people do not install both qt21 and qt22 ports at the same time. I'd like to take a moment to thank the following people for their help: Alex Zepeda <jazepeda@pacbell.net>, Stephan Kulow <coolo@kde.org>, Harri Porten <porten@kde.org>, Waldo Bastian <waba@kde.org>, Marc G. Fournier <scrappy@hub.org>, Arun Sharma <adsharma@sharmas.dhs.org>, Matthias Hoelzer-Kluepfel <mhk@caldera.de>, and many others. Over 150 hours of hard work, testing, etc. were put into this update. Another couple hundred of hours were spent by CPUs trying to compile this behemoth. :-> Special thanks to: Physics Computer Network @ Purdue staff, especially C. Stephen Gunn <csg@physics.purdue.edu>, for giving me access to an extremely fast machine for doing test builds (it performed 12 full builds of the entire suite in the last 7 days). PR: 18838 Submitted by: Arun Sharma <adsharma@sharmas.dhs.org> Approved by: imura, asami
Diffstat (limited to 'editors')
-rw-r--r--editors/calligra/Makefile29
-rw-r--r--editors/calligra/distinfo2
-rw-r--r--editors/calligra/pkg-plist525
-rw-r--r--editors/koffice-kde3/Makefile29
-rw-r--r--editors/koffice-kde3/distinfo2
-rw-r--r--editors/koffice-kde3/pkg-plist525
-rw-r--r--editors/koffice-kde4/Makefile29
-rw-r--r--editors/koffice-kde4/distinfo2
-rw-r--r--editors/koffice-kde4/pkg-plist525
-rw-r--r--editors/koffice/Makefile29
-rw-r--r--editors/koffice/distinfo2
-rw-r--r--editors/koffice/pkg-plist525
12 files changed, 1128 insertions, 1096 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 0a71dbb8520d..8bd9ce9f50d7 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -1,31 +1,38 @@
# New ports collection makefile for: koffice
# Date created: Sun May 14 2000 16:33:15
-# Whom: Will Andrews <will@FreeBSD>org>
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= koffice
-PORTVERSION= 1.90
+PORTVERSION= 20000724A
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+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_QT2= yes
+USE_NEWGCC= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+ --with-qt-libraries=${X11BASE}/lib \
+ --with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
+pre-install:
+ @(find ${WRKSRC} -name CVS | xargs rm -rf)
+
.include <bsd.port.mk>
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 554b1ff849fe..29689accec3b 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1 +1 @@
-MD5 (koffice-1.90.tar.bz2) = aabb2ffd04f10ebdcccce8748cfd62ad
+MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 3462309e42ed..b9623c9d9c0d 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -1,3 +1,4 @@
+bin/graphite
bin/kchart
bin/killustrator
bin/koshell
@@ -5,6 +6,8 @@ bin/kpresenter
bin/kscript
bin/kspread
bin/kword
+include/KoApplicationIface.h
+include/KoDocumentIface.h
include/handler.h
include/kcoloractions.h
include/koApplication.h
@@ -20,7 +23,7 @@ include/koFilter.h
include/koFilterDialog.h
include/koFilterManager.h
include/koFrame.h
-include/koIcons.h
+include/koGlobal.h
include/koKoolBar.h
include/koMainWindow.h
include/koPageLayoutDia.h
@@ -34,8 +37,7 @@ include/koTabChooser.h
include/koTarStore.h
include/koTemplateChooseDia.h
include/koTemplateCreateDia.h
-include/koUIUtils.h
-include/koUndo.h
+include/koTemplates.h
include/koView.h
include/komlFeed.h
include/komlFileFeed.h
@@ -45,64 +47,84 @@ include/komlStreamFeed.h
include/komlWriter.h
include/toolbox.h
include/torben.h
+lib/graphite.a
+lib/graphite.la
+lib/kchart.a
+lib/kchart.la
+lib/killustrator.a
+lib/killustrator.la
+lib/koshell.a
+lib/koshell.la
+lib/kpresenter.a
+lib/kpresenter.la
+lib/kspread.a
+lib/kspread.la
+lib/kword.a
+lib/kword.la
+lib/libasciiexport.a
lib/libasciiexport.la
-lib/libasciiexport.so
+lib/libasciiimport.a
lib/libasciiimport.la
-lib/libasciiimport.so
+lib/libcsvexport.a
lib/libcsvexport.la
-lib/libcsvexport.so
+lib/libcsvexport_test.a
lib/libcsvexport_test.la
-lib/libcsvexport_test.so
+lib/libcsvfilter.a
lib/libcsvfilter.la
-lib/libcsvfilter.so
+lib/libcsvfilterdia.a
lib/libcsvfilterdia.la
-lib/libcsvfilterdia.so
+lib/libgraphitepart.a
+lib/libgraphitepart.la
+lib/libhtmlexport.a
lib/libhtmlexport.la
-lib/libhtmlexport.so
+lib/libhtmlimport.a
lib/libhtmlimport.la
-lib/libhtmlimport.so
-lib/libkchart.la
-lib/libkchart.so
-lib/libkillustrator.la
-lib/libkillustrator.so
+lib/libkchartpart.a
+lib/libkchartpart.la
+lib/libkillustratorpart.a
+lib/libkillustratorpart.la
+lib/libkodocinfopropspage.a
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/libkpresenter.la
-lib/libkpresenter.so
+lib/libkpresenterpart.a
+lib/libkpresenterpart.la
lib/libkscript.la
lib/libkscript.so.1
+lib/libkspelltool.a
lib/libkspelltool.la
-lib/libkspelltool.so
-lib/libkspread.la
-lib/libkspread.so
+lib/libkspreadcalc.a
lib/libkspreadcalc.la
-lib/libkspreadcalc.so
+lib/libkspreadpart.a
+lib/libkspreadpart.la
lib/libkstore.la
lib/libkstore.so.1
-lib/libkword.la
-lib/libkword.so
+lib/libkwordpart.a
+lib/libkwordpart.la
+lib/libolefilter.a
lib/libolefilter.la
-lib/libolefilter.so
-share/applnk/Applications/KOffice/kchart.desktop
-share/applnk/Applications/KOffice/killustrator.desktop
-share/applnk/Applications/KOffice/koshell.desktop
-share/applnk/Applications/KOffice/kpresenter.desktop
-share/applnk/Applications/KOffice/kspread.desktop
-share/applnk/Applications/KOffice/kword.desktop
+share/applnk/Office/graphite.desktop
+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
+share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
+share/apps/kchart/icons/locolor/22x22/actions/data.png
+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/toolbar/areas.png
-share/apps/kchart/toolbar/bars.png
-share/apps/kchart/toolbar/cakes.png
-share/apps/kchart/toolbar/lines.png
-share/apps/kchart/toolbar/options.png
share/apps/killustrator/KIllustrator.rc
-share/apps/killustrator/default.pal
share/apps/killustrator/pics/abottom.png
share/apps/killustrator/pics/ahcenter.png
share/apps/killustrator/pics/aleft.png
@@ -147,19 +169,38 @@ share/apps/killustrator/pics/tleftalign.png
share/apps/killustrator/pics/trightalign.png
share/apps/killustrator/pics/vmirror.png
share/apps/killustrator/pics/zoomtool.png
+share/apps/killustrator/templates/Simple/.directory
+share/apps/killustrator/templates/Simple/.icon/Plain.png
+share/apps/killustrator/templates/Simple/.source/Plain.kil
+share/apps/killustrator/templates/Simple/Plain.desktop
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/text_color.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/sort_az.png
+share/apps/koffice/icons/hicolor/32x32/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/documentinfo.png
+share/apps/koffice/icons/locolor/16x16/actions/enum_list.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/text_sub.png
+share/apps/koffice/icons/locolor/16x16/actions/text_super.png
+share/apps/koffice/icons/locolor/16x16/actions/unsorted_list.png
share/apps/koffice/icons/locolor/22x22/actions/alignBlock.png
share/apps/koffice/icons/locolor/22x22/actions/alignCenter.png
share/apps/koffice/icons/locolor/22x22/actions/alignLeft.png
share/apps/koffice/icons/locolor/22x22/actions/alignRight.png
-share/apps/koffice/icons/locolor/22x22/actions/bold.png
share/apps/koffice/icons/locolor/22x22/actions/cancel.png
share/apps/koffice/icons/locolor/22x22/actions/clipart.png
-share/apps/koffice/icons/locolor/22x22/actions/clipart/from-file.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/italic.png
+share/apps/koffice/icons/locolor/22x22/actions/clipart_from_file.png
share/apps/koffice/icons/locolor/22x22/actions/neonpen.png
share/apps/koffice/icons/locolor/22x22/actions/ok.png
share/apps/koffice/icons/locolor/22x22/actions/part/kchart.png
@@ -172,12 +213,6 @@ share/apps/koffice/icons/locolor/22x22/actions/part/kword.png
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/icons/locolor/22x22/actions/product.png
-share/apps/koffice/icons/locolor/22x22/actions/sum.png
-share/apps/koffice/icons/locolor/22x22/actions/text/bold.png
-share/apps/koffice/icons/locolor/22x22/actions/text/italic.png
-share/apps/koffice/icons/locolor/22x22/actions/text/underlined.png
-share/apps/koffice/icons/locolor/22x22/actions/underl.png
share/apps/koffice/koffice_shell.rc
share/apps/koffice/pics/koRulerFirst.png
share/apps/koffice/pics/koRulerLeft.png
@@ -325,77 +360,82 @@ share/apps/kpresenter/slideshow/next.png
share/apps/kpresenter/slideshow/prev.bmp
share/apps/kpresenter/slideshow/prev.jpeg
share/apps/kpresenter/slideshow/prev.png
-share/apps/kpresenter/templates/.templates
-share/apps/kpresenter/templates/Professional/One.kpt
-share/apps/kpresenter/templates/Professional/One.png
-share/apps/kpresenter/templates/Professional/Title.kpt
-share/apps/kpresenter/templates/Professional/Title.png
-share/apps/kpresenter/templates/Professional/Two.kpt
-share/apps/kpresenter/templates/Professional/Two.png
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.kpt
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/Sand1.kpt
-share/apps/kpresenter/templates/Screenpresentations/Sand1.png
-share/apps/kpresenter/templates/Screenpresentations/kde.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde.png
-share/apps/kpresenter/templates/Screenpresentations/kde2.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde2.png
+share/apps/kpresenter/templates/Professional/.directory
+share/apps/kpresenter/templates/Professional/.icon/One.png
+share/apps/kpresenter/templates/Professional/.icon/Title.png
+share/apps/kpresenter/templates/Professional/.icon/Two.png
+share/apps/kpresenter/templates/Professional/.source/One.kpt
+share/apps/kpresenter/templates/Professional/.source/Title.kpt
+share/apps/kpresenter/templates/Professional/.source/Two.kpt
+share/apps/kpresenter/templates/Professional/One.desktop
+share/apps/kpresenter/templates/Professional/Title.desktop
+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
share/apps/kspread/extensions/math.ks
share/apps/kspread/icons/locolor/22x22/actions/abort.png
share/apps/kspread/icons/locolor/22x22/actions/adjustcol.png
share/apps/kspread/icons/locolor/22x22/actions/adjustrow.png
-share/apps/kspread/icons/locolor/22x22/actions/black/sum.png
-share/apps/kspread/icons/locolor/22x22/actions/bold.png
-share/apps/kspread/icons/locolor/22x22/actions/borderall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderbottom.png
-share/apps/kspread/icons/locolor/22x22/actions/borderfall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderhorizontal.png
-share/apps/kspread/icons/locolor/22x22/actions/borderinside.png
-share/apps/kspread/icons/locolor/22x22/actions/borderleft.png
-share/apps/kspread/icons/locolor/22x22/actions/borderoutline.png
-share/apps/kspread/icons/locolor/22x22/actions/borderremove.png
-share/apps/kspread/icons/locolor/22x22/actions/borderright.png
-share/apps/kspread/icons/locolor/22x22/actions/bordertop.png
-share/apps/kspread/icons/locolor/22x22/actions/borderup.png
-share/apps/kspread/icons/locolor/22x22/actions/bordervertical.png
+share/apps/kspread/icons/locolor/22x22/actions/black_sum.png
share/apps/kspread/icons/locolor/22x22/actions/bottom.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_edit.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_layout.png
share/apps/kspread/icons/locolor/22x22/actions/center.png
share/apps/kspread/icons/locolor/22x22/actions/chart.png
-share/apps/kspread/icons/locolor/22x22/actions/colin.png
share/apps/kspread/icons/locolor/22x22/actions/colout.png
+share/apps/kspread/icons/locolor/22x22/actions/comment.png
+share/apps/kspread/icons/locolor/22x22/actions/delete_table.png
+share/apps/kspread/icons/locolor/22x22/actions/deletecell.png
+share/apps/kspread/icons/locolor/22x22/actions/dissociatecell.png
share/apps/kspread/icons/locolor/22x22/actions/done.png
+share/apps/kspread/icons/locolor/22x22/actions/find.png
+share/apps/kspread/icons/locolor/22x22/actions/first_letter_upper.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizedown.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizeup.png
-share/apps/kspread/icons/locolor/22x22/actions/funct.png
-share/apps/kspread/icons/locolor/22x22/actions/italic.png
+share/apps/kspread/icons/locolor/22x22/actions/goto.png
+share/apps/kspread/icons/locolor/22x22/actions/insertcell.png
+share/apps/kspread/icons/locolor/22x22/actions/inserttable.png
share/apps/kspread/icons/locolor/22x22/actions/left.png
share/apps/kspread/icons/locolor/22x22/actions/lower.png
+share/apps/kspread/icons/locolor/22x22/actions/mergecell.png
share/apps/kspread/icons/locolor/22x22/actions/middle.png
share/apps/kspread/icons/locolor/22x22/actions/money.png
share/apps/kspread/icons/locolor/22x22/actions/multirow.png
share/apps/kspread/icons/locolor/22x22/actions/neonpen.png
-share/apps/kspread/icons/locolor/22x22/actions/paste.png
-share/apps/kspread/icons/locolor/22x22/actions/percent.png
-share/apps/kspread/icons/locolor/22x22/actions/precminus.png
-share/apps/kspread/icons/locolor/22x22/actions/precplus.png
+share/apps/kspread/icons/locolor/22x22/actions/oscilloscope.png
+share/apps/kspread/icons/locolor/22x22/actions/removecell.png
+share/apps/kspread/icons/locolor/22x22/actions/removecomment.png
share/apps/kspread/icons/locolor/22x22/actions/resizecol.png
share/apps/kspread/icons/locolor/22x22/actions/resizerow.png
share/apps/kspread/icons/locolor/22x22/actions/right.png
share/apps/kspread/icons/locolor/22x22/actions/rotate.png
-share/apps/kspread/icons/locolor/22x22/actions/rowin.png
share/apps/kspread/icons/locolor/22x22/actions/rowout.png
share/apps/kspread/icons/locolor/22x22/actions/sort_decrease.png
share/apps/kspread/icons/locolor/22x22/actions/sort_incr.png
+share/apps/kspread/icons/locolor/22x22/actions/special_paste.png
+share/apps/kspread/icons/locolor/22x22/actions/strike_out.png
share/apps/kspread/icons/locolor/22x22/actions/tab_first.png
share/apps/kspread/icons/locolor/22x22/actions/tab_last.png
share/apps/kspread/icons/locolor/22x22/actions/tab_left.png
share/apps/kspread/icons/locolor/22x22/actions/tab_right.png
share/apps/kspread/icons/locolor/22x22/actions/top.png
-share/apps/kspread/icons/locolor/22x22/actions/underline.png
share/apps/kspread/icons/locolor/22x22/actions/upper.png
+share/apps/kspread/icons/locolor/22x22/actions/vertical_text.png
share/apps/kspread/kpartplugins/kspreadcalc.rc
share/apps/kspread/kspread.rc
share/apps/kspread/scripts/callme.ks
@@ -412,7 +452,6 @@ share/apps/kword/icons/locolor/22x22/actions/borderleft.png
share/apps/kword/icons/locolor/22x22/actions/borderright.png
share/apps/kword/icons/locolor/22x22/actions/bordertop.png
share/apps/kword/icons/locolor/22x22/actions/char.png
-share/apps/kword/icons/locolor/22x22/actions/colin.png
share/apps/kword/icons/locolor/22x22/actions/colout.png
share/apps/kword/icons/locolor/22x22/actions/editframetool.png
share/apps/kword/icons/locolor/22x22/actions/edittool.png
@@ -421,7 +460,6 @@ share/apps/kword/icons/locolor/22x22/actions/formula.png
share/apps/kword/icons/locolor/22x22/actions/kwsearch.png
share/apps/kword/icons/locolor/22x22/actions/picframetool.png
share/apps/kword/icons/locolor/22x22/actions/return.png
-share/apps/kword/icons/locolor/22x22/actions/rowin.png
share/apps/kword/icons/locolor/22x22/actions/rowout.png
share/apps/kword/icons/locolor/22x22/actions/run_bounding.png
share/apps/kword/icons/locolor/22x22/actions/run_not.png
@@ -440,18 +478,22 @@ share/apps/kword/icons/locolor/22x22/actions/tree_embedded.png
share/apps/kword/icons/locolor/22x22/actions/tree_picture.png
share/apps/kword/icons/locolor/22x22/actions/tree_table.png
share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
-share/apps/kword/icons/locolor/22x22/actions/underl.png
share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
share/apps/kword/kword.rc
-share/apps/kword/templates/.templates
-share/apps/kword/templates/DTP/SimpleLayout.kwt
-share/apps/kword/templates/DTP/SimpleLayout.png
-share/apps/kword/templates/DTP/Test.kwt
-share/apps/kword/templates/DTP/Test.png
-share/apps/kword/templates/Wordprocessing/PlainText.kwt
-share/apps/kword/templates/Wordprocessing/PlainText.png
-share/apps/kword/templates/Wordprocessing/TwoColumns.kwt
-share/apps/kword/templates/Wordprocessing/TwoColumns.png
+share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/PlainText.png
+share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/PlainText.kwt
+share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/PlainText.desktop
+share/apps/kword/templates/Normal/TwoColumns.desktop
+share/apps/kword/templates/Publishing/.directory
+share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
+share/apps/kword/templates/Publishing/.icon/Test.png
+share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
+share/apps/kword/templates/Publishing/.source/Test.kwt
+share/apps/kword/templates/Publishing/SimpleLayout.desktop
+share/apps/kword/templates/Publishing/Test.desktop
share/doc/HTML/en/doc/README.documentation
share/doc/HTML/en/doc/index.html
share/doc/HTML/en/doc/kdelogo.png
@@ -461,42 +503,18 @@ 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
@@ -506,137 +524,49 @@ 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/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/kspread/index.docbook
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/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/border_all.png
+share/icons/hicolor/22x22/actions/border_bottom.png
+share/icons/hicolor/22x22/actions/border_fall.png
+share/icons/hicolor/22x22/actions/border_horizontal.png
+share/icons/hicolor/22x22/actions/border_inside.png
+share/icons/hicolor/22x22/actions/border_left.png
+share/icons/hicolor/22x22/actions/border_outline.png
+share/icons/hicolor/22x22/actions/border_remove.png
+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/funct.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/32x32/actions/border_all.png
+share/icons/hicolor/32x32/actions/border_bottom.png
+share/icons/hicolor/32x32/actions/border_fall.png
+share/icons/hicolor/32x32/actions/border_horizontal.png
+share/icons/hicolor/32x32/actions/border_inside.png
+share/icons/hicolor/32x32/actions/border_left.png
+share/icons/hicolor/32x32/actions/border_outline.png
+share/icons/hicolor/32x32/actions/border_remove.png
+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/funct.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/apps/kchart.png
share/icons/hicolor/32x32/apps/killustrator.png
share/icons/hicolor/32x32/apps/kpresenter.png
@@ -647,18 +577,75 @@ 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/adjustcol.png
+share/icons/locolor/16x16/actions/adjustrow.png
+share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/black_sum.png
+share/icons/locolor/16x16/actions/border_all.png
+share/icons/locolor/16x16/actions/border_bottom.png
+share/icons/locolor/16x16/actions/border_fall.png
+share/icons/locolor/16x16/actions/border_horizontal.png
+share/icons/locolor/16x16/actions/border_inside.png
+share/icons/locolor/16x16/actions/border_left.png
+share/icons/locolor/16x16/actions/border_outline.png
+share/icons/locolor/16x16/actions/border_remove.png
+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/cakes.png
+share/icons/locolor/16x16/actions/cell_edit.png
+share/icons/locolor/16x16/actions/cell_layout.png
+share/icons/locolor/16x16/actions/center.png
+share/icons/locolor/16x16/actions/chart.png
+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/first_letter_upper.png
+share/icons/locolor/16x16/actions/fontsizedown.png
+share/icons/locolor/16x16/actions/fontsizeup.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/left.png
+share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lower.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/percent.png
+share/icons/locolor/16x16/actions/precminus.png
+share/icons/locolor/16x16/actions/precplus.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/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/strike_out.png
+share/icons/locolor/16x16/actions/upper.png
+share/icons/locolor/16x16/actions/vertical_text.png
+share/icons/locolor/16x16/actions/wizard.png
share/icons/locolor/16x16/apps/kchart.png
share/icons/locolor/16x16/apps/killustrator.png
share/icons/locolor/16x16/apps/kpresenter.png
share/icons/locolor/16x16/apps/kspread.png
share/icons/locolor/16x16/apps/kspreadcalc.png
share/icons/locolor/16x16/apps/kword.png
+share/icons/locolor/22x22/apps/kspreadcalc.png
share/icons/locolor/32x32/apps/kchart.png
share/icons/locolor/32x32/apps/killustrator.png
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
@@ -684,19 +671,20 @@ share/servicetypes/kofilter.desktop
share/servicetypes/kofilterdialog.desktop
share/servicetypes/koplugin.desktop
share/servicetypes/kotool.desktop
-@unexec rm -f %D/share/doc/HTML/en/katabase/common
-@unexec rm -f %D/share/doc/HTML/en/killustrator/common
-@unexec rm -f %D/share/doc/HTML/en/koffice/common
-@unexec rm -f %D/share/doc/HTML/en/kpresenter/common
-@unexec rm -f %D/share/doc/HTML/en/kword/common
+@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
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
@dirrm share/doc/HTML/en/katabase
@dirrm share/doc/HTML/en/doc
-@dirrm share/apps/kword/templates/Wordprocessing
-@dirrm share/apps/kword/templates/DTP
+@dirrm share/apps/kword/templates/Publishing/.source
+@dirrm share/apps/kword/templates/Publishing/.icon
+@dirrm share/apps/kword/templates/Publishing
+@dirrm share/apps/kword/templates/Normal/.source
+@dirrm share/apps/kword/templates/Normal/.icon
+@dirrm share/apps/kword/templates/Normal
@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
@dirrm share/apps/kword/icons/locolor/22x22
@@ -707,7 +695,6 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
-@dirrm share/apps/kspread/icons/locolor/22x22/actions/black
@dirrm share/apps/kspread/icons/locolor/22x22/actions
@dirrm share/apps/kspread/icons/locolor/22x22
@dirrm share/apps/kspread/icons/locolor
@@ -715,7 +702,11 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.source
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
@dirrm share/apps/kpresenter/templates/Screenpresentations
+@dirrm share/apps/kpresenter/templates/Professional/.source
+@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@@ -730,19 +721,29 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/autoforms
@dirrm share/apps/kpresenter
@dirrm share/apps/koffice/pics
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/text
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/insert
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/delete
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/clipart
@dirrm share/apps/koffice/icons/locolor/22x22/actions
@dirrm share/apps/koffice/icons/locolor/22x22
+@dirrm share/apps/koffice/icons/locolor/16x16/actions
+@dirrm share/apps/koffice/icons/locolor/16x16
@dirrm share/apps/koffice/icons/locolor
+@dirrm share/apps/koffice/icons/hicolor/32x32/actions
+@dirrm share/apps/koffice/icons/hicolor/32x32
+@dirrm share/apps/koffice/icons/hicolor/22x22/actions
+@dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
+@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/toolbar
+@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/applnk/Applications/KOffice
-@dirrm share/applnk/Applications
+@dirrm share/apps/graphite
+@dirrm share/applnk/Office
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 0a71dbb8520d..8bd9ce9f50d7 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -1,31 +1,38 @@
# New ports collection makefile for: koffice
# Date created: Sun May 14 2000 16:33:15
-# Whom: Will Andrews <will@FreeBSD>org>
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= koffice
-PORTVERSION= 1.90
+PORTVERSION= 20000724A
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+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_QT2= yes
+USE_NEWGCC= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+ --with-qt-libraries=${X11BASE}/lib \
+ --with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
+pre-install:
+ @(find ${WRKSRC} -name CVS | xargs rm -rf)
+
.include <bsd.port.mk>
diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo
index 554b1ff849fe..29689accec3b 100644
--- a/editors/koffice-kde3/distinfo
+++ b/editors/koffice-kde3/distinfo
@@ -1 +1 @@
-MD5 (koffice-1.90.tar.bz2) = aabb2ffd04f10ebdcccce8748cfd62ad
+MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist
index 3462309e42ed..b9623c9d9c0d 100644
--- a/editors/koffice-kde3/pkg-plist
+++ b/editors/koffice-kde3/pkg-plist
@@ -1,3 +1,4 @@
+bin/graphite
bin/kchart
bin/killustrator
bin/koshell
@@ -5,6 +6,8 @@ bin/kpresenter
bin/kscript
bin/kspread
bin/kword
+include/KoApplicationIface.h
+include/KoDocumentIface.h
include/handler.h
include/kcoloractions.h
include/koApplication.h
@@ -20,7 +23,7 @@ include/koFilter.h
include/koFilterDialog.h
include/koFilterManager.h
include/koFrame.h
-include/koIcons.h
+include/koGlobal.h
include/koKoolBar.h
include/koMainWindow.h
include/koPageLayoutDia.h
@@ -34,8 +37,7 @@ include/koTabChooser.h
include/koTarStore.h
include/koTemplateChooseDia.h
include/koTemplateCreateDia.h
-include/koUIUtils.h
-include/koUndo.h
+include/koTemplates.h
include/koView.h
include/komlFeed.h
include/komlFileFeed.h
@@ -45,64 +47,84 @@ include/komlStreamFeed.h
include/komlWriter.h
include/toolbox.h
include/torben.h
+lib/graphite.a
+lib/graphite.la
+lib/kchart.a
+lib/kchart.la
+lib/killustrator.a
+lib/killustrator.la
+lib/koshell.a
+lib/koshell.la
+lib/kpresenter.a
+lib/kpresenter.la
+lib/kspread.a
+lib/kspread.la
+lib/kword.a
+lib/kword.la
+lib/libasciiexport.a
lib/libasciiexport.la
-lib/libasciiexport.so
+lib/libasciiimport.a
lib/libasciiimport.la
-lib/libasciiimport.so
+lib/libcsvexport.a
lib/libcsvexport.la
-lib/libcsvexport.so
+lib/libcsvexport_test.a
lib/libcsvexport_test.la
-lib/libcsvexport_test.so
+lib/libcsvfilter.a
lib/libcsvfilter.la
-lib/libcsvfilter.so
+lib/libcsvfilterdia.a
lib/libcsvfilterdia.la
-lib/libcsvfilterdia.so
+lib/libgraphitepart.a
+lib/libgraphitepart.la
+lib/libhtmlexport.a
lib/libhtmlexport.la
-lib/libhtmlexport.so
+lib/libhtmlimport.a
lib/libhtmlimport.la
-lib/libhtmlimport.so
-lib/libkchart.la
-lib/libkchart.so
-lib/libkillustrator.la
-lib/libkillustrator.so
+lib/libkchartpart.a
+lib/libkchartpart.la
+lib/libkillustratorpart.a
+lib/libkillustratorpart.la
+lib/libkodocinfopropspage.a
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/libkpresenter.la
-lib/libkpresenter.so
+lib/libkpresenterpart.a
+lib/libkpresenterpart.la
lib/libkscript.la
lib/libkscript.so.1
+lib/libkspelltool.a
lib/libkspelltool.la
-lib/libkspelltool.so
-lib/libkspread.la
-lib/libkspread.so
+lib/libkspreadcalc.a
lib/libkspreadcalc.la
-lib/libkspreadcalc.so
+lib/libkspreadpart.a
+lib/libkspreadpart.la
lib/libkstore.la
lib/libkstore.so.1
-lib/libkword.la
-lib/libkword.so
+lib/libkwordpart.a
+lib/libkwordpart.la
+lib/libolefilter.a
lib/libolefilter.la
-lib/libolefilter.so
-share/applnk/Applications/KOffice/kchart.desktop
-share/applnk/Applications/KOffice/killustrator.desktop
-share/applnk/Applications/KOffice/koshell.desktop
-share/applnk/Applications/KOffice/kpresenter.desktop
-share/applnk/Applications/KOffice/kspread.desktop
-share/applnk/Applications/KOffice/kword.desktop
+share/applnk/Office/graphite.desktop
+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
+share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
+share/apps/kchart/icons/locolor/22x22/actions/data.png
+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/toolbar/areas.png
-share/apps/kchart/toolbar/bars.png
-share/apps/kchart/toolbar/cakes.png
-share/apps/kchart/toolbar/lines.png
-share/apps/kchart/toolbar/options.png
share/apps/killustrator/KIllustrator.rc
-share/apps/killustrator/default.pal
share/apps/killustrator/pics/abottom.png
share/apps/killustrator/pics/ahcenter.png
share/apps/killustrator/pics/aleft.png
@@ -147,19 +169,38 @@ share/apps/killustrator/pics/tleftalign.png
share/apps/killustrator/pics/trightalign.png
share/apps/killustrator/pics/vmirror.png
share/apps/killustrator/pics/zoomtool.png
+share/apps/killustrator/templates/Simple/.directory
+share/apps/killustrator/templates/Simple/.icon/Plain.png
+share/apps/killustrator/templates/Simple/.source/Plain.kil
+share/apps/killustrator/templates/Simple/Plain.desktop
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/text_color.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/sort_az.png
+share/apps/koffice/icons/hicolor/32x32/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/documentinfo.png
+share/apps/koffice/icons/locolor/16x16/actions/enum_list.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/text_sub.png
+share/apps/koffice/icons/locolor/16x16/actions/text_super.png
+share/apps/koffice/icons/locolor/16x16/actions/unsorted_list.png
share/apps/koffice/icons/locolor/22x22/actions/alignBlock.png
share/apps/koffice/icons/locolor/22x22/actions/alignCenter.png
share/apps/koffice/icons/locolor/22x22/actions/alignLeft.png
share/apps/koffice/icons/locolor/22x22/actions/alignRight.png
-share/apps/koffice/icons/locolor/22x22/actions/bold.png
share/apps/koffice/icons/locolor/22x22/actions/cancel.png
share/apps/koffice/icons/locolor/22x22/actions/clipart.png
-share/apps/koffice/icons/locolor/22x22/actions/clipart/from-file.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/italic.png
+share/apps/koffice/icons/locolor/22x22/actions/clipart_from_file.png
share/apps/koffice/icons/locolor/22x22/actions/neonpen.png
share/apps/koffice/icons/locolor/22x22/actions/ok.png
share/apps/koffice/icons/locolor/22x22/actions/part/kchart.png
@@ -172,12 +213,6 @@ share/apps/koffice/icons/locolor/22x22/actions/part/kword.png
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/icons/locolor/22x22/actions/product.png
-share/apps/koffice/icons/locolor/22x22/actions/sum.png
-share/apps/koffice/icons/locolor/22x22/actions/text/bold.png
-share/apps/koffice/icons/locolor/22x22/actions/text/italic.png
-share/apps/koffice/icons/locolor/22x22/actions/text/underlined.png
-share/apps/koffice/icons/locolor/22x22/actions/underl.png
share/apps/koffice/koffice_shell.rc
share/apps/koffice/pics/koRulerFirst.png
share/apps/koffice/pics/koRulerLeft.png
@@ -325,77 +360,82 @@ share/apps/kpresenter/slideshow/next.png
share/apps/kpresenter/slideshow/prev.bmp
share/apps/kpresenter/slideshow/prev.jpeg
share/apps/kpresenter/slideshow/prev.png
-share/apps/kpresenter/templates/.templates
-share/apps/kpresenter/templates/Professional/One.kpt
-share/apps/kpresenter/templates/Professional/One.png
-share/apps/kpresenter/templates/Professional/Title.kpt
-share/apps/kpresenter/templates/Professional/Title.png
-share/apps/kpresenter/templates/Professional/Two.kpt
-share/apps/kpresenter/templates/Professional/Two.png
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.kpt
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/Sand1.kpt
-share/apps/kpresenter/templates/Screenpresentations/Sand1.png
-share/apps/kpresenter/templates/Screenpresentations/kde.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde.png
-share/apps/kpresenter/templates/Screenpresentations/kde2.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde2.png
+share/apps/kpresenter/templates/Professional/.directory
+share/apps/kpresenter/templates/Professional/.icon/One.png
+share/apps/kpresenter/templates/Professional/.icon/Title.png
+share/apps/kpresenter/templates/Professional/.icon/Two.png
+share/apps/kpresenter/templates/Professional/.source/One.kpt
+share/apps/kpresenter/templates/Professional/.source/Title.kpt
+share/apps/kpresenter/templates/Professional/.source/Two.kpt
+share/apps/kpresenter/templates/Professional/One.desktop
+share/apps/kpresenter/templates/Professional/Title.desktop
+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
share/apps/kspread/extensions/math.ks
share/apps/kspread/icons/locolor/22x22/actions/abort.png
share/apps/kspread/icons/locolor/22x22/actions/adjustcol.png
share/apps/kspread/icons/locolor/22x22/actions/adjustrow.png
-share/apps/kspread/icons/locolor/22x22/actions/black/sum.png
-share/apps/kspread/icons/locolor/22x22/actions/bold.png
-share/apps/kspread/icons/locolor/22x22/actions/borderall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderbottom.png
-share/apps/kspread/icons/locolor/22x22/actions/borderfall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderhorizontal.png
-share/apps/kspread/icons/locolor/22x22/actions/borderinside.png
-share/apps/kspread/icons/locolor/22x22/actions/borderleft.png
-share/apps/kspread/icons/locolor/22x22/actions/borderoutline.png
-share/apps/kspread/icons/locolor/22x22/actions/borderremove.png
-share/apps/kspread/icons/locolor/22x22/actions/borderright.png
-share/apps/kspread/icons/locolor/22x22/actions/bordertop.png
-share/apps/kspread/icons/locolor/22x22/actions/borderup.png
-share/apps/kspread/icons/locolor/22x22/actions/bordervertical.png
+share/apps/kspread/icons/locolor/22x22/actions/black_sum.png
share/apps/kspread/icons/locolor/22x22/actions/bottom.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_edit.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_layout.png
share/apps/kspread/icons/locolor/22x22/actions/center.png
share/apps/kspread/icons/locolor/22x22/actions/chart.png
-share/apps/kspread/icons/locolor/22x22/actions/colin.png
share/apps/kspread/icons/locolor/22x22/actions/colout.png
+share/apps/kspread/icons/locolor/22x22/actions/comment.png
+share/apps/kspread/icons/locolor/22x22/actions/delete_table.png
+share/apps/kspread/icons/locolor/22x22/actions/deletecell.png
+share/apps/kspread/icons/locolor/22x22/actions/dissociatecell.png
share/apps/kspread/icons/locolor/22x22/actions/done.png
+share/apps/kspread/icons/locolor/22x22/actions/find.png
+share/apps/kspread/icons/locolor/22x22/actions/first_letter_upper.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizedown.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizeup.png
-share/apps/kspread/icons/locolor/22x22/actions/funct.png
-share/apps/kspread/icons/locolor/22x22/actions/italic.png
+share/apps/kspread/icons/locolor/22x22/actions/goto.png
+share/apps/kspread/icons/locolor/22x22/actions/insertcell.png
+share/apps/kspread/icons/locolor/22x22/actions/inserttable.png
share/apps/kspread/icons/locolor/22x22/actions/left.png
share/apps/kspread/icons/locolor/22x22/actions/lower.png
+share/apps/kspread/icons/locolor/22x22/actions/mergecell.png
share/apps/kspread/icons/locolor/22x22/actions/middle.png
share/apps/kspread/icons/locolor/22x22/actions/money.png
share/apps/kspread/icons/locolor/22x22/actions/multirow.png
share/apps/kspread/icons/locolor/22x22/actions/neonpen.png
-share/apps/kspread/icons/locolor/22x22/actions/paste.png
-share/apps/kspread/icons/locolor/22x22/actions/percent.png
-share/apps/kspread/icons/locolor/22x22/actions/precminus.png
-share/apps/kspread/icons/locolor/22x22/actions/precplus.png
+share/apps/kspread/icons/locolor/22x22/actions/oscilloscope.png
+share/apps/kspread/icons/locolor/22x22/actions/removecell.png
+share/apps/kspread/icons/locolor/22x22/actions/removecomment.png
share/apps/kspread/icons/locolor/22x22/actions/resizecol.png
share/apps/kspread/icons/locolor/22x22/actions/resizerow.png
share/apps/kspread/icons/locolor/22x22/actions/right.png
share/apps/kspread/icons/locolor/22x22/actions/rotate.png
-share/apps/kspread/icons/locolor/22x22/actions/rowin.png
share/apps/kspread/icons/locolor/22x22/actions/rowout.png
share/apps/kspread/icons/locolor/22x22/actions/sort_decrease.png
share/apps/kspread/icons/locolor/22x22/actions/sort_incr.png
+share/apps/kspread/icons/locolor/22x22/actions/special_paste.png
+share/apps/kspread/icons/locolor/22x22/actions/strike_out.png
share/apps/kspread/icons/locolor/22x22/actions/tab_first.png
share/apps/kspread/icons/locolor/22x22/actions/tab_last.png
share/apps/kspread/icons/locolor/22x22/actions/tab_left.png
share/apps/kspread/icons/locolor/22x22/actions/tab_right.png
share/apps/kspread/icons/locolor/22x22/actions/top.png
-share/apps/kspread/icons/locolor/22x22/actions/underline.png
share/apps/kspread/icons/locolor/22x22/actions/upper.png
+share/apps/kspread/icons/locolor/22x22/actions/vertical_text.png
share/apps/kspread/kpartplugins/kspreadcalc.rc
share/apps/kspread/kspread.rc
share/apps/kspread/scripts/callme.ks
@@ -412,7 +452,6 @@ share/apps/kword/icons/locolor/22x22/actions/borderleft.png
share/apps/kword/icons/locolor/22x22/actions/borderright.png
share/apps/kword/icons/locolor/22x22/actions/bordertop.png
share/apps/kword/icons/locolor/22x22/actions/char.png
-share/apps/kword/icons/locolor/22x22/actions/colin.png
share/apps/kword/icons/locolor/22x22/actions/colout.png
share/apps/kword/icons/locolor/22x22/actions/editframetool.png
share/apps/kword/icons/locolor/22x22/actions/edittool.png
@@ -421,7 +460,6 @@ share/apps/kword/icons/locolor/22x22/actions/formula.png
share/apps/kword/icons/locolor/22x22/actions/kwsearch.png
share/apps/kword/icons/locolor/22x22/actions/picframetool.png
share/apps/kword/icons/locolor/22x22/actions/return.png
-share/apps/kword/icons/locolor/22x22/actions/rowin.png
share/apps/kword/icons/locolor/22x22/actions/rowout.png
share/apps/kword/icons/locolor/22x22/actions/run_bounding.png
share/apps/kword/icons/locolor/22x22/actions/run_not.png
@@ -440,18 +478,22 @@ share/apps/kword/icons/locolor/22x22/actions/tree_embedded.png
share/apps/kword/icons/locolor/22x22/actions/tree_picture.png
share/apps/kword/icons/locolor/22x22/actions/tree_table.png
share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
-share/apps/kword/icons/locolor/22x22/actions/underl.png
share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
share/apps/kword/kword.rc
-share/apps/kword/templates/.templates
-share/apps/kword/templates/DTP/SimpleLayout.kwt
-share/apps/kword/templates/DTP/SimpleLayout.png
-share/apps/kword/templates/DTP/Test.kwt
-share/apps/kword/templates/DTP/Test.png
-share/apps/kword/templates/Wordprocessing/PlainText.kwt
-share/apps/kword/templates/Wordprocessing/PlainText.png
-share/apps/kword/templates/Wordprocessing/TwoColumns.kwt
-share/apps/kword/templates/Wordprocessing/TwoColumns.png
+share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/PlainText.png
+share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/PlainText.kwt
+share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/PlainText.desktop
+share/apps/kword/templates/Normal/TwoColumns.desktop
+share/apps/kword/templates/Publishing/.directory
+share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
+share/apps/kword/templates/Publishing/.icon/Test.png
+share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
+share/apps/kword/templates/Publishing/.source/Test.kwt
+share/apps/kword/templates/Publishing/SimpleLayout.desktop
+share/apps/kword/templates/Publishing/Test.desktop
share/doc/HTML/en/doc/README.documentation
share/doc/HTML/en/doc/index.html
share/doc/HTML/en/doc/kdelogo.png
@@ -461,42 +503,18 @@ 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
@@ -506,137 +524,49 @@ 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/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/kspread/index.docbook
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/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/border_all.png
+share/icons/hicolor/22x22/actions/border_bottom.png
+share/icons/hicolor/22x22/actions/border_fall.png
+share/icons/hicolor/22x22/actions/border_horizontal.png
+share/icons/hicolor/22x22/actions/border_inside.png
+share/icons/hicolor/22x22/actions/border_left.png
+share/icons/hicolor/22x22/actions/border_outline.png
+share/icons/hicolor/22x22/actions/border_remove.png
+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/funct.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/32x32/actions/border_all.png
+share/icons/hicolor/32x32/actions/border_bottom.png
+share/icons/hicolor/32x32/actions/border_fall.png
+share/icons/hicolor/32x32/actions/border_horizontal.png
+share/icons/hicolor/32x32/actions/border_inside.png
+share/icons/hicolor/32x32/actions/border_left.png
+share/icons/hicolor/32x32/actions/border_outline.png
+share/icons/hicolor/32x32/actions/border_remove.png
+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/funct.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/apps/kchart.png
share/icons/hicolor/32x32/apps/killustrator.png
share/icons/hicolor/32x32/apps/kpresenter.png
@@ -647,18 +577,75 @@ 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/adjustcol.png
+share/icons/locolor/16x16/actions/adjustrow.png
+share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/black_sum.png
+share/icons/locolor/16x16/actions/border_all.png
+share/icons/locolor/16x16/actions/border_bottom.png
+share/icons/locolor/16x16/actions/border_fall.png
+share/icons/locolor/16x16/actions/border_horizontal.png
+share/icons/locolor/16x16/actions/border_inside.png
+share/icons/locolor/16x16/actions/border_left.png
+share/icons/locolor/16x16/actions/border_outline.png
+share/icons/locolor/16x16/actions/border_remove.png
+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/cakes.png
+share/icons/locolor/16x16/actions/cell_edit.png
+share/icons/locolor/16x16/actions/cell_layout.png
+share/icons/locolor/16x16/actions/center.png
+share/icons/locolor/16x16/actions/chart.png
+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/first_letter_upper.png
+share/icons/locolor/16x16/actions/fontsizedown.png
+share/icons/locolor/16x16/actions/fontsizeup.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/left.png
+share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lower.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/percent.png
+share/icons/locolor/16x16/actions/precminus.png
+share/icons/locolor/16x16/actions/precplus.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/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/strike_out.png
+share/icons/locolor/16x16/actions/upper.png
+share/icons/locolor/16x16/actions/vertical_text.png
+share/icons/locolor/16x16/actions/wizard.png
share/icons/locolor/16x16/apps/kchart.png
share/icons/locolor/16x16/apps/killustrator.png
share/icons/locolor/16x16/apps/kpresenter.png
share/icons/locolor/16x16/apps/kspread.png
share/icons/locolor/16x16/apps/kspreadcalc.png
share/icons/locolor/16x16/apps/kword.png
+share/icons/locolor/22x22/apps/kspreadcalc.png
share/icons/locolor/32x32/apps/kchart.png
share/icons/locolor/32x32/apps/killustrator.png
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
@@ -684,19 +671,20 @@ share/servicetypes/kofilter.desktop
share/servicetypes/kofilterdialog.desktop
share/servicetypes/koplugin.desktop
share/servicetypes/kotool.desktop
-@unexec rm -f %D/share/doc/HTML/en/katabase/common
-@unexec rm -f %D/share/doc/HTML/en/killustrator/common
-@unexec rm -f %D/share/doc/HTML/en/koffice/common
-@unexec rm -f %D/share/doc/HTML/en/kpresenter/common
-@unexec rm -f %D/share/doc/HTML/en/kword/common
+@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
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
@dirrm share/doc/HTML/en/katabase
@dirrm share/doc/HTML/en/doc
-@dirrm share/apps/kword/templates/Wordprocessing
-@dirrm share/apps/kword/templates/DTP
+@dirrm share/apps/kword/templates/Publishing/.source
+@dirrm share/apps/kword/templates/Publishing/.icon
+@dirrm share/apps/kword/templates/Publishing
+@dirrm share/apps/kword/templates/Normal/.source
+@dirrm share/apps/kword/templates/Normal/.icon
+@dirrm share/apps/kword/templates/Normal
@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
@dirrm share/apps/kword/icons/locolor/22x22
@@ -707,7 +695,6 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
-@dirrm share/apps/kspread/icons/locolor/22x22/actions/black
@dirrm share/apps/kspread/icons/locolor/22x22/actions
@dirrm share/apps/kspread/icons/locolor/22x22
@dirrm share/apps/kspread/icons/locolor
@@ -715,7 +702,11 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.source
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
@dirrm share/apps/kpresenter/templates/Screenpresentations
+@dirrm share/apps/kpresenter/templates/Professional/.source
+@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@@ -730,19 +721,29 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/autoforms
@dirrm share/apps/kpresenter
@dirrm share/apps/koffice/pics
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/text
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/insert
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/delete
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/clipart
@dirrm share/apps/koffice/icons/locolor/22x22/actions
@dirrm share/apps/koffice/icons/locolor/22x22
+@dirrm share/apps/koffice/icons/locolor/16x16/actions
+@dirrm share/apps/koffice/icons/locolor/16x16
@dirrm share/apps/koffice/icons/locolor
+@dirrm share/apps/koffice/icons/hicolor/32x32/actions
+@dirrm share/apps/koffice/icons/hicolor/32x32
+@dirrm share/apps/koffice/icons/hicolor/22x22/actions
+@dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
+@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/toolbar
+@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/applnk/Applications/KOffice
-@dirrm share/applnk/Applications
+@dirrm share/apps/graphite
+@dirrm share/applnk/Office
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 0a71dbb8520d..8bd9ce9f50d7 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -1,31 +1,38 @@
# New ports collection makefile for: koffice
# Date created: Sun May 14 2000 16:33:15
-# Whom: Will Andrews <will@FreeBSD>org>
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= koffice
-PORTVERSION= 1.90
+PORTVERSION= 20000724A
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+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_QT2= yes
+USE_NEWGCC= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+ --with-qt-libraries=${X11BASE}/lib \
+ --with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
+pre-install:
+ @(find ${WRKSRC} -name CVS | xargs rm -rf)
+
.include <bsd.port.mk>
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 554b1ff849fe..29689accec3b 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1 +1 @@
-MD5 (koffice-1.90.tar.bz2) = aabb2ffd04f10ebdcccce8748cfd62ad
+MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index 3462309e42ed..b9623c9d9c0d 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1,3 +1,4 @@
+bin/graphite
bin/kchart
bin/killustrator
bin/koshell
@@ -5,6 +6,8 @@ bin/kpresenter
bin/kscript
bin/kspread
bin/kword
+include/KoApplicationIface.h
+include/KoDocumentIface.h
include/handler.h
include/kcoloractions.h
include/koApplication.h
@@ -20,7 +23,7 @@ include/koFilter.h
include/koFilterDialog.h
include/koFilterManager.h
include/koFrame.h
-include/koIcons.h
+include/koGlobal.h
include/koKoolBar.h
include/koMainWindow.h
include/koPageLayoutDia.h
@@ -34,8 +37,7 @@ include/koTabChooser.h
include/koTarStore.h
include/koTemplateChooseDia.h
include/koTemplateCreateDia.h
-include/koUIUtils.h
-include/koUndo.h
+include/koTemplates.h
include/koView.h
include/komlFeed.h
include/komlFileFeed.h
@@ -45,64 +47,84 @@ include/komlStreamFeed.h
include/komlWriter.h
include/toolbox.h
include/torben.h
+lib/graphite.a
+lib/graphite.la
+lib/kchart.a
+lib/kchart.la
+lib/killustrator.a
+lib/killustrator.la
+lib/koshell.a
+lib/koshell.la
+lib/kpresenter.a
+lib/kpresenter.la
+lib/kspread.a
+lib/kspread.la
+lib/kword.a
+lib/kword.la
+lib/libasciiexport.a
lib/libasciiexport.la
-lib/libasciiexport.so
+lib/libasciiimport.a
lib/libasciiimport.la
-lib/libasciiimport.so
+lib/libcsvexport.a
lib/libcsvexport.la
-lib/libcsvexport.so
+lib/libcsvexport_test.a
lib/libcsvexport_test.la
-lib/libcsvexport_test.so
+lib/libcsvfilter.a
lib/libcsvfilter.la
-lib/libcsvfilter.so
+lib/libcsvfilterdia.a
lib/libcsvfilterdia.la
-lib/libcsvfilterdia.so
+lib/libgraphitepart.a
+lib/libgraphitepart.la
+lib/libhtmlexport.a
lib/libhtmlexport.la
-lib/libhtmlexport.so
+lib/libhtmlimport.a
lib/libhtmlimport.la
-lib/libhtmlimport.so
-lib/libkchart.la
-lib/libkchart.so
-lib/libkillustrator.la
-lib/libkillustrator.so
+lib/libkchartpart.a
+lib/libkchartpart.la
+lib/libkillustratorpart.a
+lib/libkillustratorpart.la
+lib/libkodocinfopropspage.a
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/libkpresenter.la
-lib/libkpresenter.so
+lib/libkpresenterpart.a
+lib/libkpresenterpart.la
lib/libkscript.la
lib/libkscript.so.1
+lib/libkspelltool.a
lib/libkspelltool.la
-lib/libkspelltool.so
-lib/libkspread.la
-lib/libkspread.so
+lib/libkspreadcalc.a
lib/libkspreadcalc.la
-lib/libkspreadcalc.so
+lib/libkspreadpart.a
+lib/libkspreadpart.la
lib/libkstore.la
lib/libkstore.so.1
-lib/libkword.la
-lib/libkword.so
+lib/libkwordpart.a
+lib/libkwordpart.la
+lib/libolefilter.a
lib/libolefilter.la
-lib/libolefilter.so
-share/applnk/Applications/KOffice/kchart.desktop
-share/applnk/Applications/KOffice/killustrator.desktop
-share/applnk/Applications/KOffice/koshell.desktop
-share/applnk/Applications/KOffice/kpresenter.desktop
-share/applnk/Applications/KOffice/kspread.desktop
-share/applnk/Applications/KOffice/kword.desktop
+share/applnk/Office/graphite.desktop
+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
+share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
+share/apps/kchart/icons/locolor/22x22/actions/data.png
+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/toolbar/areas.png
-share/apps/kchart/toolbar/bars.png
-share/apps/kchart/toolbar/cakes.png
-share/apps/kchart/toolbar/lines.png
-share/apps/kchart/toolbar/options.png
share/apps/killustrator/KIllustrator.rc
-share/apps/killustrator/default.pal
share/apps/killustrator/pics/abottom.png
share/apps/killustrator/pics/ahcenter.png
share/apps/killustrator/pics/aleft.png
@@ -147,19 +169,38 @@ share/apps/killustrator/pics/tleftalign.png
share/apps/killustrator/pics/trightalign.png
share/apps/killustrator/pics/vmirror.png
share/apps/killustrator/pics/zoomtool.png
+share/apps/killustrator/templates/Simple/.directory
+share/apps/killustrator/templates/Simple/.icon/Plain.png
+share/apps/killustrator/templates/Simple/.source/Plain.kil
+share/apps/killustrator/templates/Simple/Plain.desktop
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/text_color.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/sort_az.png
+share/apps/koffice/icons/hicolor/32x32/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/documentinfo.png
+share/apps/koffice/icons/locolor/16x16/actions/enum_list.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/text_sub.png
+share/apps/koffice/icons/locolor/16x16/actions/text_super.png
+share/apps/koffice/icons/locolor/16x16/actions/unsorted_list.png
share/apps/koffice/icons/locolor/22x22/actions/alignBlock.png
share/apps/koffice/icons/locolor/22x22/actions/alignCenter.png
share/apps/koffice/icons/locolor/22x22/actions/alignLeft.png
share/apps/koffice/icons/locolor/22x22/actions/alignRight.png
-share/apps/koffice/icons/locolor/22x22/actions/bold.png
share/apps/koffice/icons/locolor/22x22/actions/cancel.png
share/apps/koffice/icons/locolor/22x22/actions/clipart.png
-share/apps/koffice/icons/locolor/22x22/actions/clipart/from-file.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/italic.png
+share/apps/koffice/icons/locolor/22x22/actions/clipart_from_file.png
share/apps/koffice/icons/locolor/22x22/actions/neonpen.png
share/apps/koffice/icons/locolor/22x22/actions/ok.png
share/apps/koffice/icons/locolor/22x22/actions/part/kchart.png
@@ -172,12 +213,6 @@ share/apps/koffice/icons/locolor/22x22/actions/part/kword.png
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/icons/locolor/22x22/actions/product.png
-share/apps/koffice/icons/locolor/22x22/actions/sum.png
-share/apps/koffice/icons/locolor/22x22/actions/text/bold.png
-share/apps/koffice/icons/locolor/22x22/actions/text/italic.png
-share/apps/koffice/icons/locolor/22x22/actions/text/underlined.png
-share/apps/koffice/icons/locolor/22x22/actions/underl.png
share/apps/koffice/koffice_shell.rc
share/apps/koffice/pics/koRulerFirst.png
share/apps/koffice/pics/koRulerLeft.png
@@ -325,77 +360,82 @@ share/apps/kpresenter/slideshow/next.png
share/apps/kpresenter/slideshow/prev.bmp
share/apps/kpresenter/slideshow/prev.jpeg
share/apps/kpresenter/slideshow/prev.png
-share/apps/kpresenter/templates/.templates
-share/apps/kpresenter/templates/Professional/One.kpt
-share/apps/kpresenter/templates/Professional/One.png
-share/apps/kpresenter/templates/Professional/Title.kpt
-share/apps/kpresenter/templates/Professional/Title.png
-share/apps/kpresenter/templates/Professional/Two.kpt
-share/apps/kpresenter/templates/Professional/Two.png
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.kpt
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/Sand1.kpt
-share/apps/kpresenter/templates/Screenpresentations/Sand1.png
-share/apps/kpresenter/templates/Screenpresentations/kde.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde.png
-share/apps/kpresenter/templates/Screenpresentations/kde2.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde2.png
+share/apps/kpresenter/templates/Professional/.directory
+share/apps/kpresenter/templates/Professional/.icon/One.png
+share/apps/kpresenter/templates/Professional/.icon/Title.png
+share/apps/kpresenter/templates/Professional/.icon/Two.png
+share/apps/kpresenter/templates/Professional/.source/One.kpt
+share/apps/kpresenter/templates/Professional/.source/Title.kpt
+share/apps/kpresenter/templates/Professional/.source/Two.kpt
+share/apps/kpresenter/templates/Professional/One.desktop
+share/apps/kpresenter/templates/Professional/Title.desktop
+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
share/apps/kspread/extensions/math.ks
share/apps/kspread/icons/locolor/22x22/actions/abort.png
share/apps/kspread/icons/locolor/22x22/actions/adjustcol.png
share/apps/kspread/icons/locolor/22x22/actions/adjustrow.png
-share/apps/kspread/icons/locolor/22x22/actions/black/sum.png
-share/apps/kspread/icons/locolor/22x22/actions/bold.png
-share/apps/kspread/icons/locolor/22x22/actions/borderall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderbottom.png
-share/apps/kspread/icons/locolor/22x22/actions/borderfall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderhorizontal.png
-share/apps/kspread/icons/locolor/22x22/actions/borderinside.png
-share/apps/kspread/icons/locolor/22x22/actions/borderleft.png
-share/apps/kspread/icons/locolor/22x22/actions/borderoutline.png
-share/apps/kspread/icons/locolor/22x22/actions/borderremove.png
-share/apps/kspread/icons/locolor/22x22/actions/borderright.png
-share/apps/kspread/icons/locolor/22x22/actions/bordertop.png
-share/apps/kspread/icons/locolor/22x22/actions/borderup.png
-share/apps/kspread/icons/locolor/22x22/actions/bordervertical.png
+share/apps/kspread/icons/locolor/22x22/actions/black_sum.png
share/apps/kspread/icons/locolor/22x22/actions/bottom.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_edit.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_layout.png
share/apps/kspread/icons/locolor/22x22/actions/center.png
share/apps/kspread/icons/locolor/22x22/actions/chart.png
-share/apps/kspread/icons/locolor/22x22/actions/colin.png
share/apps/kspread/icons/locolor/22x22/actions/colout.png
+share/apps/kspread/icons/locolor/22x22/actions/comment.png
+share/apps/kspread/icons/locolor/22x22/actions/delete_table.png
+share/apps/kspread/icons/locolor/22x22/actions/deletecell.png
+share/apps/kspread/icons/locolor/22x22/actions/dissociatecell.png
share/apps/kspread/icons/locolor/22x22/actions/done.png
+share/apps/kspread/icons/locolor/22x22/actions/find.png
+share/apps/kspread/icons/locolor/22x22/actions/first_letter_upper.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizedown.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizeup.png
-share/apps/kspread/icons/locolor/22x22/actions/funct.png
-share/apps/kspread/icons/locolor/22x22/actions/italic.png
+share/apps/kspread/icons/locolor/22x22/actions/goto.png
+share/apps/kspread/icons/locolor/22x22/actions/insertcell.png
+share/apps/kspread/icons/locolor/22x22/actions/inserttable.png
share/apps/kspread/icons/locolor/22x22/actions/left.png
share/apps/kspread/icons/locolor/22x22/actions/lower.png
+share/apps/kspread/icons/locolor/22x22/actions/mergecell.png
share/apps/kspread/icons/locolor/22x22/actions/middle.png
share/apps/kspread/icons/locolor/22x22/actions/money.png
share/apps/kspread/icons/locolor/22x22/actions/multirow.png
share/apps/kspread/icons/locolor/22x22/actions/neonpen.png
-share/apps/kspread/icons/locolor/22x22/actions/paste.png
-share/apps/kspread/icons/locolor/22x22/actions/percent.png
-share/apps/kspread/icons/locolor/22x22/actions/precminus.png
-share/apps/kspread/icons/locolor/22x22/actions/precplus.png
+share/apps/kspread/icons/locolor/22x22/actions/oscilloscope.png
+share/apps/kspread/icons/locolor/22x22/actions/removecell.png
+share/apps/kspread/icons/locolor/22x22/actions/removecomment.png
share/apps/kspread/icons/locolor/22x22/actions/resizecol.png
share/apps/kspread/icons/locolor/22x22/actions/resizerow.png
share/apps/kspread/icons/locolor/22x22/actions/right.png
share/apps/kspread/icons/locolor/22x22/actions/rotate.png
-share/apps/kspread/icons/locolor/22x22/actions/rowin.png
share/apps/kspread/icons/locolor/22x22/actions/rowout.png
share/apps/kspread/icons/locolor/22x22/actions/sort_decrease.png
share/apps/kspread/icons/locolor/22x22/actions/sort_incr.png
+share/apps/kspread/icons/locolor/22x22/actions/special_paste.png
+share/apps/kspread/icons/locolor/22x22/actions/strike_out.png
share/apps/kspread/icons/locolor/22x22/actions/tab_first.png
share/apps/kspread/icons/locolor/22x22/actions/tab_last.png
share/apps/kspread/icons/locolor/22x22/actions/tab_left.png
share/apps/kspread/icons/locolor/22x22/actions/tab_right.png
share/apps/kspread/icons/locolor/22x22/actions/top.png
-share/apps/kspread/icons/locolor/22x22/actions/underline.png
share/apps/kspread/icons/locolor/22x22/actions/upper.png
+share/apps/kspread/icons/locolor/22x22/actions/vertical_text.png
share/apps/kspread/kpartplugins/kspreadcalc.rc
share/apps/kspread/kspread.rc
share/apps/kspread/scripts/callme.ks
@@ -412,7 +452,6 @@ share/apps/kword/icons/locolor/22x22/actions/borderleft.png
share/apps/kword/icons/locolor/22x22/actions/borderright.png
share/apps/kword/icons/locolor/22x22/actions/bordertop.png
share/apps/kword/icons/locolor/22x22/actions/char.png
-share/apps/kword/icons/locolor/22x22/actions/colin.png
share/apps/kword/icons/locolor/22x22/actions/colout.png
share/apps/kword/icons/locolor/22x22/actions/editframetool.png
share/apps/kword/icons/locolor/22x22/actions/edittool.png
@@ -421,7 +460,6 @@ share/apps/kword/icons/locolor/22x22/actions/formula.png
share/apps/kword/icons/locolor/22x22/actions/kwsearch.png
share/apps/kword/icons/locolor/22x22/actions/picframetool.png
share/apps/kword/icons/locolor/22x22/actions/return.png
-share/apps/kword/icons/locolor/22x22/actions/rowin.png
share/apps/kword/icons/locolor/22x22/actions/rowout.png
share/apps/kword/icons/locolor/22x22/actions/run_bounding.png
share/apps/kword/icons/locolor/22x22/actions/run_not.png
@@ -440,18 +478,22 @@ share/apps/kword/icons/locolor/22x22/actions/tree_embedded.png
share/apps/kword/icons/locolor/22x22/actions/tree_picture.png
share/apps/kword/icons/locolor/22x22/actions/tree_table.png
share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
-share/apps/kword/icons/locolor/22x22/actions/underl.png
share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
share/apps/kword/kword.rc
-share/apps/kword/templates/.templates
-share/apps/kword/templates/DTP/SimpleLayout.kwt
-share/apps/kword/templates/DTP/SimpleLayout.png
-share/apps/kword/templates/DTP/Test.kwt
-share/apps/kword/templates/DTP/Test.png
-share/apps/kword/templates/Wordprocessing/PlainText.kwt
-share/apps/kword/templates/Wordprocessing/PlainText.png
-share/apps/kword/templates/Wordprocessing/TwoColumns.kwt
-share/apps/kword/templates/Wordprocessing/TwoColumns.png
+share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/PlainText.png
+share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/PlainText.kwt
+share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/PlainText.desktop
+share/apps/kword/templates/Normal/TwoColumns.desktop
+share/apps/kword/templates/Publishing/.directory
+share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
+share/apps/kword/templates/Publishing/.icon/Test.png
+share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
+share/apps/kword/templates/Publishing/.source/Test.kwt
+share/apps/kword/templates/Publishing/SimpleLayout.desktop
+share/apps/kword/templates/Publishing/Test.desktop
share/doc/HTML/en/doc/README.documentation
share/doc/HTML/en/doc/index.html
share/doc/HTML/en/doc/kdelogo.png
@@ -461,42 +503,18 @@ 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
@@ -506,137 +524,49 @@ 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/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/kspread/index.docbook
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/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/border_all.png
+share/icons/hicolor/22x22/actions/border_bottom.png
+share/icons/hicolor/22x22/actions/border_fall.png
+share/icons/hicolor/22x22/actions/border_horizontal.png
+share/icons/hicolor/22x22/actions/border_inside.png
+share/icons/hicolor/22x22/actions/border_left.png
+share/icons/hicolor/22x22/actions/border_outline.png
+share/icons/hicolor/22x22/actions/border_remove.png
+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/funct.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/32x32/actions/border_all.png
+share/icons/hicolor/32x32/actions/border_bottom.png
+share/icons/hicolor/32x32/actions/border_fall.png
+share/icons/hicolor/32x32/actions/border_horizontal.png
+share/icons/hicolor/32x32/actions/border_inside.png
+share/icons/hicolor/32x32/actions/border_left.png
+share/icons/hicolor/32x32/actions/border_outline.png
+share/icons/hicolor/32x32/actions/border_remove.png
+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/funct.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/apps/kchart.png
share/icons/hicolor/32x32/apps/killustrator.png
share/icons/hicolor/32x32/apps/kpresenter.png
@@ -647,18 +577,75 @@ 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/adjustcol.png
+share/icons/locolor/16x16/actions/adjustrow.png
+share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/black_sum.png
+share/icons/locolor/16x16/actions/border_all.png
+share/icons/locolor/16x16/actions/border_bottom.png
+share/icons/locolor/16x16/actions/border_fall.png
+share/icons/locolor/16x16/actions/border_horizontal.png
+share/icons/locolor/16x16/actions/border_inside.png
+share/icons/locolor/16x16/actions/border_left.png
+share/icons/locolor/16x16/actions/border_outline.png
+share/icons/locolor/16x16/actions/border_remove.png
+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/cakes.png
+share/icons/locolor/16x16/actions/cell_edit.png
+share/icons/locolor/16x16/actions/cell_layout.png
+share/icons/locolor/16x16/actions/center.png
+share/icons/locolor/16x16/actions/chart.png
+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/first_letter_upper.png
+share/icons/locolor/16x16/actions/fontsizedown.png
+share/icons/locolor/16x16/actions/fontsizeup.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/left.png
+share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lower.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/percent.png
+share/icons/locolor/16x16/actions/precminus.png
+share/icons/locolor/16x16/actions/precplus.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/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/strike_out.png
+share/icons/locolor/16x16/actions/upper.png
+share/icons/locolor/16x16/actions/vertical_text.png
+share/icons/locolor/16x16/actions/wizard.png
share/icons/locolor/16x16/apps/kchart.png
share/icons/locolor/16x16/apps/killustrator.png
share/icons/locolor/16x16/apps/kpresenter.png
share/icons/locolor/16x16/apps/kspread.png
share/icons/locolor/16x16/apps/kspreadcalc.png
share/icons/locolor/16x16/apps/kword.png
+share/icons/locolor/22x22/apps/kspreadcalc.png
share/icons/locolor/32x32/apps/kchart.png
share/icons/locolor/32x32/apps/killustrator.png
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
@@ -684,19 +671,20 @@ share/servicetypes/kofilter.desktop
share/servicetypes/kofilterdialog.desktop
share/servicetypes/koplugin.desktop
share/servicetypes/kotool.desktop
-@unexec rm -f %D/share/doc/HTML/en/katabase/common
-@unexec rm -f %D/share/doc/HTML/en/killustrator/common
-@unexec rm -f %D/share/doc/HTML/en/koffice/common
-@unexec rm -f %D/share/doc/HTML/en/kpresenter/common
-@unexec rm -f %D/share/doc/HTML/en/kword/common
+@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
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
@dirrm share/doc/HTML/en/katabase
@dirrm share/doc/HTML/en/doc
-@dirrm share/apps/kword/templates/Wordprocessing
-@dirrm share/apps/kword/templates/DTP
+@dirrm share/apps/kword/templates/Publishing/.source
+@dirrm share/apps/kword/templates/Publishing/.icon
+@dirrm share/apps/kword/templates/Publishing
+@dirrm share/apps/kword/templates/Normal/.source
+@dirrm share/apps/kword/templates/Normal/.icon
+@dirrm share/apps/kword/templates/Normal
@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
@dirrm share/apps/kword/icons/locolor/22x22
@@ -707,7 +695,6 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
-@dirrm share/apps/kspread/icons/locolor/22x22/actions/black
@dirrm share/apps/kspread/icons/locolor/22x22/actions
@dirrm share/apps/kspread/icons/locolor/22x22
@dirrm share/apps/kspread/icons/locolor
@@ -715,7 +702,11 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.source
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
@dirrm share/apps/kpresenter/templates/Screenpresentations
+@dirrm share/apps/kpresenter/templates/Professional/.source
+@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@@ -730,19 +721,29 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/autoforms
@dirrm share/apps/kpresenter
@dirrm share/apps/koffice/pics
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/text
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/insert
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/delete
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/clipart
@dirrm share/apps/koffice/icons/locolor/22x22/actions
@dirrm share/apps/koffice/icons/locolor/22x22
+@dirrm share/apps/koffice/icons/locolor/16x16/actions
+@dirrm share/apps/koffice/icons/locolor/16x16
@dirrm share/apps/koffice/icons/locolor
+@dirrm share/apps/koffice/icons/hicolor/32x32/actions
+@dirrm share/apps/koffice/icons/hicolor/32x32
+@dirrm share/apps/koffice/icons/hicolor/22x22/actions
+@dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
+@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/toolbar
+@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/applnk/Applications/KOffice
-@dirrm share/applnk/Applications
+@dirrm share/apps/graphite
+@dirrm share/applnk/Office
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index 0a71dbb8520d..8bd9ce9f50d7 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -1,31 +1,38 @@
# New ports collection makefile for: koffice
# Date created: Sun May 14 2000 16:33:15
-# Whom: Will Andrews <will@FreeBSD>org>
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= koffice
-PORTVERSION= 1.90
+PORTVERSION= 20000724A
CATEGORIES= editors kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+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_QT2= yes
+USE_NEWGCC= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+ --with-qt-libraries=${X11BASE}/lib \
+ --with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE/include} -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
+pre-install:
+ @(find ${WRKSRC} -name CVS | xargs rm -rf)
+
.include <bsd.port.mk>
diff --git a/editors/koffice/distinfo b/editors/koffice/distinfo
index 554b1ff849fe..29689accec3b 100644
--- a/editors/koffice/distinfo
+++ b/editors/koffice/distinfo
@@ -1 +1 @@
-MD5 (koffice-1.90.tar.bz2) = aabb2ffd04f10ebdcccce8748cfd62ad
+MD5 (koffice-20000724A.tar.bz2) = 6c6015050c1c078ca8fd5cf6b6e8df76
diff --git a/editors/koffice/pkg-plist b/editors/koffice/pkg-plist
index 3462309e42ed..b9623c9d9c0d 100644
--- a/editors/koffice/pkg-plist
+++ b/editors/koffice/pkg-plist
@@ -1,3 +1,4 @@
+bin/graphite
bin/kchart
bin/killustrator
bin/koshell
@@ -5,6 +6,8 @@ bin/kpresenter
bin/kscript
bin/kspread
bin/kword
+include/KoApplicationIface.h
+include/KoDocumentIface.h
include/handler.h
include/kcoloractions.h
include/koApplication.h
@@ -20,7 +23,7 @@ include/koFilter.h
include/koFilterDialog.h
include/koFilterManager.h
include/koFrame.h
-include/koIcons.h
+include/koGlobal.h
include/koKoolBar.h
include/koMainWindow.h
include/koPageLayoutDia.h
@@ -34,8 +37,7 @@ include/koTabChooser.h
include/koTarStore.h
include/koTemplateChooseDia.h
include/koTemplateCreateDia.h
-include/koUIUtils.h
-include/koUndo.h
+include/koTemplates.h
include/koView.h
include/komlFeed.h
include/komlFileFeed.h
@@ -45,64 +47,84 @@ include/komlStreamFeed.h
include/komlWriter.h
include/toolbox.h
include/torben.h
+lib/graphite.a
+lib/graphite.la
+lib/kchart.a
+lib/kchart.la
+lib/killustrator.a
+lib/killustrator.la
+lib/koshell.a
+lib/koshell.la
+lib/kpresenter.a
+lib/kpresenter.la
+lib/kspread.a
+lib/kspread.la
+lib/kword.a
+lib/kword.la
+lib/libasciiexport.a
lib/libasciiexport.la
-lib/libasciiexport.so
+lib/libasciiimport.a
lib/libasciiimport.la
-lib/libasciiimport.so
+lib/libcsvexport.a
lib/libcsvexport.la
-lib/libcsvexport.so
+lib/libcsvexport_test.a
lib/libcsvexport_test.la
-lib/libcsvexport_test.so
+lib/libcsvfilter.a
lib/libcsvfilter.la
-lib/libcsvfilter.so
+lib/libcsvfilterdia.a
lib/libcsvfilterdia.la
-lib/libcsvfilterdia.so
+lib/libgraphitepart.a
+lib/libgraphitepart.la
+lib/libhtmlexport.a
lib/libhtmlexport.la
-lib/libhtmlexport.so
+lib/libhtmlimport.a
lib/libhtmlimport.la
-lib/libhtmlimport.so
-lib/libkchart.la
-lib/libkchart.so
-lib/libkillustrator.la
-lib/libkillustrator.so
+lib/libkchartpart.a
+lib/libkchartpart.la
+lib/libkillustratorpart.a
+lib/libkillustratorpart.la
+lib/libkodocinfopropspage.a
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/libkpresenter.la
-lib/libkpresenter.so
+lib/libkpresenterpart.a
+lib/libkpresenterpart.la
lib/libkscript.la
lib/libkscript.so.1
+lib/libkspelltool.a
lib/libkspelltool.la
-lib/libkspelltool.so
-lib/libkspread.la
-lib/libkspread.so
+lib/libkspreadcalc.a
lib/libkspreadcalc.la
-lib/libkspreadcalc.so
+lib/libkspreadpart.a
+lib/libkspreadpart.la
lib/libkstore.la
lib/libkstore.so.1
-lib/libkword.la
-lib/libkword.so
+lib/libkwordpart.a
+lib/libkwordpart.la
+lib/libolefilter.a
lib/libolefilter.la
-lib/libolefilter.so
-share/applnk/Applications/KOffice/kchart.desktop
-share/applnk/Applications/KOffice/killustrator.desktop
-share/applnk/Applications/KOffice/koshell.desktop
-share/applnk/Applications/KOffice/kpresenter.desktop
-share/applnk/Applications/KOffice/kspread.desktop
-share/applnk/Applications/KOffice/kword.desktop
+share/applnk/Office/graphite.desktop
+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
+share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
+share/apps/kchart/icons/locolor/22x22/actions/data.png
+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/toolbar/areas.png
-share/apps/kchart/toolbar/bars.png
-share/apps/kchart/toolbar/cakes.png
-share/apps/kchart/toolbar/lines.png
-share/apps/kchart/toolbar/options.png
share/apps/killustrator/KIllustrator.rc
-share/apps/killustrator/default.pal
share/apps/killustrator/pics/abottom.png
share/apps/killustrator/pics/ahcenter.png
share/apps/killustrator/pics/aleft.png
@@ -147,19 +169,38 @@ share/apps/killustrator/pics/tleftalign.png
share/apps/killustrator/pics/trightalign.png
share/apps/killustrator/pics/vmirror.png
share/apps/killustrator/pics/zoomtool.png
+share/apps/killustrator/templates/Simple/.directory
+share/apps/killustrator/templates/Simple/.icon/Plain.png
+share/apps/killustrator/templates/Simple/.source/Plain.kil
+share/apps/killustrator/templates/Simple/Plain.desktop
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/22x22/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/22x22/actions/text_color.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/delete_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_col.png
+share/apps/koffice/icons/hicolor/32x32/actions/insert_table_row.png
+share/apps/koffice/icons/hicolor/32x32/actions/sort_az.png
+share/apps/koffice/icons/hicolor/32x32/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/delete_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/documentinfo.png
+share/apps/koffice/icons/locolor/16x16/actions/enum_list.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_col.png
+share/apps/koffice/icons/locolor/16x16/actions/insert_table_row.png
+share/apps/koffice/icons/locolor/16x16/actions/text_color.png
+share/apps/koffice/icons/locolor/16x16/actions/text_sub.png
+share/apps/koffice/icons/locolor/16x16/actions/text_super.png
+share/apps/koffice/icons/locolor/16x16/actions/unsorted_list.png
share/apps/koffice/icons/locolor/22x22/actions/alignBlock.png
share/apps/koffice/icons/locolor/22x22/actions/alignCenter.png
share/apps/koffice/icons/locolor/22x22/actions/alignLeft.png
share/apps/koffice/icons/locolor/22x22/actions/alignRight.png
-share/apps/koffice/icons/locolor/22x22/actions/bold.png
share/apps/koffice/icons/locolor/22x22/actions/cancel.png
share/apps/koffice/icons/locolor/22x22/actions/clipart.png
-share/apps/koffice/icons/locolor/22x22/actions/clipart/from-file.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/delete/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-col.png
-share/apps/koffice/icons/locolor/22x22/actions/insert/table-row.png
-share/apps/koffice/icons/locolor/22x22/actions/italic.png
+share/apps/koffice/icons/locolor/22x22/actions/clipart_from_file.png
share/apps/koffice/icons/locolor/22x22/actions/neonpen.png
share/apps/koffice/icons/locolor/22x22/actions/ok.png
share/apps/koffice/icons/locolor/22x22/actions/part/kchart.png
@@ -172,12 +213,6 @@ share/apps/koffice/icons/locolor/22x22/actions/part/kword.png
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/icons/locolor/22x22/actions/product.png
-share/apps/koffice/icons/locolor/22x22/actions/sum.png
-share/apps/koffice/icons/locolor/22x22/actions/text/bold.png
-share/apps/koffice/icons/locolor/22x22/actions/text/italic.png
-share/apps/koffice/icons/locolor/22x22/actions/text/underlined.png
-share/apps/koffice/icons/locolor/22x22/actions/underl.png
share/apps/koffice/koffice_shell.rc
share/apps/koffice/pics/koRulerFirst.png
share/apps/koffice/pics/koRulerLeft.png
@@ -325,77 +360,82 @@ share/apps/kpresenter/slideshow/next.png
share/apps/kpresenter/slideshow/prev.bmp
share/apps/kpresenter/slideshow/prev.jpeg
share/apps/kpresenter/slideshow/prev.png
-share/apps/kpresenter/templates/.templates
-share/apps/kpresenter/templates/Professional/One.kpt
-share/apps/kpresenter/templates/Professional/One.png
-share/apps/kpresenter/templates/Professional/Title.kpt
-share/apps/kpresenter/templates/Professional/Title.png
-share/apps/kpresenter/templates/Professional/Two.kpt
-share/apps/kpresenter/templates/Professional/Two.png
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.kpt
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/Plain.kpt
-share/apps/kpresenter/templates/Screenpresentations/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/Sand1.kpt
-share/apps/kpresenter/templates/Screenpresentations/Sand1.png
-share/apps/kpresenter/templates/Screenpresentations/kde.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde.png
-share/apps/kpresenter/templates/Screenpresentations/kde2.kpt
-share/apps/kpresenter/templates/Screenpresentations/kde2.png
+share/apps/kpresenter/templates/Professional/.directory
+share/apps/kpresenter/templates/Professional/.icon/One.png
+share/apps/kpresenter/templates/Professional/.icon/Title.png
+share/apps/kpresenter/templates/Professional/.icon/Two.png
+share/apps/kpresenter/templates/Professional/.source/One.kpt
+share/apps/kpresenter/templates/Professional/.source/Title.kpt
+share/apps/kpresenter/templates/Professional/.source/Two.kpt
+share/apps/kpresenter/templates/Professional/One.desktop
+share/apps/kpresenter/templates/Professional/Title.desktop
+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
share/apps/kspread/extensions/math.ks
share/apps/kspread/icons/locolor/22x22/actions/abort.png
share/apps/kspread/icons/locolor/22x22/actions/adjustcol.png
share/apps/kspread/icons/locolor/22x22/actions/adjustrow.png
-share/apps/kspread/icons/locolor/22x22/actions/black/sum.png
-share/apps/kspread/icons/locolor/22x22/actions/bold.png
-share/apps/kspread/icons/locolor/22x22/actions/borderall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderbottom.png
-share/apps/kspread/icons/locolor/22x22/actions/borderfall.png
-share/apps/kspread/icons/locolor/22x22/actions/borderhorizontal.png
-share/apps/kspread/icons/locolor/22x22/actions/borderinside.png
-share/apps/kspread/icons/locolor/22x22/actions/borderleft.png
-share/apps/kspread/icons/locolor/22x22/actions/borderoutline.png
-share/apps/kspread/icons/locolor/22x22/actions/borderremove.png
-share/apps/kspread/icons/locolor/22x22/actions/borderright.png
-share/apps/kspread/icons/locolor/22x22/actions/bordertop.png
-share/apps/kspread/icons/locolor/22x22/actions/borderup.png
-share/apps/kspread/icons/locolor/22x22/actions/bordervertical.png
+share/apps/kspread/icons/locolor/22x22/actions/black_sum.png
share/apps/kspread/icons/locolor/22x22/actions/bottom.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_edit.png
+share/apps/kspread/icons/locolor/22x22/actions/cell_layout.png
share/apps/kspread/icons/locolor/22x22/actions/center.png
share/apps/kspread/icons/locolor/22x22/actions/chart.png
-share/apps/kspread/icons/locolor/22x22/actions/colin.png
share/apps/kspread/icons/locolor/22x22/actions/colout.png
+share/apps/kspread/icons/locolor/22x22/actions/comment.png
+share/apps/kspread/icons/locolor/22x22/actions/delete_table.png
+share/apps/kspread/icons/locolor/22x22/actions/deletecell.png
+share/apps/kspread/icons/locolor/22x22/actions/dissociatecell.png
share/apps/kspread/icons/locolor/22x22/actions/done.png
+share/apps/kspread/icons/locolor/22x22/actions/find.png
+share/apps/kspread/icons/locolor/22x22/actions/first_letter_upper.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizedown.png
share/apps/kspread/icons/locolor/22x22/actions/fontsizeup.png
-share/apps/kspread/icons/locolor/22x22/actions/funct.png
-share/apps/kspread/icons/locolor/22x22/actions/italic.png
+share/apps/kspread/icons/locolor/22x22/actions/goto.png
+share/apps/kspread/icons/locolor/22x22/actions/insertcell.png
+share/apps/kspread/icons/locolor/22x22/actions/inserttable.png
share/apps/kspread/icons/locolor/22x22/actions/left.png
share/apps/kspread/icons/locolor/22x22/actions/lower.png
+share/apps/kspread/icons/locolor/22x22/actions/mergecell.png
share/apps/kspread/icons/locolor/22x22/actions/middle.png
share/apps/kspread/icons/locolor/22x22/actions/money.png
share/apps/kspread/icons/locolor/22x22/actions/multirow.png
share/apps/kspread/icons/locolor/22x22/actions/neonpen.png
-share/apps/kspread/icons/locolor/22x22/actions/paste.png
-share/apps/kspread/icons/locolor/22x22/actions/percent.png
-share/apps/kspread/icons/locolor/22x22/actions/precminus.png
-share/apps/kspread/icons/locolor/22x22/actions/precplus.png
+share/apps/kspread/icons/locolor/22x22/actions/oscilloscope.png
+share/apps/kspread/icons/locolor/22x22/actions/removecell.png
+share/apps/kspread/icons/locolor/22x22/actions/removecomment.png
share/apps/kspread/icons/locolor/22x22/actions/resizecol.png
share/apps/kspread/icons/locolor/22x22/actions/resizerow.png
share/apps/kspread/icons/locolor/22x22/actions/right.png
share/apps/kspread/icons/locolor/22x22/actions/rotate.png
-share/apps/kspread/icons/locolor/22x22/actions/rowin.png
share/apps/kspread/icons/locolor/22x22/actions/rowout.png
share/apps/kspread/icons/locolor/22x22/actions/sort_decrease.png
share/apps/kspread/icons/locolor/22x22/actions/sort_incr.png
+share/apps/kspread/icons/locolor/22x22/actions/special_paste.png
+share/apps/kspread/icons/locolor/22x22/actions/strike_out.png
share/apps/kspread/icons/locolor/22x22/actions/tab_first.png
share/apps/kspread/icons/locolor/22x22/actions/tab_last.png
share/apps/kspread/icons/locolor/22x22/actions/tab_left.png
share/apps/kspread/icons/locolor/22x22/actions/tab_right.png
share/apps/kspread/icons/locolor/22x22/actions/top.png
-share/apps/kspread/icons/locolor/22x22/actions/underline.png
share/apps/kspread/icons/locolor/22x22/actions/upper.png
+share/apps/kspread/icons/locolor/22x22/actions/vertical_text.png
share/apps/kspread/kpartplugins/kspreadcalc.rc
share/apps/kspread/kspread.rc
share/apps/kspread/scripts/callme.ks
@@ -412,7 +452,6 @@ share/apps/kword/icons/locolor/22x22/actions/borderleft.png
share/apps/kword/icons/locolor/22x22/actions/borderright.png
share/apps/kword/icons/locolor/22x22/actions/bordertop.png
share/apps/kword/icons/locolor/22x22/actions/char.png
-share/apps/kword/icons/locolor/22x22/actions/colin.png
share/apps/kword/icons/locolor/22x22/actions/colout.png
share/apps/kword/icons/locolor/22x22/actions/editframetool.png
share/apps/kword/icons/locolor/22x22/actions/edittool.png
@@ -421,7 +460,6 @@ share/apps/kword/icons/locolor/22x22/actions/formula.png
share/apps/kword/icons/locolor/22x22/actions/kwsearch.png
share/apps/kword/icons/locolor/22x22/actions/picframetool.png
share/apps/kword/icons/locolor/22x22/actions/return.png
-share/apps/kword/icons/locolor/22x22/actions/rowin.png
share/apps/kword/icons/locolor/22x22/actions/rowout.png
share/apps/kword/icons/locolor/22x22/actions/run_bounding.png
share/apps/kword/icons/locolor/22x22/actions/run_not.png
@@ -440,18 +478,22 @@ share/apps/kword/icons/locolor/22x22/actions/tree_embedded.png
share/apps/kword/icons/locolor/22x22/actions/tree_picture.png
share/apps/kword/icons/locolor/22x22/actions/tree_table.png
share/apps/kword/icons/locolor/22x22/actions/tree_textframes.png
-share/apps/kword/icons/locolor/22x22/actions/underl.png
share/apps/kword/icons/locolor/22x22/actions/unsortedList.png
share/apps/kword/kword.rc
-share/apps/kword/templates/.templates
-share/apps/kword/templates/DTP/SimpleLayout.kwt
-share/apps/kword/templates/DTP/SimpleLayout.png
-share/apps/kword/templates/DTP/Test.kwt
-share/apps/kword/templates/DTP/Test.png
-share/apps/kword/templates/Wordprocessing/PlainText.kwt
-share/apps/kword/templates/Wordprocessing/PlainText.png
-share/apps/kword/templates/Wordprocessing/TwoColumns.kwt
-share/apps/kword/templates/Wordprocessing/TwoColumns.png
+share/apps/kword/templates/Normal/.directory
+share/apps/kword/templates/Normal/.icon/PlainText.png
+share/apps/kword/templates/Normal/.icon/TwoColumns.png
+share/apps/kword/templates/Normal/.source/PlainText.kwt
+share/apps/kword/templates/Normal/.source/TwoColumns.kwt
+share/apps/kword/templates/Normal/PlainText.desktop
+share/apps/kword/templates/Normal/TwoColumns.desktop
+share/apps/kword/templates/Publishing/.directory
+share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
+share/apps/kword/templates/Publishing/.icon/Test.png
+share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
+share/apps/kword/templates/Publishing/.source/Test.kwt
+share/apps/kword/templates/Publishing/SimpleLayout.desktop
+share/apps/kword/templates/Publishing/Test.desktop
share/doc/HTML/en/doc/README.documentation
share/doc/HTML/en/doc/index.html
share/doc/HTML/en/doc/kdelogo.png
@@ -461,42 +503,18 @@ 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
@@ -506,137 +524,49 @@ 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/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/kspread/index.docbook
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/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/border_all.png
+share/icons/hicolor/22x22/actions/border_bottom.png
+share/icons/hicolor/22x22/actions/border_fall.png
+share/icons/hicolor/22x22/actions/border_horizontal.png
+share/icons/hicolor/22x22/actions/border_inside.png
+share/icons/hicolor/22x22/actions/border_left.png
+share/icons/hicolor/22x22/actions/border_outline.png
+share/icons/hicolor/22x22/actions/border_remove.png
+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/funct.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/32x32/actions/border_all.png
+share/icons/hicolor/32x32/actions/border_bottom.png
+share/icons/hicolor/32x32/actions/border_fall.png
+share/icons/hicolor/32x32/actions/border_horizontal.png
+share/icons/hicolor/32x32/actions/border_inside.png
+share/icons/hicolor/32x32/actions/border_left.png
+share/icons/hicolor/32x32/actions/border_outline.png
+share/icons/hicolor/32x32/actions/border_remove.png
+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/funct.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/apps/kchart.png
share/icons/hicolor/32x32/apps/killustrator.png
share/icons/hicolor/32x32/apps/kpresenter.png
@@ -647,18 +577,75 @@ 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/adjustcol.png
+share/icons/locolor/16x16/actions/adjustrow.png
+share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/black_sum.png
+share/icons/locolor/16x16/actions/border_all.png
+share/icons/locolor/16x16/actions/border_bottom.png
+share/icons/locolor/16x16/actions/border_fall.png
+share/icons/locolor/16x16/actions/border_horizontal.png
+share/icons/locolor/16x16/actions/border_inside.png
+share/icons/locolor/16x16/actions/border_left.png
+share/icons/locolor/16x16/actions/border_outline.png
+share/icons/locolor/16x16/actions/border_remove.png
+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/cakes.png
+share/icons/locolor/16x16/actions/cell_edit.png
+share/icons/locolor/16x16/actions/cell_layout.png
+share/icons/locolor/16x16/actions/center.png
+share/icons/locolor/16x16/actions/chart.png
+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/first_letter_upper.png
+share/icons/locolor/16x16/actions/fontsizedown.png
+share/icons/locolor/16x16/actions/fontsizeup.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/left.png
+share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lower.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/percent.png
+share/icons/locolor/16x16/actions/precminus.png
+share/icons/locolor/16x16/actions/precplus.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/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/strike_out.png
+share/icons/locolor/16x16/actions/upper.png
+share/icons/locolor/16x16/actions/vertical_text.png
+share/icons/locolor/16x16/actions/wizard.png
share/icons/locolor/16x16/apps/kchart.png
share/icons/locolor/16x16/apps/killustrator.png
share/icons/locolor/16x16/apps/kpresenter.png
share/icons/locolor/16x16/apps/kspread.png
share/icons/locolor/16x16/apps/kspreadcalc.png
share/icons/locolor/16x16/apps/kword.png
+share/icons/locolor/22x22/apps/kspreadcalc.png
share/icons/locolor/32x32/apps/kchart.png
share/icons/locolor/32x32/apps/killustrator.png
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
@@ -684,19 +671,20 @@ share/servicetypes/kofilter.desktop
share/servicetypes/kofilterdialog.desktop
share/servicetypes/koplugin.desktop
share/servicetypes/kotool.desktop
-@unexec rm -f %D/share/doc/HTML/en/katabase/common
-@unexec rm -f %D/share/doc/HTML/en/killustrator/common
-@unexec rm -f %D/share/doc/HTML/en/koffice/common
-@unexec rm -f %D/share/doc/HTML/en/kpresenter/common
-@unexec rm -f %D/share/doc/HTML/en/kword/common
+@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
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
@dirrm share/doc/HTML/en/katabase
@dirrm share/doc/HTML/en/doc
-@dirrm share/apps/kword/templates/Wordprocessing
-@dirrm share/apps/kword/templates/DTP
+@dirrm share/apps/kword/templates/Publishing/.source
+@dirrm share/apps/kword/templates/Publishing/.icon
+@dirrm share/apps/kword/templates/Publishing
+@dirrm share/apps/kword/templates/Normal/.source
+@dirrm share/apps/kword/templates/Normal/.icon
+@dirrm share/apps/kword/templates/Normal
@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
@dirrm share/apps/kword/icons/locolor/22x22
@@ -707,7 +695,6 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
-@dirrm share/apps/kspread/icons/locolor/22x22/actions/black
@dirrm share/apps/kspread/icons/locolor/22x22/actions
@dirrm share/apps/kspread/icons/locolor/22x22
@dirrm share/apps/kspread/icons/locolor
@@ -715,7 +702,11 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.source
+@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
@dirrm share/apps/kpresenter/templates/Screenpresentations
+@dirrm share/apps/kpresenter/templates/Professional/.source
+@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@@ -730,19 +721,29 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/autoforms
@dirrm share/apps/kpresenter
@dirrm share/apps/koffice/pics
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/text
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/insert
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/delete
-@dirrm share/apps/koffice/icons/locolor/22x22/actions/clipart
@dirrm share/apps/koffice/icons/locolor/22x22/actions
@dirrm share/apps/koffice/icons/locolor/22x22
+@dirrm share/apps/koffice/icons/locolor/16x16/actions
+@dirrm share/apps/koffice/icons/locolor/16x16
@dirrm share/apps/koffice/icons/locolor
+@dirrm share/apps/koffice/icons/hicolor/32x32/actions
+@dirrm share/apps/koffice/icons/hicolor/32x32
+@dirrm share/apps/koffice/icons/hicolor/22x22/actions
+@dirrm share/apps/koffice/icons/hicolor/22x22
+@dirrm share/apps/koffice/icons/hicolor
@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
+@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/toolbar
+@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/applnk/Applications/KOffice
-@dirrm share/applnk/Applications
+@dirrm share/apps/graphite
+@dirrm share/applnk/Office