Update to KDE 3.5.1

Changes:
* man KIO slave
  o  fix processing of URLs in man documents
  o  allow comment lines after a .TP request
* Konqueror
  o 2 Tools menus when embedding KPDF in Konqueror
* KDesktop
  o Fix initializations for desktops >4 when using DCOP calls.
* Konsole
  o Update blue/red icons to be more distinguishable.
  o The history options (line #/enabled) are now used in the profiles.
* Kwin
  o Incorrectly restored window geometry upon leaving fullscreen mode
    under certain circumstances

5 files changed, 40 insertions, 24 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 44b4a92fa39..2db53424d3c 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2006/01/24 07:32:57 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2006/01/31 22:25:32 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 8dba166c288..75f4ae55440 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2005/12/11 11:01:48 markd Exp $
+@comment $NetBSD: PLIST,v 1.39 2006/01/31 22:25:32 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -237,7 +237,7 @@ lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_winbind.la
 lib/kde3/khelpcenter.la
 lib/kde3/khotkeys.la
-lib/kde3/khotkeys_shared_arts.la
+lib/kde3/khotkeys_arts.la
 lib/kde3/kicker.la
 lib/kde3/kickermenu_find.la
 lib/kde3/kickermenu_kdeprint.la
@@ -860,6 +860,7 @@ share/doc/kde/HTML/en/khelpcenter/userguide/kmouth2.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kmouth3.png
 share/doc/kde/HTML/en/khelpcenter/userguide/knode-identity.png
 share/doc/kde/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/kde/HTML/en/khelpcenter/userguide/knode-news-account.png
 share/doc/kde/HTML/en/khelpcenter/userguide/knode-start.png
 share/doc/kde/HTML/en/khelpcenter/userguide/konq-sidebar.png
 share/doc/kde/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2614,6 +2615,7 @@ share/kde/icons/crystalsvg/32x32/apps/pan.png
 share/kde/icons/crystalsvg/32x32/apps/penguin.png
 share/kde/icons/crystalsvg/32x32/apps/personal.png
 share/kde/icons/crystalsvg/32x32/apps/phppg.png
+share/kde/icons/crystalsvg/32x32/apps/pinguin.png
 share/kde/icons/crystalsvg/32x32/apps/plan.png
 share/kde/icons/crystalsvg/32x32/apps/planner.png
 share/kde/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index dd5b688eafa..08234cf61d4 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.79 2006/01/20 03:44:09 markd Exp $
+$NetBSD: distinfo,v 1.80 2006/01/31 22:25:32 markd Exp $
 
-SHA1 (kdebase-3.5.0.tar.bz2) = 8826fdd8884151cf224442da78d23d5685bd21e9
-RMD160 (kdebase-3.5.0.tar.bz2) = 5f8d5735a468f1c4e42cccfc0f006e63e3c3c762
-Size (kdebase-3.5.0.tar.bz2) = 23233185 bytes
+SHA1 (kdebase-3.5.1.tar.bz2) = 656fca622f1a663eab5f254dcceb8ded2d41ef48
+RMD160 (kdebase-3.5.1.tar.bz2) = 5308bfe188f49815e68392b2f3a48e7def34dee0
+Size (kdebase-3.5.1.tar.bz2) = 23587827 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
@@ -12,12 +12,13 @@ Size (Daemon.README) = 2191 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (patch-aa) = 4169721877093c7d658a707f92cb9ef2d399964d
+SHA1 (patch-aa) = 28647cdec95367504e582ceb871e67dd3c321e29
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
 SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490
 SHA1 (patch-af) = d149ff332c82b9ef2765de407fefe4daffdafe31
 SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
+SHA1 (patch-ah) = 3d4f42af56a5c345d5784458d70b8f73a1841664
 SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323
 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
 SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index 78c8204e5ec..dad83178039 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
+$NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $
 
---- configure.orig	2005-11-06 18:05:17.000000000 +0100
+--- configure.orig	2006-01-21 20:13:16.000000000 +1300
 +++ configure
-@@ -30769,7 +30769,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
+@@ -30884,7 +30884,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
  	# if you're trying to debug this check and think it's incorrect,
  	# better check your installation. The check _is_ correct - your
  	# installation is not.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
  		kde_cv_uic_plugins=yes
  	fi
  fi
-@@ -42502,6 +42502,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -42634,6 +42634,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -35,17 +35,16 @@ $NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -45346,6 +45363,9 @@ case "$host" in
-   *-*-freebsd*)
+@@ -45486,7 +45503,7 @@ fi
+ 
+ 
+ case "$host" in
+-  *-*-linux*|*-*-freebsd*|*-*-kfreebsd*-gnu)
++  *-*-linux*|*-*-freebsd*|*-*-netbsd*|*-*-kfreebsd*-gnu)
  	FOUND_USBVIEW=yes
  	;;
-+  *-*-netbsd*)
-+	FOUND_USBVIEW=yes
-+	;;
  esac
- 
- 
-@@ -46730,7 +46750,7 @@ acimake:
+@@ -46925,7 +46942,7 @@ acimake:
  
  EOF
      if $XMKMF >&5 2>&1 && test -f Makefile; then
@@ -54,7 +53,7 @@ $NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
  	kde_cv_defines_imake_version=$imkv
      else
          echo "$as_me:$LINENO: result: failed" >&5
-@@ -53339,6 +53359,7 @@ case "$host" in
+@@ -54341,6 +54358,7 @@ case "$host" in
    *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
    *-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
    *-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
@@ -62,7 +61,7 @@ $NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
    *) ksysguardd_compile=no; UNAME='' ;;
  esac
  
-@@ -53367,7 +53388,7 @@ fi
+@@ -54369,7 +54387,7 @@ fi
  
  
  
@@ -71,7 +70,7 @@ $NetBSD: patch-aa,v 1.15 2005/11/08 18:25:44 joerg Exp $
    include_ksysguardd_freebsd_TRUE=
    include_ksysguardd_freebsd_FALSE='#'
  else
-@@ -53523,6 +53544,7 @@ fi
+@@ -54704,6 +54722,7 @@ fi
  case "$UNAME" in
  	Linux) LIBHOSTS="$LIBSENSORS" ;;
  	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff --git a/x11/kdebase3/patches/patch-ah b/x11/kdebase3/patches/patch-ah
new file mode 100644
index 00000000000..3563531df2c
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.7 2006/01/31 22:25:34 markd Exp $
+
+--- ksmserver/legacy.cpp.orig	2006-01-20 06:01:08.000000000 +1300
++++ ksmserver/legacy.cpp
+@@ -34,6 +34,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
+ #include <config.h>
+ #endif
+ 
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++
+ #include "server.h"
+ 
+ #include <unistd.h>