Factor out all but one of the build switches of the KDE main module ports

into separate ports. The OPTIONS will remain as of yet and trigger dependencies
now, for easy transition.

Update KOffice to version 1.3.2.

Add patches to fix a number of issues, including:

- fix kxkb on Xorg
- fix kdemultimedia WITH_MPEGLIB (now mpeglib_artsplug) compilation on gcc 3.4.2
  with optimizations greater than -O

Add security related patches and entries to portaudit.txt.

10 files changed, 456 insertions, 500 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 6926d39a256d..5a411f28f66c 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -17,13 +17,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT=	Network-related programs and modules for KDE
 
-CONFLICTS=	kopete-*
-
 LIB_DEPENDS=	slp:${PORTSDIR}/net/openslp
 
+CONFLICTS=	kopete-[0-9]*
+
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
-KDE_BUILD_PLIST=yes
 
 USE_PERL5=	yes
 USE_BZIP2=	yes
@@ -43,22 +42,4 @@ pre-configure:
 		${WRKSRC}/kopete/protocols/gadu/libgadu/libgadu-config.h.in
 .endif
 
-.if !defined(WITHOUT_KTALKD)
-UTMP?=	/var/run/utmp
-.if exists(${UTMP})
-PLIST_APPEND+=	plist.ktalkd
-.else
-DO_NOT_COMPILE+=	ktalkd
-pre-everything::
-	@${ECHO_MSG} "===> \"${UTMP}\" was not found."
-	@${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built."
-.endif # exists(${UTMP})
-.else
-DO_NOT_COMPILE+=	ktalkd
-.endif # !defined(WITHOUT_KTALKD)
-
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .include <bsd.port.post.mk>
diff --git a/net/kdenetwork3/files/patch-configure b/net/kdenetwork3/files/patch-configure
index 0080bfe0e139..1777e1e0a39a 100644
--- a/net/kdenetwork3/files/patch-configure
+++ b/net/kdenetwork3/files/patch-configure
@@ -69,3 +69,24 @@
  
  fi
  done
+@@ -37996,20 +37996,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-    kde_cv_utmp_file=no
+-
+-    for ac_file in    \
+-                      \
+-	/var/run/utmp \
+-	/var/adm/utmp \
+-	/etc/utmp     \
+-     ; \
+-    do
+-     if test -r "$ac_file"; then
+-       kde_cv_utmp_file=$ac_file
+-       break
+-     fi
+-    done
++    kde_cv_utmp_file=/var/run/utmp
+ 
+ fi
\ No newline at end of file
diff --git a/net/kdenetwork3/files/plist.base.rm b/net/kdenetwork3/files/plist.base.rm
deleted file mode 100644
index 13d56686f0eb..000000000000
--- a/net/kdenetwork3/files/plist.base.rm
+++ /dev/null
@@ -1,217 +0,0 @@
-@dirrm share/sounds
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services/kconfiguredialog
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/lisa
-@dirrm share/doc/HTML/en/kwifimanager
-@dirrm share/doc/HTML/en/ktalkd
-@dirrm share/doc/HTML/en/ksirc
-@dirrm share/doc/HTML/en/krfb
-@dirrm share/doc/HTML/en/krdc
-@dirrm share/doc/HTML/en/kppp
-@dirrm share/doc/HTML/en/kpf
-@dirrm share/doc/HTML/en/kopete
-@dirrm share/doc/HTML/en/knewsticker
-@dirrm share/doc/HTML/en/kget
-@dirrm share/doc/HTML/en/kdict
-@dirrm share/doc/HTML/en/kcontrol/lanbrowser
-@dirrm share/doc/HTML/en/kcontrol/kcmtalkd
-@dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config
-@dirrm share/apps/lisa
-@dirrm share/apps/ksirc/pics/emoticons
-@dirrm share/apps/ksirc/pics
-@dirrm share/apps/ksirc/icons/crystalsvg/64x64/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/64x64
-@dirrm share/apps/ksirc/icons/crystalsvg/48x48/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/48x48
-@dirrm share/apps/ksirc/icons/crystalsvg/32x32/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/32x32
-@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ksirc/icons/crystalsvg/22x22
-@dirrm share/apps/ksirc/icons/crystalsvg/16x16/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/16x16
-@dirrm share/apps/ksirc/icons/crystalsvg
-@dirrm share/apps/ksirc/icons
-@dirrm share/apps/ksirc
-@dirrm share/apps/krfb/pics
-@dirrm share/apps/krfb
-@dirrm share/apps/krdc/rdp-keymaps
-@dirrm share/apps/krdc/pics
-@dirrm share/apps/krdc
-@dirrm share/apps/kppp/pics
-@dirrm share/apps/kppp/Rules/Yugoslavia
-@dirrm share/apps/kppp/Rules/Uruguay
-@dirrm share/apps/kppp/Rules/United_Kingdom
-@dirrm share/apps/kppp/Rules/Ukraine
-@dirrm share/apps/kppp/Rules/Turkey
-@dirrm share/apps/kppp/Rules/Switzerland
-@dirrm share/apps/kppp/Rules/Sweden
-@dirrm share/apps/kppp/Rules/Spain
-@dirrm share/apps/kppp/Rules/South_Afrika
-@dirrm share/apps/kppp/Rules/South_Africa
-@dirrm share/apps/kppp/Rules/Slovenia
-@dirrm share/apps/kppp/Rules/Slovakia
-@dirrm share/apps/kppp/Rules/Singapore
-@dirrm share/apps/kppp/Rules/Russia
-@dirrm share/apps/kppp/Rules/Romania
-@dirrm share/apps/kppp/Rules/Portugal
-@dirrm share/apps/kppp/Rules/Poland
-@dirrm share/apps/kppp/Rules/Norway
-@dirrm share/apps/kppp/Rules/Netherlands
-@dirrm share/apps/kppp/Rules/Malaysia
-@dirrm share/apps/kppp/Rules/Macedonia
-@dirrm share/apps/kppp/Rules/Luxembourg
-@dirrm share/apps/kppp/Rules/Kazakhstan
-@dirrm share/apps/kppp/Rules/Japan
-@dirrm share/apps/kppp/Rules/Jamaica
-@dirrm share/apps/kppp/Rules/Italy
-@dirrm share/apps/kppp/Rules/Israel
-@dirrm share/apps/kppp/Rules/Ireland
-@dirrm share/apps/kppp/Rules/Indonesia
-@dirrm share/apps/kppp/Rules/India
-@dirrm share/apps/kppp/Rules/Iceland
-@dirrm share/apps/kppp/Rules/Hungary
-@dirrm share/apps/kppp/Rules/Hong_Kong
-@dirrm share/apps/kppp/Rules/Greece
-@dirrm share/apps/kppp/Rules/Germany
-@dirrm share/apps/kppp/Rules/France
-@dirrm share/apps/kppp/Rules/Finland
-@dirrm share/apps/kppp/Rules/Estonia
-@dirrm share/apps/kppp/Rules/Denmark
-@dirrm share/apps/kppp/Rules/Czechia
-@dirrm share/apps/kppp/Rules/Croatia
-@dirrm share/apps/kppp/Rules/Brasil
-@dirrm share/apps/kppp/Rules/Bosnia_and_Herzegovina
-@dirrm share/apps/kppp/Rules/Belgium
-@dirrm share/apps/kppp/Rules/Bangladesh
-@dirrm share/apps/kppp/Rules/Austria/Standard
-@dirrm share/apps/kppp/Rules/Austria/Minimum
-@dirrm share/apps/kppp/Rules/Austria/Business_2
-@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
-@dirrm share/apps/kppp/Rules/Australia
-@dirrm share/apps/kppp/Rules/Argentina
-@dirrm share/apps/kppp/Rules
-@dirrm share/apps/kppp/Provider/Yugoslavia
-@dirrm share/apps/kppp/Provider/United_Kingdom
-@dirrm share/apps/kppp/Provider/Ukraine
-@dirrm share/apps/kppp/Provider/Taiwan
-@dirrm share/apps/kppp/Provider/Switzerland
-@dirrm share/apps/kppp/Provider/Sweden
-@dirrm share/apps/kppp/Provider/Slovenia
-@dirrm share/apps/kppp/Provider/Portugal
-@dirrm share/apps/kppp/Provider/Norway
-@dirrm share/apps/kppp/Provider/NewZealand
-@dirrm share/apps/kppp/Provider/Netherlands
-@dirrm share/apps/kppp/Provider/Irland
-@dirrm share/apps/kppp/Provider/Germany
-@dirrm share/apps/kppp/Provider/France
-@dirrm share/apps/kppp/Provider/Denmark
-@dirrm share/apps/kppp/Provider/Czech_Republic
-@dirrm share/apps/kppp/Provider/Belarus
-@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/kopeterichtexteditpart
-@dirrm share/apps/kopete_translator
-@dirrm share/apps/kopete_history
-@dirrm share/apps/kopete_cryptography
-@dirrm share/apps/kopete_contactnotes
-@dirrm share/apps/kopete/webpresence
-@dirrm share/apps/kopete/styles
-@dirrm share/apps/kopete/pics/emoticons/tweakers.net
-@dirrm share/apps/kopete/pics/emoticons/phpBB
-@dirrm share/apps/kopete/pics/emoticons/greggman.com
-@dirrm share/apps/kopete/pics/emoticons/ccmathteam.com
-@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-22
-@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-16
-@dirrm share/apps/kopete/pics/emoticons/RedOnes
-@dirrm share/apps/kopete/pics/emoticons/Plain
-@dirrm share/apps/kopete/pics/emoticons/KMess-Violet
-@dirrm share/apps/kopete/pics/emoticons/KMess-Cartoon
-@dirrm share/apps/kopete/pics/emoticons/KMess-Blue
-@dirrm share/apps/kopete/pics/emoticons/KMess
-@dirrm share/apps/kopete/pics/emoticons/Default
-@dirrm share/apps/kopete/pics/emoticons/Boxed
-@dirrm share/apps/kopete/pics/emoticons
-@dirrm share/apps/kopete/pics
-@dirrm share/apps/kopete/icons/crystalsvg/64x64/apps
-@dirrm share/apps/kopete/icons/crystalsvg/64x64
-@dirrm share/apps/kopete/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kopete/icons/crystalsvg/48x48/actions
-@dirrm share/apps/kopete/icons/crystalsvg/48x48
-@dirrm share/apps/kopete/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kopete/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kopete/icons/crystalsvg/32x32
-@dirrm share/apps/kopete/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kopete/icons/crystalsvg/22x22
-@dirrm share/apps/kopete/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kopete/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kopete/icons/crystalsvg/16x16
-@dirrm share/apps/kopete/icons/crystalsvg/128x128/apps
-@dirrm share/apps/kopete/icons/crystalsvg/128x128
-@dirrm share/apps/kopete/icons/crystalsvg
-@dirrm share/apps/kopete/icons
-@dirrm share/apps/kopete
-@dirrm share/apps/konqueror/dirtree/remote
-@dirrm share/apps/konqueror/dirtree
-@dirrm share/apps/konqueror
-@dirrm share/apps/knewsticker
-@dirrm share/apps/kinetd
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khtml/kpartplugins
-@dirrm share/apps/khtml
-@dirrm share/apps/kget/sounds
-@dirrm share/apps/kget/pics
-@dirrm share/apps/kget/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kget/icons/crystalsvg/22x22
-@dirrm share/apps/kget/icons/crystalsvg
-@dirrm share/apps/kget/icons
-@dirrm share/apps/kget
-@dirrm share/apps/kdict/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdict/icons/crystalsvg/32x32
-@dirrm share/apps/kdict/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kdict/icons/crystalsvg/22x22
-@dirrm share/apps/kdict/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kdict/icons/crystalsvg/16x16
-@dirrm share/apps/kdict/icons/crystalsvg
-@dirrm share/apps/kdict/icons
-@dirrm share/apps/kdict
-@dirrm share/apps/kconf_update
-@dirrm share/apps
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3
-@dirrm lib/kconf_update_bin
-@dirrm include/rss
diff --git a/net/kdenetwork3/files/plist.ktalkd b/net/kdenetwork3/files/plist.ktalkd
deleted file mode 100644
index c61949a945ea..000000000000
--- a/net/kdenetwork3/files/plist.ktalkd
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/ktalkd
-bin/ktalkdlg
-bin/mail.local
-lib/kde3/kcm_ktalkd.la
-lib/kde3/kcm_ktalkd.so
-share/applications/kde/kcmktalkd.desktop
-share/config/ktalkdrc
-share/icons/crystalsvg/128x128/apps/ktalkd.png
-share/icons/crystalsvg/16x16/apps/ktalkd.png
-share/icons/crystalsvg/32x32/apps/ktalkd.png
-share/icons/crystalsvg/48x48/apps/ktalkd.png
-share/sounds/ktalkd.wav
diff --git a/net/kdenetwork3/files/plist.base b/net/kdenetwork3/pkg-plist
index a6f87c4af986..09319c45843c 100644
--- a/net/kdenetwork3/files/plist.base
+++ b/net/kdenetwork3/pkg-plist
@@ -10,7 +10,10 @@ bin/krdc
 bin/krfb
 bin/krfb_httpd
 bin/ksirc
+bin/ktalkd
+bin/ktalkdlg
 bin/lisa
+bin/mail.local
 bin/reslisa
 bin/rssclient
 bin/rssservice
@@ -49,6 +52,8 @@ 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/kded_kinetd.la
@@ -125,6 +130,7 @@ lib/librss.so
 lib/librss.so.1
 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
@@ -1169,6 +1175,7 @@ share/apps/ksirc/servers.txt
 share/apps/ksirc/sirc.help.gz
 share/apps/lisa/README
 share/config/ksircrc
+share/config/ktalkdrc
 share/doc/HTML/en/kcontrol/kcmtalkd/common
 share/doc/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
 share/doc/HTML/en/kcontrol/kcmtalkd/index.docbook
@@ -1325,12 +1332,14 @@ share/doc/HTML/en/lisa/index.docbook
 share/icons/crystalsvg/128x128/apps/kdict.png
 share/icons/crystalsvg/128x128/apps/kopete.png
 share/icons/crystalsvg/128x128/apps/kppp.png
+share/icons/crystalsvg/128x128/apps/ktalkd.png
 share/icons/crystalsvg/16x16/apps/kdict.png
 share/icons/crystalsvg/16x16/apps/knewsticker.png
 share/icons/crystalsvg/16x16/apps/kopete.png
 share/icons/crystalsvg/16x16/apps/kpf.png
 share/icons/crystalsvg/16x16/apps/kppp.png
 share/icons/crystalsvg/16x16/apps/ksirc.png
+share/icons/crystalsvg/16x16/apps/ktalkd.png
 share/icons/crystalsvg/22x22/actions/khtml_kget.png
 share/icons/crystalsvg/22x22/apps/kopete.png
 share/icons/crystalsvg/32x32/apps/kdict.png
@@ -1341,6 +1350,7 @@ share/icons/crystalsvg/32x32/apps/kppp.png
 share/icons/crystalsvg/32x32/apps/krdc.png
 share/icons/crystalsvg/32x32/apps/krfb.png
 share/icons/crystalsvg/32x32/apps/ksirc.png
+share/icons/crystalsvg/32x32/apps/ktalkd.png
 share/icons/crystalsvg/48x48/apps/kdict.png
 share/icons/crystalsvg/48x48/apps/kget.png
 share/icons/crystalsvg/48x48/apps/knewsticker.png
@@ -1350,6 +1360,7 @@ share/icons/crystalsvg/48x48/apps/kppp.png
 share/icons/crystalsvg/48x48/apps/krdc.png
 share/icons/crystalsvg/48x48/apps/krfb.png
 share/icons/crystalsvg/48x48/apps/ksirc.png
+share/icons/crystalsvg/48x48/apps/ktalkd.png
 share/icons/crystalsvg/48x48/mimetypes/kget_list.png
 share/icons/crystalsvg/64x64/apps/kdict.png
 share/icons/crystalsvg/64x64/apps/kopete.png
@@ -1407,3 +1418,197 @@ share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg
 share/sounds/Kopete_User_is_Online.ogg
+share/sounds/ktalkd.wav
+@dirrm share/sounds
+@dirrm share/services/kconfiguredialog
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/doc/HTML/en/lisa
+@dirrm share/doc/HTML/en/kwifimanager
+@dirrm share/doc/HTML/en/ktalkd
+@dirrm share/doc/HTML/en/ksirc
+@dirrm share/doc/HTML/en/krfb
+@dirrm share/doc/HTML/en/krdc
+@dirrm share/doc/HTML/en/kppp
+@dirrm share/doc/HTML/en/kpf
+@dirrm share/doc/HTML/en/kopete
+@dirrm share/doc/HTML/en/knewsticker
+@dirrm share/doc/HTML/en/kget
+@dirrm share/doc/HTML/en/kdict
+@dirrm share/doc/HTML/en/kcontrol/lanbrowser
+@dirrm share/doc/HTML/en/kcontrol/kcmtalkd
+@dirrm share/doc/HTML/en/kcontrol
+@dirrm share/apps/lisa
+@dirrm share/apps/ksirc/pics/emoticons
+@dirrm share/apps/ksirc/pics
+@dirrm share/apps/ksirc/icons/crystalsvg/64x64/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/64x64
+@dirrm share/apps/ksirc/icons/crystalsvg/48x48/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/48x48
+@dirrm share/apps/ksirc/icons/crystalsvg/32x32/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/32x32
+@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions
+@dirrm share/apps/ksirc/icons/crystalsvg/22x22
+@dirrm share/apps/ksirc/icons/crystalsvg/16x16/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/16x16
+@dirrm share/apps/ksirc/icons/crystalsvg
+@dirrm share/apps/ksirc/icons
+@dirrm share/apps/ksirc
+@dirrm share/apps/krfb/pics
+@dirrm share/apps/krfb
+@dirrm share/apps/krdc/rdp-keymaps
+@dirrm share/apps/krdc/pics
+@dirrm share/apps/krdc
+@dirrm share/apps/kppp/pics
+@dirrm share/apps/kppp/Rules/Yugoslavia
+@dirrm share/apps/kppp/Rules/Uruguay
+@dirrm share/apps/kppp/Rules/United_Kingdom
+@dirrm share/apps/kppp/Rules/Ukraine
+@dirrm share/apps/kppp/Rules/Turkey
+@dirrm share/apps/kppp/Rules/Switzerland
+@dirrm share/apps/kppp/Rules/Sweden
+@dirrm share/apps/kppp/Rules/Spain
+@dirrm share/apps/kppp/Rules/South_Afrika
+@dirrm share/apps/kppp/Rules/South_Africa
+@dirrm share/apps/kppp/Rules/Slovenia
+@dirrm share/apps/kppp/Rules/Slovakia
+@dirrm share/apps/kppp/Rules/Singapore
+@dirrm share/apps/kppp/Rules/Russia
+@dirrm share/apps/kppp/Rules/Romania
+@dirrm share/apps/kppp/Rules/Portugal
+@dirrm share/apps/kppp/Rules/Poland
+@dirrm share/apps/kppp/Rules/Norway
+@dirrm share/apps/kppp/Rules/Netherlands
+@dirrm share/apps/kppp/Rules/Malaysia
+@dirrm share/apps/kppp/Rules/Macedonia
+@dirrm share/apps/kppp/Rules/Luxembourg
+@dirrm share/apps/kppp/Rules/Kazakhstan
+@dirrm share/apps/kppp/Rules/Japan
+@dirrm share/apps/kppp/Rules/Jamaica
+@dirrm share/apps/kppp/Rules/Italy
+@dirrm share/apps/kppp/Rules/Israel
+@dirrm share/apps/kppp/Rules/Ireland
+@dirrm share/apps/kppp/Rules/Indonesia
+@dirrm share/apps/kppp/Rules/India
+@dirrm share/apps/kppp/Rules/Iceland
+@dirrm share/apps/kppp/Rules/Hungary
+@dirrm share/apps/kppp/Rules/Hong_Kong
+@dirrm share/apps/kppp/Rules/Greece
+@dirrm share/apps/kppp/Rules/Germany
+@dirrm share/apps/kppp/Rules/France
+@dirrm share/apps/kppp/Rules/Finland
+@dirrm share/apps/kppp/Rules/Estonia
+@dirrm share/apps/kppp/Rules/Denmark
+@dirrm share/apps/kppp/Rules/Czechia
+@dirrm share/apps/kppp/Rules/Croatia
+@dirrm share/apps/kppp/Rules/Brasil
+@dirrm share/apps/kppp/Rules/Bosnia_and_Herzegovina
+@dirrm share/apps/kppp/Rules/Belgium
+@dirrm share/apps/kppp/Rules/Bangladesh
+@dirrm share/apps/kppp/Rules/Austria/Standard
+@dirrm share/apps/kppp/Rules/Austria/Minimum
+@dirrm share/apps/kppp/Rules/Austria/Business_2
+@dirrm share/apps/kppp/Rules/Austria/Business_1
+@dirrm share/apps/kppp/Rules/Austria
+@dirrm share/apps/kppp/Rules/Australia
+@dirrm share/apps/kppp/Rules/Argentina
+@dirrm share/apps/kppp/Rules
+@dirrm share/apps/kppp/Provider/Yugoslavia
+@dirrm share/apps/kppp/Provider/United_Kingdom
+@dirrm share/apps/kppp/Provider/Ukraine
+@dirrm share/apps/kppp/Provider/Taiwan
+@dirrm share/apps/kppp/Provider/Switzerland
+@dirrm share/apps/kppp/Provider/Sweden
+@dirrm share/apps/kppp/Provider/Slovenia
+@dirrm share/apps/kppp/Provider/Portugal
+@dirrm share/apps/kppp/Provider/Norway
+@dirrm share/apps/kppp/Provider/NewZealand
+@dirrm share/apps/kppp/Provider/Netherlands
+@dirrm share/apps/kppp/Provider/Irland
+@dirrm share/apps/kppp/Provider/Germany
+@dirrm share/apps/kppp/Provider/France
+@dirrm share/apps/kppp/Provider/Denmark
+@dirrm share/apps/kppp/Provider/Czech_Republic
+@dirrm share/apps/kppp/Provider/Belarus
+@dirrm share/apps/kppp/Provider/Austria
+@dirrm share/apps/kppp/Provider
+@dirrm share/apps/kppp
+@dirrm share/apps/kopeterichtexteditpart
+@dirrm share/apps/kopete_translator
+@dirrm share/apps/kopete_history
+@dirrm share/apps/kopete_cryptography
+@dirrm share/apps/kopete_contactnotes
+@dirrm share/apps/kopete/webpresence
+@dirrm share/apps/kopete/styles
+@dirrm share/apps/kopete/pics/emoticons/tweakers.net
+@dirrm share/apps/kopete/pics/emoticons/phpBB
+@dirrm share/apps/kopete/pics/emoticons/greggman.com
+@dirrm share/apps/kopete/pics/emoticons/ccmathteam.com
+@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-22
+@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-16
+@dirrm share/apps/kopete/pics/emoticons/RedOnes
+@dirrm share/apps/kopete/pics/emoticons/Plain
+@dirrm share/apps/kopete/pics/emoticons/KMess-Violet
+@dirrm share/apps/kopete/pics/emoticons/KMess-Cartoon
+@dirrm share/apps/kopete/pics/emoticons/KMess-Blue
+@dirrm share/apps/kopete/pics/emoticons/KMess
+@dirrm share/apps/kopete/pics/emoticons/Default
+@dirrm share/apps/kopete/pics/emoticons/Boxed
+@dirrm share/apps/kopete/pics/emoticons
+@dirrm share/apps/kopete/pics
+@dirrm share/apps/kopete/icons/crystalsvg/64x64/apps
+@dirrm share/apps/kopete/icons/crystalsvg/64x64
+@dirrm share/apps/kopete/icons/crystalsvg/48x48/apps
+@dirrm share/apps/kopete/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kopete/icons/crystalsvg/48x48
+@dirrm share/apps/kopete/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kopete/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kopete/icons/crystalsvg/32x32
+@dirrm share/apps/kopete/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kopete/icons/crystalsvg/22x22
+@dirrm share/apps/kopete/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kopete/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kopete/icons/crystalsvg/16x16
+@dirrm share/apps/kopete/icons/crystalsvg/128x128/apps
+@dirrm share/apps/kopete/icons/crystalsvg/128x128
+@dirrm share/apps/kopete/icons/crystalsvg
+@dirrm share/apps/kopete/icons
+@dirrm share/apps/kopete
+@dirrm share/apps/konqueror/dirtree/remote
+@dirrm share/apps/konqueror/dirtree
+@dirrm share/apps/konqueror
+@dirrm share/apps/knewsticker
+@dirrm share/apps/kinetd
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
+@dirrm share/apps/khtml/kpartplugins
+@dirrm share/apps/kget/sounds
+@dirrm share/apps/kget/pics
+@dirrm share/apps/kget/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kget/icons/crystalsvg/22x22
+@dirrm share/apps/kget/icons/crystalsvg
+@dirrm share/apps/kget/icons
+@dirrm share/apps/kget
+@dirrm share/apps/kdict/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdict/icons/crystalsvg/32x32
+@dirrm share/apps/kdict/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdict/icons/crystalsvg/22x22
+@dirrm share/apps/kdict/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdict/icons/crystalsvg/16x16
+@dirrm share/apps/kdict/icons/crystalsvg
+@dirrm share/apps/kdict/icons
+@dirrm share/apps/kdict
+@dirrm share/applnk/Internet
+@dirrm share/applnk/.hidden
+@dirrm share/applnk
+@dirrm lib/kconf_update_bin
+@dirrm include/rss
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 6926d39a256d..5a411f28f66c 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -17,13 +17,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT=	Network-related programs and modules for KDE
 
-CONFLICTS=	kopete-*
-
 LIB_DEPENDS=	slp:${PORTSDIR}/net/openslp
 
+CONFLICTS=	kopete-[0-9]*
+
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
-KDE_BUILD_PLIST=yes
 
 USE_PERL5=	yes
 USE_BZIP2=	yes
@@ -43,22 +42,4 @@ pre-configure:
 		${WRKSRC}/kopete/protocols/gadu/libgadu/libgadu-config.h.in
 .endif
 
-.if !defined(WITHOUT_KTALKD)
-UTMP?=	/var/run/utmp
-.if exists(${UTMP})
-PLIST_APPEND+=	plist.ktalkd
-.else
-DO_NOT_COMPILE+=	ktalkd
-pre-everything::
-	@${ECHO_MSG} "===> \"${UTMP}\" was not found."
-	@${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built."
-.endif # exists(${UTMP})
-.else
-DO_NOT_COMPILE+=	ktalkd
-.endif # !defined(WITHOUT_KTALKD)
-
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .include <bsd.port.post.mk>
diff --git a/net/kdenetwork4/files/patch-configure b/net/kdenetwork4/files/patch-configure
index 0080bfe0e139..1777e1e0a39a 100644
--- a/net/kdenetwork4/files/patch-configure
+++ b/net/kdenetwork4/files/patch-configure
@@ -69,3 +69,24 @@
  
  fi
  done
+@@ -37996,20 +37996,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-    kde_cv_utmp_file=no
+-
+-    for ac_file in    \
+-                      \
+-	/var/run/utmp \
+-	/var/adm/utmp \
+-	/etc/utmp     \
+-     ; \
+-    do
+-     if test -r "$ac_file"; then
+-       kde_cv_utmp_file=$ac_file
+-       break
+-     fi
+-    done
++    kde_cv_utmp_file=/var/run/utmp
+ 
+ fi
\ No newline at end of file
diff --git a/net/kdenetwork4/files/plist.base.rm b/net/kdenetwork4/files/plist.base.rm
deleted file mode 100644
index 13d56686f0eb..000000000000
--- a/net/kdenetwork4/files/plist.base.rm
+++ /dev/null
@@ -1,217 +0,0 @@
-@dirrm share/sounds
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services/kconfiguredialog
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/lisa
-@dirrm share/doc/HTML/en/kwifimanager
-@dirrm share/doc/HTML/en/ktalkd
-@dirrm share/doc/HTML/en/ksirc
-@dirrm share/doc/HTML/en/krfb
-@dirrm share/doc/HTML/en/krdc
-@dirrm share/doc/HTML/en/kppp
-@dirrm share/doc/HTML/en/kpf
-@dirrm share/doc/HTML/en/kopete
-@dirrm share/doc/HTML/en/knewsticker
-@dirrm share/doc/HTML/en/kget
-@dirrm share/doc/HTML/en/kdict
-@dirrm share/doc/HTML/en/kcontrol/lanbrowser
-@dirrm share/doc/HTML/en/kcontrol/kcmtalkd
-@dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config
-@dirrm share/apps/lisa
-@dirrm share/apps/ksirc/pics/emoticons
-@dirrm share/apps/ksirc/pics
-@dirrm share/apps/ksirc/icons/crystalsvg/64x64/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/64x64
-@dirrm share/apps/ksirc/icons/crystalsvg/48x48/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/48x48
-@dirrm share/apps/ksirc/icons/crystalsvg/32x32/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/32x32
-@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ksirc/icons/crystalsvg/22x22
-@dirrm share/apps/ksirc/icons/crystalsvg/16x16/apps
-@dirrm share/apps/ksirc/icons/crystalsvg/16x16
-@dirrm share/apps/ksirc/icons/crystalsvg
-@dirrm share/apps/ksirc/icons
-@dirrm share/apps/ksirc
-@dirrm share/apps/krfb/pics
-@dirrm share/apps/krfb
-@dirrm share/apps/krdc/rdp-keymaps
-@dirrm share/apps/krdc/pics
-@dirrm share/apps/krdc
-@dirrm share/apps/kppp/pics
-@dirrm share/apps/kppp/Rules/Yugoslavia
-@dirrm share/apps/kppp/Rules/Uruguay
-@dirrm share/apps/kppp/Rules/United_Kingdom
-@dirrm share/apps/kppp/Rules/Ukraine
-@dirrm share/apps/kppp/Rules/Turkey
-@dirrm share/apps/kppp/Rules/Switzerland
-@dirrm share/apps/kppp/Rules/Sweden
-@dirrm share/apps/kppp/Rules/Spain
-@dirrm share/apps/kppp/Rules/South_Afrika
-@dirrm share/apps/kppp/Rules/South_Africa
-@dirrm share/apps/kppp/Rules/Slovenia
-@dirrm share/apps/kppp/Rules/Slovakia
-@dirrm share/apps/kppp/Rules/Singapore
-@dirrm share/apps/kppp/Rules/Russia
-@dirrm share/apps/kppp/Rules/Romania
-@dirrm share/apps/kppp/Rules/Portugal
-@dirrm share/apps/kppp/Rules/Poland
-@dirrm share/apps/kppp/Rules/Norway
-@dirrm share/apps/kppp/Rules/Netherlands
-@dirrm share/apps/kppp/Rules/Malaysia
-@dirrm share/apps/kppp/Rules/Macedonia
-@dirrm share/apps/kppp/Rules/Luxembourg
-@dirrm share/apps/kppp/Rules/Kazakhstan
-@dirrm share/apps/kppp/Rules/Japan
-@dirrm share/apps/kppp/Rules/Jamaica
-@dirrm share/apps/kppp/Rules/Italy
-@dirrm share/apps/kppp/Rules/Israel
-@dirrm share/apps/kppp/Rules/Ireland
-@dirrm share/apps/kppp/Rules/Indonesia
-@dirrm share/apps/kppp/Rules/India
-@dirrm share/apps/kppp/Rules/Iceland
-@dirrm share/apps/kppp/Rules/Hungary
-@dirrm share/apps/kppp/Rules/Hong_Kong
-@dirrm share/apps/kppp/Rules/Greece
-@dirrm share/apps/kppp/Rules/Germany
-@dirrm share/apps/kppp/Rules/France
-@dirrm share/apps/kppp/Rules/Finland
-@dirrm share/apps/kppp/Rules/Estonia
-@dirrm share/apps/kppp/Rules/Denmark
-@dirrm share/apps/kppp/Rules/Czechia
-@dirrm share/apps/kppp/Rules/Croatia
-@dirrm share/apps/kppp/Rules/Brasil
-@dirrm share/apps/kppp/Rules/Bosnia_and_Herzegovina
-@dirrm share/apps/kppp/Rules/Belgium
-@dirrm share/apps/kppp/Rules/Bangladesh
-@dirrm share/apps/kppp/Rules/Austria/Standard
-@dirrm share/apps/kppp/Rules/Austria/Minimum
-@dirrm share/apps/kppp/Rules/Austria/Business_2
-@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
-@dirrm share/apps/kppp/Rules/Australia
-@dirrm share/apps/kppp/Rules/Argentina
-@dirrm share/apps/kppp/Rules
-@dirrm share/apps/kppp/Provider/Yugoslavia
-@dirrm share/apps/kppp/Provider/United_Kingdom
-@dirrm share/apps/kppp/Provider/Ukraine
-@dirrm share/apps/kppp/Provider/Taiwan
-@dirrm share/apps/kppp/Provider/Switzerland
-@dirrm share/apps/kppp/Provider/Sweden
-@dirrm share/apps/kppp/Provider/Slovenia
-@dirrm share/apps/kppp/Provider/Portugal
-@dirrm share/apps/kppp/Provider/Norway
-@dirrm share/apps/kppp/Provider/NewZealand
-@dirrm share/apps/kppp/Provider/Netherlands
-@dirrm share/apps/kppp/Provider/Irland
-@dirrm share/apps/kppp/Provider/Germany
-@dirrm share/apps/kppp/Provider/France
-@dirrm share/apps/kppp/Provider/Denmark
-@dirrm share/apps/kppp/Provider/Czech_Republic
-@dirrm share/apps/kppp/Provider/Belarus
-@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/kopeterichtexteditpart
-@dirrm share/apps/kopete_translator
-@dirrm share/apps/kopete_history
-@dirrm share/apps/kopete_cryptography
-@dirrm share/apps/kopete_contactnotes
-@dirrm share/apps/kopete/webpresence
-@dirrm share/apps/kopete/styles
-@dirrm share/apps/kopete/pics/emoticons/tweakers.net
-@dirrm share/apps/kopete/pics/emoticons/phpBB
-@dirrm share/apps/kopete/pics/emoticons/greggman.com
-@dirrm share/apps/kopete/pics/emoticons/ccmathteam.com
-@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-22
-@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-16
-@dirrm share/apps/kopete/pics/emoticons/RedOnes
-@dirrm share/apps/kopete/pics/emoticons/Plain
-@dirrm share/apps/kopete/pics/emoticons/KMess-Violet
-@dirrm share/apps/kopete/pics/emoticons/KMess-Cartoon
-@dirrm share/apps/kopete/pics/emoticons/KMess-Blue
-@dirrm share/apps/kopete/pics/emoticons/KMess
-@dirrm share/apps/kopete/pics/emoticons/Default
-@dirrm share/apps/kopete/pics/emoticons/Boxed
-@dirrm share/apps/kopete/pics/emoticons
-@dirrm share/apps/kopete/pics
-@dirrm share/apps/kopete/icons/crystalsvg/64x64/apps
-@dirrm share/apps/kopete/icons/crystalsvg/64x64
-@dirrm share/apps/kopete/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kopete/icons/crystalsvg/48x48/actions
-@dirrm share/apps/kopete/icons/crystalsvg/48x48
-@dirrm share/apps/kopete/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kopete/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kopete/icons/crystalsvg/32x32
-@dirrm share/apps/kopete/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kopete/icons/crystalsvg/22x22
-@dirrm share/apps/kopete/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kopete/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kopete/icons/crystalsvg/16x16
-@dirrm share/apps/kopete/icons/crystalsvg/128x128/apps
-@dirrm share/apps/kopete/icons/crystalsvg/128x128
-@dirrm share/apps/kopete/icons/crystalsvg
-@dirrm share/apps/kopete/icons
-@dirrm share/apps/kopete
-@dirrm share/apps/konqueror/dirtree/remote
-@dirrm share/apps/konqueror/dirtree
-@dirrm share/apps/konqueror
-@dirrm share/apps/knewsticker
-@dirrm share/apps/kinetd
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khtml/kpartplugins
-@dirrm share/apps/khtml
-@dirrm share/apps/kget/sounds
-@dirrm share/apps/kget/pics
-@dirrm share/apps/kget/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kget/icons/crystalsvg/22x22
-@dirrm share/apps/kget/icons/crystalsvg
-@dirrm share/apps/kget/icons
-@dirrm share/apps/kget
-@dirrm share/apps/kdict/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdict/icons/crystalsvg/32x32
-@dirrm share/apps/kdict/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kdict/icons/crystalsvg/22x22
-@dirrm share/apps/kdict/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kdict/icons/crystalsvg/16x16
-@dirrm share/apps/kdict/icons/crystalsvg
-@dirrm share/apps/kdict/icons
-@dirrm share/apps/kdict
-@dirrm share/apps/kconf_update
-@dirrm share/apps
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3
-@dirrm lib/kconf_update_bin
-@dirrm include/rss
diff --git a/net/kdenetwork4/files/plist.ktalkd b/net/kdenetwork4/files/plist.ktalkd
deleted file mode 100644
index c61949a945ea..000000000000
--- a/net/kdenetwork4/files/plist.ktalkd
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/ktalkd
-bin/ktalkdlg
-bin/mail.local
-lib/kde3/kcm_ktalkd.la
-lib/kde3/kcm_ktalkd.so
-share/applications/kde/kcmktalkd.desktop
-share/config/ktalkdrc
-share/icons/crystalsvg/128x128/apps/ktalkd.png
-share/icons/crystalsvg/16x16/apps/ktalkd.png
-share/icons/crystalsvg/32x32/apps/ktalkd.png
-share/icons/crystalsvg/48x48/apps/ktalkd.png
-share/sounds/ktalkd.wav
diff --git a/net/kdenetwork4/files/plist.base b/net/kdenetwork4/pkg-plist
index a6f87c4af986..09319c45843c 100644
--- a/net/kdenetwork4/files/plist.base
+++ b/net/kdenetwork4/pkg-plist
@@ -10,7 +10,10 @@ bin/krdc
 bin/krfb
 bin/krfb_httpd
 bin/ksirc
+bin/ktalkd
+bin/ktalkdlg
 bin/lisa
+bin/mail.local
 bin/reslisa
 bin/rssclient
 bin/rssservice
@@ -49,6 +52,8 @@ 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/kded_kinetd.la
@@ -125,6 +130,7 @@ lib/librss.so
 lib/librss.so.1
 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
@@ -1169,6 +1175,7 @@ share/apps/ksirc/servers.txt
 share/apps/ksirc/sirc.help.gz
 share/apps/lisa/README
 share/config/ksircrc
+share/config/ktalkdrc
 share/doc/HTML/en/kcontrol/kcmtalkd/common
 share/doc/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
 share/doc/HTML/en/kcontrol/kcmtalkd/index.docbook
@@ -1325,12 +1332,14 @@ share/doc/HTML/en/lisa/index.docbook
 share/icons/crystalsvg/128x128/apps/kdict.png
 share/icons/crystalsvg/128x128/apps/kopete.png
 share/icons/crystalsvg/128x128/apps/kppp.png
+share/icons/crystalsvg/128x128/apps/ktalkd.png
 share/icons/crystalsvg/16x16/apps/kdict.png
 share/icons/crystalsvg/16x16/apps/knewsticker.png
 share/icons/crystalsvg/16x16/apps/kopete.png
 share/icons/crystalsvg/16x16/apps/kpf.png
 share/icons/crystalsvg/16x16/apps/kppp.png
 share/icons/crystalsvg/16x16/apps/ksirc.png
+share/icons/crystalsvg/16x16/apps/ktalkd.png
 share/icons/crystalsvg/22x22/actions/khtml_kget.png
 share/icons/crystalsvg/22x22/apps/kopete.png
 share/icons/crystalsvg/32x32/apps/kdict.png
@@ -1341,6 +1350,7 @@ share/icons/crystalsvg/32x32/apps/kppp.png
 share/icons/crystalsvg/32x32/apps/krdc.png
 share/icons/crystalsvg/32x32/apps/krfb.png
 share/icons/crystalsvg/32x32/apps/ksirc.png
+share/icons/crystalsvg/32x32/apps/ktalkd.png
 share/icons/crystalsvg/48x48/apps/kdict.png
 share/icons/crystalsvg/48x48/apps/kget.png
 share/icons/crystalsvg/48x48/apps/knewsticker.png
@@ -1350,6 +1360,7 @@ share/icons/crystalsvg/48x48/apps/kppp.png
 share/icons/crystalsvg/48x48/apps/krdc.png
 share/icons/crystalsvg/48x48/apps/krfb.png
 share/icons/crystalsvg/48x48/apps/ksirc.png
+share/icons/crystalsvg/48x48/apps/ktalkd.png
 share/icons/crystalsvg/48x48/mimetypes/kget_list.png
 share/icons/crystalsvg/64x64/apps/kdict.png
 share/icons/crystalsvg/64x64/apps/kopete.png
@@ -1407,3 +1418,197 @@ share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg
 share/sounds/Kopete_User_is_Online.ogg
+share/sounds/ktalkd.wav
+@dirrm share/sounds
+@dirrm share/services/kconfiguredialog
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/22x22/apps
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/doc/HTML/en/lisa
+@dirrm share/doc/HTML/en/kwifimanager
+@dirrm share/doc/HTML/en/ktalkd
+@dirrm share/doc/HTML/en/ksirc
+@dirrm share/doc/HTML/en/krfb
+@dirrm share/doc/HTML/en/krdc
+@dirrm share/doc/HTML/en/kppp
+@dirrm share/doc/HTML/en/kpf
+@dirrm share/doc/HTML/en/kopete
+@dirrm share/doc/HTML/en/knewsticker
+@dirrm share/doc/HTML/en/kget
+@dirrm share/doc/HTML/en/kdict
+@dirrm share/doc/HTML/en/kcontrol/lanbrowser
+@dirrm share/doc/HTML/en/kcontrol/kcmtalkd
+@dirrm share/doc/HTML/en/kcontrol
+@dirrm share/apps/lisa
+@dirrm share/apps/ksirc/pics/emoticons
+@dirrm share/apps/ksirc/pics
+@dirrm share/apps/ksirc/icons/crystalsvg/64x64/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/64x64
+@dirrm share/apps/ksirc/icons/crystalsvg/48x48/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/48x48
+@dirrm share/apps/ksirc/icons/crystalsvg/32x32/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/32x32
+@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions
+@dirrm share/apps/ksirc/icons/crystalsvg/22x22
+@dirrm share/apps/ksirc/icons/crystalsvg/16x16/apps
+@dirrm share/apps/ksirc/icons/crystalsvg/16x16
+@dirrm share/apps/ksirc/icons/crystalsvg
+@dirrm share/apps/ksirc/icons
+@dirrm share/apps/ksirc
+@dirrm share/apps/krfb/pics
+@dirrm share/apps/krfb
+@dirrm share/apps/krdc/rdp-keymaps
+@dirrm share/apps/krdc/pics
+@dirrm share/apps/krdc
+@dirrm share/apps/kppp/pics
+@dirrm share/apps/kppp/Rules/Yugoslavia
+@dirrm share/apps/kppp/Rules/Uruguay
+@dirrm share/apps/kppp/Rules/United_Kingdom
+@dirrm share/apps/kppp/Rules/Ukraine
+@dirrm share/apps/kppp/Rules/Turkey
+@dirrm share/apps/kppp/Rules/Switzerland
+@dirrm share/apps/kppp/Rules/Sweden
+@dirrm share/apps/kppp/Rules/Spain
+@dirrm share/apps/kppp/Rules/South_Afrika
+@dirrm share/apps/kppp/Rules/South_Africa
+@dirrm share/apps/kppp/Rules/Slovenia
+@dirrm share/apps/kppp/Rules/Slovakia
+@dirrm share/apps/kppp/Rules/Singapore
+@dirrm share/apps/kppp/Rules/Russia
+@dirrm share/apps/kppp/Rules/Romania
+@dirrm share/apps/kppp/Rules/Portugal
+@dirrm share/apps/kppp/Rules/Poland
+@dirrm share/apps/kppp/Rules/Norway
+@dirrm share/apps/kppp/Rules/Netherlands
+@dirrm share/apps/kppp/Rules/Malaysia
+@dirrm share/apps/kppp/Rules/Macedonia
+@dirrm share/apps/kppp/Rules/Luxembourg
+@dirrm share/apps/kppp/Rules/Kazakhstan
+@dirrm share/apps/kppp/Rules/Japan
+@dirrm share/apps/kppp/Rules/Jamaica
+@dirrm share/apps/kppp/Rules/Italy
+@dirrm share/apps/kppp/Rules/Israel
+@dirrm share/apps/kppp/Rules/Ireland
+@dirrm share/apps/kppp/Rules/Indonesia
+@dirrm share/apps/kppp/Rules/India
+@dirrm share/apps/kppp/Rules/Iceland
+@dirrm share/apps/kppp/Rules/Hungary
+@dirrm share/apps/kppp/Rules/Hong_Kong
+@dirrm share/apps/kppp/Rules/Greece
+@dirrm share/apps/kppp/Rules/Germany
+@dirrm share/apps/kppp/Rules/France
+@dirrm share/apps/kppp/Rules/Finland
+@dirrm share/apps/kppp/Rules/Estonia
+@dirrm share/apps/kppp/Rules/Denmark
+@dirrm share/apps/kppp/Rules/Czechia
+@dirrm share/apps/kppp/Rules/Croatia
+@dirrm share/apps/kppp/Rules/Brasil
+@dirrm share/apps/kppp/Rules/Bosnia_and_Herzegovina
+@dirrm share/apps/kppp/Rules/Belgium
+@dirrm share/apps/kppp/Rules/Bangladesh
+@dirrm share/apps/kppp/Rules/Austria/Standard
+@dirrm share/apps/kppp/Rules/Austria/Minimum
+@dirrm share/apps/kppp/Rules/Austria/Business_2
+@dirrm share/apps/kppp/Rules/Austria/Business_1
+@dirrm share/apps/kppp/Rules/Austria
+@dirrm share/apps/kppp/Rules/Australia
+@dirrm share/apps/kppp/Rules/Argentina
+@dirrm share/apps/kppp/Rules
+@dirrm share/apps/kppp/Provider/Yugoslavia
+@dirrm share/apps/kppp/Provider/United_Kingdom
+@dirrm share/apps/kppp/Provider/Ukraine
+@dirrm share/apps/kppp/Provider/Taiwan
+@dirrm share/apps/kppp/Provider/Switzerland
+@dirrm share/apps/kppp/Provider/Sweden
+@dirrm share/apps/kppp/Provider/Slovenia
+@dirrm share/apps/kppp/Provider/Portugal
+@dirrm share/apps/kppp/Provider/Norway
+@dirrm share/apps/kppp/Provider/NewZealand
+@dirrm share/apps/kppp/Provider/Netherlands
+@dirrm share/apps/kppp/Provider/Irland
+@dirrm share/apps/kppp/Provider/Germany
+@dirrm share/apps/kppp/Provider/France
+@dirrm share/apps/kppp/Provider/Denmark
+@dirrm share/apps/kppp/Provider/Czech_Republic
+@dirrm share/apps/kppp/Provider/Belarus
+@dirrm share/apps/kppp/Provider/Austria
+@dirrm share/apps/kppp/Provider
+@dirrm share/apps/kppp
+@dirrm share/apps/kopeterichtexteditpart
+@dirrm share/apps/kopete_translator
+@dirrm share/apps/kopete_history
+@dirrm share/apps/kopete_cryptography
+@dirrm share/apps/kopete_contactnotes
+@dirrm share/apps/kopete/webpresence
+@dirrm share/apps/kopete/styles
+@dirrm share/apps/kopete/pics/emoticons/tweakers.net
+@dirrm share/apps/kopete/pics/emoticons/phpBB
+@dirrm share/apps/kopete/pics/emoticons/greggman.com
+@dirrm share/apps/kopete/pics/emoticons/ccmathteam.com
+@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-22
+@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-16
+@dirrm share/apps/kopete/pics/emoticons/RedOnes
+@dirrm share/apps/kopete/pics/emoticons/Plain
+@dirrm share/apps/kopete/pics/emoticons/KMess-Violet
+@dirrm share/apps/kopete/pics/emoticons/KMess-Cartoon
+@dirrm share/apps/kopete/pics/emoticons/KMess-Blue
+@dirrm share/apps/kopete/pics/emoticons/KMess
+@dirrm share/apps/kopete/pics/emoticons/Default
+@dirrm share/apps/kopete/pics/emoticons/Boxed
+@dirrm share/apps/kopete/pics/emoticons
+@dirrm share/apps/kopete/pics
+@dirrm share/apps/kopete/icons/crystalsvg/64x64/apps
+@dirrm share/apps/kopete/icons/crystalsvg/64x64
+@dirrm share/apps/kopete/icons/crystalsvg/48x48/apps
+@dirrm share/apps/kopete/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kopete/icons/crystalsvg/48x48
+@dirrm share/apps/kopete/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kopete/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kopete/icons/crystalsvg/32x32
+@dirrm share/apps/kopete/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kopete/icons/crystalsvg/22x22
+@dirrm share/apps/kopete/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kopete/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kopete/icons/crystalsvg/16x16
+@dirrm share/apps/kopete/icons/crystalsvg/128x128/apps
+@dirrm share/apps/kopete/icons/crystalsvg/128x128
+@dirrm share/apps/kopete/icons/crystalsvg
+@dirrm share/apps/kopete/icons
+@dirrm share/apps/kopete
+@dirrm share/apps/konqueror/dirtree/remote
+@dirrm share/apps/konqueror/dirtree
+@dirrm share/apps/konqueror
+@dirrm share/apps/knewsticker
+@dirrm share/apps/kinetd
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
+@dirrm share/apps/khtml/kpartplugins
+@dirrm share/apps/kget/sounds
+@dirrm share/apps/kget/pics
+@dirrm share/apps/kget/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kget/icons/crystalsvg/22x22
+@dirrm share/apps/kget/icons/crystalsvg
+@dirrm share/apps/kget/icons
+@dirrm share/apps/kget
+@dirrm share/apps/kdict/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdict/icons/crystalsvg/32x32
+@dirrm share/apps/kdict/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdict/icons/crystalsvg/22x22
+@dirrm share/apps/kdict/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdict/icons/crystalsvg/16x16
+@dirrm share/apps/kdict/icons/crystalsvg
+@dirrm share/apps/kdict/icons
+@dirrm share/apps/kdict
+@dirrm share/applnk/Internet
+@dirrm share/applnk/.hidden
+@dirrm share/applnk
+@dirrm lib/kconf_update_bin
+@dirrm include/rss