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

3 files changed, 186 insertions, 201 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 98e543f..a72825a 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,25 +6,25 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	1.90
+PORTVERSION=	20000724A
 CATEGORIES=	x11-toolkits
-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=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.4:${PORTSDIR}/graphics/png \
+		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
+		qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kde-qt-addon.4:${PORTSDIR}/x11-toolkits/kde-qt-addon
 
-BROKEN=		"Does not compile/run properly"
-
+WRKSRC=		${WRKDIR}/${PORTNAME}
 MOC?=		${X11BASE}/bin/moc2
 SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
-USE_QT2=	yes
+USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
@@ -32,20 +32,28 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
 		--with-qt-libraries=${X11BASE}/lib \
 		--with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
-		MOC="${MOC}"
+		MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
 
+pre-configure:
+.for NUM in 1 3
+	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+		"s@version-info ${NUM}:0@version-info ${SOMAJOR}:${SOMINOR}@g")
+.endfor
+
 post-install:
-.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula khtml kio kjs kmid \
-	    kparts kspell ksycoca kwrite
+.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs kmid \
+	    kparts kspell ksycoca kjava
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${SOMAJOR} ${PREFIX}/lib/lib${LIB}.so
 .endfor
-.for LIB in artsc artscbackend artsdsp artsflow artsflow_idl kmedia2_idl qtmcop \
-	    soundserver_idl x11globalcomm
+.for LIB in artsc artsflow artsflow_idl kmedia2_idl qtmcop soundserver_idl
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.0 ${PREFIX}/lib/lib${LIB}.so
 .endfor
-	@${LN} -sf ${PREFIX}/lib/libkjava.so.1 ${PREFIX}/lib/libkjava.so
+
+pre-install:
+	@(find ${WRKSRC} -name CVS | xargs rm -rf)
 
 .include <bsd.port.mk>
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 75b46ba..5b7468a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-1.90.tar.bz2) = a1aab64294725840189f11457c52619c
+MD5 (kdelibs-20000724A.tar.bz2) = 915701484d5091cac8e04341fefb9be9
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 918aac0..b3f0c6a 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -4,7 +4,7 @@ bin/artsd
 bin/artsdsp
 bin/artsplay
 bin/artswrapper
-bin/db2ps
+bin/dcop
 bin/dcopidl
 bin/dcopidl2cpp
 bin/dcopserver
@@ -21,11 +21,10 @@ bin/klauncher
 bin/knotify
 bin/mcopidl
 bin/settheme
-include/MatrixDialog.h
 include/addressbook.h
+include/arts/anyref.h
 include/arts/artsflow.h
 include/arts/artsflow.idl
-include/arts/artsserver_impl.h
 include/arts/asyncstream.h
 include/arts/audiosubsys.h
 include/arts/buffer.h
@@ -39,7 +38,7 @@ include/arts/core.h
 include/arts/datapacket.h
 include/arts/debug.h
 include/arts/dispatcher.h
-include/arts/execrequest.h
+include/arts/dynamicrequest.h
 include/arts/extensionloader.h
 include/arts/factory.h
 include/arts/fft.h
@@ -54,7 +53,6 @@ include/arts/mcoputils.h
 include/arts/notification.h
 include/arts/object.h
 include/arts/objectmanager.h
-include/arts/objectwrapper.h
 include/arts/pipebuffer.h
 include/arts/pool.h
 include/arts/qiomanager.h
@@ -72,9 +70,9 @@ include/arts/type.h
 include/arts/unixconnection.h
 include/arts/unixserver.h
 include/arts/utils.h
+include/arts/weakreference.h
 include/artsc/artsc.h
 include/booktoken.h
-include/box.h
 include/dcopclient.h
 include/dcopobject.h
 include/dcopref.h
@@ -108,8 +106,10 @@ include/dom/html_misc.h
 include/dom/html_object.h
 include/dom/html_table.h
 include/kabapi.h
+include/kaboutapplication.h
 include/kaboutdata.h
 include/kaboutdialog.h
+include/kaboutdialog_private.h
 include/kaboutkde.h
 include/kaccel.h
 include/kaccelmenu.h
@@ -128,12 +128,13 @@ include/kcmdlineargs.h
 include/kcmenumngr.h
 include/kcmodule.h
 include/kcolorbtn.h
+include/kcolorbutton.h
+include/kcolorcombo.h
 include/kcolordlg.h
 include/kcolordrag.h
 include/kcombiview.h
 include/kcombobox.h
 include/kcompletion.h
-include/kcompletion_private.h
 include/kconfig.h
 include/kconfigbackend.h
 include/kconfigbase.h
@@ -141,9 +142,12 @@ include/kconfigdata.h
 include/kcontainer.h
 include/kcrash.h
 include/kcursor.h
+include/kdatastream.h
 include/kdatepik.h
 include/kdatetbl.h
 include/kdbtn.h
+include/kdcopactionproxy.h
+include/kdcoppropertyproxy.h
 include/kde.pot
 include/kde_dmalloc.h
 include/kdebug.h
@@ -160,7 +164,9 @@ include/kdesu/su.h
 include/kdialog.h
 include/kdialogbase.h
 include/kdirlister.h
+include/kdirnotify.h
 include/kdiroperator.h
+include/kdirsize.h
 include/kdirwatch.h
 include/kdocktabctl.h
 include/kdockwidget.h
@@ -181,14 +187,14 @@ include/kfilereader.h
 include/kfileview.h
 include/kfileviewitem.h
 include/kfontdialog.h
-include/kformula.h
-include/kformulaedit.h
-include/kformulatoolbar.h
 include/kglobal.h
 include/kglobalaccel.h
 include/kglobalsettings.h
 include/khelpmenu.h
+include/khtml_events.h
 include/khtml_part.h
+include/khtml_settings.h
+include/khtmldefaults.h
 include/khtmlview.h
 include/kicondialog.h
 include/kiconeffect.h
@@ -200,7 +206,6 @@ include/kimageio.h
 include/kinstance.h
 include/kio/connection.h
 include/kio/defaultprogress.h
-include/kio/filter.h
 include/kio/global.h
 include/kio/job.h
 include/kio/jobclasses.h
@@ -208,11 +213,11 @@ include/kio/netaccess.h
 include/kio/passdlg.h
 include/kio/paste.h
 include/kio/progressbase.h
-include/kio/renamedlg.h
-include/kio/skipdlg.h
 include/kio/slavebase.h
 include/kio/slaveinterface.h
 include/kio/statusbarprogress.h
+include/kio/tcpslavebase.h
+include/kio/uiserver.h
 include/kipc.h
 include/kjanuswidget.h
 include/kjavaapplet.h
@@ -235,6 +240,7 @@ include/klineeditdlg.h
 include/klistbox.h
 include/klistview.h
 include/klocale.h
+include/kmainwindow.h
 include/kmenubar.h
 include/kmessagebox.h
 include/kmimemagic.h
@@ -247,6 +253,7 @@ include/kpalette.h
 include/kpanelapplet.h
 include/kpanelmenu.h
 include/kparts/browserextension.h
+include/kparts/dockmainwindow.h
 include/kparts/event.h
 include/kparts/factory.h
 include/kparts/mainwindow.h
@@ -257,17 +264,20 @@ include/kpassdlg.h
 include/kpixmap.h
 include/kpixmapeffect.h
 include/kpixmapio.h
+include/kpixmapprovider.h
 include/kpopupmenu.h
 include/kprocctrl.h
 include/kprocess.h
 include/kprocio.h
 include/kprogress.h
 include/kpropsdlg.h
+include/kprotocolinfo.h
 include/kprotocolmanager.h
 include/krandomsequence.h
 include/krecentdocument.h
 include/kregexp.h
 include/krestrictedline.h
+include/krfcdate.h
 include/krootpixmap.h
 include/krootprop.h
 include/kruler.h
@@ -287,6 +297,7 @@ include/ksimpleconfig.h
 include/ksock.h
 include/kspell.h
 include/kspelldlg.h
+include/kstaticdeleter.h
 include/kstatusbar.h
 include/kstdaccel.h
 include/kstdaction.h
@@ -296,25 +307,27 @@ include/kstyle.h
 include/ksycoca.h
 include/ksycocaentry.h
 include/ksycocatype.h
+include/ksystemtray.h
 include/ktabctl.h
 include/ktar.h
 include/ktempfile.h
 include/ktextbrowser.h
+include/ktexteditor.h
 include/kthemebase.h
 include/kthemestyle.h
 include/ktmainwindow.h
-include/ktmlayout.h
 include/ktoolbar.h
 include/ktoolbarbutton.h
 include/ktoolbarradiogroup.h
-include/ktoolboxmgr.h
 include/ktrader.h
 include/kuniqueapp.h
+include/kunload.h
 include/kurifilter.h
 include/kurl.h
 include/kurlcombobox.h
 include/kurlcompletion.h
 include/kurllabel.h
+include/kurlpixmapprovider.h
 include/kurlrequester.h
 include/kurlrequesterdlg.h
 include/kuserprofile.h
@@ -322,14 +335,6 @@ include/kwidgetid.h
 include/kwin.h
 include/kwinmodule.h
 include/kwizard.h
-include/kwm.h
-include/kwrite/highlight.h
-include/kwrite/kwrite.h
-include/kwrite/kwrite_doc.h
-include/kwrite/kwrite_factory.h
-include/kwrite/kwrite_misc.h
-include/kwrite/kwrite_part.h
-include/kwrite/kwrite_view.h
 include/kxmlgui.h
 include/kxmlguibuilder.h
 include/kxmlguiclient.h
@@ -351,12 +356,27 @@ include/libkmid/synthout.h
 include/libkmid/track.h
 include/libkmid/voiceman.h
 include/ltdl.h
-include/matrixbox.h
+include/netwm.h
+include/netwm_def.h
+include/netwm_p.h
 include/progressbase.h
 include/qconfigDB.h
 include/qxembed.h
 include/statusbarprogress.h
-lib/X11GlobalComm.mcopclass
+lib/Arts/Synth_ADD.mcopclass
+lib/Arts/Synth_AMAN_PLAY.mcopclass
+lib/Arts/Synth_AMAN_RECORD.mcopclass
+lib/Arts/Synth_BUS_DOWNLINK.mcopclass
+lib/Arts/Synth_BUS_UPLINK.mcopclass
+lib/Arts/Synth_FREQUENCY.mcopclass
+lib/Arts/Synth_MUL.mcopclass
+lib/Arts/Synth_MULTI_ADD.mcopclass
+lib/Arts/Synth_PLAY.mcopclass
+lib/Arts/Synth_PLAY_WAV.mcopclass
+lib/Arts/Synth_RECORD.mcopclass
+lib/Arts/Synth_WAVE_SIN.mcopclass
+lib/Arts/WavPlayObject.mcopclass
+lib/Arts/X11GlobalComm.mcopclass
 lib/b3style.la
 lib/b3style.so
 lib/basicstyle.la
@@ -373,6 +393,8 @@ lib/kded.la
 lib/kded.so
 lib/kimg_eps.la
 lib/kimg_eps.so
+lib/kimg_g3.la
+lib/kimg_g3.so
 lib/kimg_krl.la
 lib/kimg_krl.so
 lib/kimg_tiff.la
@@ -395,98 +417,93 @@ lib/kjs_html.la
 lib/kjs_html.so
 lib/klauncher.la
 lib/klauncher.so
+lib/klegacystyle.la
+lib/klegacystyle.so
+lib/knotify.la
+lib/knotify.so
+lib/ksgistyle.la
+lib/ksgistyle.so
 lib/kstephighcolor.la
 lib/kstephighcolor.so
 lib/kstepstyle.la
 lib/kstepstyle.so
 lib/libDCOP.la
-lib/libDCOP.so
-lib/libDCOP.so.%%LIBVER%%
+lib/libDCOP.so.4
+lib/libDCOPC.la
+lib/libDCOPC.so.4
 lib/libartsc.la
-lib/libartsc.so
 lib/libartsc.so.0
 lib/libartscbackend.la
-lib/libartscbackend.so
 lib/libartscbackend.so.0
 lib/libartsdsp.la
-lib/libartsdsp.so
 lib/libartsdsp.so.0
 lib/libartsflow.la
-lib/libartsflow.so
 lib/libartsflow.so.0
 lib/libartsflow_idl.la
-lib/libartsflow_idl.so
 lib/libartsflow_idl.so.0
 lib/libkab.la
-lib/libkab.so
-lib/libkab.so.%%LIBVER%%
+lib/libkab.so.4
 lib/libkdecore.la
-lib/libkdecore.so
-lib/libkdecore.so.%%LIBVER%%
+lib/libkdecore.so.4
 lib/libkdesu.la
-lib/libkdesu.so
-lib/libkdesu.so.%%LIBVER%%
+lib/libkdesu.so.4
 lib/libkdeui.la
-lib/libkdeui.so
-lib/libkdeui.so.%%LIBVER%%
+lib/libkdeui.so.4
 lib/libkfile.la
-lib/libkfile.so
-lib/libkfile.so.%%LIBVER%%
-lib/libkformula.la
-lib/libkformula.so
-lib/libkformula.so.%%LIBVER%%
+lib/libkfile.so.4
 lib/libkhtml.la
-lib/libkhtml.so
-lib/libkhtml.so.%%LIBVER%%
+lib/libkhtml.so.4
 lib/libkio.la
-lib/libkio.so
-lib/libkio.so.%%LIBVER%%
+lib/libkio.so.4
 lib/libkjava.la
-lib/libkjava.so
-lib/libkjava.so.1
+lib/libkjava.so.4
 lib/libkjs.la
-lib/libkjs.so
-lib/libkjs.so.%%LIBVER%%
+lib/libkjs.so.4
+lib/libkmapnotify.la
+lib/libkmapnotify.so.4
 lib/libkmedia2_idl.la
-lib/libkmedia2_idl.so
 lib/libkmedia2_idl.so.0
 lib/libkmid.la
-lib/libkmid.so
-lib/libkmid.so.%%LIBVER%%
+lib/libkmid.so.0
 lib/libkparts.la
-lib/libkparts.so
-lib/libkparts.so.%%LIBVER%%
+lib/libkparts.so.4
 lib/libkspell.la
-lib/libkspell.so
-lib/libkspell.so.%%LIBVER%%
+lib/libkspell.so.4
 lib/libksycoca.la
-lib/libksycoca.so
-lib/libksycoca.so.%%LIBVER%%
-lib/libkwrite.la
-lib/libkwrite.so
-lib/libkwrite.so.%%LIBVER%%
+lib/libksycoca.so.4
+lib/libktexteditor.la
+lib/libktexteditor.so.0
 lib/libmcop.la
-lib/libmcop.so
-lib/libmcop.so.%%LIBVER%%
+lib/libmcop.so.0
 lib/libqtmcop.la
-lib/libqtmcop.so
 lib/libqtmcop.so.0
 lib/libsoundserver_idl.la
-lib/libsoundserver_idl.so
 lib/libsoundserver_idl.so.0
 lib/libx11globalcomm.la
-lib/libx11globalcomm.so
 lib/libx11globalcomm.so.0
+share/apps/kab/template.config
+share/apps/kab/template.kab
 share/apps/kdeui/pics/aboutkde.png
 share/apps/kdeui/pics/keys.png
 share/apps/khtml/css/html4.css
 share/apps/khtml/khtml.rc
+share/apps/khtml/khtml_browser.rc
 share/apps/khtml/khtml_popupmenu.rc
 share/apps/kjava/kjava-classes.zip
-share/apps/ksgmltools/kde-rdbhier2.elements
-share/apps/ksgmltools/kde-rdbpool.elements
-share/apps/ksgmltools/kde.cat
-share/apps/ksgmltools/kde.dtd
+share/apps/ksgmltools/catalog
+share/apps/ksgmltools/dtd/fdl-notice.entities
+share/apps/ksgmltools/dtd/kde-genent.entities
+share/apps/ksgmltools/dtd/kde-next.dtd
+share/apps/ksgmltools/dtd/kde-prologue.entities
+share/apps/ksgmltools/dtd/kde-rdbhier2.elements
+share/apps/ksgmltools/dtd/kde-rdbpool.elements
+share/apps/ksgmltools/dtd/kde.dtd
+share/apps/ksgmltools/entities/fdl-notice.docbook
+share/apps/ksgmltools/entities/gpl-notice.docbook
+share/apps/ksgmltools/entities/help-menu.docbook
+share/apps/ksgmltools/entities/lgpl-notice.docbook
+share/apps/ksgmltools/entities/license-links.docbook
+share/apps/ksgmltools/kde.dcl
 share/apps/ksgmltools/stylesheets/kde-anchor.dsl
 share/apps/ksgmltools/stylesheets/kde-faq.dsl
 share/apps/ksgmltools/stylesheets/kde-img.dsl
@@ -541,6 +558,8 @@ share/apps/ksgmltools/stylesheets/kde-l1sv.ent
 share/apps/ksgmltools/stylesheets/kde-l1zh-CN.dsl
 share/apps/ksgmltools/stylesheets/kde-l1zh-CN.ent
 share/apps/ksgmltools/stylesheets/kde-navig.dsl
+share/apps/ksgmltools/stylesheets/kde-search.dsl
+share/apps/ksgmltools/stylesheets/kde-ttlpg.dsl
 share/apps/ksgmltools/stylesheets/kde.css
 share/apps/ksgmltools/stylesheets/kde.dsl
 share/apps/kstyle/pixmaps/aquaice.png
@@ -602,9 +621,9 @@ share/apps/kstyle/pixmaps/woodmenu.png
 share/apps/kstyle/pixmaps/yellow_off.png
 share/apps/kstyle/pixmaps/yellow_on.png
 share/apps/kstyle/themes/b3.themerc
-share/apps/kstyle/themes/coldions.themerc
 share/apps/kstyle/themes/default.themerc
 share/apps/kstyle/themes/highcolor.themerc
+share/apps/kstyle/themes/ksgistyle.themerc
 share/apps/kstyle/themes/kstep.themerc
 share/apps/kstyle/themes/marble.themerc
 share/apps/kstyle/themes/qtcde.themerc
@@ -614,30 +633,22 @@ share/apps/kstyle/themes/qtwindows.themerc
 share/apps/kstyle/themes/system.themerc
 share/apps/kstyle/themes/systemalt.themerc
 share/apps/kstyle/themes/systemtest.themerc
-share/apps/kwrite/kwrite.rc
-share/apps/kwrite/kwrite_browser.rc
 share/config/charsets
 share/config/colors/40 Colors
 share/config/colors/Royal
 share/config/colors/Web
 share/config/eventsrc
+share/config/kde-config
 share/config/kdebug.areas
 share/config/kdebugrc
-share/config/protocols/file.desktop
-share/config/protocols/ftp.desktop
-share/config/protocols/http.desktop
-share/config/protocols/https.desktop
 share/config/ui/ui_standards.rc
 share/doc/HTML/en/common/caution.png
 share/doc/HTML/en/common/fdl-licence
 share/doc/HTML/en/common/fdl-licence.html
 share/doc/HTML/en/common/fdl-notice
-share/doc/HTML/en/common/fdl-notice.docbook
-share/doc/HTML/en/common/fdl-notice.entities
 share/doc/HTML/en/common/gpl-licence
 share/doc/HTML/en/common/gpl-licence.html
 share/doc/HTML/en/common/gpl-notice
-share/doc/HTML/en/common/gpl-notice.docbook
 share/doc/HTML/en/common/home.png
 share/doc/HTML/en/common/important.png
 share/doc/HTML/en/common/kde-common.css
@@ -645,7 +656,6 @@ share/doc/HTML/en/common/kde-default.css
 share/doc/HTML/en/common/lgpl-licence
 share/doc/HTML/en/common/lgpl-licence.html
 share/doc/HTML/en/common/lgpl-notice
-share/doc/HTML/en/common/lgpl-notice.docbook
 share/doc/HTML/en/common/mieterra-artistic-license
 share/doc/HTML/en/common/next.png
 share/doc/HTML/en/common/note.png
@@ -657,7 +667,7 @@ share/doc/HTML/en/common/toc-plus.png
 share/doc/HTML/en/common/up.png
 share/doc/HTML/en/common/warning.png
 share/doc/HTML/en/common/xml.dcl
-share/doc/HTML/en/kdelibs/index.html
+share/doc/HTML/en/kdelibs/kdebug/index.html
 share/doc/HTML/en/kspell/.anchors
 share/doc/HTML/en/kspell/configuration-dialog-.html
 share/doc/HTML/en/kspell/contact-information.html
@@ -673,17 +683,17 @@ share/icons/hicolor/22x22/actions/1leftarrow.png
 share/icons/hicolor/22x22/actions/1rightarrow.png
 share/icons/hicolor/22x22/actions/2leftarrow.png
 share/icons/hicolor/22x22/actions/2rightarrow.png
-share/icons/hicolor/22x22/actions/abs.png
 share/icons/hicolor/22x22/actions/add_point.png
 share/icons/hicolor/22x22/actions/airbrush.png
 share/icons/hicolor/22x22/actions/back.png
 share/icons/hicolor/22x22/actions/blend.png
 share/icons/hicolor/22x22/actions/bottom.png
-share/icons/hicolor/22x22/actions/brace.png
-share/icons/hicolor/22x22/actions/brackets.png
 share/icons/hicolor/22x22/actions/centrejust.png
 share/icons/hicolor/22x22/actions/colorpicker.png
 share/icons/hicolor/22x22/actions/configure.png
+share/icons/hicolor/22x22/actions/connect_creating.png
+share/icons/hicolor/22x22/actions/connect_established.png
+share/icons/hicolor/22x22/actions/connect_no.png
 share/icons/hicolor/22x22/actions/contexthelp.png
 share/icons/hicolor/22x22/actions/contiguous.png
 share/icons/hicolor/22x22/actions/crop.png
@@ -694,17 +704,17 @@ share/icons/hicolor/22x22/actions/editpaste.png
 share/icons/hicolor/22x22/actions/edittrash.png
 share/icons/hicolor/22x22/actions/elliptical.png
 share/icons/hicolor/22x22/actions/eraser.png
+share/icons/hicolor/22x22/actions/exec.png
 share/icons/hicolor/22x22/actions/filenew.png
 share/icons/hicolor/22x22/actions/fileopen.png
 share/icons/hicolor/22x22/actions/fileprint.png
 share/icons/hicolor/22x22/actions/filesave.png
 share/icons/hicolor/22x22/actions/fill.png
+share/icons/hicolor/22x22/actions/find.png
 share/icons/hicolor/22x22/actions/finish.png
 share/icons/hicolor/22x22/actions/forward.png
-share/icons/hicolor/22x22/actions/frac.png
 share/icons/hicolor/22x22/actions/gohome.png
 share/icons/hicolor/22x22/actions/handdrawn.png
-share/icons/hicolor/22x22/actions/int.png
 share/icons/hicolor/22x22/actions/kde/0001.png
 share/icons/hicolor/22x22/actions/kde/0002.png
 share/icons/hicolor/22x22/actions/kde/0003.png
@@ -757,30 +767,29 @@ share/icons/hicolor/22x22/actions/kde/0049.png
 share/icons/hicolor/22x22/actions/kde/0050.png
 share/icons/hicolor/22x22/actions/lasso.png
 share/icons/hicolor/22x22/actions/leftjust.png
-share/icons/hicolor/22x22/actions/lsub.png
-share/icons/hicolor/22x22/actions/lsup.png
-share/icons/hicolor/22x22/actions/matrix.png
 share/icons/hicolor/22x22/actions/move.png
+share/icons/hicolor/22x22/actions/next.png
 share/icons/hicolor/22x22/actions/openterm.png
 share/icons/hicolor/22x22/actions/paintbrush.png
-share/icons/hicolor/22x22/actions/paren.png
 share/icons/hicolor/22x22/actions/pencil.png
 share/icons/hicolor/22x22/actions/previous.png
-share/icons/hicolor/22x22/actions/prod.png
 share/icons/hicolor/22x22/actions/rectangular.png
 share/icons/hicolor/22x22/actions/redo.png
 share/icons/hicolor/22x22/actions/reload.png
 share/icons/hicolor/22x22/actions/rightjust.png
-share/icons/hicolor/22x22/actions/rsub.png
-share/icons/hicolor/22x22/actions/rsup.png
 share/icons/hicolor/22x22/actions/run.png
 share/icons/hicolor/22x22/actions/smart_select.png
 share/icons/hicolor/22x22/actions/spellcheck.png
-share/icons/hicolor/22x22/actions/sqrt.png
 share/icons/hicolor/22x22/actions/start.png
 share/icons/hicolor/22x22/actions/stop.png
-share/icons/hicolor/22x22/actions/sum.png
 share/icons/hicolor/22x22/actions/text.png
+share/icons/hicolor/22x22/actions/text_block.png
+share/icons/hicolor/22x22/actions/text_bold.png
+share/icons/hicolor/22x22/actions/text_center.png
+share/icons/hicolor/22x22/actions/text_italic.png
+share/icons/hicolor/22x22/actions/text_left.png
+share/icons/hicolor/22x22/actions/text_right.png
+share/icons/hicolor/22x22/actions/text_under.png
 share/icons/hicolor/22x22/actions/top.png
 share/icons/hicolor/22x22/actions/undo.png
 share/icons/hicolor/22x22/actions/up.png
@@ -788,33 +797,31 @@ share/icons/hicolor/22x22/actions/viewmag+.png
 share/icons/hicolor/22x22/actions/viewmag-.png
 share/icons/hicolor/22x22/actions/viewmag.png
 share/icons/hicolor/22x22/actions/window_nofullscreen.png
-share/icons/hicolor/32x32/actions/abs.png
 share/icons/hicolor/32x32/actions/back.png
 share/icons/hicolor/32x32/actions/blend.png
 share/icons/hicolor/32x32/actions/bottom.png
-share/icons/hicolor/32x32/actions/brace.png
-share/icons/hicolor/32x32/actions/brackets.png
 share/icons/hicolor/32x32/actions/centrejust.png
 share/icons/hicolor/32x32/actions/colors.png
+share/icons/hicolor/32x32/actions/contents.png
 share/icons/hicolor/32x32/actions/contexthelp.png
 share/icons/hicolor/32x32/actions/down.png
 share/icons/hicolor/32x32/actions/editcopy.png
 share/icons/hicolor/32x32/actions/editcut.png
 share/icons/hicolor/32x32/actions/editdelete.png
 share/icons/hicolor/32x32/actions/editpaste.png
+share/icons/hicolor/32x32/actions/exec.png
 share/icons/hicolor/32x32/actions/filenew.png
 share/icons/hicolor/32x32/actions/fileopen.png
 share/icons/hicolor/32x32/actions/fileprint.png
 share/icons/hicolor/32x32/actions/files.png
 share/icons/hicolor/32x32/actions/filesave.png
+share/icons/hicolor/32x32/actions/find.png
 share/icons/hicolor/32x32/actions/finish.png
 share/icons/hicolor/32x32/actions/fonts.png
 share/icons/hicolor/32x32/actions/forward.png
-share/icons/hicolor/32x32/actions/frac.png
 share/icons/hicolor/32x32/actions/gohome.png
 share/icons/hicolor/32x32/actions/goto.png
 share/icons/hicolor/32x32/actions/help.png
-share/icons/hicolor/32x32/actions/int.png
 share/icons/hicolor/32x32/actions/kde/0001.png
 share/icons/hicolor/32x32/actions/kde/0002.png
 share/icons/hicolor/32x32/actions/kde/0003.png
@@ -866,28 +873,26 @@ share/icons/hicolor/32x32/actions/kde/0048.png
 share/icons/hicolor/32x32/actions/kde/0049.png
 share/icons/hicolor/32x32/actions/kde/0050.png
 share/icons/hicolor/32x32/actions/leftjust.png
-share/icons/hicolor/32x32/actions/lsub.png
-share/icons/hicolor/32x32/actions/lsup.png
-share/icons/hicolor/32x32/actions/matrix.png
 share/icons/hicolor/32x32/actions/misc.png
 share/icons/hicolor/32x32/actions/mouse.png
 share/icons/hicolor/32x32/actions/next.png
 share/icons/hicolor/32x32/actions/openterm.png
-share/icons/hicolor/32x32/actions/paren.png
 share/icons/hicolor/32x32/actions/previous.png
-share/icons/hicolor/32x32/actions/prod.png
 share/icons/hicolor/32x32/actions/redo.png
 share/icons/hicolor/32x32/actions/reload.png
 share/icons/hicolor/32x32/actions/rightjust.png
 share/icons/hicolor/32x32/actions/rotate.png
-share/icons/hicolor/32x32/actions/rsub.png
-share/icons/hicolor/32x32/actions/rsup.png
 share/icons/hicolor/32x32/actions/run.png
 share/icons/hicolor/32x32/actions/spellcheck.png
-share/icons/hicolor/32x32/actions/sqrt.png
 share/icons/hicolor/32x32/actions/start.png
 share/icons/hicolor/32x32/actions/stop.png
-share/icons/hicolor/32x32/actions/sum.png
+share/icons/hicolor/32x32/actions/text_block.png
+share/icons/hicolor/32x32/actions/text_bold.png
+share/icons/hicolor/32x32/actions/text_center.png
+share/icons/hicolor/32x32/actions/text_italic.png
+share/icons/hicolor/32x32/actions/text_left.png
+share/icons/hicolor/32x32/actions/text_right.png
+share/icons/hicolor/32x32/actions/text_under.png
 share/icons/hicolor/32x32/actions/top.png
 share/icons/hicolor/32x32/actions/undo.png
 share/icons/hicolor/32x32/actions/up.png
@@ -909,12 +914,14 @@ share/icons/hicolor/32x32/filesystems/folder_red.png
 share/icons/hicolor/32x32/filesystems/folder_yellow.png
 share/icons/hicolor/32x32/filesystems/ftp.png
 share/icons/hicolor/32x32/filesystems/link.png
+share/icons/hicolor/32x32/filesystems/lock.png
 share/icons/hicolor/32x32/filesystems/pipe.png
 share/icons/hicolor/32x32/filesystems/shredder.png
 share/icons/hicolor/32x32/filesystems/socket.png
 share/icons/hicolor/32x32/filesystems/trashcan_empty.png
 share/icons/hicolor/32x32/filesystems/trashcan_full.png
 share/icons/hicolor/32x32/filesystems/www.png
+share/icons/hicolor/32x32/filesystems/zip.png
 share/icons/hicolor/32x32/mimetypes/applix.png
 share/icons/hicolor/32x32/mimetypes/binary.png
 share/icons/hicolor/32x32/mimetypes/binary2.png
@@ -922,6 +929,7 @@ share/icons/hicolor/32x32/mimetypes/blockdevice.png
 share/icons/hicolor/32x32/mimetypes/c_src.png
 share/icons/hicolor/32x32/mimetypes/chardevice.png
 share/icons/hicolor/32x32/mimetypes/core.png
+share/icons/hicolor/32x32/mimetypes/cpp_src.png
 share/icons/hicolor/32x32/mimetypes/document.png
 share/icons/hicolor/32x32/mimetypes/dvi.png
 share/icons/hicolor/32x32/mimetypes/f_src.png
@@ -950,6 +958,7 @@ share/icons/hicolor/32x32/mimetypes/postscript.png
 share/icons/hicolor/32x32/mimetypes/readme.png
 share/icons/hicolor/32x32/mimetypes/recycled.png
 share/icons/hicolor/32x32/mimetypes/resource.png
+share/icons/hicolor/32x32/mimetypes/rpm.png
 share/icons/hicolor/32x32/mimetypes/s_src.png
 share/icons/hicolor/32x32/mimetypes/sound.png
 share/icons/hicolor/32x32/mimetypes/tex.png
@@ -1025,17 +1034,20 @@ share/icons/hicolor/48x48/filesystems/folder_red.png
 share/icons/hicolor/48x48/filesystems/folder_yellow.png
 share/icons/hicolor/48x48/filesystems/ftp.png
 share/icons/hicolor/48x48/filesystems/link.png
+share/icons/hicolor/48x48/filesystems/lock.png
 share/icons/hicolor/48x48/filesystems/shredder.png
 share/icons/hicolor/48x48/filesystems/socket.png
 share/icons/hicolor/48x48/filesystems/trashcan_empty.png
 share/icons/hicolor/48x48/filesystems/trashcan_full.png
 share/icons/hicolor/48x48/filesystems/www.png
+share/icons/hicolor/48x48/filesystems/zip.png
 share/icons/hicolor/48x48/mimetypes/binary.png
 share/icons/hicolor/48x48/mimetypes/binary2.png
 share/icons/hicolor/48x48/mimetypes/blockdevice.png
 share/icons/hicolor/48x48/mimetypes/c_src.png
 share/icons/hicolor/48x48/mimetypes/chardevice.png
 share/icons/hicolor/48x48/mimetypes/core.png
+share/icons/hicolor/48x48/mimetypes/cpp_src.png
 share/icons/hicolor/48x48/mimetypes/document.png
 share/icons/hicolor/48x48/mimetypes/dvi.png
 share/icons/hicolor/48x48/mimetypes/f_src.png
@@ -1064,6 +1076,7 @@ share/icons/hicolor/48x48/mimetypes/postscript.png
 share/icons/hicolor/48x48/mimetypes/readme.png
 share/icons/hicolor/48x48/mimetypes/recycled.png
 share/icons/hicolor/48x48/mimetypes/resource.png
+share/icons/hicolor/48x48/mimetypes/rpm.png
 share/icons/hicolor/48x48/mimetypes/s_src.png
 share/icons/hicolor/48x48/mimetypes/sound.png
 share/icons/hicolor/48x48/mimetypes/tar.png
@@ -1081,7 +1094,6 @@ share/icons/locolor/16x16/actions/1leftarrow.png
 share/icons/locolor/16x16/actions/1rightarrow.png
 share/icons/locolor/16x16/actions/2leftarrow.png
 share/icons/locolor/16x16/actions/2rightarrow.png
-share/icons/locolor/16x16/actions/abs.png
 share/icons/locolor/16x16/actions/add_point.png
 share/icons/locolor/16x16/actions/airbrush.png
 share/icons/locolor/16x16/actions/back.png
@@ -1089,9 +1101,6 @@ share/icons/locolor/16x16/actions/blend.png
 share/icons/locolor/16x16/actions/bookmark.png
 share/icons/locolor/16x16/actions/bookmark_add.png
 share/icons/locolor/16x16/actions/bottom.png
-share/icons/locolor/16x16/actions/brace.png
-share/icons/locolor/16x16/actions/brackets.png
-share/icons/locolor/16x16/actions/centrejust.png
 share/icons/locolor/16x16/actions/circle_select.png
 share/icons/locolor/16x16/actions/colorpicker.png
 share/icons/locolor/16x16/actions/configure.png
@@ -1108,7 +1117,9 @@ share/icons/locolor/16x16/actions/editshred.png
 share/icons/locolor/16x16/actions/edittrash.png
 share/icons/locolor/16x16/actions/elliptical.png
 share/icons/locolor/16x16/actions/eraser.png
+share/icons/locolor/16x16/actions/exec.png
 share/icons/locolor/16x16/actions/exit.png
+share/icons/locolor/16x16/actions/fileclose.png
 share/icons/locolor/16x16/actions/filemail.png
 share/icons/locolor/16x16/actions/filenew.png
 share/icons/locolor/16x16/actions/fileopen.png
@@ -1120,47 +1131,41 @@ share/icons/locolor/16x16/actions/find.png
 share/icons/locolor/16x16/actions/finish.png
 share/icons/locolor/16x16/actions/flag.png
 share/icons/locolor/16x16/actions/forward.png
-share/icons/locolor/16x16/actions/frac.png
 share/icons/locolor/16x16/actions/gohome.png
 share/icons/locolor/16x16/actions/goto.png
 share/icons/locolor/16x16/actions/handdrawn.png
 share/icons/locolor/16x16/actions/help.png
 share/icons/locolor/16x16/actions/idea.png
-share/icons/locolor/16x16/actions/int.png
 share/icons/locolor/16x16/actions/key.png
 share/icons/locolor/16x16/actions/lasso.png
-share/icons/locolor/16x16/actions/leftjust.png
 share/icons/locolor/16x16/actions/lock.png
-share/icons/locolor/16x16/actions/lsub.png
-share/icons/locolor/16x16/actions/lsup.png
-share/icons/locolor/16x16/actions/matrix.png
 share/icons/locolor/16x16/actions/misc.png
 share/icons/locolor/16x16/actions/move.png
 share/icons/locolor/16x16/actions/next.png
 share/icons/locolor/16x16/actions/openterm.png
 share/icons/locolor/16x16/actions/paintbrush.png
-share/icons/locolor/16x16/actions/paren.png
 share/icons/locolor/16x16/actions/pencil.png
 share/icons/locolor/16x16/actions/previous.png
-share/icons/locolor/16x16/actions/prod.png
 share/icons/locolor/16x16/actions/quickprint.png
 share/icons/locolor/16x16/actions/rectangular.png
 share/icons/locolor/16x16/actions/redo.png
 share/icons/locolor/16x16/actions/reload.png
-share/icons/locolor/16x16/actions/rightjust.png
 share/icons/locolor/16x16/actions/rotate.png
-share/icons/locolor/16x16/actions/rsub.png
-share/icons/locolor/16x16/actions/rsup.png
 share/icons/locolor/16x16/actions/run.png
 share/icons/locolor/16x16/actions/send.png
 share/icons/locolor/16x16/actions/smart_select.png
 share/icons/locolor/16x16/actions/spellcheck.png
-share/icons/locolor/16x16/actions/sqrt.png
 share/icons/locolor/16x16/actions/stamp.png
 share/icons/locolor/16x16/actions/start.png
 share/icons/locolor/16x16/actions/stop.png
-share/icons/locolor/16x16/actions/sum.png
 share/icons/locolor/16x16/actions/text.png
+share/icons/locolor/16x16/actions/text_block.png
+share/icons/locolor/16x16/actions/text_bold.png
+share/icons/locolor/16x16/actions/text_centered.png
+share/icons/locolor/16x16/actions/text_italic.png
+share/icons/locolor/16x16/actions/text_left.png
+share/icons/locolor/16x16/actions/text_right.png
+share/icons/locolor/16x16/actions/text_under.png
 share/icons/locolor/16x16/actions/top.png
 share/icons/locolor/16x16/actions/transform.png
 share/icons/locolor/16x16/actions/trash.png
@@ -1185,17 +1190,20 @@ share/icons/locolor/16x16/filesystems/folder_open.png
 share/icons/locolor/16x16/filesystems/folder_red.png
 share/icons/locolor/16x16/filesystems/folder_yellow.png
 share/icons/locolor/16x16/filesystems/ftp.png
+share/icons/locolor/16x16/filesystems/lock.png
 share/icons/locolor/16x16/filesystems/pipe.png
 share/icons/locolor/16x16/filesystems/socket.png
 share/icons/locolor/16x16/filesystems/trashcan_empty.png
 share/icons/locolor/16x16/filesystems/trashcan_full.png
 share/icons/locolor/16x16/filesystems/www.png
+share/icons/locolor/16x16/filesystems/zip.png
 share/icons/locolor/16x16/mimetypes/binary.png
 share/icons/locolor/16x16/mimetypes/binary2.png
 share/icons/locolor/16x16/mimetypes/blockdevice.png
 share/icons/locolor/16x16/mimetypes/c_src.png
 share/icons/locolor/16x16/mimetypes/chardevice.png
 share/icons/locolor/16x16/mimetypes/core.png
+share/icons/locolor/16x16/mimetypes/cpp_src.png
 share/icons/locolor/16x16/mimetypes/document.png
 share/icons/locolor/16x16/mimetypes/dvi.png
 share/icons/locolor/16x16/mimetypes/f_src.png
@@ -1222,6 +1230,7 @@ share/icons/locolor/16x16/mimetypes/pk.png
 share/icons/locolor/16x16/mimetypes/postscript.png
 share/icons/locolor/16x16/mimetypes/readme.png
 share/icons/locolor/16x16/mimetypes/recycled.png
+share/icons/locolor/16x16/mimetypes/rpm.png
 share/icons/locolor/16x16/mimetypes/s_src.png
 share/icons/locolor/16x16/mimetypes/sound.png
 share/icons/locolor/16x16/mimetypes/source.png
@@ -1232,19 +1241,6 @@ share/icons/locolor/16x16/mimetypes/txt.png
 share/icons/locolor/16x16/mimetypes/unknown.png
 share/icons/locolor/16x16/mimetypes/video.png
 share/icons/locolor/16x16/mimetypes/y_src.png
-share/icons/locolor/22x22/actions/1leftarrow.png
-share/icons/locolor/22x22/actions/1rightarrow.png
-share/icons/locolor/22x22/actions/2leftarrow.png
-share/icons/locolor/22x22/actions/2rightarrow.png
-share/icons/locolor/22x22/actions/kde1.png
-share/icons/locolor/22x22/actions/kde2.png
-share/icons/locolor/22x22/actions/kde3.png
-share/icons/locolor/22x22/actions/kde4.png
-share/icons/locolor/22x22/actions/kde5.png
-share/icons/locolor/22x22/actions/kde6.png
-share/icons/locolor/22x22/actions/kde7.png
-share/icons/locolor/22x22/actions/kde8.png
-share/icons/locolor/22x22/actions/kde9.png
 share/icons/locolor/32x32/actions/key.png
 share/icons/locolor/32x32/actions/misc.png
 share/icons/locolor/32x32/filesystems/desktop.png
@@ -1260,11 +1256,13 @@ share/icons/locolor/32x32/filesystems/folder_open.png
 share/icons/locolor/32x32/filesystems/folder_red.png
 share/icons/locolor/32x32/filesystems/folder_yellow.png
 share/icons/locolor/32x32/filesystems/ftp.png
+share/icons/locolor/32x32/filesystems/lock.png
 share/icons/locolor/32x32/filesystems/pipe.png
 share/icons/locolor/32x32/filesystems/socket.png
 share/icons/locolor/32x32/filesystems/trashcan_empty.png
 share/icons/locolor/32x32/filesystems/trashcan_full.png
 share/icons/locolor/32x32/filesystems/www.png
+share/icons/locolor/32x32/filesystems/zip.png
 share/icons/locolor/32x32/mimetypes/applix.png
 share/icons/locolor/32x32/mimetypes/binary.png
 share/icons/locolor/32x32/mimetypes/blockdevice.png
@@ -1305,8 +1303,10 @@ share/icons/locolor/32x32/mimetypes/unknown.png
 share/icons/locolor/32x32/mimetypes/video.png
 share/icons/locolor/32x32/mimetypes/y_src.png
 share/icons/locolor/index.desktop
-share/mimelnk/application/gzip.desktop
+share/mimelnk/all/all.desktop
+share/mimelnk/all/allfiles.desktop
 share/mimelnk/application/msexcel.desktop
+share/mimelnk/application/msexcel2.desktop
 share/mimelnk/application/mspowerpoint.desktop
 share/mimelnk/application/msword.desktop
 share/mimelnk/application/octet-stream.desktop
@@ -1315,7 +1315,7 @@ share/mimelnk/application/postscript.desktop
 share/mimelnk/application/smil.desktop
 share/mimelnk/application/wordperfect.desktop
 share/mimelnk/application/x-applix.desktop
-share/mimelnk/application/x-ar.desktop
+share/mimelnk/application/x-archive.desktop
 share/mimelnk/application/x-arj.desktop
 share/mimelnk/application/x-awk.desktop
 share/mimelnk/application/x-bzip.desktop
@@ -1327,6 +1327,7 @@ share/mimelnk/application/x-desktop.desktop
 share/mimelnk/application/x-dvi.desktop
 share/mimelnk/application/x-executable.desktop
 share/mimelnk/application/x-font.desktop
+share/mimelnk/application/x-gzip.desktop
 share/mimelnk/application/x-jar.desktop
 share/mimelnk/application/x-java.desktop
 share/mimelnk/application/x-lha.desktop
@@ -1339,7 +1340,9 @@ share/mimelnk/application/x-rar.desktop
 share/mimelnk/application/x-rpm.desktop
 share/mimelnk/application/x-sharedlib.desktop
 share/mimelnk/application/x-shellscript.desktop
+share/mimelnk/application/x-shockwave-flash.desktop
 share/mimelnk/application/x-tar.desktop
+share/mimelnk/application/x-tarz.desktop
 share/mimelnk/application/x-tbz.desktop
 share/mimelnk/application/x-tex-gf.desktop
 share/mimelnk/application/x-tex-pk.desktop
@@ -1359,6 +1362,7 @@ share/mimelnk/audio/x-midi.desktop
 share/mimelnk/audio/x-mod.desktop
 share/mimelnk/audio/x-mp3.desktop
 share/mimelnk/audio/x-mpegurl.desktop
+share/mimelnk/audio/x-ogg.desktop
 share/mimelnk/audio/x-pn-realaudio.desktop
 share/mimelnk/audio/x-scpls.desktop
 share/mimelnk/audio/x-wav.desktop
@@ -1392,6 +1396,7 @@ share/mimelnk/text/x-c++hdr.desktop
 share/mimelnk/text/x-c++src.desktop
 share/mimelnk/text/x-chdr.desktop
 share/mimelnk/text/x-csrc.desktop
+share/mimelnk/text/x-diff.desktop
 share/mimelnk/text/x-java.desktop
 share/mimelnk/text/x-makefile.desktop
 share/mimelnk/text/x-moc.desktop
@@ -1407,73 +1412,45 @@ share/mimelnk/video/x-flic.desktop
 share/mimelnk/video/x-msvideo.desktop
 share/services/bmp.kimgio
 share/services/eps.kimgio
+share/services/file.protocol
+share/services/ftp.protocol
+share/services/g3.kimgio
 share/services/gif.kimgio
+share/services/http.protocol
 share/services/http_cache_cleaner.desktop
+share/services/https.protocol
 share/services/jpeg.kimgio
 share/services/kcookiejar.desktop
 share/services/khtml.desktop
 share/services/kio_uiserver.desktop
 share/services/knotify.desktop
 share/services/krl.kimgio
-share/services/kwrite_part.desktop
 share/services/png.kimgio
 share/services/pnm.kimgio
 share/services/tiff.kimgio
 share/services/xbm.kimgio
 share/services/xpm.kimgio
 share/services/xv.kimgio
+share/servicetypes/application.desktop
 share/servicetypes/browserview.desktop
 share/servicetypes/kpart.desktop
 share/servicetypes/kpropsdlgplugin.desktop
 share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
+share/servicetypes/ktexteditor.desktop
 share/servicetypes/kurifilterplugin.desktop
-share/toolbar/configure.png
-@dirrm share/toolbar
-@dirrm share/skel
-@dirrm share/servicetypes
-@dirrm share/services
-@dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/filesystems
-@dirrm share/icons/locolor/32x32/actions
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/22x22/actions
-@dirrm share/icons/locolor/22x22
-@dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/filesystems
-@dirrm share/icons/locolor/16x16/actions
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/scalable/filesystems
-@dirrm share/icons/hicolor/scalable
-@dirrm share/icons/hicolor/48x48/mimetypes
-@dirrm share/icons/hicolor/48x48/filesystems
-@dirrm share/icons/hicolor/48x48/actions/kde
-@dirrm share/icons/hicolor/48x48/actions
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/mimetypes
-@dirrm share/icons/hicolor/32x32/filesystems
-@dirrm share/icons/hicolor/32x32/actions/kde
-@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/22x22/actions/kde
-@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor
-@dirrm share/icons
-@dirrm share/examples
-@unexec rm -f %D/share/doc/HTML/en/kspell/common
 @dirrm share/doc/HTML/en/kspell
+@dirrm share/doc/HTML/en/kdelibs/kdebug
 @dirrm share/doc/HTML/en/kdelibs
 @dirrm share/doc/HTML/en/common
-@dirrm share/config/ui
-@dirrm share/config/protocols
-@dirrm share/config/colors
-@dirrm share/apps/kwrite
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
 @dirrm share/apps/kstyle/themes
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
 @dirrm share/apps/ksgmltools/stylesheets
+@dirrm share/apps/ksgmltools/entities
+@dirrm share/apps/ksgmltools/dtd
 @dirrm share/apps/ksgmltools
 @dirrm share/apps/kjava
 @dirrm share/apps/khtml/css
@@ -1482,8 +1459,8 @@ share/toolbar/configure.png
 @dirrm share/apps/kdeui
 @dirrm share/apps/kab/pics
 @dirrm share/apps/kab
+@dirrm lib/Arts
 @dirrm include/libkmid
-@dirrm include/kwrite
 @dirrm include/kparts
 @dirrm include/kjs
 @dirrm include/kio