4 files changed, 62 insertions, 9 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 433813f18c7f..184482f7e3ea 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -29,15 +29,19 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
+.if !defined(WITHOUT_KTALKD)
 UTMP?=	/var/run/utmp
 .if exists(${UTMP})
 PLIST_APPEND+=	plist.ktalkd
 .else
 DO_NOT_COMPILE+=	ktalkd
 pre-configure:
-	@${ECHO_MSG} "===> Shit! \"${UTMP}\" was not found."
+	@${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}"
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 1a4bc27d1ac3..2be617ca46c5 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdenetwork-3.1.tar.bz2) = f286a6708c80c439401817bf31f63fba
+MD5 (KDE/kdenetwork-3.1.1.tar.bz2) = d981fa1114d06256230bed4a4b948766
diff --git a/net/kdenetwork4/files/plist.base b/net/kdenetwork4/files/plist.base
index 836030175c63..329b493d8845 100644
--- a/net/kdenetwork4/files/plist.base
+++ b/net/kdenetwork4/files/plist.base
@@ -335,36 +335,68 @@ share/apps/kppp/Provider/Germany/MUC%046DE
 share/apps/kppp/Provider/Germany/Netsurf
 share/apps/kppp/Provider/Netherlands/.directory
 share/apps/kppp/Provider/Netherlands/12Move
+share/apps/kppp/Provider/Netherlands/Avades
 share/apps/kppp/Provider/Netherlands/Bart
-share/apps/kppp/Provider/Netherlands/Betuwenet
+share/apps/kppp/Provider/Netherlands/Betuwenet%032BFree
+share/apps/kppp/Provider/Netherlands/Betuwenet%032BQuality
 share/apps/kppp/Provider/Netherlands/Cistron
 share/apps/kppp/Provider/Netherlands/Concepts%032ICT
+share/apps/kppp/Provider/Netherlands/Cubic%032Circle
 share/apps/kppp/Provider/Netherlands/Cybercomm
+share/apps/kppp/Provider/Netherlands/Dataweb
 share/apps/kppp/Provider/Netherlands/Daxis%032Internet
+share/apps/kppp/Provider/Netherlands/Demon%032Internet
+share/apps/kppp/Provider/Netherlands/Energis-Ision
 share/apps/kppp/Provider/Netherlands/Euronet%032anytime
 share/apps/kppp/Provider/Netherlands/Euronet%032professional
+share/apps/kppp/Provider/Netherlands/FlakkeeNet
+share/apps/kppp/Provider/Netherlands/FreeAcces
 share/apps/kppp/Provider/Netherlands/Freeler%032basis
 share/apps/kppp/Provider/Netherlands/Freeler%032compleet
-share/apps/kppp/Provider/Netherlands/HetNet
+share/apps/kppp/Provider/Netherlands/Freeler%032voordelig
+share/apps/kppp/Provider/Netherlands/HCC%032NET
+share/apps/kppp/Provider/Netherlands/Hacom
+share/apps/kppp/Provider/Netherlands/HetNet%032Basis%032Surfen
+share/apps/kppp/Provider/Netherlands/HetNet%032Frequent%032Surfen
+share/apps/kppp/Provider/Netherlands/HetNet%032Regelmatig%032Surfen
 share/apps/kppp/Provider/Netherlands/IAE
+share/apps/kppp/Provider/Netherlands/ILimburg
 share/apps/kppp/Provider/Netherlands/InterNLnet
+share/apps/kppp/Provider/Netherlands/Interbox
 share/apps/kppp/Provider/Netherlands/Internet%032Acces%032Facilities
+share/apps/kppp/Provider/Netherlands/Internet%032Online
 share/apps/kppp/Provider/Netherlands/Interstroom
 share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032e.o.
 share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0323-cijferig%032kengetal
 share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0324-cijferig%032kengetal
+share/apps/kppp/Provider/Netherlands/Kabelfoon
+share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0323%032cijferig%032kengetal
+share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0324%032cijferig%032kengetal
 share/apps/kppp/Provider/Netherlands/Luna
-share/apps/kppp/Provider/Netherlands/Planet%032Internet
+share/apps/kppp/Provider/Netherlands/Macom
+share/apps/kppp/Provider/Netherlands/Nederland.net
+share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Premium
+share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Standaard
+share/apps/kppp/Provider/Netherlands/Plant%032Acces
+share/apps/kppp/Provider/Netherlands/Popin
+share/apps/kppp/Provider/Netherlands/PublishNet
 share/apps/kppp/Provider/Netherlands/Raketnet
 share/apps/kppp/Provider/Netherlands/Solcon
+share/apps/kppp/Provider/Netherlands/Support%032Net
+share/apps/kppp/Provider/Netherlands/Telebyte
+share/apps/kppp/Provider/Netherlands/Tiscali%032Compleet
+share/apps/kppp/Provider/Netherlands/Tiscali%032Gratis
 share/apps/kppp/Provider/Netherlands/UwNet
+share/apps/kppp/Provider/Netherlands/Via%032Networks
 share/apps/kppp/Provider/Netherlands/Wannadoo%032budget
 share/apps/kppp/Provider/Netherlands/Wannadoo%032budget%320plus
-share/apps/kppp/Provider/Netherlands/Wannadoo%032hometime
 share/apps/kppp/Provider/Netherlands/Wannadoo%032smartpack
 share/apps/kppp/Provider/Netherlands/Wirehub
-share/apps/kppp/Provider/Netherlands/Wish
-share/apps/kppp/Provider/Netherlands/Zonnet
+share/apps/kppp/Provider/Netherlands/XS4All
+share/apps/kppp/Provider/Netherlands/Zeelandnet
+share/apps/kppp/Provider/Netherlands/Zon%0322
+share/apps/kppp/Provider/Netherlands/Zon%032Gratis
+share/apps/kppp/Provider/Netherlands/Zon%032Inclusief
 share/apps/kppp/Provider/NewZealand/.directory
 share/apps/kppp/Provider/NewZealand/OrconInternet
 share/apps/kppp/Provider/NewZealand/Paradise
@@ -595,6 +627,7 @@ share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst
 share/apps/kppp/Rules/Macedonia/Macedonia_MTnet.rst
 share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
 share/apps/kppp/Rules/Malaysia/malaysia.rst
+share/apps/kppp/Rules/Netherlands/12Move.rst
 share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
 share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
 share/apps/kppp/Rules/Netherlands/BelBasis_Regio.rst
@@ -604,8 +637,25 @@ share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
 share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
 share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
 share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/Cistron
+share/apps/kppp/Rules/Netherlands/Freeler_Basis.rst
+share/apps/kppp/Rules/Netherlands/Freeler_Voordelig.rst
+share/apps/kppp/Rules/Netherlands/HetNet_Regelmatig_Surfen.rst
+share/apps/kppp/Rules/Netherlands/InterNLnet.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Regio.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Regio.rst
+share/apps/kppp/Rules/Netherlands/Planet_Internet.rst
 share/apps/kppp/Rules/Netherlands/Priority_Telecom_Nationaal.rst
 share/apps/kppp/Rules/Netherlands/Priority_Telecom_Regionaal.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Extra_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Extra_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Regio.rst
+share/apps/kppp/Rules/Netherlands/Wannadoo_Budget_Plus
 share/apps/kppp/Rules/Norway/Local_Area.rst
 share/apps/kppp/Rules/Norway/Long_Distance.rst
 share/apps/kppp/Rules/Norway/Netcom.rst
diff --git a/net/kdenetwork4/files/plist.base.rm b/net/kdenetwork4/files/plist.base.rm
index b44fd3035670..1acf462492b9 100644
--- a/net/kdenetwork4/files/plist.base.rm
+++ b/net/kdenetwork4/files/plist.base.rm
@@ -42,7 +42,6 @@
 @dirrm share/doc/HTML/en/kcontrol
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/config
 @dirrm share/apps/lisa
 @dirrm share/apps/ksirc/pics/emoticons