Update to KDE3.1.4.

Changes:
* kdialog: Fixed "--warningcontinuecancel".
* Konqueror: Don't crash when opening a directory in tab from the navigation
  panel
* KDM: Fix weak cookie generation / local root
* smb:// slave: improve error handling.
* khotkeys: allow usage of global config file for site-wide configuration.
* kwin: fix mouse grabbing problem with _NET_WM_MOVERESIZE.
* krdb: improve exported colorsheme for Adobe acroread.
* fonts kcontrol: improve configure check to handle newer fontconfig releases
  which use pkg-config.
* kwin: fix "left click into active window in background does not raise" bug
* KDM: implement parsing of display names that contain dashes.
* kicker: memory leak fixes.
* khotkeys: crash fix.
* konsole: ported grantpty to FreeBSD.
* ksmserver: support read-only home directory.
* Improve FreeBSD support in fish://.
* kdesktop: accept empty password if account has no password set.
* konqueror: ensure that we don't change the servicetype, in case the mimetype
  is ambiguous.
* konqueror: Fix handling of wildcard file selection / unselection.
* konqueror: fix crash when trying to drag the location label.
* konqueror's listview: selected items don't get unselected anymore during
  DnD operation
* thumbnail creator: fix filedescriptor leak.
* thumbnail creator: fix Postscript thumbnail rendering.

4 files changed, 17 insertions, 18 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 6df238b1f82..a3cbbe0d885 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2003/08/05 13:45:45 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2003/09/17 23:18:55 markd Exp $
 
-DISTNAME=	kdebase-3.1.3
-PKGREVISION=	1
+DISTNAME=	kdebase-3.1.4
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 0d8662cea96..fe8cb302c0f 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.36 2003/08/03 19:22:50 tron Exp $
+$NetBSD: distinfo,v 1.37 2003/09/17 23:18:56 markd Exp $
 
-SHA1 (kdebase-3.1.3.tar.bz2) = 4c7b39bb2ae0484e705bd1c2d43e3a2a47222ca3
-Size (kdebase-3.1.3.tar.bz2) = 15196014 bytes
+SHA1 (kdebase-3.1.4.tar.bz2) = 8f6e69ee4a34fdfb5b5d090ef9a4125d7936a7c4
+Size (kdebase-3.1.4.tar.bz2) = 15192052 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = c84de559cfdc320c96c5dd82b9abb139e509e1bd
+SHA1 (patch-aa) = 65d0a22cd49a961d738103eb2bd275c0d1a13d4f
 SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44
 SHA1 (patch-ac) = 08793eed3b396839abf2b8ff3d52caafa3a9c59d
 SHA1 (patch-ad) = 40be5fb84b1fe2a7a08e4c2119350246004e5b29
@@ -72,7 +72,7 @@ SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f
 SHA1 (patch-cs) = 40fd36127054b092bb9a18f1f989060e9a0df018
 SHA1 (patch-ct) = ee9cdc12d3e7c75ab0be238dbe53b785ad725e11
 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf
-SHA1 (patch-cx) = 8a2d029f56481c1b3d1626c82096fda36700cf00
+SHA1 (patch-cx) = 5e44d311404a839ab30c45d7a9ba764197a96b4b
 SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80
 SHA1 (patch-cz) = f74d50e90acab6a9da6e95266f78fd38657ce0a8
 SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index 948ab08ff8e..b540ef695ec 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.8 2003/07/30 13:34:59 markd Exp $
+$NetBSD: patch-aa,v 1.9 2003/09/17 23:18:57 markd Exp $
 
---- configure.orig	2003-07-15 22:03:59.000000000 +1200
+--- configure.orig	2003-09-11 03:00:30.000000000 +1200
 +++ configure
-@@ -31616,63 +31616,6 @@ _ACEOF
+@@ -31619,63 +31619,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
 -  cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
+-#line $LINENO "configure"
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.8 2003/07/30 13:34:59 markd Exp $
  echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
  echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
  
-@@ -33793,6 +33736,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -33816,6 +33759,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -90,7 +90,7 @@ $NetBSD: patch-aa,v 1.8 2003/07/30 13:34:59 markd Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -38659,6 +38619,7 @@ fi
+@@ -38765,6 +38725,7 @@ fi
  case "$UNAME" in
  	Linux) LIBHOSTS="$LIBSENSORS" ;;
  	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff --git a/x11/kdebase3/patches/patch-cx b/x11/kdebase3/patches/patch-cx
index d964a9c4687..78f547b9c11 100644
--- a/x11/kdebase3/patches/patch-cx
+++ b/x11/kdebase3/patches/patch-cx
@@ -1,9 +1,9 @@
-$NetBSD: patch-cx,v 1.3 2002/08/25 19:23:43 jlam Exp $
+$NetBSD: patch-cx,v 1.4 2003/09/17 23:18:58 markd Exp $
 
---- konsole/konsole/main.cpp.orig	Mon Jun 24 12:57:09 2002
+--- konsole/konsole/main.cpp.orig	2003-09-01 23:32:01.000000000 +1200
 +++ konsole/konsole/main.cpp
-@@ -112,7 +112,9 @@
- 
+@@ -126,7 +126,9 @@ public:
+ extern void TEPtyInit();
  
  /* --| main |------------------------------------------------------ */
 -int main(int argc, char* argv[])