Fix some URI handler issues.

Bump PKGREVISION.

4 files changed, 54 insertions, 3 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index c8ca5b8b90c..676e5505783 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2004/05/11 12:17:21 markd Exp $
+# $NetBSD: Makefile,v 1.60 2004/05/17 00:03:39 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index aca136e7cdf..bb7caa73c80 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2004/04/26 11:24:15 markd Exp $
+$NetBSD: distinfo,v 1.37 2004/05/17 00:03:40 markd Exp $
 
 SHA1 (kdelibs-3.2.2.tar.bz2) = 74899bccba17b1d6475cc1b154a03d462ef02e1f
 Size (kdelibs-3.2.2.tar.bz2) = 12716460 bytes
@@ -8,6 +8,8 @@ SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d
 SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
+SHA1 (patch-ah) = d267babaefa3492ff8959d0018c2e0168a873226
+SHA1 (patch-ai) = 06e04841d3198537482a268cb87c613e18cf0f8f
 SHA1 (patch-an) = 41d2721bd55d060cde630771dad0377dbe770d73
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = f233a73d0a8148e1ae7f4e777c3f5d50b56d768f
diff --git a/x11/kdelibs3/patches/patch-ah b/x11/kdelibs3/patches/patch-ah
new file mode 100644
index 00000000000..916767b392e
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.4 2004/05/17 00:03:39 markd Exp $
+
+Index: kapplication.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kdecore/kapplication.cpp,v
+retrieving revision 1.637.2.8
+diff -u -p -r1.637.2.8 kapplication.cpp
+--- kdecore/kapplication.cpp	8 Apr 2004 09:56:28 -0000	1.637.2.8
++++ kdecore/kapplication.cpp	14 May 2004 12:24:53 -0000
+@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS
+ 
+    if (command.isEmpty() || command == QString::fromLatin1("kmail")
+        || command.endsWith("/kmail"))
+-     command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
++     command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
+ 
+    // TODO: Take care of the preferred terminal app (instead of hardcoding
+    // Konsole), this will probably require a rewrite of the configurable
diff --git a/x11/kdelibs3/patches/patch-ai b/x11/kdelibs3/patches/patch-ai
new file mode 100644
index 00000000000..c8c575e4519
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ai
@@ -0,0 +1,31 @@
+$NetBSD: patch-ai,v 1.4 2004/05/17 00:03:39 markd Exp $
+
+Index: ktelnetservice.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kio/misc/ktelnetservice.cpp,v
+retrieving revision 1.7.2.1
+diff -u -p -r1.7.2.1 ktelnetservice.cpp
+--- kio/misc/ktelnetservice.cpp	18 Feb 2004 11:42:12 -0000	1.7.2.1
++++ kio/misc/ktelnetservice.cpp	13 May 2004 15:12:14 -0000
+@@ -77,10 +77,19 @@ int main(int argc, char **argv)
+ 		cmd << url.user();
+ 	}
+ 
++        QString host;
+         if (!url.host().isEmpty())
+-           cmd << url.host(); // telnet://host
++           host = url.host(); // telnet://host
+         else if (!url.path().isEmpty())
+-           cmd << url.path(); // telnet:host
++           host = url.path(); // telnet:host
++
++        if (host.isEmpty() || host.startsWith("-"))
++        {
++            kdError() << "Invalid hostname " << host << endl;
++            return 2;
++        }
++
++        cmd << host;
+         
+ 	if (url.port()){
+             if ( url.protocol() == "ssh" )