1 files changed, 98 insertions, 116 deletions

diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index 92d9870a8a02..1d9204b53f63 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1,8 +1,8 @@
+@comment files/links
 bin/filter_wrapper
 bin/kchart
 bin/kformula
 bin/kivio
-bin/kivio.real
 bin/kontour
 bin/koscript
 bin/koshell
@@ -64,76 +64,78 @@ include/tkcombobox.h
 include/tktoolbarbutton.h
 lib/kchart.la
 lib/kchart.so
-lib/kde2/libabiwordexport.la
-lib/kde2/libabiwordexport.so
-lib/kde2/libabiwordimport.la
-lib/kde2/libabiwordimport.so
-lib/kde2/libapplixgraphicimport.la
-lib/kde2/libapplixgraphicimport.so
-lib/kde2/libapplixspreadimport.la
-lib/kde2/libapplixspreadimport.so
-lib/kde2/libapplixwordimport.la
-lib/kde2/libapplixwordimport.so
-lib/kde2/libasciiexport.la
-lib/kde2/libasciiexport.so
-lib/kde2/libasciiimport.la
-lib/kde2/libasciiimport.so
-lib/kde2/libcsvexport.la
-lib/kde2/libcsvexport.so
-lib/kde2/libcsvimport.la
-lib/kde2/libcsvimport.so
-lib/kde2/libdocbookexport.la
-lib/kde2/libdocbookexport.so
-lib/kde2/libgnumericexport.la
-lib/kde2/libgnumericexport.so
-lib/kde2/libgnumericimport.la
-lib/kde2/libgnumericimport.so
-lib/kde2/libhtmlexport.la
-lib/kde2/libhtmlexport.so
-lib/kde2/libhtmlimport.la
-lib/kde2/libhtmlimport.so
-lib/kde2/libkchartpart.la
-lib/kde2/libkchartpart.so
-lib/kde2/libkformulapart.la
-lib/kde2/libkformulapart.so
-lib/kde2/libkiviopart.la
-lib/kde2/libkiviopart.so
-lib/kde2/libkofficescan.la
-lib/kde2/libkofficescan.so
-lib/kde2/libkontourpart.la
-lib/kde2/libkontourpart.so
-lib/kde2/libkpresenterpart.la
-lib/kde2/libkpresenterpart.so
-lib/kde2/libkprkword.la
-lib/kde2/libkprkword.so
-lib/kde2/libkspelltool.la
-lib/kde2/libkspelltool.so
-lib/kde2/libkspreadcalc.la
-lib/kde2/libkspreadcalc.so
-lib/kde2/libkspreadhtmlexport.la
-lib/kde2/libkspreadhtmlexport.so
-lib/kde2/libkspreadpart.la
-lib/kde2/libkspreadpart.so
-lib/kde2/libkwordpart.la
-lib/kde2/libkwordpart.so
-lib/kde2/liblatexexport.la
-lib/kde2/liblatexexport.so
-lib/kde2/libmsodimport.la
-lib/kde2/libmsodimport.so
-lib/kde2/libolefilter.la
-lib/kde2/libolefilter.so
-lib/kde2/libqproimport.la
-lib/kde2/libqproimport.so
-lib/kde2/librtfexport.la
-lib/kde2/librtfexport.so
-lib/kde2/libsvgexport.la
-lib/kde2/libsvgexport.so
-lib/kde2/libsvgimport.la
-lib/kde2/libsvgimport.so
-lib/kde2/libwmfimport.la
-lib/kde2/libwmfimport.so
-lib/kde2/libxfigimport.la
-lib/kde2/libxfigimport.so
+lib/kde3/kofficescan.la
+lib/kde3/kofficescan.so
+lib/kde3/libabiwordexport.la
+lib/kde3/libabiwordexport.so
+lib/kde3/libabiwordimport.la
+lib/kde3/libabiwordimport.so
+lib/kde3/libapplixgraphicimport.la
+lib/kde3/libapplixgraphicimport.so
+lib/kde3/libapplixspreadimport.la
+lib/kde3/libapplixspreadimport.so
+lib/kde3/libapplixwordimport.la
+lib/kde3/libapplixwordimport.so
+lib/kde3/libasciiexport.la
+lib/kde3/libasciiexport.so
+lib/kde3/libasciiimport.la
+lib/kde3/libasciiimport.so
+lib/kde3/libcsvexport.la
+lib/kde3/libcsvexport.so
+lib/kde3/libcsvimport.la
+lib/kde3/libcsvimport.so
+lib/kde3/libdocbookexport.la
+lib/kde3/libdocbookexport.so
+lib/kde3/libgnumericexport.la
+lib/kde3/libgnumericexport.so
+lib/kde3/libgnumericimport.la
+lib/kde3/libgnumericimport.so
+lib/kde3/libhtmlexport.la
+lib/kde3/libhtmlexport.so
+lib/kde3/libhtmlimport.la
+lib/kde3/libhtmlimport.so
+lib/kde3/libkchartpart.la
+lib/kde3/libkchartpart.so
+lib/kde3/libkformulapart.la
+lib/kde3/libkformulapart.so
+lib/kde3/libkiviopart.la
+lib/kde3/libkiviopart.so
+lib/kde3/libkontourpart.la
+lib/kde3/libkontourpart.so
+lib/kde3/libkpresenterpart.la
+lib/kde3/libkpresenterpart.so
+lib/kde3/libkprkword.la
+lib/kde3/libkprkword.so
+lib/kde3/libkspelltool.la
+lib/kde3/libkspelltool.so
+lib/kde3/libkspreadcalc.la
+lib/kde3/libkspreadcalc.so
+lib/kde3/libkspreadhtmlexport.la
+lib/kde3/libkspreadhtmlexport.so
+lib/kde3/libkspreadpart.la
+lib/kde3/libkspreadpart.so
+lib/kde3/libkwordpart.la
+lib/kde3/libkwordpart.so
+lib/kde3/liblatexexport.la
+lib/kde3/liblatexexport.so
+lib/kde3/libmsodimport.la
+lib/kde3/libmsodimport.so
+lib/kde3/libolefilter.la
+lib/kde3/libolefilter.so
+lib/kde3/libqproimport.la
+lib/kde3/libqproimport.so
+lib/kde3/librtfexport.la
+lib/kde3/librtfexport.so
+lib/kde3/libsvgexport.la
+lib/kde3/libsvgexport.so
+lib/kde3/libsvgimport.la
+lib/kde3/libsvgimport.so
+lib/kde3/libwmfimport.la
+lib/kde3/libwmfimport.so
+lib/kde3/libwpimport.la
+lib/kde3/libwpimport.so
+lib/kde3/libxfigimport.la
+lib/kde3/libxfigimport.so
 lib/kformulamain.la
 lib/kformulamain.so
 lib/kivio.la
@@ -206,6 +208,7 @@ share/apps/kchart/icons/hicolor/22x22/actions/hilo.png
 share/apps/kchart/icons/hicolor/22x22/actions/lines.png
 share/apps/kchart/icons/hicolor/22x22/actions/lines3d.png
 share/apps/kchart/icons/hicolor/22x22/actions/options.png
+share/apps/kchart/icons/hicolor/22x22/actions/polar.png
 share/apps/kchart/icons/hicolor/22x22/actions/ring.png
 share/apps/kchart/icons/hicolor/22x22/actions/wizard.png
 share/apps/kchart/icons/locolor/16x16/actions/areas.png
@@ -839,7 +842,6 @@ share/apps/kpresenter/templates/letter/TwoColumnLandscape.desktop
 share/apps/kpresenter/templates/letter/TwoColumnPortrait.desktop
 share/apps/kpresenter/templates/letter/emptyLandscape.desktop
 share/apps/kpresenter/templates/letter/emptyPortrait.desktop
-share/apps/krayon/kpartplugins/scan-krayon.rc
 share/apps/kspread/dtd/kspread.dtd
 share/apps/kspread/extensions/builtin.xml
 share/apps/kspread/extensions/math.ks
@@ -1115,38 +1117,6 @@ share/doc/HTML/en/kpresenter/tut21.png
 share/doc/HTML/en/kpresenter/tut22.png
 share/doc/HTML/en/kpresenter/tut23.png
 share/doc/HTML/en/kpresenter/tutorial.docbook
-share/doc/HTML/en/krayon/airbrush.png
-share/doc/HTML/en/krayon/colorpicker.png
-share/doc/HTML/en/krayon/common
-share/doc/HTML/en/krayon/documentinfo.png
-share/doc/HTML/en/krayon/editcopy.png
-share/doc/HTML/en/krayon/editcut.png
-share/doc/HTML/en/krayon/editpaste.png
-share/doc/HTML/en/krayon/eraser.png
-share/doc/HTML/en/krayon/exit.png
-share/doc/HTML/en/krayon/fileclose.png
-share/doc/HTML/en/krayon/filenew.png
-share/doc/HTML/en/krayon/fileopen.png
-share/doc/HTML/en/krayon/fileprint.png
-share/doc/HTML/en/krayon/filesave.png
-share/doc/HTML/en/krayon/fill.png
-share/doc/HTML/en/krayon/generictool.png
-share/doc/HTML/en/krayon/gradient.png
-share/doc/HTML/en/krayon/index.cache.bz2
-share/doc/HTML/en/krayon/index.docbook
-share/doc/HTML/en/krayon/krayon-commands.docbook
-share/doc/HTML/en/krayon/krayon-faq.docbook
-share/doc/HTML/en/krayon/krayon-using.docbook
-share/doc/HTML/en/krayon/move.png
-share/doc/HTML/en/krayon/paintbrush.png
-share/doc/HTML/en/krayon/pencil.png
-share/doc/HTML/en/krayon/redo.png
-share/doc/HTML/en/krayon/undo.png
-share/doc/HTML/en/krayon/unfinished.png
-share/doc/HTML/en/krayon/viewmag+.png
-share/doc/HTML/en/krayon/viewmag-.png
-share/doc/HTML/en/krayon/viewmag.png
-share/doc/HTML/en/krayon/wizard.png
 share/doc/HTML/en/kspread/common
 share/doc/HTML/en/kspread/index.cache.bz2
 share/doc/HTML/en/kspread/index.docbook
@@ -1470,15 +1440,6 @@ share/icons/locolor/16x16/apps/kspreadcalc.png
 share/icons/locolor/22x22/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
 share/mimelnk/application/x-abiword.desktop
-share/mimelnk/application/x-kchart.desktop
-share/mimelnk/application/x-kformula.desktop
-share/mimelnk/application/x-killustrator.desktop
-share/mimelnk/application/x-kivio.desktop
-share/mimelnk/application/x-kontour.desktop
-share/mimelnk/application/x-kpresenter.desktop
-share/mimelnk/application/x-kspread.desktop
-share/mimelnk/application/x-kugar.desktop
-share/mimelnk/application/x-kword.desktop
 share/mimelnk/application/x-quattropro.desktop
 share/mimelnk/image/x-msod.desktop
 share/mimelnk/image/x-svg.desktop
@@ -1519,6 +1480,7 @@ share/services/kword_html_export.desktop
 share/services/kword_html_import.desktop
 share/services/kword_latex_export.desktop
 share/services/kword_rtf_export.desktop
+share/services/kword_wp_import.desktop
 share/services/ole_excel97_import.desktop
 share/services/ole_powerpoint97_import.desktop
 share/services/ole_winword97_import.desktop
@@ -1535,8 +1497,15 @@ share/templates/Illustration.desktop
 share/templates/Presentation.desktop
 share/templates/SpreadSheet.desktop
 share/templates/TextDocument.desktop
+@comment directories
 @dirrm share/templates/.source
 @dirrm share/templates
+@dirrm share/servicetypes
+@dirrm share/services
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/image
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/22x22/apps
@@ -1544,18 +1513,32 @@ share/templates/TextDocument.desktop
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
+@dirrm share/icons/hicolor/48x48/mimetypes
 @dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/mimetypes
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32/actions
+@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/22x22/mimetypes
 @dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22/actions
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/mimetypes
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16/actions
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
 @dirrm share/doc/HTML/en/kspread
-@dirrm share/doc/HTML/en/krayon
 @dirrm share/doc/HTML/en/kpresenter
 @dirrm share/doc/HTML/en/koshell
 @dirrm share/doc/HTML/en/kontour
 @dirrm share/doc/HTML/en/koffice
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
 @dirrm share/apps/kword/templates/Publishing/.source
 @dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
@@ -1589,8 +1572,6 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kspread/extensions
 @dirrm share/apps/kspread/dtd
 @dirrm share/apps/kspread
-@dirrm share/apps/krayon/kpartplugins
-@dirrm share/apps/krayon
 @dirrm share/apps/kpresenter/templates/letter/.source
 @dirrm share/apps/kpresenter/templates/letter
 @dirrm share/apps/kpresenter/templates/legal/.source
@@ -1675,5 +1656,6 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kchart/icons/hicolor
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
+@dirrm share/apps
 @dirrm share/applnk/Office
 @dirrm share/applnk