Update to KDE 3.4.1

Changes:
* Quanta Plus
  o read/write the correct entry from description.rc in the editor
  o fill only the attributes with source="selection" with the
    selection in the tag editing dialog
  o fix matching of excluded files from a project
  o don't crash when Selected is pressed and nothing is selected (in
    the CSS editor)
  o try to fix the crash caused by incompatible changes between
    KDE 3.3.x and 3.4.x libcvsservice
  o show the correct relative paths in URL autocompletion
  o fix crash when unsetting breakpoints
  o nicer processing of CVS output
  o read the image sizes for remote images as well
  o insert an img tag for remote images as well when using Drag and
    Drop
  o better context sensitive documentation (needs updated documentation
    and DTEP packages)
* Kommander
  o fix detection of scripts that are run from a temporary directory

4 files changed, 9 insertions, 53 deletions

diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index cb4b341798e..706250b9287 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2005/05/04 13:49:50 markd Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/31 14:30:37 markd Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	www
 COMMENT= 	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/kdewebdev3/PLIST b/www/kdewebdev3/PLIST
index cfc2f5840dc..52f4324f6ed 100644
--- a/www/kdewebdev3/PLIST
+++ b/www/kdewebdev3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/23 21:53:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/05/31 14:30:37 markd Exp $
 bin/kfilereplace
 bin/kimagemapeditor
 bin/klinkstatus
@@ -233,6 +233,7 @@ share/kde/apps/kimagemapeditor/removepointcursor.png
 share/kde/apps/klinkstatus/klinkstatus_shell.rc
 share/kde/apps/klinkstatuspart/klinkstatus_part.rc
 share/kde/apps/klinkstatuspart/pics/304.png
+share/kde/apps/kmdr-editor/pics/kommandersplash.png
 share/kde/apps/kxsldbg/kxsldbg_shell.rc
 share/kde/apps/kxsldbgpart/kxsldbg_part.rc
 share/kde/apps/quanta/actions.rc
@@ -1697,6 +1698,8 @@ share/kde/servicetypes/quantadebugger.desktop
 @dirrm share/kde/apps/quanta
 @dirrm share/kde/apps/kxsldbgpart
 @dirrm share/kde/apps/kxsldbg
+@dirrm share/kde/apps/kmdr-editor/pics
+@dirrm share/kde/apps/kmdr-editor
 @dirrm share/kde/apps/klinkstatuspart/pics
 @dirrm share/kde/apps/klinkstatuspart
 @dirrm share/kde/apps/klinkstatus
diff --git a/www/kdewebdev3/distinfo b/www/kdewebdev3/distinfo
index 161f1045c44..9f49544b61b 100644
--- a/www/kdewebdev3/distinfo
+++ b/www/kdewebdev3/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/05/04 13:49:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2005/05/31 14:30:37 markd Exp $
 
-SHA1 (kdewebdev-3.4.0.tar.bz2) = 392b31a9ceefb07caa28d8929a3e602499f1c067
-RMD160 (kdewebdev-3.4.0.tar.bz2) = e6432ce054677a850618a1cac6c13bcf6af27f36
-Size (kdewebdev-3.4.0.tar.bz2) = 6243584 bytes
-SHA1 (patch-aa) = 603a35e148be3538fa74e78303dcbdcb74320157
+SHA1 (kdewebdev-3.4.1.tar.bz2) = c4dfe1c6c6f44e1fafe9836fdbe0dc682559589e
+RMD160 (kdewebdev-3.4.1.tar.bz2) = 7e2d7077f8bca7b9287ef9ac7b93cac202cf44e7
+Size (kdewebdev-3.4.1.tar.bz2) = 5966577 bytes
diff --git a/www/kdewebdev3/patches/patch-aa b/www/kdewebdev3/patches/patch-aa
deleted file mode 100644
index 9675cdfe223..00000000000
--- a/www/kdewebdev3/patches/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/05/04 13:49:50 markd Exp $
-
-Index: kommander/executor/instance.cpp
-===================================================================
-RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v
-retrieving revision 1.49
-retrieving revision 1.49.2.3
-diff -u -3 -d -p -r1.49 -r1.49.2.3
---- kommander/executor/instance.cpp	29 Dec 2004 09:58:46 -0000	1.49
-+++ kommander/executor/instance.cpp	17 Apr 2005 08:56:01 -0000	1.49.2.3
-@@ -131,6 +131,14 @@ bool Instance::build(QFile *a_file)
- 
- bool Instance::run(QFile *a_file)
- {
-+  // Check whether extension is *.kmdr
-+  if (!m_uiFileName.fileName().endsWith(".kmdr")) {
-+    KMessageBox::error(0, i18n("<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution "
-+           "Kommander will only run Kommander scripts with a clear identity.</qt>"),
-+           i18n("Wrong Extension"));
-+    return false;
-+  }
-+
-   /* add runtime arguments */
-   if (m_cmdArguments) {
-     QString args;
-@@ -144,8 +152,17 @@ bool Instance::run(QFile *a_file)
-   }
-   KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments));
-     
--  if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") ||
--      m_uiFileName.directory().startsWith("/tmp/"))
-+  QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp");
-+  tmpDirs += KGlobal::dirs()->resourceDirs("cache");
-+  tmpDirs.append("/tmp/");
-+  tmpDirs.append("/var/tmp/");
-+  
-+  bool inTemp = false;
-+  for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
-+  if (m_uiFileName.directory(false).startsWith(*I))
-+      inTemp = true;
-+        
-+  if (inTemp)
-   {
-      if (KMessageBox::warningYesNo(0, i18n("<qt>This dialog is running from your <i>/tmp</i> directory. "
-          " This may mean that it was run from a KMail attachment or from a webpage. "