Update to KDE 3.5.2

* Klipper
  o Handle URLs as URLs and not as Text
  o Prevent crashes caused by corrupted history
  o XFixes support (especially helps with broken clipboard
    implementations of some non-KDE applications)
  o Images are ignored by default, add 'IgnoreImages=false' to
    '[General]' in klipperrc
  o Avoid repeated action popup with the same URL with some
    non-KDE applications with broken clipboard implementations
* Konsole
  o Correct issue where history size is unlimited when dealing
    with History options in profiles
  o Correctly set Tab bar when set to Dynamic Hide after session
    restore
* Country settings
  o Fix short date format for Switzerland
  o Fix address format (especially P.O. Box) for Switzerland
* KSysGuard
  o Show the sensors with values of more than two digits correctly
    in the applet
* Kicker
  o Connect the applications to systray correctly on startup
  o Panels properly reserve space at screen edges even for
    differently sized Xinerama screens
* Konqueror
  o Resolve symlinks only on the desktop
* KWin
  o Added new window-specific rules for OpenOffice.org, XV and
    Mozilla family applications for turning off focus stealing
    prevention, as these applications don't work well with it
  o Reverted a workaround that as a side-effect had broken systray
    docking of some applications
  o Each virtual desktop has a separate focus chain
* KDesktop
  o Fixed stacking of some dialogs

5 files changed, 35 insertions, 46 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 61ec82db9da..0d36e24f9e7 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.107 2006/02/24 21:54:23 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2006/03/30 02:39:39 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -9,9 +8,9 @@ COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 DISTFILES+=	NetBSD-flag-1.0.png
-SITES_Daemon.png=	${MASTER_SITE_LOCAL}
-SITES_Daemon.README=	${MASTER_SITE_LOCAL}
-SITES_NetBSD-flag-1.0.png=	${MASTER_SITE_LOCAL}
+SITES.Daemon.png=	${MASTER_SITE_LOCAL}
+SITES.Daemon.README=	${MASTER_SITE_LOCAL}
+SITES.NetBSD-flag-1.0.png=	${MASTER_SITE_LOCAL}
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -35,8 +34,7 @@ CONFIGURE_ARGS+=	--without-lame
 CONFIGURE_ARGS+=	--without-vorbis
 CONFIGURE_ARGS+=	--without-java
 
-REPLACE_PERL=		kcontrol/fileshare/fileshareset \
-			kcontrol/keys/convertShortcuts.pl \
+REPLACE_PERL+=		kcontrol/keys/convertShortcuts.pl \
 			khelpcenter/searchhandlers/khc_docbookdig.pl.in \
 			khelpcenter/searchhandlers/khc_htdig.pl.in \
 			khelpcenter/searchhandlers/khc_htsearch.pl \
@@ -100,7 +98,7 @@ DEPENDS+=		htdig>=3.2.0:../../www/htdig-devel
 
 .if !empty(PKG_OPTIONS:Msamba)
 .include "../../net/samba/buildlink3.mk"
-LIBS+=			-L${BUILDLINK_PREFIX.samba}/lib/samba -Wl,-R${BUILDLINK_PREFIX.samba}/lib/samba
+LIBS+=			-L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba
 PLIST_SUBST+=		HAVE_SMB=""
 .else
 PLIST_SUBST+=		HAVE_SMB="@comment "
@@ -137,9 +135,9 @@ SUBST_STAGE.varlock=	post-patch
 SUBST_MESSAGE.varlock=	Fix lock directory path.
 SUBST_FILES.varlock=	kcheckpass/kcheckpass.c
 .if ${OPSYS} == "SunOS"
-SUBST_SED.varlock=	s:/var/lock:/var/spool/locks:
+SUBST_SED.varlock=	-e s:/var/lock:/var/spool/locks:
 .else
-SUBST_SED.varlock=	s:/var/lock:/var/spool/lock:
+SUBST_SED.varlock=	-e s:/var/lock:/var/spool/lock:
 .endif
 .endif
 
@@ -147,7 +145,7 @@ SUBST_CLASSES+=		htdig paths
 SUBST_STAGE.htdig=	post-patch
 SUBST_MESSAGE.htdig=	Fix htdig paths.
 SUBST_FILES.htdig=	khelpcenter/searchhandlers/khc_htsearch.pl
-SUBST_SED.htdig=	s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
+SUBST_SED.htdig=	-e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
 
 SUBST_FILES.paths=	kcontrol/kdm/main.cpp kioslave/info/kde-info2html.conf
 SUBST_SED.paths=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 866ca5e9f77..e5166acd498 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2006/02/24 21:54:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.41 2006/03/30 02:39:39 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -144,6 +144,7 @@ include/kwin/workspace.h
 include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
 lib/kconf_update_bin/kicker-3.4-reverseLayout
+lib/kconf_update_bin/kwin_update_default_rules
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/clock_panelapplet.la
@@ -1110,6 +1111,9 @@ share/doc/kde/HTML/en/kwrite/index.docbook
 share/doc/kde/HTML/en/kxkb/common
 share/doc/kde/HTML/en/kxkb/index.cache.bz2
 share/doc/kde/HTML/en/kxkb/index.docbook
+share/doc/kde/HTML/en/kxkb/layout.png
+share/doc/kde/HTML/en/kxkb/switching.png
+share/doc/kde/HTML/en/kxkb/xkb.png
 share/examples/kdebase3/applications-merged/kde-essential.menu
 share/examples/kdebase3/kde-information.menu
 share/examples/kdebase3/kde-screensavers.menu
@@ -1449,6 +1453,7 @@ share/kde/apps/kconf_update/kwin_focus1.sh
 share/kde/apps/kconf_update/kwin_focus1.upd
 share/kde/apps/kconf_update/kwin_focus2.sh
 share/kde/apps/kconf_update/kwin_focus2.upd
+share/kde/apps/kconf_update/kwin_fsp_workarounds_1.upd
 share/kde/apps/kconf_update/kwiniconify.upd
 share/kde/apps/kconf_update/kwinsticky.upd
 share/kde/apps/kconf_update/kwinupdatewindowsettings.upd
@@ -2147,6 +2152,7 @@ share/kde/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
 share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
 share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/kde/apps/kwin/b2.desktop
+share/kde/apps/kwin/default_rules/fsp_workarounds_1
 share/kde/apps/kwin/eventsrc
 share/kde/apps/kwin/keramik.desktop
 share/kde/apps/kwin/laptop.desktop
@@ -4248,6 +4254,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm share/kde/apps/naughtyapplet
 @dirrm share/kde/apps/kwrite
 @dirrm share/kde/apps/kwin/pics
+@dirrm share/kde/apps/kwin/default_rules
 @comment in kde: @dirrm share/kde/apps/kwin
 @dirrm share/kde/apps/kthememanager/themes/YellowOnBlue-big
 @dirrm share/kde/apps/kthememanager/themes/YellowOnBlue
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index abf2d9dd2a9..dc0a8b2fd33 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.81 2006/02/01 12:36:25 markd Exp $
+$NetBSD: distinfo,v 1.82 2006/03/30 02:39:39 markd Exp $
 
-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 (kdebase-3.5.2.tar.bz2) = 16cddd8766c3bd8821044fe9cce66f5291c8412b
+RMD160 (kdebase-3.5.2.tar.bz2) = 216ff59c49bb4fee2aa3b7d976ec40a8cccff107
+Size (kdebase-3.5.2.tar.bz2) = 23590820 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
@@ -18,7 +18,6 @@ SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
 SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490
 SHA1 (patch-af) = 5438b3738420d154715bf0d0f75b23767aa944d6
 SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
-SHA1 (patch-ah) = 3d4f42af56a5c345d5784458d70b8f73a1841664
 SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323
 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
 SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e
@@ -28,7 +27,7 @@ SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
 SHA1 (patch-bc) = fd7e784b584763b7351dbdaefda58443bd1aaadb
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
 SHA1 (patch-ca) = 0cdd9ee4766fef59a3c1c04a4ff820aee5043e2c
-SHA1 (patch-cb) = fff02fcd41b27bc2a35ee0658153cb8c81617bd0
+SHA1 (patch-cb) = d13c59029ef13c89d565431244128044735ddaef
 SHA1 (patch-cc) = ed95490558d4de4a04aa0f45634e44ed0b78fdd8
 SHA1 (patch-da) = 06da421a8adcb54712e7c04125cffa9bef9003fb
 SHA1 (patch-db) = f67ffaf0676484db40759574cc2822ad0d6933bd
diff --git a/x11/kdebase3/patches/patch-ah b/x11/kdebase3/patches/patch-ah
deleted file mode 100644
index 3563531df2c..00000000000
--- a/x11/kdebase3/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$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>
diff --git a/x11/kdebase3/patches/patch-cb b/x11/kdebase3/patches/patch-cb
index a2858639031..05159172d3f 100644
--- a/x11/kdebase3/patches/patch-cb
+++ b/x11/kdebase3/patches/patch-cb
@@ -1,6 +1,6 @@
-$NetBSD: patch-cb,v 1.4 2005/12/17 19:36:27 markd Exp $
+$NetBSD: patch-cb,v 1.5 2006/03/30 02:39:39 markd Exp $
 
---- khelpcenter/searchhandlers/khc_docbookdig.pl.in.orig	2005-10-11 04:03:56.000000000 +1300
+--- khelpcenter/searchhandlers/khc_docbookdig.pl.in.orig	2006-03-17 23:17:24.000000000 +1300
 +++ khelpcenter/searchhandlers/khc_docbookdig.pl.in
 @@ -26,8 +26,8 @@ use strict;
  
@@ -13,16 +13,16 @@ $NetBSD: patch-cb,v 1.4 2005/12/17 19:36:27 markd Exp $
  my $kdeprefix = "@prefix@";
  chomp $kdeprefix;
  
-@@ -85,7 +85,7 @@ if ( !open( START, ">$startfile" ) ) {
-   exit 1;
- }
+@@ -89,7 +89,7 @@ $ENV{ PATH } = '/bin:/usr/bin';
+ $ENV{ CDPATH } = '';
+ $ENV{ ENV } = '';
  
--my $findcmd = "find $kdeprefix/share/doc/HTML/$lang/ -name index.docbook";
-+my $findcmd = "find $kdeprefix/share/doc/kde/HTML/$lang/ -name index.docbook";
+-my $findpath = "$kdeprefix/share/doc/HTML/$lang/";
++my $findpath = "$kdeprefix/share/doc/kde/HTML/$lang/";
+ my $findcmd = "find $findpath -name index.docbook";
  
  print STDERR "FINDCMD: $findcmd\n";
- 
-@@ -121,21 +121,24 @@ if ( !open( PARSER, ">$parserfile" ) ) {
+@@ -126,21 +126,24 @@ if ( !open( PARSER, ">$parserfile" ) ) {
  print PARSER << "EOT";
  #! /bin/sh
  
@@ -35,15 +35,15 @@ $NetBSD: patch-cb,v 1.4 2005/12/17 19:36:27 markd Exp $
  shift
  
  if test "\$#" -gt 0; then
--  orig=\${1/file:\/\//}
+-  orig=\${1/file:\\//}
 +  orig=`echo \$1 | sed -e 's=file:=/='`
    shift
  fi
  
  case "\$orig" in
    help:/*)
--	orig=\${orig/help:\//}
--	orig=\${orig/\/index.docbook//}
+-	orig=\${orig/help:\\//}
+-	orig=\${orig/\/index.docbook/}
 -	cd $kdeprefix/share/doc/HTML/en/\$orig
 +	orig=\${orig#help:}
 +	orig=\${orig\%/index.docbook}
@@ -51,7 +51,7 @@ $NetBSD: patch-cb,v 1.4 2005/12/17 19:36:27 markd Exp $
  	file=index.docbook
  	;;
    *)	
-@@ -162,14 +165,14 @@ common_dir:		$commondir
+@@ -167,14 +170,14 @@ common_dir:		$commondir
  locale:                 $locale
  database_dir:           $htdigdb
  database_base:		\${database_dir}/$identifier