Update to KDE-3.2.

Changes:
Network

Kopete
* NEW IN KDE: A multi-protocol instant messaging tool
* Remove the config page for the yahoo module. All configuration will be
  moved to the Yahoo account config. Matt Rogers
* Port the plugin loading GUI over to kdelibs::KPluginSelector and get
  rid of the custom PluginLoader class Martijn Klingens
* Support KWallet for password storage Martijn Klingens
* Port the configuration to KSettings::Dialog. Matt Rogers
* Integrate Kopete's contact list into KAddressBook The Kopete team
* Cleanup the API to be more robust. Notably, unload plugins
  asynchronously, get rid of ConfigModule and use KCMs instead and try
  to cut down on the amount of nested event loops. Martijn Klingens
* Switch the Oscar Plugin to KExtendedSocket Matt Rogers
* Port the Jabber plugin to use libxmpp Till Gerken
* Port MSN to the new protocol (MSNP9) Olivier Goffart
* MSN display picture and incomming MSN custom emoticons support Olivier
  Goffart

Desktop Sharing (krfb)
* HTTP Server for Java applet

ksim
* Snmp plugin Simon Hausmann

Remote Desktop Connection (krdc)
* Additional protocol: RDP
* Preferences system
* Special keys dialog for CTRL-ALT-DEL and similar combinations
* View Only option
* Allow scaling in fullscreen mode
* Support for CursorPos extension, better 'dot-cursor' handling
* Toolbar redesign

KWiFiManager
* NEW IN KDE: application for monitoring and configuring wireless LAN
  connections Stefan Winter

KPPP
* Log viewer:Show summary for selections and show a monthly estimates in
  the statistics area. Andras Mantia, Mikolaj Machowski
* Fixed a bug in modem command writing

12 files changed, 815 insertions, 1353 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 09c277a48a9..3467ed64bea 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.25 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/04 14:42:23 markd Exp $
 
-DISTNAME=	kdenetwork-3.1.5
-PKGREVISION=	1
+DISTNAME=	kdenetwork-${_KDE_VERSION}
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
+CONFLICTS=	kopete-[0-9]*
+
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		yes
 PTHREAD_OPTS+=		require
 
-FOO_MAIN_FILES= \
-	ksirc/ksirc_main.cpp \
-	kxmlrpc/kxmlrpcd_main.cpp
-
 REPLACE_PERL=		ksirc/dsirc
 
 .include "../../mk/bsd.prefs.mk"
@@ -22,8 +19,6 @@ REPLACE_PERL=		ksirc/dsirc
 CONFIGURE_ENV+=		ac_cv_sys_file_offset_bits=no
 .endif
 
-.include "../../meta-pkgs/kde3/Makefile.foo_main"
-
 .include "../../converters/uulib/buildlink2.mk"
 .include "../../databases/gdbm/buildlink2.mk"
 .include "../../meta-pkgs/kde3/buildlink2.mk"
diff --git a/net/kdenetwork3/PLIST b/net/kdenetwork3/PLIST
index 94dac2e198e..0ee5eadff74 100644
--- a/net/kdenetwork3/PLIST
+++ b/net/kdenetwork3/PLIST
@@ -1,114 +1,149 @@
-@comment $NetBSD: PLIST,v 1.7 2004/01/15 11:24:07 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/02/04 14:42:23 markd Exp $
 bin/dsirc
+bin/feedbrowser
 bin/kdict
 bin/kget
-bin/kgpgcertmanager
-bin/kit
-bin/kmail
-bin/kmailcvt
 bin/knewstickerstub
-bin/knode
-bin/korn
+bin/kopete
 bin/kppp
 bin/kppplogview
 bin/krdc
 bin/krfb
+bin/krfb_httpd
 bin/ksirc
 bin/ktalkd
 bin/ktalkdlg
-bin/kxmlrpcd
 bin/lisa
 bin/mail.local
 bin/reslisa
-include/kmailIface.h
-include/mimelib/address.h
-include/mimelib/addrlist.h
-include/mimelib/binhex.h
-include/mimelib/body.h
-include/mimelib/bodypart.h
-include/mimelib/boyermor.h
-include/mimelib/config.h
-include/mimelib/datetime.h
-include/mimelib/debug.h
-include/mimelib/disptype.h
-include/mimelib/entity.h
-include/mimelib/enum.h
-include/mimelib/field.h
-include/mimelib/fieldbdy.h
-include/mimelib/group.h
-include/mimelib/headers.h
-include/mimelib/mailbox.h
-include/mimelib/mboxlist.h
-include/mimelib/mechansm.h
-include/mimelib/mediatyp.h
-include/mimelib/message.h
-include/mimelib/mimepp.h
-include/mimelib/msgcmp.h
-include/mimelib/msgid.h
-include/mimelib/nntp.h
-include/mimelib/param.h
-include/mimelib/pop.h
-include/mimelib/protocol.h
-include/mimelib/smtp.h
-include/mimelib/string.h
-include/mimelib/text.h
-include/mimelib/token.h
-include/mimelib/utility.h
-include/mimelib/uuencode.h
-lib/kde3/kcm_knewsticker.la
-lib/kde3/kcm_knewsticker.so
+bin/rssclient
+bin/rssservice
+include/rss/article.h
+include/rss/document.h
+include/rss/global.h
+include/rss/image.h
+include/rss/librss.h
+include/rss/loader.h
+include/rss/textinput.h
+lib/kconf_update_bin/kopete-account-kconf_update
+lib/kconf_update_bin/kopete-pluginloader2-kconf_update
+lib/kde3/kcm_kopete_accountconfig.la
+lib/kde3/kcm_kopete_accountconfig.so
+lib/kde3/kcm_kopete_appearanceconfig.la
+lib/kde3/kcm_kopete_appearanceconfig.so
+lib/kde3/kcm_kopete_autoreplace.la
+lib/kde3/kcm_kopete_autoreplace.so
+lib/kde3/kcm_kopete_behaviorconfig.la
+lib/kde3/kcm_kopete_behaviorconfig.so
+lib/kde3/kcm_kopete_cryptography.la
+lib/kde3/kcm_kopete_cryptography.so
+lib/kde3/kcm_kopete_highlight.la
+lib/kde3/kcm_kopete_highlight.so
+lib/kde3/kcm_kopete_history.la
+lib/kde3/kcm_kopete_history.so
+lib/kde3/kcm_kopete_msn.la
+lib/kde3/kcm_kopete_msn.so
+lib/kde3/kcm_kopete_nowlistening.la
+lib/kde3/kcm_kopete_nowlistening.so
+lib/kde3/kcm_kopete_texteffect.la
+lib/kde3/kcm_kopete_texteffect.so
+lib/kde3/kcm_kopete_translator.la
+lib/kde3/kcm_kopete_translator.so
+lib/kde3/kcm_kopete_webpresence.la
+lib/kde3/kcm_kopete_webpresence.so
 lib/kde3/kcm_krfb.la
 lib/kde3/kcm_krfb.so
 lib/kde3/kcm_ktalkd.la
 lib/kde3/kcm_ktalkd.so
 lib/kde3/kcm_lanbrowser.la
 lib/kde3/kcm_lanbrowser.so
-lib/kde3/kcm_xmlrpcd.la
-lib/kde3/kcm_xmlrpcd.so
 lib/kde3/kded_kinetd.la
 lib/kde3/kded_kinetd.so
 lib/kde3/kdict_panelapplet.la
 lib/kde3/kdict_panelapplet.so
-lib/kde3/kfile_rfc822.la
-lib/kde3/kfile_rfc822.so
 lib/kde3/khtml_kget.la
 lib/kde3/khtml_kget.so
 lib/kde3/kio_lan.la
 lib/kde3/kio_lan.so
 lib/kde3/knewsticker_panelapplet.la
 lib/kde3/knewsticker_panelapplet.so
+lib/kde3/kopete_aim.la
+lib/kde3/kopete_aim.so
+lib/kde3/kopete_autoreplace.la
+lib/kde3/kopete_autoreplace.so
+lib/kde3/kopete_chatwindow.la
+lib/kde3/kopete_chatwindow.so
+lib/kde3/kopete_connectionstatus.la
+lib/kde3/kopete_connectionstatus.so
+lib/kde3/kopete_contactnotes.la
+lib/kde3/kopete_contactnotes.so
+lib/kde3/kopete_cryptography.la
+lib/kde3/kopete_cryptography.so
+lib/kde3/kopete_highlight.la
+lib/kde3/kopete_highlight.so
+lib/kde3/kopete_history.la
+lib/kde3/kopete_history.so
+lib/kde3/kopete_icq.la
+lib/kde3/kopete_icq.so
+lib/kde3/kopete_irc.la
+lib/kde3/kopete_irc.so
+lib/kde3/kopete_jabber.la
+lib/kde3/kopete_jabber.so
+lib/kde3/kopete_msn.la
+lib/kde3/kopete_msn.so
+lib/kde3/kopete_nowlistening.la
+lib/kde3/kopete_nowlistening.so
+lib/kde3/kopete_sms.la
+lib/kde3/kopete_sms.so
+lib/kde3/kopete_texteffect.la
+lib/kde3/kopete_texteffect.so
+lib/kde3/kopete_translator.la
+lib/kde3/kopete_translator.so
+lib/kde3/kopete_webpresence.la
+lib/kde3/kopete_webpresence.so
+lib/kde3/kopete_yahoo.la
+lib/kde3/kopete_yahoo.so
 lib/kde3/kpf_panelapplet.la
 lib/kde3/kpf_panelapplet.so
 lib/kde3/kpfpropertiesdialog.la
 lib/kde3/kpfpropertiesdialog.so
-lib/ksirc.la
-lib/ksirc.so
-lib/kxmlrpcd.la
-lib/kxmlrpcd.so
-lib/libkdenetwork.la
-lib/libkdenetwork.so
-lib/libkdenetwork.so.2
-lib/libkdenetwork.so.2.0
-lib/libkntsrcfilepropsdlg.la
-lib/libkntsrcfilepropsdlg.so
-lib/libksirc_main.la
-lib/libksirc_main.so
-lib/libksirc_main.so.0
-lib/libksirc_main.so.0.0
-lib/libkxmlrpcd_main.la
-lib/libkxmlrpcd_main.so
-lib/libkxmlrpcd_main.so.0
-lib/libkxmlrpcd_main.so.0.0
-lib/libmimelib.la
-lib/libmimelib.so
-lib/libmimelib.so.1
-lib/libmimelib.so.1.1
+lib/kde3/ksirc.la
+lib/kde3/ksirc.so
+lib/kde3/libkntsrcfilepropsdlg.la
+lib/kde3/libkntsrcfilepropsdlg.so
+lib/kde3/libkrichtexteditpart.la
+lib/kde3/libkrichtexteditpart.so
+lib/libkdeinit_ksirc.la
+lib/libkdeinit_ksirc.so
+lib/libkopete.la
+lib/libkopete.so
+lib/libkopete.so.1
+lib/libkopete.so.1.0
+lib/libkopete_msn_shared.la
+lib/libkopete_msn_shared.so
+lib/libkopete_msn_shared.so.0
+lib/libkopete_msn_shared.so.0.0
+lib/libkopete_oscar.la
+lib/libkopete_oscar.so
+lib/libkopete_oscar.so.1
+lib/libkopete_oscar.so.1.0
+lib/librss.la
+lib/librss.so
+lib/librss.so.1
+lib/librss.so.1.0
+share/applications/kde/Kppp.desktop
+share/applications/kde/kcmkrfb.desktop
+share/applications/kde/kcmktalkd.desktop
+share/applications/kde/kdict.desktop
+share/applications/kde/kget.desktop
+share/applications/kde/knewsticker-standalone.desktop
+share/applications/kde/kppplogview.desktop
+share/applications/kde/krdc.desktop
+share/applications/kde/krfb.desktop
+share/applications/kde/ksirc.desktop
 share/doc/kde/HTML/en/kcontrol/kcmtalkd/common
 share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.docbook
-share/doc/kde/HTML/en/kcontrol/kxmlrpcd/common
-share/doc/kde/HTML/en/kcontrol/kxmlrpcd/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kxmlrpcd/index.docbook
 share/doc/kde/HTML/en/kcontrol/lanbrowser/common
 share/doc/kde/HTML/en/kcontrol/lanbrowser/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/lanbrowser/index.docbook
@@ -119,23 +154,31 @@ share/doc/kde/HTML/en/kdict/index.cache.bz2
 share/doc/kde/HTML/en/kdict/index.docbook
 share/doc/kde/HTML/en/kdict/mainwin.png
 share/doc/kde/HTML/en/kdict/seteditor.png
-share/doc/kde/HTML/en/kgpgcertmanager/common
-share/doc/kde/HTML/en/kgpgcertmanager/index.cache.bz2
-share/doc/kde/HTML/en/kgpgcertmanager/index.docbook
-share/doc/kde/HTML/en/kit/common
-share/doc/kde/HTML/en/kit/index.cache.bz2
-share/doc/kde/HTML/en/kit/index.docbook
-share/doc/kde/HTML/en/kmail/common
-share/doc/kde/HTML/en/kmail/configure.docbook
-share/doc/kde/HTML/en/kmail/credits-and-licenses.docbook
-share/doc/kde/HTML/en/kmail/faq.docbook
-share/doc/kde/HTML/en/kmail/getting-started.docbook
-share/doc/kde/HTML/en/kmail/importing.docbook
-share/doc/kde/HTML/en/kmail/index.cache.bz2
-share/doc/kde/HTML/en/kmail/index.docbook
-share/doc/kde/HTML/en/kmail/intro.docbook
-share/doc/kde/HTML/en/kmail/menus.docbook
-share/doc/kde/HTML/en/kmail/using-kmail.docbook
+share/doc/kde/HTML/en/kget/common
+share/doc/kde/HTML/en/kget/cr22-action-tool_delay.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_delete.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_disconnect.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_drop_target.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_expert.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_logwindow.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_offline_mode_off.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_offline_mode_on.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_paste.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_pause.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_queue.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_restart.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_resume.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_shutdown.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_timer.png
+share/doc/kde/HTML/en/kget/cr22-action-tool_uselastdir.png
+share/doc/kde/HTML/en/kget/fileopen.png
+share/doc/kde/HTML/en/kget/index.cache.bz2
+share/doc/kde/HTML/en/kget/index.docbook
+share/doc/kde/HTML/en/kget/kget1.png
+share/doc/kde/HTML/en/kget/kget2.png
+share/doc/kde/HTML/en/kget/kget3.png
+share/doc/kde/HTML/en/kget/kget4.png
+share/doc/kde/HTML/en/kget/kget5.png
 share/doc/kde/HTML/en/knewsticker/TODO
 share/doc/kde/HTML/en/knewsticker/about-icon.png
 share/doc/kde/HTML/en/knewsticker/checknews-icon.png
@@ -158,51 +201,9 @@ share/doc/kde/HTML/en/knewsticker/newarticle-icon.png
 share/doc/kde/HTML/en/knewsticker/newssite-icon.png
 share/doc/kde/HTML/en/knewsticker/oldarticle-icon.png
 share/doc/kde/HTML/en/knewsticker/preferences-icon.png
-share/doc/kde/HTML/en/knode/commands.docbook
-share/doc/kde/HTML/en/knode/common
-share/doc/kde/HTML/en/knode/credits.docbook
-share/doc/kde/HTML/en/knode/eyes.png
-share/doc/kde/HTML/en/knode/faq.docbook
-share/doc/kde/HTML/en/knode/gloss.docbook
-share/doc/kde/HTML/en/knode/greyball.png
-share/doc/kde/HTML/en/knode/greyballchk.png
-share/doc/kde/HTML/en/knode/index.cache.bz2
-share/doc/kde/HTML/en/knode/index.docbook
-share/doc/kde/HTML/en/knode/install.docbook
-share/doc/kde/HTML/en/knode/introduction.docbook
-share/doc/kde/HTML/en/knode/journey.docbook
-share/doc/kde/HTML/en/knode/knode-cleanup.png
-share/doc/kde/HTML/en/knode/knode-colors-fonts.png
-share/doc/kde/HTML/en/knode/knode-composer-attachments.png
-share/doc/kde/HTML/en/knode/knode-composer-settings.png
-share/doc/kde/HTML/en/knode/knode-edit-filter.png
-share/doc/kde/HTML/en/knode/knode-edit-header1.png
-share/doc/kde/HTML/en/knode/knode-edit-header2.png
-share/doc/kde/HTML/en/knode/knode-filters.png
-share/doc/kde/HTML/en/knode/knode-followup.png
-share/doc/kde/HTML/en/knode/knode-header-settings.png
-share/doc/kde/HTML/en/knode/knode-identity.png
-share/doc/kde/HTML/en/knode/knode-mail-account.png
-share/doc/kde/HTML/en/knode/knode-new-article.png
-share/doc/kde/HTML/en/knode/knode-news-account.png
-share/doc/kde/HTML/en/knode/knode-post-settings.png
-share/doc/kde/HTML/en/knode/knode-read-news-appearance-dialog.png
-share/doc/kde/HTML/en/knode/knode-read-news-settings.png
-share/doc/kde/HTML/en/knode/knode-reply.png
-share/doc/kde/HTML/en/knode/knode-search.png
-share/doc/kde/HTML/en/knode/knode-start.png
-share/doc/kde/HTML/en/knode/knode-subscribe.png
-share/doc/kde/HTML/en/knode/knode-views.png
-share/doc/kde/HTML/en/knode/more.docbook
-share/doc/kde/HTML/en/knode/newsubs.png
-share/doc/kde/HTML/en/knode/redball.png
-share/doc/kde/HTML/en/knode/redballchk.png
-share/doc/kde/HTML/en/knode/using-firststart.docbook
-share/doc/kde/HTML/en/knode/using-morefeatures.docbook
-share/doc/kde/HTML/en/knode/using-subscribing.docbook
-share/doc/kde/HTML/en/korn/common
-share/doc/kde/HTML/en/korn/index.cache.bz2
-share/doc/kde/HTML/en/korn/index.docbook
+share/doc/kde/HTML/en/kopete/common
+share/doc/kde/HTML/en/kopete/index.cache.bz2
+share/doc/kde/HTML/en/kopete/index.docbook
 share/doc/kde/HTML/en/kpf/common
 share/doc/kde/HTML/en/kpf/index.cache.bz2
 share/doc/kde/HTML/en/kpf/index.docbook
@@ -238,59 +239,87 @@ share/doc/kde/HTML/en/kppp/security.docbook
 share/doc/kde/HTML/en/kppp/tricks.docbook
 share/doc/kde/HTML/en/kppp/ttyS-cua.txt
 share/doc/kde/HTML/en/kppp/wizard.docbook
+share/doc/kde/HTML/en/krdc/authentication.eps
+share/doc/kde/HTML/en/krdc/authentication.png
+share/doc/kde/HTML/en/krdc/close.png
+share/doc/kde/HTML/en/krdc/common
+share/doc/kde/HTML/en/krdc/index.cache.bz2
+share/doc/kde/HTML/en/krdc/index.docbook
+share/doc/kde/HTML/en/krdc/krdc_window.eps
+share/doc/kde/HTML/en/krdc/krdc_window.png
+share/doc/kde/HTML/en/krdc/preferences_profilestab.eps
+share/doc/kde/HTML/en/krdc/preferences_profilestab.png
+share/doc/kde/HTML/en/krdc/preferences_rdpdefaultstab.eps
+share/doc/kde/HTML/en/krdc/preferences_rdpdefaultstab.png
+share/doc/kde/HTML/en/krdc/preferences_vncdefaultstab.eps
+share/doc/kde/HTML/en/krdc/preferences_vncdefaultstab.png
+share/doc/kde/HTML/en/krdc/snapshot.eps
+share/doc/kde/HTML/en/krdc/snapshot.png
+share/doc/kde/HTML/en/krdc/snapshot_connectionspeed.eps
+share/doc/kde/HTML/en/krdc/snapshot_connectionspeed.png
+share/doc/kde/HTML/en/krdc/snapshot_nobrowse.eps
+share/doc/kde/HTML/en/krdc/snapshot_nobrowse.png
+share/doc/kde/HTML/en/krdc/snapshot_vncentry.eps
+share/doc/kde/HTML/en/krdc/snapshot_vncentry.png
+share/doc/kde/HTML/en/krdc/window_fullscreen.png
+share/doc/kde/HTML/en/krdc/window_nofullscreen.png
 share/doc/kde/HTML/en/krfb/common
+share/doc/kde/HTML/en/krfb/configuration_access.eps
+share/doc/kde/HTML/en/krfb/configuration_access.png
+share/doc/kde/HTML/en/krfb/configuration_network.eps
+share/doc/kde/HTML/en/krfb/configuration_network.png
+share/doc/kde/HTML/en/krfb/configuration_session.eps
+share/doc/kde/HTML/en/krfb/configuration_session.png
+share/doc/kde/HTML/en/krfb/connection.eps
+share/doc/kde/HTML/en/krfb/connection.png
+share/doc/kde/HTML/en/krfb/email_invitation.eps
+share/doc/kde/HTML/en/krfb/email_invitation.png
 share/doc/kde/HTML/en/krfb/index.cache.bz2
 share/doc/kde/HTML/en/krfb/index.docbook
+share/doc/kde/HTML/en/krfb/invitation_management.eps
+share/doc/kde/HTML/en/krfb/invitation_management.png
+share/doc/kde/HTML/en/krfb/personal_invitation.eps
+share/doc/kde/HTML/en/krfb/personal_invitation.png
+share/doc/kde/HTML/en/krfb/screenshot.eps
+share/doc/kde/HTML/en/krfb/screenshot.png
 share/doc/kde/HTML/en/ksirc/common
 share/doc/kde/HTML/en/ksirc/index.cache.bz2
 share/doc/kde/HTML/en/ksirc/index.docbook
 share/doc/kde/HTML/en/ktalkd/common
 share/doc/kde/HTML/en/ktalkd/index.cache.bz2
 share/doc/kde/HTML/en/ktalkd/index.docbook
+share/doc/kde/HTML/en/kwifimanager/common
+share/doc/kde/HTML/en/kwifimanager/index.cache.bz2
+share/doc/kde/HTML/en/kwifimanager/index.docbook
 share/doc/kde/HTML/en/lisa/common
 share/doc/kde/HTML/en/lisa/index.cache.bz2
 share/doc/kde/HTML/en/lisa/index.docbook
 share/kde/applnk/.hidden/kcmkiolan.desktop
 share/kde/applnk/.hidden/kcmlisa.desktop
-share/kde/applnk/.hidden/kcmnewsticker.desktop
 share/kde/applnk/.hidden/kcmreslisa.desktop
 share/kde/applnk/.hidden/knewstickerstub.desktop
-share/kde/applnk/Internet/KMail.desktop
-share/kde/applnk/Internet/KNode.desktop
-share/kde/applnk/Internet/KOrn.desktop
-share/kde/applnk/Internet/Kppp.desktop
-share/kde/applnk/Internet/More/KOrn.desktop
-share/kde/applnk/Internet/More/knewsticker-standalone.desktop
-share/kde/applnk/Internet/More/kppplogview.desktop
-share/kde/applnk/Internet/kget.desktop
-share/kde/applnk/Internet/kit.desktop
-share/kde/applnk/Internet/knewsticker-standalone.desktop
-share/kde/applnk/Internet/kppplogview.desktop
-share/kde/applnk/Internet/krdc.desktop
-share/kde/applnk/Internet/ksirc.desktop
-share/kde/applnk/Settings/Network/kcmkrfb.desktop
-share/kde/applnk/Settings/Network/kcmktalkd.desktop
-share/kde/applnk/Settings/Personalization/kcmnewsticker.desktop
-share/kde/applnk/System/krfb.desktop
-share/kde/applnk/Utilities/kdict.desktop
-share/kde/applnk/Utilities/kmailcvt.desktop
-share/kde/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-share/kde/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-share/kde/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-share/kde/apps/kconf_update/kmail-pgpidentity.pl
-share/kde/apps/kconf_update/kmail-upd-identities.pl
-share/kde/apps/kconf_update/kmail.upd
+share/kde/applnk/Internet/kopete.desktop
 share/kde/apps/kconf_update/knewsticker.upd
 share/kde/apps/kconf_update/knt-0.1-0.2.pl
-share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
-share/kde/apps/kconf_update/kpgp.upd
-share/kde/apps/kconf_update/upgrade-signature.pl
-share/kde/apps/kconf_update/upgrade-transport.pl
+share/kde/apps/kconf_update/kopete-account-kconf_update.sh
+share/kde/apps/kconf_update/kopete-account-kconf_update.upd
+share/kde/apps/kconf_update/kopete-pluginloader.pl
+share/kde/apps/kconf_update/kopete-pluginloader.upd
+share/kde/apps/kconf_update/kopete-pluginloader2.sh
+share/kde/apps/kconf_update/kopete-pluginloader2.upd
 share/kde/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
 share/kde/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
 share/kde/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png
 share/kde/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png
 share/kde/apps/kdict/kdictui.rc
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar1.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar2.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar3.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar4.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar5.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/bar6.png
+share/kde/apps/kget/icons/crystalsvg/22x22/actions/dock.png
 share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_clipboard.png
 share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_delay.png
 share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_delete.png
@@ -312,13 +341,6 @@ share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_shutdown.png
 share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_timer.png
 share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_uselastdir.png
 share/kde/apps/kget/kgetui.rc
-share/kde/apps/kget/pics/bar0.png
-share/kde/apps/kget/pics/bar1.png
-share/kde/apps/kget/pics/bar2.png
-share/kde/apps/kget/pics/bar3.png
-share/kde/apps/kget/pics/bar4.png
-share/kde/apps/kget/pics/bar5.png
-share/kde/apps/kget/pics/bar6.png
 share/kde/apps/kget/pics/connect0.png
 share/kde/apps/kget/pics/connect1.png
 share/kde/apps/kget/pics/connect2.png
@@ -327,7 +349,6 @@ share/kde/apps/kget/pics/connect4.png
 share/kde/apps/kget/pics/connect5.png
 share/kde/apps/kget/pics/connect6.png
 share/kde/apps/kget/pics/connect7.png
-share/kde/apps/kget/pics/dock.png
 share/kde/apps/kget/pics/md_delayed.png
 share/kde/apps/kget/pics/md_finished.png
 share/kde/apps/kget/pics/md_queued.png
@@ -346,127 +367,364 @@ share/kde/apps/kget/sounds/added.wav
 share/kde/apps/kget/sounds/finished.wav
 share/kde/apps/kget/sounds/finishedall.wav
 share/kde/apps/kget/sounds/started.wav
-share/kde/apps/kgpgcertmanager/kgpgcertmanagerui.rc
 share/kde/apps/khtml/kpartplugins/kget_plug_in.rc
 share/kde/apps/kicker/applets/kdictapplet.desktop
 share/kde/apps/kicker/applets/knewsticker.desktop
 share/kde/apps/kicker/applets/kpfapplet.desktop
 share/kde/apps/kinetd/eventsrc
-share/kde/apps/kit/eventsrc
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_anonwarning.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_away.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_bold.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_group.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_info.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_logging.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_offline.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_online.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_sound.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_status.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_timestamping.png
-share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_warning.png
-share/kde/apps/kit/kitui.rc
-share/kde/apps/kmail/about/background.png
-share/kde/apps/kmail/about/bgtable.png
-share/kde/apps/kmail/about/kdelogo2.png
-share/kde/apps/kmail/about/kmail.png
-share/kde/apps/kmail/about/konq.css
-share/kde/apps/kmail/about/lines.png
-share/kde/apps/kmail/about/lines2.png
-share/kde/apps/kmail/about/main.html
-share/kde/apps/kmail/about/pointers.png
-share/kde/apps/kmail/about/shadow1.png
-share/kde/apps/kmail/eventsrc
-share/kde/apps/kmail/kmcomposerui.rc
-share/kde/apps/kmail/kmmainwin.rc
-share/kde/apps/kmail/pics/kdelogo.png
-share/kde/apps/kmail/pics/key.png
-share/kde/apps/kmail/pics/key_bad.png
-share/kde/apps/kmail/pics/key_ok.png
-share/kde/apps/kmail/pics/key_unknown.png
-share/kde/apps/kmail/pics/kmailwindowlayout1.png
-share/kde/apps/kmail/pics/kmailwindowlayout1_no_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout1_smart_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout2.png
-share/kde/apps/kmail/pics/kmailwindowlayout2_no_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout2_smart_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout3.png
-share/kde/apps/kmail/pics/kmailwindowlayout3_no_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout3_smart_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout4.png
-share/kde/apps/kmail/pics/kmailwindowlayout4_no_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout4_smart_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout5.png
-share/kde/apps/kmail/pics/kmailwindowlayout5_no_mime.png
-share/kde/apps/kmail/pics/kmailwindowlayout5_smart_mime.png
-share/kde/apps/kmail/pics/kmmsgdel.png
-share/kde/apps/kmail/pics/kmmsgfiller.png
-share/kde/apps/kmail/pics/kmmsgflag.png
-share/kde/apps/kmail/pics/kmmsgforwarded.png
-share/kde/apps/kmail/pics/kmmsgfullyencrypted.png
-share/kde/apps/kmail/pics/kmmsgfullysigned.png
-share/kde/apps/kmail/pics/kmmsgnew.png
-share/kde/apps/kmail/pics/kmmsgold.png
-share/kde/apps/kmail/pics/kmmsgpartiallyencrypted.png
-share/kde/apps/kmail/pics/kmmsgpartiallysigned.png
-share/kde/apps/kmail/pics/kmmsgqueued.png
-share/kde/apps/kmail/pics/kmmsgreplied.png
-share/kde/apps/kmail/pics/kmmsgsent.png
-share/kde/apps/kmail/pics/kmmsgundefinedencrypted.png
-share/kde/apps/kmail/pics/kmmsgundefinedsigned.png
-share/kde/apps/kmail/pics/kmmsgunseen.png
-share/kde/apps/kmail/pics/pgp-keys.png
-share/kde/apps/kmail/pics/pub_key_red.png
-share/kde/apps/kmail/pics/stopwatch.xbm
-share/kde/apps/kmail/pics/stopwatchMask.xbm
-share/kde/apps/kmail/profile-default-rc
-share/kde/apps/kmail/profile-high-contrast-rc
-share/kde/apps/kmail/profile-html-rc
-share/kde/apps/kmail/profile-purist-rc
-share/kde/apps/kmail/profile-secure-rc
-share/kde/apps/kmail/tips
 share/kde/apps/knewsticker/eventsrc
-share/kde/apps/knode/filters/1.fltr
-share/kde/apps/knode/filters/2.fltr
-share/kde/apps/knode/filters/3.fltr
-share/kde/apps/knode/filters/4.fltr
-share/kde/apps/knode/filters/5.fltr
-share/kde/apps/knode/filters/6.fltr
-share/kde/apps/knode/filters/7.fltr
-share/kde/apps/knode/filters/8.fltr
-share/kde/apps/knode/filters/filters.rc
-share/kde/apps/knode/headers.rc
-share/kde/apps/knode/icons/crystalsvg/16x16/actions/message_reply.png
-share/kde/apps/knode/icons/crystalsvg/22x22/actions/message_reply.png
-share/kde/apps/knode/icons/crystalsvg/32x32/actions/message_reply.png
-share/kde/apps/knode/kncomposerui.rc
-share/kde/apps/knode/knodeui.rc
-share/kde/apps/knode/knreaderui.rc
-share/kde/apps/knode/pics/ctlart.png
-share/kde/apps/knode/pics/eyes.png
-share/kde/apps/knode/pics/greyball.png
-share/kde/apps/knode/pics/greyballchk.png
-share/kde/apps/knode/pics/group.png
-share/kde/apps/knode/pics/group_big.png
-share/kde/apps/knode/pics/ignore.png
-share/kde/apps/knode/pics/key.png
-share/kde/apps/knode/pics/key_bad.png
-share/kde/apps/knode/pics/key_ok.png
-share/kde/apps/knode/pics/key_unknown.png
-share/kde/apps/knode/pics/mail.png
-share/kde/apps/knode/pics/newsubs.png
-share/kde/apps/knode/pics/pgp-keys.png
-share/kde/apps/knode/pics/posting.png
-share/kde/apps/knode/pics/server.png
-share/kde/apps/knode/pics/server_big.png
-share/kde/apps/knode/pics/snderr.png
-share/kde/apps/knode/pics/stat_cncl.png
-share/kde/apps/knode/pics/stat_edit.png
-share/kde/apps/knode/pics/stat_saved.png
-share/kde/apps/knode/pics/stat_sent.png
 share/kde/apps/konqueror/dirtree/remote/lan.desktop
+share/kde/apps/kopete/eventsrc
+share/kde/apps/kopete/historychatui.rc
+share/kde/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/admin_icon.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/aim_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/aim_offline.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/aim_online.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/aol_icon.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/dt_icon.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/free_icon.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_dnd.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_ffc.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_invisible.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_na.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_occupied.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_offline.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/icq_online.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_channel.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_connecting.mng
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_normal.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_online.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_op.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_server.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/irc_voice.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_chatty.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_group.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_invisible.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_na.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_offline.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_online.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_original.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_raw.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_off.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_on.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/jabber_xa.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/kopeteavailable.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_offline.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_online.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_unknown.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_busy.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_connecting.mng
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_invisible.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_lunch.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_na.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_newmsg.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/newmsg.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/status_unknown.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_idle.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png
+share/kde/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/actions/aol_icon.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/actions/kopeteavailable.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/jabber_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png
+share/kde/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/actions/kopeteavailable.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/actions/kopeteaway.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/apps/jabber_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png
+share/kde/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png
+share/kde/apps/kopete/kopetechatwindow.rc
+share/kde/apps/kopete/kopeteemailwindow.rc
+share/kde/apps/kopete/kopeteui.rc
+share/kde/apps/kopete/msnchatui.rc
+share/kde/apps/kopete/nowlisteningchatui.rc
+share/kde/apps/kopete/nowlisteningui.rc
+share/kde/apps/kopete/pics/emoticons/Boxed/angry.png
+share/kde/apps/kopete/pics/emoticons/Boxed/bigsmile.png
+share/kde/apps/kopete/pics/emoticons/Boxed/confused.png
+share/kde/apps/kopete/pics/emoticons/Boxed/cry.png
+share/kde/apps/kopete/pics/emoticons/Boxed/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/Boxed/oh.png
+share/kde/apps/kopete/pics/emoticons/Boxed/sad.png
+share/kde/apps/kopete/pics/emoticons/Boxed/shade.png
+share/kde/apps/kopete/pics/emoticons/Boxed/smile.png
+share/kde/apps/kopete/pics/emoticons/Boxed/tongue.png
+share/kde/apps/kopete/pics/emoticons/Boxed/wink.png
+share/kde/apps/kopete/pics/emoticons/Default/angry.png
+share/kde/apps/kopete/pics/emoticons/Default/bat.png
+share/kde/apps/kopete/pics/emoticons/Default/beer.png
+share/kde/apps/kopete/pics/emoticons/Default/biggrin.png
+share/kde/apps/kopete/pics/emoticons/Default/cake.png
+share/kde/apps/kopete/pics/emoticons/Default/camera.png
+share/kde/apps/kopete/pics/emoticons/Default/cat.png
+share/kde/apps/kopete/pics/emoticons/Default/clock.png
+share/kde/apps/kopete/pics/emoticons/Default/cocktail.png
+share/kde/apps/kopete/pics/emoticons/Default/confused.png
+share/kde/apps/kopete/pics/emoticons/Default/cry.png
+share/kde/apps/kopete/pics/emoticons/Default/cup.png
+share/kde/apps/kopete/pics/emoticons/Default/dog.png
+share/kde/apps/kopete/pics/emoticons/Default/email.png
+share/kde/apps/kopete/pics/emoticons/Default/embarassed.png
+share/kde/apps/kopete/pics/emoticons/Default/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/Default/film.png
+share/kde/apps/kopete/pics/emoticons/Default/kiss.png
+share/kde/apps/kopete/pics/emoticons/Default/lightbulb.png
+share/kde/apps/kopete/pics/emoticons/Default/love.png
+share/kde/apps/kopete/pics/emoticons/Default/note.png
+share/kde/apps/kopete/pics/emoticons/Default/oh.png
+share/kde/apps/kopete/pics/emoticons/Default/omg.png
+share/kde/apps/kopete/pics/emoticons/Default/phone.png
+share/kde/apps/kopete/pics/emoticons/Default/present.png
+share/kde/apps/kopete/pics/emoticons/Default/rose.png
+share/kde/apps/kopete/pics/emoticons/Default/sad.png
+share/kde/apps/kopete/pics/emoticons/Default/shade.png
+share/kde/apps/kopete/pics/emoticons/Default/sleep.png
+share/kde/apps/kopete/pics/emoticons/Default/smile.png
+share/kde/apps/kopete/pics/emoticons/Default/star.png
+share/kde/apps/kopete/pics/emoticons/Default/teeth.png
+share/kde/apps/kopete/pics/emoticons/Default/thumbs_down.png
+share/kde/apps/kopete/pics/emoticons/Default/thumbs_up.png
+share/kde/apps/kopete/pics/emoticons/Default/tongue.png
+share/kde/apps/kopete/pics/emoticons/Default/unhappy.png
+share/kde/apps/kopete/pics/emoticons/Default/unlove.png
+share/kde/apps/kopete/pics/emoticons/Default/wilted_rose.png
+share/kde/apps/kopete/pics/emoticons/Default/wink.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/angry.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/confused.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/cry.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/embarassed.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/omg.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/sad.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/shade.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/smile.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/teeth.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/tongue.png
+share/kde/apps/kopete/pics/emoticons/KMess-Blue/wink.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/angel.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/angry.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/confused.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/cry.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/devil.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/embarrassed.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/omg.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/sad.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/shade.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/smile.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/teeth.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/tongue.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/ugly.png
+share/kde/apps/kopete/pics/emoticons/KMess-Cartoon/wink.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/angry.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/confused.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/cry.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/embarassed.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/omg.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/sad.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/shade.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/smile.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/teeth.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/tongue.png
+share/kde/apps/kopete/pics/emoticons/KMess-Violet/wink.png
+share/kde/apps/kopete/pics/emoticons/KMess/angel.png
+share/kde/apps/kopete/pics/emoticons/KMess/angry.png
+share/kde/apps/kopete/pics/emoticons/KMess/bat.png
+share/kde/apps/kopete/pics/emoticons/KMess/beer.png
+share/kde/apps/kopete/pics/emoticons/KMess/boy.png
+share/kde/apps/kopete/pics/emoticons/KMess/cake.png
+share/kde/apps/kopete/pics/emoticons/KMess/camera.png
+share/kde/apps/kopete/pics/emoticons/KMess/cat.png
+share/kde/apps/kopete/pics/emoticons/KMess/clock.png
+share/kde/apps/kopete/pics/emoticons/KMess/cocktail.png
+share/kde/apps/kopete/pics/emoticons/KMess/confused.png
+share/kde/apps/kopete/pics/emoticons/KMess/cry.png
+share/kde/apps/kopete/pics/emoticons/KMess/cup.png
+share/kde/apps/kopete/pics/emoticons/KMess/devil.png
+share/kde/apps/kopete/pics/emoticons/KMess/dog.png
+share/kde/apps/kopete/pics/emoticons/KMess/dude_hug.png
+share/kde/apps/kopete/pics/emoticons/KMess/email.png
+share/kde/apps/kopete/pics/emoticons/KMess/embarassed.png
+share/kde/apps/kopete/pics/emoticons/KMess/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/KMess/film.png
+share/kde/apps/kopete/pics/emoticons/KMess/girl.png
+share/kde/apps/kopete/pics/emoticons/KMess/girl_hug.png
+share/kde/apps/kopete/pics/emoticons/KMess/kiss.png
+share/kde/apps/kopete/pics/emoticons/KMess/lightbulb.png
+share/kde/apps/kopete/pics/emoticons/KMess/love.png
+share/kde/apps/kopete/pics/emoticons/KMess/messenger.png
+share/kde/apps/kopete/pics/emoticons/KMess/note.png
+share/kde/apps/kopete/pics/emoticons/KMess/omg.png
+share/kde/apps/kopete/pics/emoticons/KMess/phone.png
+share/kde/apps/kopete/pics/emoticons/KMess/present.png
+share/kde/apps/kopete/pics/emoticons/KMess/rose.png
+share/kde/apps/kopete/pics/emoticons/KMess/sad.png
+share/kde/apps/kopete/pics/emoticons/KMess/shade.png
+share/kde/apps/kopete/pics/emoticons/KMess/smile.png
+share/kde/apps/kopete/pics/emoticons/KMess/star.png
+share/kde/apps/kopete/pics/emoticons/KMess/teeth.png
+share/kde/apps/kopete/pics/emoticons/KMess/thumbs_down.png
+share/kde/apps/kopete/pics/emoticons/KMess/thumbs_up.png
+share/kde/apps/kopete/pics/emoticons/KMess/tongue.png
+share/kde/apps/kopete/pics/emoticons/KMess/unlove.png
+share/kde/apps/kopete/pics/emoticons/KMess/wilted_rose.png
+share/kde/apps/kopete/pics/emoticons/KMess/wink.png
+share/kde/apps/kopete/pics/emoticons/Plain/biggrin.png
+share/kde/apps/kopete/pics/emoticons/Plain/confused.png
+share/kde/apps/kopete/pics/emoticons/Plain/cry.png
+share/kde/apps/kopete/pics/emoticons/Plain/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/Plain/oh.png
+share/kde/apps/kopete/pics/emoticons/Plain/pig.png
+share/kde/apps/kopete/pics/emoticons/Plain/smile.png
+share/kde/apps/kopete/pics/emoticons/Plain/sunglasses.png
+share/kde/apps/kopete/pics/emoticons/Plain/tongue.png
+share/kde/apps/kopete/pics/emoticons/Plain/unhappy.png
+share/kde/apps/kopete/pics/emoticons/Plain/wink.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/angel.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/biggrin.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/confused.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/cry.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/RedOnes/oh.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/smile.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/sunglasses.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/tongue.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/unhappy.png
+share/kde/apps/kopete/pics/emoticons/RedOnes/wink.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/angry.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/big_smile.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/confused.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/cool.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/lol.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/ooooh.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/sad.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/smile.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/tongue_out.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16/wink.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/angry.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/big_smile.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/confused.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/cool.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/lol.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/ooooh.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/sad.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/smile.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/tongue_out.png
+share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22/wink.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/biggrin.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/confused.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/cry.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/devil.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/oh.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/smile.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/sunglasses.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/tongue.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/unhappy.png
+share/kde/apps/kopete/pics/emoticons/ccmathteam.com/wink.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/biggrin.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/confused.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/greggman.com/kiss.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/oh.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/smile.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/sunglasses.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/tongue.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/unhappy.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/vampire.png
+share/kde/apps/kopete/pics/emoticons/greggman.com/wink.png
+share/kde/apps/kopete/pics/emoticons/phpBB/biggrin.png
+share/kde/apps/kopete/pics/emoticons/phpBB/confused.png
+share/kde/apps/kopete/pics/emoticons/phpBB/cry.png
+share/kde/apps/kopete/pics/emoticons/phpBB/devil.png
+share/kde/apps/kopete/pics/emoticons/phpBB/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/phpBB/oh.png
+share/kde/apps/kopete/pics/emoticons/phpBB/smile.png
+share/kde/apps/kopete/pics/emoticons/phpBB/sunglasses.png
+share/kde/apps/kopete/pics/emoticons/phpBB/tongue.png
+share/kde/apps/kopete/pics/emoticons/phpBB/unhappy.png
+share/kde/apps/kopete/pics/emoticons/phpBB/wink.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/biggrin.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/cry.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/emoticons.xml
+share/kde/apps/kopete/pics/emoticons/tweakers.net/oh.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/sleep.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/smile.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/tongue.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/unhappy.png
+share/kde/apps/kopete/pics/emoticons/tweakers.net/wink.png
+share/kde/apps/kopete/styles/Enclosed.xsl
+share/kde/apps/kopete/styles/Keramik.xsl
+share/kde/apps/kopete/styles/Kopete.xsl
+share/kde/apps/kopete/styles/MSN.xsl
+share/kde/apps/kopete/styles/Minimal.xsl
+share/kde/apps/kopete/styles/XChat.xsl
+share/kde/apps/kopete/translatorchatui.rc
+share/kde/apps/kopete/webpresence/webpresencedefault.xsl
+share/kde/apps/kopete/webpresence/wpimages.xsl
+share/kde/apps/kopete_contactnotes/contactnotesui.rc
+share/kde/apps/kopete_cryptography/cryptographyui.rc
+share/kde/apps/kopete_history/historychatui.rc
+share/kde/apps/kopete_history/historyui.rc
+share/kde/apps/kopete_translator/translatorui.rc
+share/kde/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+share/kde/apps/kopeterichtexteditpart/kopeterichtexteditpartsimple.rc
 share/kde/apps/kppp/Provider/Austria/.directory
 share/kde/apps/kppp/Provider/Austria/Simon%032Media
+share/kde/apps/kppp/Provider/Belarus/.directory
+share/kde/apps/kppp/Provider/Belarus/AtlantTelecom
 share/kde/apps/kppp/Provider/Czech_Republic/.directory
 share/kde/apps/kppp/Provider/Czech_Republic/AICOM
 share/kde/apps/kppp/Provider/Czech_Republic/ARsystem
@@ -493,11 +751,18 @@ share/kde/apps/kppp/Provider/Czech_Republic/Video_OnLine
 share/kde/apps/kppp/Provider/Czech_Republic/Volny
 share/kde/apps/kppp/Provider/Denmark/.directory
 share/kde/apps/kppp/Provider/Denmark/Get2Net
+share/kde/apps/kppp/Provider/France/.directory
+share/kde/apps/kppp/Provider/France/ClubInternetFull
 share/kde/apps/kppp/Provider/Germany/.directory
 share/kde/apps/kppp/Provider/Germany/CityWeb
 share/kde/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
 share/kde/apps/kppp/Provider/Germany/MUC%046DE
 share/kde/apps/kppp/Provider/Germany/Netsurf
+share/kde/apps/kppp/Provider/Irland/.directory
+share/kde/apps/kppp/Provider/Irland/Eircom
+share/kde/apps/kppp/Provider/Irland/IOL
+share/kde/apps/kppp/Provider/Irland/UTV
+share/kde/apps/kppp/Provider/Irland/UVT
 share/kde/apps/kppp/Provider/Netherlands/.directory
 share/kde/apps/kppp/Provider/Netherlands/12Move
 share/kde/apps/kppp/Provider/Netherlands/Avades
@@ -584,6 +849,7 @@ share/kde/apps/kppp/Provider/Slovenia/Volja
 share/kde/apps/kppp/Provider/Sweden/.directory
 share/kde/apps/kppp/Provider/Sweden/Tiscali
 share/kde/apps/kppp/Provider/Sweden/Utfors
+share/kde/apps/kppp/Provider/Switzerland/.directory
 share/kde/apps/kppp/Provider/Switzerland/Bluewin
 share/kde/apps/kppp/Provider/Taiwan/.directory
 share/kde/apps/kppp/Provider/Taiwan/EraNet
@@ -663,14 +929,20 @@ share/kde/apps/kppp/Rules/Belgium/Belgium_internet_euro.rst
 share/kde/apps/kppp/Rules/Belgium/Belgium_internet_frank.rst
 share/kde/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
 share/kde/apps/kppp/Rules/Belgium/Belgium_zonal.rst
+share/kde/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_home_-_bez_impulsa.rst
+share/kde/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_student_-_bez_impulsa.rst
+share/kde/apps/kppp/Rules/Bosnia_and_Herzegovina/SmartNet_PERSONAL_bez_impulsa.rst
+share/kde/apps/kppp/Rules/Bosnia_and_Herzegovina/samo_impulsi.rst
 share/kde/apps/kppp/Rules/Brasil/Brasil.rst
 share/kde/apps/kppp/Rules/Brasil/Brasil_Ligbr.rst
 share/kde/apps/kppp/Rules/Brasil/Rio_de_Janeiro.rst
 share/kde/apps/kppp/Rules/Brasil/SaoPaulo.rst
 share/kde/apps/kppp/Rules/Croatia/CARNet.rst
-share/kde/apps/kppp/Rules/Czechia/Tarif_INTERNET_2002_INTERNET_MAXI_PLUS.rst
-share/kde/apps/kppp/Rules/Czechia/Tarif_INTERNET_2002_MINI.rst
-share/kde/apps/kppp/Rules/Czechia/Tarif_INTERNET_2002_STANDARD_MAXI.rst
+share/kde/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Business_Internet.rst
+share/kde/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Home_Internet.rst
+share/kde/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst
+share/kde/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst
+share/kde/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_universal.rst
 share/kde/apps/kppp/Rules/Denmark/12Move_Analog.rst
 share/kde/apps/kppp/Rules/Denmark/12Move_ISDN.rst
 share/kde/apps/kppp/Rules/Denmark/Cybercity_Friabonnement.rst
@@ -682,7 +954,7 @@ share/kde/apps/kppp/Rules/Denmark/Teledanmark_Favoritinternet.rst
 share/kde/apps/kppp/Rules/Denmark/Worldonline-Analog.rst
 share/kde/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst
 share/kde/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
-share/kde/apps/kppp/Rules/Finland/Vaasan_LP.rst
+share/kde/apps/kppp/Rules/Finland/VLP.rst
 share/kde/apps/kppp/Rules/France/Cegetel_Local.rst
 share/kde/apps/kppp/Rules/France/Cegetel_National.rst
 share/kde/apps/kppp/Rules/France/France_Telecom_Local.rst
@@ -761,8 +1033,6 @@ share/kde/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst
 share/kde/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst
 share/kde/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst
 share/kde/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst
-share/kde/apps/kppp/Rules/Italy/Tele2_Altri_ISP.rst
-share/kde/apps/kppp/Rules/Italy/Tele2_Internet.rst
 share/kde/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst
 share/kde/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst
 share/kde/apps/kppp/Rules/Italy/Telecom_Locali.rst
@@ -849,6 +1119,8 @@ share/kde/apps/kppp/Rules/Slovakia/ST_mesto.rst
 share/kde/apps/kppp/Rules/Slovenia/omrezje_0880.rst
 share/kde/apps/kppp/Rules/Slovenia/omrezje_0889.rst
 share/kde/apps/kppp/Rules/Slovenia/stacionarno_omrezje.rst
+share/kde/apps/kppp/Rules/South_Africa/South_Africa_local.rst
+share/kde/apps/kppp/Rules/South_Africa/South_Africa_long_distance.rst
 share/kde/apps/kppp/Rules/South_Afrika/South_Afrika.rst
 share/kde/apps/kppp/Rules/South_Afrika/South_Afrika_Justin.rst
 share/kde/apps/kppp/Rules/Spain/Infovia.rst
@@ -932,21 +1204,67 @@ share/kde/apps/kppp/pics/modemnone.png
 share/kde/apps/kppp/pics/modemright.png
 share/kde/apps/kppp/pics/phone.png
 share/kde/apps/krdc/pics/pindown.png
+share/kde/apps/krdc/pics/close.png
+share/kde/apps/krdc/pics/iconify.png
 share/kde/apps/krdc/pics/pinup.png
 share/kde/apps/krdc/pics/pointcursor.png
 share/kde/apps/krdc/pics/pointcursormask.png
+share/kde/apps/krdc/rdp-keymaps/ar
+share/kde/apps/krdc/rdp-keymaps/common
+share/kde/apps/krdc/rdp-keymaps/convert-map
+share/kde/apps/krdc/rdp-keymaps/da
+share/kde/apps/krdc/rdp-keymaps/de
+share/kde/apps/krdc/rdp-keymaps/en-gb
+share/kde/apps/krdc/rdp-keymaps/en-us
+share/kde/apps/krdc/rdp-keymaps/es
+share/kde/apps/krdc/rdp-keymaps/fi
+share/kde/apps/krdc/rdp-keymaps/fr
+share/kde/apps/krdc/rdp-keymaps/fr-be
+share/kde/apps/krdc/rdp-keymaps/hr
+share/kde/apps/krdc/rdp-keymaps/hu
+share/kde/apps/krdc/rdp-keymaps/it
+share/kde/apps/krdc/rdp-keymaps/ja
+share/kde/apps/krdc/rdp-keymaps/lt
+share/kde/apps/krdc/rdp-keymaps/lv
+share/kde/apps/krdc/rdp-keymaps/mk
+share/kde/apps/krdc/rdp-keymaps/modifiers
+share/kde/apps/krdc/rdp-keymaps/no
+share/kde/apps/krdc/rdp-keymaps/pl
+share/kde/apps/krdc/rdp-keymaps/pt
+share/kde/apps/krdc/rdp-keymaps/pt-br
+share/kde/apps/krdc/rdp-keymaps/ru
+share/kde/apps/krdc/rdp-keymaps/sl
+share/kde/apps/krdc/rdp-keymaps/sv
+share/kde/apps/krdc/rdp-keymaps/th
+share/kde/apps/krdc/rdp-keymaps/tr
 share/kde/apps/krfb/eventsrc
 share/kde/apps/krfb/pics/connection-side-image.png
 share/kde/apps/krfb/pics/eyes-closed24.png
 share/kde/apps/krfb/pics/eyes-open24.png
+share/kde/apps/ksirc/autodcc.pl
 share/kde/apps/ksirc/eventsrc
 share/kde/apps/ksirc/filters.pl
+share/kde/apps/ksirc/icons/crystalsvg/16x16/apps/ksirc.png
+share/kde/apps/ksirc/icons/crystalsvg/22x22/actions/info.png
+share/kde/apps/ksirc/icons/crystalsvg/22x22/actions/ksirc_dock.png
+share/kde/apps/ksirc/icons/crystalsvg/32x32/apps/ksirc.png
+share/kde/apps/ksirc/icons/crystalsvg/48x48/apps/ksirc.png
+share/kde/apps/ksirc/icons/crystalsvg/64x64/apps/ksirc.png
 share/kde/apps/ksirc/ksirc.pl
+share/kde/apps/ksirc/pics/X.png
+share/kde/apps/ksirc/pics/action.png
 share/kde/apps/ksirc/pics/arrow.png
 share/kde/apps/ksirc/pics/blueball.png
 share/kde/apps/ksirc/pics/bluepin.png
+share/kde/apps/ksirc/pics/bminus.png
+share/kde/apps/ksirc/pics/bplus.png
 share/kde/apps/ksirc/pics/channel.xpm
 share/kde/apps/ksirc/pics/channels.xpm
+share/kde/apps/ksirc/pics/ctcpping.png
+share/kde/apps/ksirc/pics/dcc.png
+share/kde/apps/ksirc/pics/dccget.png
+share/kde/apps/ksirc/pics/dccsend.png
+share/kde/apps/ksirc/pics/elipsis.png
 share/kde/apps/ksirc/pics/emoticons/biggrin.png
 share/kde/apps/ksirc/pics/emoticons/clown.png
 share/kde/apps/ksirc/pics/emoticons/cry.png
@@ -962,21 +1280,33 @@ share/kde/apps/ksirc/pics/emoticons/slime.png
 share/kde/apps/ksirc/pics/emoticons/smile.png
 share/kde/apps/ksirc/pics/emoticons/wink.png
 share/kde/apps/ksirc/pics/emoticons/yummie.png
+share/kde/apps/ksirc/pics/error.png
 share/kde/apps/ksirc/pics/greenpin.png
 share/kde/apps/ksirc/pics/info.png
 share/kde/apps/ksirc/pics/info1.png
+share/kde/apps/ksirc/pics/join.png
+share/kde/apps/ksirc/pics/kick.png
 share/kde/apps/ksirc/pics/ksirc.png
 share/kde/apps/ksirc/pics/ksirc_a.xpm
 share/kde/apps/ksirc/pics/ksirc_b.xpm
-share/kde/apps/ksirc/pics/ksirc_dock.xpm
 share/kde/apps/ksirc/pics/madsmiley.png
 share/kde/apps/ksirc/pics/mdi.png
 share/kde/apps/ksirc/pics/mini-run.png
+share/kde/apps/ksirc/pics/minus.png
+share/kde/apps/ksirc/pics/mode.png
+share/kde/apps/ksirc/pics/notice.png
+share/kde/apps/ksirc/pics/ominus.png
+share/kde/apps/ksirc/pics/oplus.png
+share/kde/apps/ksirc/pics/part.png
+share/kde/apps/ksirc/pics/plus.png
+share/kde/apps/ksirc/pics/quit.png
 share/kde/apps/ksirc/pics/sadsmiley.png
 share/kde/apps/ksirc/pics/sdi.png
 share/kde/apps/ksirc/pics/server.xpm
+share/kde/apps/ksirc/pics/servinfo.png
 share/kde/apps/ksirc/pics/smiley.png
 share/kde/apps/ksirc/pics/star.png
+share/kde/apps/ksirc/pics/topic.png
 share/kde/apps/ksirc/relnotes
 share/kde/apps/ksirc/servers.ini
 share/kde/apps/ksirc/servers.txt
@@ -985,27 +1315,21 @@ share/kde/apps/lisa/README
 share/kde/config/ksircrc
 share/kde/config/ktalkdrc
 share/kde/icons/crystalsvg/128x128/apps/kdict.png
-share/kde/icons/crystalsvg/128x128/apps/kmail.png
+share/kde/icons/crystalsvg/128x128/apps/kopete.png
 share/kde/icons/crystalsvg/128x128/apps/kppp.png
+share/kde/icons/crystalsvg/128x128/apps/ktalkd.png
 share/kde/icons/crystalsvg/16x16/apps/kdict.png
-share/kde/icons/crystalsvg/16x16/apps/kit.png
-share/kde/icons/crystalsvg/16x16/apps/kmail.png
-share/kde/icons/crystalsvg/16x16/apps/kmailcvt.png
 share/kde/icons/crystalsvg/16x16/apps/knewsticker.png
-share/kde/icons/crystalsvg/16x16/apps/knode.png
-share/kde/icons/crystalsvg/16x16/apps/korn.png
+share/kde/icons/crystalsvg/16x16/apps/kopete.png
 share/kde/icons/crystalsvg/16x16/apps/kpf.png
 share/kde/icons/crystalsvg/16x16/apps/kppp.png
 share/kde/icons/crystalsvg/16x16/apps/ksirc.png
 share/kde/icons/crystalsvg/16x16/apps/ktalkd.png
 share/kde/icons/crystalsvg/22x22/actions/khtml_kget.png
+share/kde/icons/crystalsvg/22x22/apps/kopete.png
 share/kde/icons/crystalsvg/32x32/apps/kdict.png
-share/kde/icons/crystalsvg/32x32/apps/kit.png
-share/kde/icons/crystalsvg/32x32/apps/kmail.png
-share/kde/icons/crystalsvg/32x32/apps/kmailcvt.png
 share/kde/icons/crystalsvg/32x32/apps/knewsticker.png
-share/kde/icons/crystalsvg/32x32/apps/knode.png
-share/kde/icons/crystalsvg/32x32/apps/korn.png
+share/kde/icons/crystalsvg/32x32/apps/kopete.png
 share/kde/icons/crystalsvg/32x32/apps/kpf.png
 share/kde/icons/crystalsvg/32x32/apps/kppp.png
 share/kde/icons/crystalsvg/32x32/apps/krdc.png
@@ -1014,12 +1338,8 @@ share/kde/icons/crystalsvg/32x32/apps/ksirc.png
 share/kde/icons/crystalsvg/32x32/apps/ktalkd.png
 share/kde/icons/crystalsvg/48x48/apps/kdict.png
 share/kde/icons/crystalsvg/48x48/apps/kget.png
-share/kde/icons/crystalsvg/48x48/apps/kit.png
-share/kde/icons/crystalsvg/48x48/apps/kmail.png
-share/kde/icons/crystalsvg/48x48/apps/kmailcvt.png
 share/kde/icons/crystalsvg/48x48/apps/knewsticker.png
-share/kde/icons/crystalsvg/48x48/apps/knode.png
-share/kde/icons/crystalsvg/48x48/apps/korn.png
+share/kde/icons/crystalsvg/48x48/apps/kopete.png
 share/kde/icons/crystalsvg/48x48/apps/kpf.png
 share/kde/icons/crystalsvg/48x48/apps/kppp.png
 share/kde/icons/crystalsvg/48x48/apps/krdc.png
@@ -1028,24 +1348,60 @@ share/kde/icons/crystalsvg/48x48/apps/ksirc.png
 share/kde/icons/crystalsvg/48x48/apps/ktalkd.png
 share/kde/icons/crystalsvg/48x48/mimetypes/kget_list.png
 share/kde/icons/crystalsvg/64x64/apps/kdict.png
-share/kde/icons/crystalsvg/64x64/apps/kmail.png
+share/kde/icons/crystalsvg/64x64/apps/kopete.png
 share/kde/icons/crystalsvg/64x64/apps/kppp.png
+share/kde/icons/crystalsvg/64x64/apps/ksirc.png
 share/kde/icons/locolor/16x16/apps/krfb.png
-share/kde/icons/locolor/16x16/apps/ksirc.png
 share/kde/icons/locolor/32x32/apps/krfb.png
-share/kde/icons/locolor/32x32/apps/ksirc.png
 share/kde/mimelnk/application/x-kgetlist.desktop
+share/kde/services/chatwindow.desktop
+share/kde/services/kconfiguredialog/kopete_autoreplace_config.desktop
+share/kde/services/kconfiguredialog/kopete_cryptography_config.desktop
+share/kde/services/kconfiguredialog/kopete_highlight_config.desktop
+share/kde/services/kconfiguredialog/kopete_history_config.desktop
+share/kde/services/kconfiguredialog/kopete_msn_config.desktop
+share/kde/services/kconfiguredialog/kopete_nowlistening_config.desktop
+share/kde/services/kconfiguredialog/kopete_texteffect_config.desktop
+share/kde/services/kconfiguredialog/kopete_translator_config.desktop
+share/kde/services/kconfiguredialog/kopete_webpresence_config.desktop
 share/kde/services/kded/kinetd.desktop
-share/kde/services/kfile_rfc822.desktop
 share/kde/services/kinetd_krfb.desktop
-share/kde/services/knewsservice.protocol
+share/kde/services/kinetd_krfb_httpd.desktop
 share/kde/services/kntsrcfilepropsdlg.desktop
+share/kde/services/kopete_accountconfig.desktop
+share/kde/services/kopete_aim.desktop
+share/kde/services/kopete_appearanceconfig.desktop
+share/kde/services/kopete_autoreplace.desktop
+share/kde/services/kopete_behaviorconfig.desktop
+share/kde/services/kopete_connectionstatus.desktop
+share/kde/services/kopete_contactnotes.desktop
+share/kde/services/kopete_cryptography.desktop
+share/kde/services/kopete_highlight.desktop
+share/kde/services/kopete_history.desktop
+share/kde/services/kopete_icq.desktop
+share/kde/services/kopete_irc.desktop
+share/kde/services/kopete_jabber.desktop
+share/kde/services/kopete_msn.desktop
+share/kde/services/kopete_nowlistening.desktop
+share/kde/services/kopete_sms.desktop
+share/kde/services/kopete_texteffect.desktop
+share/kde/services/kopete_translator.desktop
+share/kde/services/kopete_webpresence.desktop
+share/kde/services/kopete_yahoo.desktop
 share/kde/services/kpfpropertiesdialogplugin.desktop
-share/kde/services/kxmlrpcd.desktop
 share/kde/services/lan.protocol
+share/kde/services/rdp.protocol
 share/kde/services/rlan.protocol
+share/kde/services/rssservice.desktop
 share/kde/services/vnc.protocol
 share/kde/servicetypes/kinetdmodule.desktop
+share/kde/servicetypes/kopeteplugin.desktop
+share/kde/servicetypes/kopeteprotocol.desktop
+share/kde/servicetypes/kopeteui.desktop
+share/kde/sounds/Kopete_Event.ogg
+share/kde/sounds/Kopete_Received.ogg
+share/kde/sounds/Kopete_Sent.ogg
+share/kde/sounds/Kopete_User_is_Online.ogg
 share/kde/sounds/ktalkd.wav
 @comment dirrm share/kde/sounds
 @comment dirrm share/kde/servicetypes
@@ -1065,9 +1421,22 @@ share/kde/sounds/ktalkd.wav
 @dirrm share/kde/apps/lisa
 @dirrm share/kde/apps/ksirc/pics/emoticons
 @dirrm share/kde/apps/ksirc/pics
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/16x16/apps
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/16x16
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/22x22
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/32x32/apps
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/32x32
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/48x48/apps
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/48x48
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/64x64/apps
+@dirrm share/kde/apps/ksirc/icons/crystalsvg/64x64
+@dirrm share/kde/apps/ksirc/icons/crystalsvg
+@dirrm share/kde/apps/ksirc/icons
 @dirrm share/kde/apps/ksirc
 @dirrm share/kde/apps/krfb/pics
 @dirrm share/kde/apps/krfb
+@dirrm share/kde/apps/krdc/rdp-keymaps
 @dirrm share/kde/apps/krdc/pics
 @dirrm share/kde/apps/krdc
 @dirrm share/kde/apps/kppp/pics
@@ -1112,6 +1481,7 @@ share/kde/sounds/ktalkd.wav
 @dirrm share/kde/apps/kppp/Rules/Czechia
 @dirrm share/kde/apps/kppp/Rules/Croatia
 @dirrm share/kde/apps/kppp/Rules/Brasil
+@dirrm share/kde/apps/kppp/Rules/Bosnia_and_Herzegovina
 @dirrm share/kde/apps/kppp/Rules/Belgium
 @dirrm share/kde/apps/kppp/Rules/Bangladesh
 @dirrm share/kde/apps/kppp/Rules/Austria/Standard
@@ -1133,39 +1503,63 @@ share/kde/sounds/ktalkd.wav
 @dirrm share/kde/apps/kppp/Provider/Norway
 @dirrm share/kde/apps/kppp/Provider/NewZealand
 @dirrm share/kde/apps/kppp/Provider/Netherlands
+@dirrm share/kde/apps/kppp/Provider/Irland
 @dirrm share/kde/apps/kppp/Provider/Germany
+@dirrm share/kde/apps/kppp/Provider/France
 @dirrm share/kde/apps/kppp/Provider/Denmark
 @dirrm share/kde/apps/kppp/Provider/Czech_Republic
+@dirrm share/kde/apps/kppp/Provider/Belarus
 @dirrm share/kde/apps/kppp/Provider/Austria
 @dirrm share/kde/apps/kppp/Provider
 @dirrm share/kde/apps/kppp
+@dirrm share/kde/apps/kopeterichtexteditpart
+@dirrm share/kde/apps/kopete_translator
+@dirrm share/kde/apps/kopete_history
+@dirrm share/kde/apps/kopete_cryptography
+@dirrm share/kde/apps/kopete_contactnotes
+@dirrm share/kde/apps/kopete/webpresence
+@dirrm share/kde/apps/kopete/styles
+@dirrm share/kde/apps/kopete/pics/emoticons/tweakers.net
+@dirrm share/kde/apps/kopete/pics/emoticons/phpBB
+@dirrm share/kde/apps/kopete/pics/emoticons/greggman.com
+@dirrm share/kde/apps/kopete/pics/emoticons/ccmathteam.com
+@dirrm share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-22
+@dirrm share/kde/apps/kopete/pics/emoticons/Yazoo-Smileys-16
+@dirrm share/kde/apps/kopete/pics/emoticons/RedOnes
+@dirrm share/kde/apps/kopete/pics/emoticons/Plain
+@dirrm share/kde/apps/kopete/pics/emoticons/KMess-Violet
+@dirrm share/kde/apps/kopete/pics/emoticons/KMess-Cartoon
+@dirrm share/kde/apps/kopete/pics/emoticons/KMess-Blue
+@dirrm share/kde/apps/kopete/pics/emoticons/KMess
+@dirrm share/kde/apps/kopete/pics/emoticons/Default
+@dirrm share/kde/apps/kopete/pics/emoticons/Boxed
+@dirrm share/kde/apps/kopete/pics/emoticons
+@dirrm share/kde/apps/kopete/pics
+@dirrm share/kde/apps/kopete/icons/crystalsvg/64x64/apps
+@dirrm share/kde/apps/kopete/icons/crystalsvg/64x64
+@dirrm share/kde/apps/kopete/icons/crystalsvg/48x48/apps
+@dirrm share/kde/apps/kopete/icons/crystalsvg/48x48/actions
+@dirrm share/kde/apps/kopete/icons/crystalsvg/48x48
+@dirrm share/kde/apps/kopete/icons/crystalsvg/32x32/apps
+@dirrm share/kde/apps/kopete/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kopete/icons/crystalsvg/32x32
+@dirrm share/kde/apps/kopete/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kopete/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kopete/icons/crystalsvg/16x16/apps
+@dirrm share/kde/apps/kopete/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kopete/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kopete/icons/crystalsvg/128x128/apps
+@dirrm share/kde/apps/kopete/icons/crystalsvg/128x128
+@dirrm share/kde/apps/kopete/icons/crystalsvg
+@dirrm share/kde/apps/kopete/icons
+@dirrm share/kde/apps/kopete
 @dirrm share/kde/apps/konqueror/dirtree/remote
 @dirrm share/kde/apps/konqueror/dirtree
 @dirrm share/kde/apps/konqueror
-@dirrm share/kde/apps/knode/pics
-@dirrm share/kde/apps/knode/icons/crystalsvg/32x32/actions
-@dirrm share/kde/apps/knode/icons/crystalsvg/32x32
-@dirrm share/kde/apps/knode/icons/crystalsvg/22x22/actions
-@dirrm share/kde/apps/knode/icons/crystalsvg/22x22
-@dirrm share/kde/apps/knode/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/knode/icons/crystalsvg/16x16
-@dirrm share/kde/apps/knode/icons/crystalsvg
-@dirrm share/kde/apps/knode/icons
-@dirrm share/kde/apps/knode/filters
-@dirrm share/kde/apps/knode
 @dirrm share/kde/apps/knewsticker
-@dirrm share/kde/apps/kmail/pics
-@dirrm share/kde/apps/kmail/about
-@dirrm share/kde/apps/kmail
-@dirrm share/kde/apps/kit/icons/crystalsvg/16x16/actions
-@dirrm share/kde/apps/kit/icons/crystalsvg/16x16
-@dirrm share/kde/apps/kit/icons/crystalsvg
-@dirrm share/kde/apps/kit/icons
-@dirrm share/kde/apps/kit
 @dirrm share/kde/apps/kinetd
 @comment dirrm share/kde/apps/kicker/applets
 @comment dirrm share/kde/apps/khtml/kpartplugins
-@dirrm share/kde/apps/kgpgcertmanager
 @dirrm share/kde/apps/kget/sounds
 @dirrm share/kde/apps/kget/pics
 @dirrm share/kde/apps/kget/icons/crystalsvg/22x22/actions
@@ -1192,21 +1586,19 @@ share/kde/sounds/ktalkd.wav
 @comment dirrm share/kde/applnk/Internet
 @comment dirrm share/kde/applnk/.hidden
 @dirrm share/doc/kde/HTML/en/lisa
+@dirrm share/doc/kde/HTML/en/kwifimanager
 @dirrm share/doc/kde/HTML/en/ktalkd
 @dirrm share/doc/kde/HTML/en/ksirc
 @dirrm share/doc/kde/HTML/en/krfb
+@dirrm share/doc/kde/HTML/en/krdc
 @dirrm share/doc/kde/HTML/en/kppp
 @dirrm share/doc/kde/HTML/en/kpf
-@dirrm share/doc/kde/HTML/en/korn
-@dirrm share/doc/kde/HTML/en/knode
+@dirrm share/doc/kde/HTML/en/kopete
 @dirrm share/doc/kde/HTML/en/knewsticker
-@dirrm share/doc/kde/HTML/en/kmail
-@dirrm share/doc/kde/HTML/en/kit
-@dirrm share/doc/kde/HTML/en/kgpgcertmanager
+@dirrm share/doc/kde/HTML/en/kget
 @dirrm share/doc/kde/HTML/en/kdict
 @dirrm share/doc/kde/HTML/en/kcontrol/lanbrowser
-@dirrm share/doc/kde/HTML/en/kcontrol/kxmlrpcd
 @dirrm share/doc/kde/HTML/en/kcontrol/kcmtalkd
 @dirrm share/doc/kde/HTML/en/kcontrol
 @comment dirrm share/doc/kde/HTML/en
-@dirrm include/mimelib
+@dirrm include/rss
diff --git a/net/kdenetwork3/buildlink2.mk b/net/kdenetwork3/buildlink2.mk
index b942646bf3a..54461ed62d0 100644
--- a/net/kdenetwork3/buildlink2.mk
+++ b/net/kdenetwork3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/12/08 14:41:41 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/04 14:42:23 markd Exp $
 #
 # This Makefile fragment is included by packages that use kdenetwork.
 #
@@ -9,30 +9,60 @@
 KDENETWORK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdenetwork
-BUILDLINK_DEPENDS.kdenetwork?=		kdenetwork>=3.1.4nb1
+BUILDLINK_DEPENDS.kdenetwork?=		kdenetwork>=3.2.0
 BUILDLINK_PKGSRCDIR.kdenetwork?=		../../net/kdenetwork3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdenetwork=kdenetwork
 BUILDLINK_PREFIX.kdenetwork_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.kdenetwork+=	include/kmailIface.h
-BUILDLINK_FILES.kdenetwork+=	include/mimelib/*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/kdictapplet.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/knewsticker_applet.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/kpfapplet.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/kpfpropertiesdialogplugin.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkcm_kcmkxmlrpcd.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkcm_ktalkd.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkcm_lanbrowser.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkcm_newsticker.*
-BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkcm_xmlrpcd.*
-BUILDLINK_FILES.kdenetwork+=	lib/kio_lan.*
-BUILDLINK_FILES.kdenetwork+=	lib/ksirc.*
-BUILDLINK_FILES.kdenetwork+=	lib/kxmlrpcd.*
-BUILDLINK_FILES.kdenetwork+=	lib/libkdenetwork.*
-BUILDLINK_FILES.kdenetwork+=	lib/libkntsrcfilepropsdlg.*
-BUILDLINK_FILES.kdenetwork+=	lib/libksirc_main.*
-BUILDLINK_FILES.kdenetwork+=	lib/libkxmlrpcd_main.*
-BUILDLINK_FILES.kdenetwork+=	lib/libmimelib.*
+BUILDLINK_FILES.kdenetwork+=	include/rss/*.h
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_accountconfig.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_appearanceconfig.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_autoreplace.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_behaviorconfig.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_cryptography.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_highlight.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_history.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_msn.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_nowlistening.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_texteffect.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_translator.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_kopete_webpresence.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_krfb.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_ktalkd.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kcm_lanbrowser.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kded_kinetd.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kdict_panelapplet.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/khtml_kget.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kio_lan.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/knewsticker_panelapplet.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_aim.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_autoreplace.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_chatwindow.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_connectionstatus.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_contactnotes.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_cryptography.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_highlight.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_history.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_icq.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_irc.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_jabber.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_msn.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_nowlistening.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_sms.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_texteffect.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_translator.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_webpresence.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kopete_yahoo.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kpf_panelapplet.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/kpfpropertiesdialog.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/ksirc.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkntsrcfilepropsdlg.*
+BUILDLINK_FILES.kdenetwork+=	lib/kde3/libkrichtexteditpart.*
+BUILDLINK_FILES.kdenetwork+=	lib/libkdeinit_ksirc.*
+BUILDLINK_FILES.kdenetwork+=	lib/libkopete.*
+BUILDLINK_FILES.kdenetwork+=	lib/libkopete_msn_shared.*
+BUILDLINK_FILES.kdenetwork+=	lib/libkopete_oscar.*
+BUILDLINK_FILES.kdenetwork+=	lib/librss.*
 
 .include "../../converters/uulib/buildlink2.mk"
 .include "../../databases/gdbm/buildlink2.mk"
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 6a83a9ec0c0..ee35548818a 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.18 2004/01/15 11:24:07 markd Exp $
+$NetBSD: distinfo,v 1.19 2004/02/04 14:42:23 markd Exp $
 
-SHA1 (kdenetwork-3.1.5.tar.bz2) = c446d71538bfa96280b0956aff529040be6eb96b
-Size (kdenetwork-3.1.5.tar.bz2) = 4994154 bytes
-SHA1 (patch-aa) = 1f0e8209896385f3b921eb64563afa669531fece
+SHA1 (kdenetwork-3.2.0.tar.bz2) = 1ef0d3569b4e8f228a22ec0ffe100a956e529ccb
+Size (kdenetwork-3.2.0.tar.bz2) = 6113134 bytes
+SHA1 (patch-aa) = f44f9cff3a34ea491ec0b31f928e537c5cbaeb9f
 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855
 SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2
-SHA1 (patch-ae) = 8b58afa071bd3f47577e5aeb46210ae77690b8bb
-SHA1 (patch-af) = c7c41172e3b61b60d105e995f4e5bd29ec09b27f
-SHA1 (patch-ag) = 41838a86a06877deb2635470a79aeb104cd56474
-SHA1 (patch-ai) = 90a97f8354c477ddb1d4600e715520adde329417
-SHA1 (patch-aj) = 89dc1011d79e22103c03f128afd4fb1d66083187
-SHA1 (patch-al) = 13c6bfb20fc49ae22d30029044808c9b77747754
-SHA1 (patch-am) = 6c698e49cb342b619df7c05ff6b54049af67a0aa
+SHA1 (patch-am) = e0511acfd35ebde0c919612f52dd63304934e8cf
diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa
index 4f62c9b5667..23947bb1e4b 100644
--- a/net/kdenetwork3/patches/patch-aa
+++ b/net/kdenetwork3/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2004/01/15 11:24:07 markd Exp $
+$NetBSD: patch-aa,v 1.10 2004/02/04 14:42:23 markd Exp $
 
---- configure.orig	2003-12-17 13:51:48.000000000 +1300
+--- configure.orig	2004-01-26 08:10:29.000000000 +1300
 +++ configure
-@@ -28439,65 +28439,6 @@ _ACEOF
+@@ -24856,63 +24856,6 @@ _ACEOF
  
  
  
--  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
--echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* #line $LINENO "configure" */
 -/* confdefs.h.  */
@@ -50,11 +50,11 @@ $NetBSD: patch-aa,v 1.9 2004/01/15 11:24:07 markd Exp $
 -      echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -      { { echo "$as_me:$LINENO: error:
--       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
+-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long
 -       does not apply. Please mail kde-devel@kde.org with a description of your system!
 -      " >&5
 -echo "$as_me: error:
--       Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long)
+-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long
 -       does not apply. Please mail kde-devel@kde.org with a description of your system!
 -      " >&2;}
 -   { (exit 1); exit 1; }; }
@@ -63,8 +63,6 @@ $NetBSD: patch-aa,v 1.9 2004/01/15 11:24:07 markd Exp $
 -rm -f conftest.$ac_objext conftest.$ac_ext
 -
 -
--
--
-     if test -z "$LIBPTHREAD"; then
-     if test -z "$USE_THREADS"; then
-       kde_check_threading_default=no
+ # darwin needs this to initialize the environment
+ 
+ for ac_header in crt_externs.h
diff --git a/net/kdenetwork3/patches/patch-ae b/net/kdenetwork3/patches/patch-ae
deleted file mode 100644
index b6f2b5d7ff8..00000000000
--- a/net/kdenetwork3/patches/patch-ae
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/03/11 13:13:28 markd Exp $
-
---- ksirc/Makefile.am.orig	Tue Nov  5 05:02:30 2002
-+++ ksirc/Makefile.am
-@@ -17,13 +17,13 @@ testview_SOURCES = kstextviewtest.cpp
- testview_LDADD = kstextview.lo $(LIB_KDEUI)
- testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
--lib_LTLIBRARIES = ksirc.la
-+lib_LTLIBRARIES = libksirc_main.la ksirc.la
- 
- noinst_PROGRAMS = getdate
- 
- # Which sources should be compiled for ksirc.
- 
--ksirc_la_SOURCES = \
-+libksirc_main_la_SOURCES = \
- 	toplevel.cpp \
- 	charSelector.cpp \
- 	chanButtons.cpp \
-@@ -57,8 +57,11 @@ ksirc_la_SOURCES = \
-         colorpicker.cpp
- 
- # the library search path
-+libksirc_main_la_LDFLAGS = $(all_libraries)
-+libksirc_main_la_COMPILE_FIRST = cdate.h
-+
-+ksirc_la_SOURCES = ksirc_main.cpp
- ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version
--ksirc_la_COMPILE_FIRST = cdate.h
- 
- all_ksirc_libraries = \
- 	./KSPrefs/libksprefs.la \
-@@ -68,10 +71,10 @@ all_ksirc_libraries = \
- 
- # the libraries to link against. Be aware of the order. First the libraries,
- # that depend on the following ones.
--ksirc_la_LIBADD   = $(all_ksirc_libraries)
-+libksirc_main_la_LIBADD   = $(all_ksirc_libraries)
- 
--ksirc_SOURCES = dummy.cpp
--ksirc_LDADD = ksirc.la
-+ksirc_SOURCES = ksirc_main.cpp
-+ksirc_LDADD = libksirc_main.la
- ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- kdoc:
-@@ -134,6 +137,3 @@ miscdir = $(kde_datadir)/ksirc
- 
- conf_DATA = ksircrc
- confdir = $(kde_confdir)
--
--dummy.cpp:
--	echo > dummy.cpp
diff --git a/net/kdenetwork3/patches/patch-af b/net/kdenetwork3/patches/patch-af
deleted file mode 100644
index bfebfef0950..00000000000
--- a/net/kdenetwork3/patches/patch-af
+++ /dev/null
@@ -1,616 +0,0 @@
-$NetBSD: patch-af,v 1.7 2004/01/15 11:24:07 markd Exp $
-
---- ksirc/Makefile.in.orig	2003-12-29 11:25:32.000000000 +1300
-+++ ksirc/Makefile.in
-@@ -304,13 +304,13 @@ testview_SOURCES = kstextviewtest.cpp
- testview_LDADD = kstextview.lo $(LIB_KDEUI)
- testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
--lib_LTLIBRARIES = ksirc.la
-+lib_LTLIBRARIES = libksirc_main.la ksirc.la
- 
- noinst_PROGRAMS = getdate
- 
- 
- # Which sources should be compiled for ksirc.
--#>- ksirc_la_SOURCES = \
-+#>- libksirc_main_la_SOURCES = \
- #>- 	toplevel.cpp \
- #>- 	charSelector.cpp \
- #>- 	chanButtons.cpp \
-@@ -343,7 +343,7 @@ noinst_PROGRAMS = getdate
- #>-         kstextview.cpp \
- #>-         colorpicker.cpp
- #>+ 32
--ksirc_la_SOURCES=\
-+libksirc_main_la_SOURCES=\
- 	toplevel.cpp \
- 	charSelector.cpp \
- 	chanButtons.cpp \
-@@ -378,8 +378,11 @@ ksirc_la_SOURCES=\
- 
- 
- # the library search path
-+libksirc_main_la_LDFLAGS = $(all_libraries)
-+libksirc_main_la_COMPILE_FIRST = cdate.h
-+
-+ksirc_la_SOURCES = ksirc_main.cpp
- ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version
--ksirc_la_COMPILE_FIRST = cdate.h
- 
- all_ksirc_libraries = \
- 	./KSPrefs/libksprefs.la \
-@@ -390,10 +393,10 @@ all_ksirc_libraries = \
- 
- # the libraries to link against. Be aware of the order. First the libraries,
- # that depend on the following ones.
--ksirc_la_LIBADD = $(all_ksirc_libraries)
-+libksirc_main_la_LIBADD = $(all_ksirc_libraries)
- 
--ksirc_SOURCES = dummy.cpp
--ksirc_LDADD = ksirc.la
-+ksirc_SOURCES = ksirc_main.cpp
-+ksirc_LDADD = libksirc_main.la
- ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- getdate_SOURCES = getdate.c
-@@ -453,9 +456,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--ksirc_la_DEPENDENCIES = ./KSPrefs/libksprefs.la \
-+ksirc_la_LIBADD =
-+am_ksirc_la_OBJECTS = ksirc_main.lo
-+#>- ksirc_la_OBJECTS = $(am_ksirc_la_OBJECTS)
-+#>+ 1
-+ksirc_la_OBJECTS = ksirc_main.lo
-+libksirc_main_la_DEPENDENCIES = ./KSPrefs/libksprefs.la \
- 	./KSProgress/libksprogress.la ./KSOpenkSirc/libksopenksirc.la
--am_ksirc_la_OBJECTS = toplevel.lo charSelector.lo chanButtons.lo \
-+am_libksirc_main_la_OBJECTS = toplevel.lo charSelector.lo chanButtons.lo \
- 	ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \
- 	NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \
- 	ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \
-@@ -464,10 +472,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe
- 	baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \
- 	displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \
- 	logfile.lo kstextview.lo colorpicker.lo
--#>- ksirc_la_OBJECTS = $(am_ksirc_la_OBJECTS)
-+#>- libksirc_main_la_OBJECTS = $(am_libksirc_main_la_OBJECTS)
- #>+ 12
--ksirc_la_final_OBJECTS = ksirc_la.all_cpp.lo 
--ksirc_la_nofinal_OBJECTS = toplevel.lo charSelector.lo chanButtons.lo \
-+libksirc_main_la_final_OBJECTS = libksirc_main_la.all_cpp.lo 
-+libksirc_main_la_nofinal_OBJECTS = toplevel.lo charSelector.lo chanButtons.lo \
- 	ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \
- 	NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \
- 	ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \
-@@ -476,8 +484,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c
- 	baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \
- 	displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \
- 	logfile.lo kstextview.lo colorpicker.lo FilterRuleWidget.lo
--@KDE_USE_FINAL_FALSE@ksirc_la_OBJECTS = $(ksirc_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@ksirc_la_OBJECTS = $(ksirc_la_final_OBJECTS)
-+@KDE_USE_FINAL_FALSE@libksirc_main_la_OBJECTS = $(libksirc_main_la_nofinal_OBJECTS)
-+@KDE_USE_FINAL_TRUE@libksirc_main_la_OBJECTS = $(libksirc_main_la_final_OBJECTS)
- bin_PROGRAMS = ksirc$(EXEEXT)
- check_PROGRAMS = testview$(EXEEXT)
- noinst_PROGRAMS = getdate$(EXEEXT)
-@@ -490,11 +498,11 @@ getdate_OBJECTS = getdate.$(OBJEXT)
- getdate_LDADD = $(LDADD)
- getdate_DEPENDENCIES =
- getdate_LDFLAGS =
--am_ksirc_OBJECTS = dummy.$(OBJEXT)
-+am_ksirc_OBJECTS = ksirc_main.$(OBJEXT)
- #>- ksirc_OBJECTS = $(am_ksirc_OBJECTS)
- #>+ 1
--ksirc_OBJECTS = dummy.$(OBJEXT)
--ksirc_DEPENDENCIES = ksirc.la
-+ksirc_OBJECTS = ksirc_main.$(OBJEXT)
-+ksirc_DEPENDENCIES = libksirc_main.la
- am_testview_OBJECTS = kstextviewtest.$(OBJEXT)
- #>- testview_OBJECTS = $(am_testview_OBJECTS)
- #>+ 1
-@@ -517,11 +525,13 @@ am__depfiles_maybe = depfiles
- #>- @AMDEP_TRUE@	./$(DEPDIR)/dccDialog.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/dccDialogData.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/displayMgrMDI.Plo \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kstextview.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kstextviewtest.Po \
-@@ -534,8 +544,8 @@ am__depfiles_maybe = depfiles
- #>- @AMDEP_TRUE@	./$(DEPDIR)/ssfepromptdata.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/topic.Plo ./$(DEPDIR)/toplevel.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/usercontrolmenu.Plo
--#>+ 57
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/FilterRuleWidget.P  $(DEPDIR)/ksirc_la.all_cpp.P  ./$(DEPDIR)/FilterRuleEditor.Plo \
-+#>+ 61
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/FilterRuleWidget.P  $(DEPDIR)/libksirc_main_la.all_cpp.P  ./$(DEPDIR)/FilterRuleEditor.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/NewWindowDialog.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ahistlineedit.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/alistbox.Plo ./$(DEPDIR)/baserules.Plo \
-@@ -546,11 +556,13 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dccDialog.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/dccDialogData.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrMDI.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kstextview.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kstextviewtest.Po \
-@@ -574,11 +586,13 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dccDialog.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/dccDialogData.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrMDI.Plo \
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/displayMgrSDI.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ksirc_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kstextview.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kstextviewtest.Po \
-@@ -617,8 +631,8 @@ CXXLD = $(CXX)
- #>+ 2
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(ksirc_la_SOURCES) $(getdate_SOURCES) $(ksirc_SOURCES) \
--	$(testview_SOURCES)
-+DIST_SOURCES = $(ksirc_la_SOURCES) $(libksirc_main_la_SOURCES) \
-+	$(getdate_SOURCES) $(ksirc_SOURCES) $(testview_SOURCES)
- DATA = $(apps_DATA) $(conf_DATA) $(misc_DATA)
- 
- HEADERS = $(noinst_HEADERS)
-@@ -631,7 +645,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	check-recursive installcheck-recursive
- DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(ksirc_la_SOURCES) $(getdate_SOURCES) $(ksirc_SOURCES) $(testview_SOURCES)
-+SOURCES = $(ksirc_la_SOURCES) $(libksirc_main_la_SOURCES) $(getdate_SOURCES) $(ksirc_SOURCES) $(testview_SOURCES)
- 
- #>- all: all-recursive
- #>+ 1
-@@ -678,6 +692,8 @@ clean-libLTLIBRARIES:
- 	done
- ksirc.la: $(ksirc_la_OBJECTS) $(ksirc_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(ksirc_la_LDFLAGS) $(ksirc_la_OBJECTS) $(ksirc_la_LIBADD) $(LIBS)
-+libksirc_main.la: $(libksirc_main_la_OBJECTS) $(libksirc_main_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libksirc_main_la_LDFLAGS) $(libksirc_main_la_OBJECTS) $(libksirc_main_la_LIBADD) $(LIBS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -770,7 +786,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccDialogData.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrMDI.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrSDI.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioBroadcast.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioDCC.Plo@am__quote@
-@@ -779,6 +794,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioNotify.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iocontroller.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksircprocess.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksopts.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstextview.Plo@am__quote@
-@@ -1053,7 +1070,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=ksirc.desktop openksircproc.dlg kstextview.h FilterRuleWidget.ui mditoplevel.h stringparserstate.h dsirc Artistic sirc.help.gz filters.pl colorpicker.h ksircrc FilterRuleEditor.dlg eventsrc relnotes dccDialog.dlg charSelector.h displayMgrMDI.h FAQ chanButtons.h ksirc.pl logfile.h servercontroller.dlg default.pl topic.h version.h 
-+KDE_DIST=FilterRuleEditor.dlg stringparserstate.h FAQ mditoplevel.h Makefile.in.rej ksircrc FilterRuleWidget.ui charSelector.h kstextview.h default.pl sirc.help.gz dsirc filters.pl openksircproc.dlg Artistic logfile.h servercontroller.dlg topic.h displayMgrMDI.h chanButtons.h ksirc.pl ksirc.desktop version.h relnotes eventsrc dccDialog.dlg colorpicker.h 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -1229,76 +1246,58 @@ messages: rc.cpp
- 	$(EXTRACTRC) KSOpenkSirc/*.ui >> rc.cpp
- 	$(EXTRACTRC) KSPrefs/*.ui >> rc.cpp
- 	$(XGETTEXT) *.cpp */*.cpp -o $(podir)/ksirc.pot
--
--dummy.cpp:
--	echo > dummy.cpp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
--#>+ 14
--FilterRuleWidget.cpp: $(srcdir)/FilterRuleWidget.ui FilterRuleWidget.h FilterRuleWidget.moc
--	rm -f FilterRuleWidget.cpp
--	echo '#include <klocale.h>' > FilterRuleWidget.cpp
--	$(UIC) -tr ${UIC_TR} -i FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui > FilterRuleWidget.cpp.temp ; ret=$$?; \
--	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleWidget.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleWidget,g" >> FilterRuleWidget.cpp ;\
--	rm -f FilterRuleWidget.cpp.temp ;\
--	if test "$$ret" = 0; then echo '#include "FilterRuleWidget.moc"' >> FilterRuleWidget.cpp; else rm -f FilterRuleWidget.cpp ; exit $$ret ; fi
--
--FilterRuleWidget.h: $(srcdir)/FilterRuleWidget.ui
--	$(UIC) -o FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui
--
--FilterRuleWidget.moc: FilterRuleWidget.h
--	$(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc
--
- #>+ 3
--kstextview.moc: $(srcdir)/kstextview.h
--	$(MOC) $(srcdir)/kstextview.h -o kstextview.moc
-+iocontroller.moc: $(srcdir)/iocontroller.h
-+	$(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc
- 
- #>+ 1
--mocs: kstextview.moc
-+mocs: iocontroller.moc
- #>+ 3
--ksview.moc: $(srcdir)/ksview.h
--	$(MOC) $(srcdir)/ksview.h -o ksview.moc
-+charSelector.moc: $(srcdir)/charSelector.h
-+	$(MOC) $(srcdir)/charSelector.h -o charSelector.moc
- 
- #>+ 1
--mocs: ksview.moc
-+mocs: charSelector.moc
- #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
--	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-+ioLAG.moc: $(srcdir)/ioLAG.h
-+	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
- 
- #>+ 1
--mocs: toplevel.moc
-+mocs: ioLAG.moc
- #>+ 3
--objFinder.moc: $(srcdir)/objFinder.h
--	$(MOC) $(srcdir)/objFinder.h -o objFinder.moc
-+NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
-+	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
- 
- #>+ 1
--mocs: objFinder.moc
-+mocs: NewWindowDialog.moc
- #>+ 3
--mditoplevel.moc: $(srcdir)/mditoplevel.h
--	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
-+ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h
-+	$(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc
- 
- #>+ 1
--mocs: mditoplevel.moc
-+mocs: ssfepromptdata.moc
- #>+ 3
--NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
--	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
-+kstextview.moc: $(srcdir)/kstextview.h
-+	$(MOC) $(srcdir)/kstextview.h -o kstextview.moc
- 
- #>+ 1
--mocs: NewWindowDialog.moc
-+mocs: kstextview.moc
- #>+ 3
--colorpicker.moc: $(srcdir)/colorpicker.h
--	$(MOC) $(srcdir)/colorpicker.h -o colorpicker.moc
-+ksview.moc: $(srcdir)/ksview.h
-+	$(MOC) $(srcdir)/ksview.h -o ksview.moc
- 
- #>+ 1
--mocs: colorpicker.moc
-+mocs: ksview.moc
- #>+ 3
--ioDCC.moc: $(srcdir)/ioDCC.h
--	$(MOC) $(srcdir)/ioDCC.h -o ioDCC.moc
-+objFinder.moc: $(srcdir)/objFinder.h
-+	$(MOC) $(srcdir)/objFinder.h -o objFinder.moc
- 
- #>+ 1
--mocs: ioDCC.moc
-+mocs: objFinder.moc
- #>+ 3
- chanButtons.moc: $(srcdir)/chanButtons.h
- 	$(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
-@@ -1306,17 +1305,17 @@ chanButtons.moc: $(srcdir)/chanButtons.h
- #>+ 1
- mocs: chanButtons.moc
- #>+ 3
--servercontroller.moc: $(srcdir)/servercontroller.h
--	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
-+ioDCC.moc: $(srcdir)/ioDCC.h
-+	$(MOC) $(srcdir)/ioDCC.h -o ioDCC.moc
- 
- #>+ 1
--mocs: servercontroller.moc
-+mocs: ioDCC.moc
- #>+ 3
--dccDialogData.moc: $(srcdir)/dccDialogData.h
--	$(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc
-+toplevel.moc: $(srcdir)/toplevel.h
-+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
- 
- #>+ 1
--mocs: dccDialogData.moc
-+mocs: toplevel.moc
- #>+ 3
- displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
- 	$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
-@@ -1324,41 +1323,47 @@ displayMgrMDI.moc: $(srcdir)/displayMgrM
- #>+ 1
- mocs: displayMgrMDI.moc
- #>+ 3
--ioLAG.moc: $(srcdir)/ioLAG.h
--	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
-+ksircprocess.moc: $(srcdir)/ksircprocess.h
-+	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
- 
- #>+ 1
--mocs: ioLAG.moc
-+mocs: ksircprocess.moc
- #>+ 3
--alistbox.moc: $(srcdir)/alistbox.h
--	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-+dccDialogData.moc: $(srcdir)/dccDialogData.h
-+	$(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc
- 
- #>+ 1
--mocs: alistbox.moc
-+mocs: dccDialogData.moc
- #>+ 3
--ahistlineedit.moc: $(srcdir)/ahistlineedit.h
--	$(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc
-+ssfeprompt.moc: $(srcdir)/ssfeprompt.h
-+	$(MOC) $(srcdir)/ssfeprompt.h -o ssfeprompt.moc
- 
- #>+ 1
--mocs: ahistlineedit.moc
-+mocs: ssfeprompt.moc
- #>+ 3
--ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h
--	$(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc
-+colorpicker.moc: $(srcdir)/colorpicker.h
-+	$(MOC) $(srcdir)/colorpicker.h -o colorpicker.moc
- 
- #>+ 1
--mocs: ssfepromptdata.moc
-+mocs: colorpicker.moc
- #>+ 3
--ksircprocess.moc: $(srcdir)/ksircprocess.h
--	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
-+servercontroller.moc: $(srcdir)/servercontroller.h
-+	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
- 
- #>+ 1
--mocs: ksircprocess.moc
-+mocs: servercontroller.moc
- #>+ 3
--ssfeprompt.moc: $(srcdir)/ssfeprompt.h
--	$(MOC) $(srcdir)/ssfeprompt.h -o ssfeprompt.moc
-+topic.moc: $(srcdir)/topic.h
-+	$(MOC) $(srcdir)/topic.h -o topic.moc
- 
- #>+ 1
--mocs: ssfeprompt.moc
-+mocs: topic.moc
-+#>+ 3
-+alistbox.moc: $(srcdir)/alistbox.h
-+	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-+
-+#>+ 1
-+mocs: alistbox.moc
- #>+ 3
- ioNotify.moc: $(srcdir)/ioNotify.h
- 	$(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc
-@@ -1366,11 +1371,17 @@ ioNotify.moc: $(srcdir)/ioNotify.h
- #>+ 1
- mocs: ioNotify.moc
- #>+ 3
--iocontroller.moc: $(srcdir)/iocontroller.h
--	$(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc
-+mditoplevel.moc: $(srcdir)/mditoplevel.h
-+	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
- 
- #>+ 1
--mocs: iocontroller.moc
-+mocs: mditoplevel.moc
-+#>+ 3
-+FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
-+	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-+
-+#>+ 1
-+mocs: FilterRuleEditor.moc
- #>+ 3
- dccDialog.moc: $(srcdir)/dccDialog.h
- 	$(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc
-@@ -1378,26 +1389,29 @@ dccDialog.moc: $(srcdir)/dccDialog.h
- #>+ 1
- mocs: dccDialog.moc
- #>+ 3
--topic.moc: $(srcdir)/topic.h
--	$(MOC) $(srcdir)/topic.h -o topic.moc
-+ahistlineedit.moc: $(srcdir)/ahistlineedit.h
-+	$(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc
- 
- #>+ 1
--mocs: topic.moc
--#>+ 3
--charSelector.moc: $(srcdir)/charSelector.h
--	$(MOC) $(srcdir)/charSelector.h -o charSelector.moc
-+mocs: ahistlineedit.moc
-+#>+ 14
-+FilterRuleWidget.cpp: $(srcdir)/FilterRuleWidget.ui FilterRuleWidget.h FilterRuleWidget.moc
-+	rm -f FilterRuleWidget.cpp
-+	echo '#include <klocale.h>' > FilterRuleWidget.cpp
-+	$(UIC) -tr ${UIC_TR} -i FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui > FilterRuleWidget.cpp.temp ; ret=$$?; \
-+	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleWidget.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleWidget,g" >> FilterRuleWidget.cpp ;\
-+	rm -f FilterRuleWidget.cpp.temp ;\
-+	if test "$$ret" = 0; then echo '#include "FilterRuleWidget.moc"' >> FilterRuleWidget.cpp; else rm -f FilterRuleWidget.cpp ; exit $$ret ; fi
- 
--#>+ 1
--mocs: charSelector.moc
--#>+ 3
--FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
--	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-+FilterRuleWidget.h: $(srcdir)/FilterRuleWidget.ui
-+	$(UIC) -o FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui
-+
-+FilterRuleWidget.moc: FilterRuleWidget.h
-+	$(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc
- 
--#>+ 1
--mocs: FilterRuleEditor.moc
- #>+ 3
- clean-metasources:
--	-rm -f  kstextview.moc ksview.moc toplevel.moc objFinder.moc mditoplevel.moc NewWindowDialog.moc colorpicker.moc ioDCC.moc chanButtons.moc servercontroller.moc dccDialogData.moc displayMgrMDI.moc ioLAG.moc alistbox.moc ahistlineedit.moc ssfepromptdata.moc ksircprocess.moc ssfeprompt.moc ioNotify.moc iocontroller.moc dccDialog.moc topic.moc charSelector.moc FilterRuleEditor.moc
-+	-rm -f  iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc
- 
- #>+ 4
- clean-ui:
-@@ -1521,33 +1535,33 @@ $(srcdir)/colorpicker.cpp: FilterRuleWid
- FilterRuleWidget.cpp: cdate.h
- 
- #>+ 11
--ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleWidget.cpp  kstextview.moc ksview.moc objFinder.moc toplevel.moc NewWindowDialog.moc mditoplevel.moc colorpicker.moc ioDCC.moc FilterRuleWidget.moc servercontroller.moc chanButtons.moc dccDialogData.moc displayMgrMDI.moc ioLAG.moc alistbox.moc ahistlineedit.moc ssfepromptdata.moc ssfeprompt.moc ksircprocess.moc iocontroller.moc ioNotify.moc dccDialog.moc topic.moc FilterRuleEditor.moc charSelector.moc
--	@echo 'creating ksirc_la.all_cpp.cpp ...'; \
--	rm -f ksirc_la.all_cpp.files ksirc_la.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> ksirc_la.all_cpp.final; \
-+libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleWidget.cpp  iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc FilterRuleWidget.moc alistbox.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc
-+	@echo 'creating libksirc_main_la.all_cpp.cpp ...'; \
-+	rm -f libksirc_main_la.all_cpp.files libksirc_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libksirc_main_la.all_cpp.final; \
- 	for file in toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp servercontroller.cpp FilterRuleEditor.cpp ioDiscard.cpp ioDCC.cpp dccDialog.cpp dccDialogData.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp colorpicker.cpp FilterRuleWidget.cpp ; do \
--	  echo "#include \"$$file\"" >> ksirc_la.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc_la.all_cpp.final; \
-+	  echo "#include \"$$file\"" >> libksirc_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libksirc_main_la.all_cpp.final; \
- 	done; \
--	cat ksirc_la.all_cpp.final ksirc_la.all_cpp.files > ksirc_la.all_cpp.cpp; \
--	rm -f ksirc_la.all_cpp.final ksirc_la.all_cpp.files
-+	cat libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files > libksirc_main_la.all_cpp.cpp; \
-+	rm -f libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files
- 
- #>+ 3
- clean-final:
--	-rm -f ksirc_la.all_cpp.cpp
-+	-rm -f libksirc_main_la.all_cpp.cpp
- 
- #>+ 2
- final:
--	$(MAKE) ksirc_la_OBJECTS="$(ksirc_la_final_OBJECTS)" all-am
-+	$(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_final_OBJECTS)" all-am
- #>+ 2
- final-install:
--	$(MAKE) ksirc_la_OBJECTS="$(ksirc_la_final_OBJECTS)" install-am
-+	$(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_final_OBJECTS)" install-am
- #>+ 2
- no-final:
--	$(MAKE) ksirc_la_OBJECTS="$(ksirc_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" all-am
- #>+ 2
- no-final-install:
--	$(MAKE) ksirc_la_OBJECTS="$(ksirc_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" install-am
- #>+ 3
- cvs-clean:
- 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1557,51 +1571,51 @@ kde-rpo-clean:
- 	-rm -f *.rpo
- 
- #>+ 49
--charSelector.o: charSelector.moc 
--iocontroller.lo: iocontroller.moc 
--chanButtons.o: chanButtons.moc 
-+ioLAG.lo: ioLAG.moc 
- ssfeprompt.lo: ssfeprompt.moc 
--dccDialogData.lo: dccDialogData.moc 
--charSelector.lo: charSelector.moc 
--colorpicker.lo: colorpicker.moc 
-+ssfepromptdata.lo: ssfepromptdata.moc 
-+toplevel.lo: toplevel.moc 
-+displayMgrMDI.lo: displayMgrMDI.moc 
-+ioLAG.o: ioLAG.moc 
-+ioNotify.o: ioNotify.moc 
- mditoplevel.o: mditoplevel.moc 
--toplevel.o: toplevel.moc 
--ksircprocess.o: ksircprocess.moc 
-+NewWindowDialog.o: NewWindowDialog.moc 
-+kstextview.lo: kstextview.moc 
-+ahistlineedit.o: ahistlineedit.moc 
-+mditoplevel.lo: mditoplevel.moc 
- ioNotify.lo: ioNotify.moc 
--ahistlineedit.lo: ahistlineedit.moc 
--kstextview.o: kstextview.moc 
-+iocontroller.o: iocontroller.moc 
-+ksview.o: ksview.moc 
-+ssfepromptdata.o: ssfepromptdata.moc 
- ksview.lo: ksview.moc 
--ksircprocess.lo: ksircprocess.moc 
-+charSelector.o: charSelector.moc 
-+kstextview.o: kstextview.moc 
-+toplevel.o: toplevel.moc 
-+NewWindowDialog.lo: NewWindowDialog.moc 
-+alistbox.o: alistbox.moc 
-+FilterRuleEditor.o: FilterRuleEditor.moc 
- objFinder.o: objFinder.moc 
--ahistlineedit.o: ahistlineedit.moc 
-+dccDialogData.lo: dccDialogData.moc 
-+alistbox.lo: alistbox.moc 
-+colorpicker.lo: colorpicker.moc 
-+ssfeprompt.o: ssfeprompt.moc 
- FilterRuleEditor.lo: FilterRuleEditor.moc 
--ksview.o: ksview.moc 
--servercontroller.o: servercontroller.moc 
--topic.lo: topic.moc 
--ssfepromptdata.o: ssfepromptdata.moc 
--dccDialogData.o: dccDialogData.moc 
--displayMgrMDI.lo: displayMgrMDI.moc 
--colorpicker.o: colorpicker.moc 
--ssfepromptdata.lo: ssfepromptdata.moc 
--ioLAG.o: ioLAG.moc 
--iocontroller.o: iocontroller.moc 
--kstextview.lo: kstextview.moc 
- dccDialog.lo: dccDialog.moc 
--ssfeprompt.o: ssfeprompt.moc 
-+ioDCC.lo: ioDCC.moc 
-+ahistlineedit.lo: ahistlineedit.moc 
-+ksircprocess.lo: ksircprocess.moc 
-+charSelector.lo: charSelector.moc 
-+servercontroller.o: servercontroller.moc 
- objFinder.lo: objFinder.moc 
--alistbox.lo: alistbox.moc 
--chanButtons.lo: chanButtons.moc 
- ioDCC.o: ioDCC.moc 
--mditoplevel.lo: mditoplevel.moc 
--displayMgrMDI.o: displayMgrMDI.moc 
- servercontroller.lo: servercontroller.moc 
--alistbox.o: alistbox.moc 
--NewWindowDialog.o: NewWindowDialog.moc 
--ioNotify.o: ioNotify.moc 
--topic.o: topic.moc 
--ioLAG.lo: ioLAG.moc 
--toplevel.lo: toplevel.moc 
--FilterRuleEditor.o: FilterRuleEditor.moc 
--NewWindowDialog.lo: NewWindowDialog.moc 
--ioDCC.lo: ioDCC.moc 
- dccDialog.o: dccDialog.moc 
-+topic.o: topic.moc 
-+dccDialogData.o: dccDialogData.moc 
-+displayMgrMDI.o: displayMgrMDI.moc 
-+chanButtons.o: chanButtons.moc 
-+topic.lo: topic.moc 
-+iocontroller.lo: iocontroller.moc 
-+ksircprocess.o: ksircprocess.moc 
-+colorpicker.o: colorpicker.moc 
-+chanButtons.lo: chanButtons.moc 
diff --git a/net/kdenetwork3/patches/patch-ag b/net/kdenetwork3/patches/patch-ag
deleted file mode 100644
index df5157fbd21..00000000000
--- a/net/kdenetwork3/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
-
---- ksirc/ksirc.cpp.orig	Thu Feb 28 10:57:55 2002
-+++ ksirc/ksirc.cpp
-@@ -59,7 +59,9 @@
-     }
- };
- 
--int main( int argc, char ** argv )
-+extern "C" int kdemain( int, char **);
-+
-+int kdemain( int argc, char ** argv )
- {
-     KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
-         KSIRC_VERSION, description, KAboutData::License_Artistic,
diff --git a/net/kdenetwork3/patches/patch-ai b/net/kdenetwork3/patches/patch-ai
deleted file mode 100644
index c5b007c9643..00000000000
--- a/net/kdenetwork3/patches/patch-ai
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/03/11 13:13:28 markd Exp $
-
---- kxmlrpc/Makefile.am.orig	Tue Sep 17 02:53:28 2002
-+++ kxmlrpc/Makefile.am
-@@ -4,17 +4,22 @@
- INCLUDES         = $(all_includes)
- 
- bin_PROGRAMS     = kxmlrpcd
--kxmlrpcd_LDADD   = kxmlrpcd.la
-+kxmlrpcd_LDADD   = libkxmlrpcd_main.la
- kxmlrpcd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kxmlrpcd_SOURCES = dummy.cpp
-+kxmlrpcd_SOURCES = kxmlrpcd_main.cpp
- 
--lib_LTLIBRARIES        = kxmlrpcd.la
-+lib_LTLIBRARIES        = libkxmlrpcd_main.la kxmlrpcd.la
- kde_module_LTLIBRARIES = kcm_xmlrpcd.la
- 
--kxmlrpcd_la_LIBADD  = $(LIB_KSYCOCA)
--kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
--kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
-+libkxmlrpcd_main_la_LIBADD  = $(LIB_KSYCOCA)
-+libkxmlrpcd_main_la_LDFLAGS = $(all_libraries)
-+libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
- 	kxmlrpcdaemon.cpp kxmlrpcutil.cpp
-+libkxmlrpcd_main_la_METASOURCES = AUTO
-+
-+kxmlrpcd_la_LIBADD  = libkxmlrpcd_main.la
-+kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
-+kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp
- kxmlrpcd_la_METASOURCES = AUTO
- 
- kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE)
diff --git a/net/kdenetwork3/patches/patch-aj b/net/kdenetwork3/patches/patch-aj
deleted file mode 100644
index bf1b403ae9d..00000000000
--- a/net/kdenetwork3/patches/patch-aj
+++ /dev/null
@@ -1,214 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2003/07/30 13:58:38 markd Exp $
-
---- kxmlrpc/Makefile.in.orig	2003-07-15 22:08:06.000000000 +1200
-+++ kxmlrpc/Makefile.in
-@@ -291,18 +291,23 @@ x_libraries = @x_libraries@
- INCLUDES = $(all_includes)
- 
- bin_PROGRAMS = kxmlrpcd
--kxmlrpcd_LDADD = kxmlrpcd.la
-+kxmlrpcd_LDADD = libkxmlrpcd_main.la
- kxmlrpcd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kxmlrpcd_SOURCES = dummy.cpp
-+kxmlrpcd_SOURCES = kxmlrpcd_main.cpp
- 
--lib_LTLIBRARIES = kxmlrpcd.la
-+lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la
- kde_module_LTLIBRARIES = kcm_xmlrpcd.la
- 
--kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA)
--kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
--kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
-+libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA)
-+libkxmlrpcd_main_la_LDFLAGS = $(all_libraries)
-+libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
- 	kxmlrpcdaemon.cpp kxmlrpcutil.cpp
- 
-+#>- libkxmlrpcd_main_la_METASOURCES = AUTO
-+
-+kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la
-+kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
-+kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp
- #>- kxmlrpcd_la_METASOURCES = AUTO
- 
- kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE)
-@@ -324,42 +329,50 @@ am_kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.
- #>- kcm_xmlrpcd_la_OBJECTS = $(am_kcm_xmlrpcd_la_OBJECTS)
- #>+ 1
- kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo
--kxmlrpcd_la_DEPENDENCIES =
--am_kxmlrpcd_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
--	kxmlrpcdaemon.lo kxmlrpcutil.lo
-+kxmlrpcd_la_DEPENDENCIES = libkxmlrpcd_main.la
-+am_kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo
- #>- kxmlrpcd_la_OBJECTS = $(am_kxmlrpcd_la_OBJECTS)
-+#>+ 1
-+kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo
-+libkxmlrpcd_main_la_DEPENDENCIES =
-+am_libkxmlrpcd_main_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
-+	kxmlrpcdaemon.lo kxmlrpcutil.lo
-+#>- libkxmlrpcd_main_la_OBJECTS = $(am_libkxmlrpcd_main_la_OBJECTS)
- #>+ 5
--kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo 
--kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
-+libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo 
-+libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
- 	kxmlrpcdaemon.lo kxmlrpcutil.lo
--@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS)
--@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS)
-+@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS)
-+@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS)
- bin_PROGRAMS = kxmlrpcd$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
--am_kxmlrpcd_OBJECTS = dummy.$(OBJEXT)
-+am_kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT)
- #>- kxmlrpcd_OBJECTS = $(am_kxmlrpcd_OBJECTS)
- #>+ 1
--kxmlrpcd_OBJECTS = dummy.$(OBJEXT)
--kxmlrpcd_DEPENDENCIES = kxmlrpcd.la
-+kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT)
-+kxmlrpcd_DEPENDENCIES = libkxmlrpcd_main.la
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
-+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcd_main.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcdaemon.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcinit.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcparser.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcserver.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcutil.Plo
--#>+ 13
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kxmlrpcd_la.all_cpp.P  ./$(DEPDIR)/dummy.Po \
-+#>+ 15
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkxmlrpcd_main_la.all_cpp.P  ./$(DEPDIR)/kxmlrpcd_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcd_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcdaemon.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcinit.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcparser.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcserver.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcutil.Plo
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/dummy.Po \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/kxmlrpcd_main.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcd_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcdaemon.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcinit.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kxmlrpcparser.Plo \
-@@ -385,13 +398,13 @@ CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) \
--	$(kxmlrpcd_SOURCES)
-+	$(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES)
- DATA = $(service_DATA)
- 
- HEADERS = $(noinst_HEADERS)
- 
- DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
--SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES)
-+SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES)
- 
- #>- all: all-am
- #>+ 1
-@@ -471,6 +484,8 @@ clean-libLTLIBRARIES:
- 	$(CXXLINK) -rpath $(kde_moduledir) $(kcm_xmlrpcd_la_LDFLAGS) $(kcm_xmlrpcd_la_OBJECTS) $(kcm_xmlrpcd_la_LIBADD) $(LIBS)
- kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(kxmlrpcd_la_LDFLAGS) $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_LIBADD) $(LIBS)
-+libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -510,7 +525,8 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcinit.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcparser.Plo@am__quote@
-@@ -636,7 +652,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- #>+ 4
--KDE_DIST=kxmlrpcd.desktop LICENSE 
-+KDE_DIST=LICENSE kxmlrpcd.desktop Makefile.in.rej 
- 
- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- 
-@@ -804,8 +820,14 @@ kxmlrpcserver.moc: $(srcdir)/kxmlrpcserv
- #>+ 1
- mocs: kxmlrpcserver.moc
- #>+ 3
-+kxmlrpcserver.moc: $(srcdir)/kxmlrpcserver.h
-+	$(MOC) $(srcdir)/kxmlrpcserver.h -o kxmlrpcserver.moc
-+
-+#>+ 1
-+mocs: kxmlrpcserver.moc
-+#>+ 3
- clean-metasources:
--	-rm -f  kxmlrpcserver.moc
-+	-rm -f  kxmlrpcserver.moc kxmlrpcserver.moc
- 
- #>+ 3
- clean-closures:
-@@ -822,33 +844,33 @@ force-reedit:
- 
- 
- #>+ 11
--kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp  kxmlrpcserver.moc
--	@echo 'creating kxmlrpcd_la.all_cpp.cpp ...'; \
--	rm -f kxmlrpcd_la.all_cpp.files kxmlrpcd_la.all_cpp.final; \
--	echo "#define KDE_USE_FINAL 1" >> kxmlrpcd_la.all_cpp.final; \
-+libkxmlrpcd_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp  kxmlrpcserver.moc
-+	@echo 'creating libkxmlrpcd_main_la.all_cpp.cpp ...'; \
-+	rm -f libkxmlrpcd_main_la.all_cpp.files libkxmlrpcd_main_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkxmlrpcd_main_la.all_cpp.final; \
- 	for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp ; do \
--	  echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \
--	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \
-+	  echo "#include \"$$file\"" >> libkxmlrpcd_main_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxmlrpcd_main_la.all_cpp.final; \
- 	done; \
--	cat kxmlrpcd_la.all_cpp.final kxmlrpcd_la.all_cpp.files > kxmlrpcd_la.all_cpp.cpp; \
--	rm -f kxmlrpcd_la.all_cpp.final kxmlrpcd_la.all_cpp.files
-+	cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files > libkxmlrpcd_main_la.all_cpp.cpp; \
-+	rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files
- 
- #>+ 3
- clean-final:
--	-rm -f kxmlrpcd_la.all_cpp.cpp
-+	-rm -f libkxmlrpcd_main_la.all_cpp.cpp
- 
- #>+ 2
- final:
--	$(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" all-am
-+	$(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" all-am
- #>+ 2
- final-install:
--	$(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" install-am
-+	$(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" install-am
- #>+ 2
- no-final:
--	$(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" all-am
-+	$(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" all-am
- #>+ 2
- no-final-install:
--	$(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" install-am
-+	$(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" install-am
- #>+ 3
- cvs-clean:
- 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -858,5 +880,5 @@ kde-rpo-clean:
- 	-rm -f *.rpo
- 
- #>+ 3
--kxmlrpcserver.lo: kxmlrpcserver.moc 
--kxmlrpcserver.o: kxmlrpcserver.moc 
-+kxmlrpcserver.o: kxmlrpcserver.moc kxmlrpcserver.moc 
-+kxmlrpcserver.lo: kxmlrpcserver.moc kxmlrpcserver.moc 
diff --git a/net/kdenetwork3/patches/patch-al b/net/kdenetwork3/patches/patch-al
deleted file mode 100644
index 23656ffdaf9..00000000000
--- a/net/kdenetwork3/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $
-
---- kxmlrpc/kxmlrpcdaemon.cpp.orig	Sun Dec  2 19:03:23 2001
-+++ kxmlrpc/kxmlrpcdaemon.cpp
-@@ -358,7 +358,9 @@
-    { 0, 0, 0 }
- };
- 
--int main(int argc, char **argv)
-+extern "C" int kdemain(int, char **);
-+
-+int kdemain(int argc, char **argv)
- {
-     KAboutData about("kxmlrpcd", I18N_NOOP("KXmlRpc Daemon"),
-                      version, description, KAboutData::License_BSD);
diff --git a/net/kdenetwork3/patches/patch-am b/net/kdenetwork3/patches/patch-am
index 4a7522119cc..04e79648620 100644
--- a/net/kdenetwork3/patches/patch-am
+++ b/net/kdenetwork3/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.2 2003/03/11 13:13:29 markd Exp $
+$NetBSD: patch-am,v 1.3 2004/02/04 14:42:24 markd Exp $
 
---- krfb/srvloc/kinetaddr.h.orig	Mon Aug 12 23:26:39 2002
-+++ krfb/srvloc/kinetaddr.h
-@@ -29,7 +29,7 @@
- 
- #include <arpa/inet.h>
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/socket.h>
- #endif
+--- krfb/libvncserver/rfb.h.orig	2003-07-21 19:38:18.000000000 +1200
++++ krfb/libvncserver/rfb.h
+@@ -62,7 +62,7 @@ typedef unsigned long KeySym;
  
+ #ifdef __linux__
+ #include <endian.h>
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
++#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <machine/endian.h>
+ #ifndef _BYTE_ORDER