From 720a5b76abd98ee2d262b15157f128d2f718a216 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 18 Sep 2004 09:46:36 +0000
Subject: [PATCH] removed patches, better synched global patches.

---
 x11/kde/base3/patches/patch-configure_in      |  17 --
 .../patch-kcontrol_passwords_passwords_cpp    |  59 ----
 .../patch-kcontrol_passwords_passwords_h      |  22 --
 x11/kde/base3/patches/patch-kdesktop_kdeeject |  13 -
 .../patch-konqueror_konq_mainwindow_cc        | 114 --------
 .../patches/patch-konqueror_konq_mainwindow_h |  16 --
 .../patches/patch-kdec_clib_Makefile_am       |  11 -
 .../patches/patch-kdec_clib_Makefile_in       |  12 -
 .../patches/patch-kjsembed_Makefile_am        |  12 -
 .../patches/patch-qtc_clib_Makefile_am        |  12 -
 .../patches/patch-qtc_clib_Makefile_in        |  21 --
 .../patches/patch-qtc_clib_qtc_Makefile_am    |  19 --
 .../patches/patch-qtc_clib_qtc_Makefile_in    |  12 -
 .../patches/patch-kbruch_src_mainqtwidget_cpp |  12 -
 x11/kde/kdoc3/pkg/PLIST                       |  12 +-
 .../libs3/patches/patch-dcop_dcopserver_cpp   | 182 ------------
 .../patches/patch-kdecore_kstandarddirs_cpp   |  33 ---
 .../libs3/patches/patch-khtml_khtml_ext_cpp   |  23 --
 x11/kde/libs3/patches/patch-khtml_khtml_ext_h |  13 -
 .../libs3/patches/patch-khtml_khtml_part_cpp  | 266 ------------------
 .../libs3/patches/patch-khtml_khtml_part_h    |  46 ---
 ...ch-kioslave_http_kcookiejar_kcookiejar_cpp |  65 -----
 ...atch-kioslave_http_kcookiejar_kcookiejar_h |  30 --
 ...tp_kcookiejar_kcookiejar_kcookieserver_cpp |  30 --
 .../patches/patch-kparts_browserextension_cpp |  21 --
 .../patches/patch-kparts_browserextension_h   |  41 ---
 .../patch-kioslave_audiocd_audiocd_cpp        |  11 -
 .../patches/patch-kmix_kmix-platforms_cpp     |  12 -
 ...protocols_gadu_libgadu_libgadu-config_h_in |  16 --
 x11/kde/okle/pkg/PLIST                        |  25 +-
 x11/kde/patches-3.2.3/patch-acinclude_m4      |  14 +-
 x11/kde/patches-3.2.3/patch-admin_cvs_sh      |   8 +-
 .../patches-3.2.3/patch-admin_libtool_m4_in   |  12 +-
 33 files changed, 32 insertions(+), 1180 deletions(-)
 delete mode 100644 x11/kde/base3/patches/patch-configure_in
 delete mode 100644 x11/kde/base3/patches/patch-kcontrol_passwords_passwords_cpp
 delete mode 100644 x11/kde/base3/patches/patch-kcontrol_passwords_passwords_h
 delete mode 100644 x11/kde/base3/patches/patch-kdesktop_kdeeject
 delete mode 100644 x11/kde/base3/patches/patch-konqueror_konq_mainwindow_cc
 delete mode 100644 x11/kde/base3/patches/patch-konqueror_konq_mainwindow_h
 delete mode 100644 x11/kde/bindings3/patches/patch-kdec_clib_Makefile_am
 delete mode 100644 x11/kde/bindings3/patches/patch-kdec_clib_Makefile_in
 delete mode 100644 x11/kde/bindings3/patches/patch-kjsembed_Makefile_am
 delete mode 100644 x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am
 delete mode 100644 x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in
 delete mode 100644 x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am
 delete mode 100644 x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in
 delete mode 100644 x11/kde/edu3/patches/patch-kbruch_src_mainqtwidget_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-dcop_dcopserver_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-kdecore_kstandarddirs_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-khtml_khtml_ext_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-khtml_khtml_ext_h
 delete mode 100644 x11/kde/libs3/patches/patch-khtml_khtml_part_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-khtml_khtml_part_h
 delete mode 100644 x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_h
 delete mode 100644 x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_kcookieserver_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-kparts_browserextension_cpp
 delete mode 100644 x11/kde/libs3/patches/patch-kparts_browserextension_h
 delete mode 100644 x11/kde/multimedia3/patches/patch-kioslave_audiocd_audiocd_cpp
 delete mode 100644 x11/kde/multimedia3/patches/patch-kmix_kmix-platforms_cpp
 delete mode 100644 x11/kde/network3/patches/patch-kopete_protocols_gadu_libgadu_libgadu-config_h_in

diff --git a/x11/kde/base3/patches/patch-configure_in b/x11/kde/base3/patches/patch-configure_in
deleted file mode 100644
index 4a62e3359cb..00000000000
--- a/x11/kde/base3/patches/patch-configure_in
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.11 2004/02/07 01:46:23 espie Exp $
---- configure.in.orig	2004-01-25 20:20:55.000000000 +0100
-+++ configure.in	2004-02-06 15:10:51.000000000 +0100
-@@ -782,10 +782,10 @@ AC_ARG_WITH(xdmcp,
- if test "x$with_xdmcp" = xyes; then
-   AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
-   if test -n "$LIBXDMCP"; then
--    ac_cpp_safe=$ac_cpp
--    ac_cpp='$CXXCPP $CPPFLAGS $X_INCLUDES'
-+    CPPFLAGS_safe=$CPPFLAGS
-+    CPPFLAGS="$CPPFLAGS $X_INCLUDES"
-     AC_CHECK_HEADER(X11/Xdmcp.h, [HAVE_X11_XDMCP_H=1], , [#include <X11/Xmd.h>])
--    ac_cpp=$ac_cpp_safe
-+    CPPFLAGS=$CPPFLAGS_safe
-   fi
-   if test -z "$HAVE_X11_XDMCP_H"; then
-     AC_MSG_WARN([Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h 
diff --git a/x11/kde/base3/patches/patch-kcontrol_passwords_passwords_cpp b/x11/kde/base3/patches/patch-kcontrol_passwords_passwords_cpp
deleted file mode 100644
index 75b15e906d7..00000000000
--- a/x11/kde/base3/patches/patch-kcontrol_passwords_passwords_cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-$OpenBSD: patch-kcontrol_passwords_passwords_cpp,v 1.3 2004/02/01 14:59:22 espie Exp $
---- kcontrol/passwords/passwords.cpp.orig	2003-11-30 10:42:31.000000000 +0100
-+++ kcontrol/passwords/passwords.cpp	2004-01-21 01:20:49.000000000 +0100
-@@ -50,6 +50,11 @@ KPasswordConfig::KPasswordConfig(QWidget
-     new QRadioButton(i18n("&3 stars"), m_EMGroup);
-     new QRadioButton(i18n("&No echo"), m_EMGroup);
-     connect(m_EMGroup, SIGNAL(clicked(int)), SLOT(slotEchoMode(int)));
-+    m_SudoBut = new QCheckBox(i18n("&Use sudo"), this);
-+    QWhatsThis::add( m_SudoBut, i18n("You can choose to use <em>sudo</em> instead of <em>su</em><p>"
-+    "See <em>sudo</em>'s documentation for details") );
-+    connect(m_SudoBut, SIGNAL(toggled(bool)), SLOT(slotSudo(bool)));
-+    top->addWidget(m_SudoBut);
- 
-     // Keep password
- 
-@@ -107,6 +112,7 @@ void KPasswordConfig::load()
- 
-     m_bKeep = m_pConfig->readBoolEntry("Keep", defKeep);
-     m_Timeout = m_pConfig->readNumEntry("Timeout", defTimeout);
-+    m_bSudo = m_pConfig->readBoolEntry("Sudo", defSudo);
-     slotKeep(m_bKeep);
- 
-     apply();
-@@ -130,6 +136,7 @@ void KPasswordConfig::save()
-     m_pConfig->writeEntry("Keep", m_bKeep, true, true);
-     m_Timeout = m_TimeoutEdit->value()*60;
-     m_pConfig->writeEntry("Timeout", m_Timeout, true, true);
-+    m_pConfig->writeEntry("Sudo", m_bSudo, true, true);
- 
-     m_pConfig->sync();
- 
-@@ -148,6 +155,7 @@ void KPasswordConfig::defaults()
-     m_Echo = defEchoMode;
-     m_bKeep = defKeep;
-     m_Timeout = defTimeout;
-+    m_bSudo = defSudo;
- 
-     apply();
-     emit changed(true);
-@@ -158,6 +166,7 @@ void KPasswordConfig::apply()
- {
-     m_EMGroup->setButton(m_Echo);
-     m_KeepBut->setChecked(m_bKeep);
-+    m_SudoBut->setChecked(m_bSudo);
- 
-     m_TimeoutEdit->setValue(m_Timeout/60);
-     m_TimeoutEdit->setEnabled(m_bKeep);
-@@ -178,6 +187,11 @@ void KPasswordConfig::slotKeep(bool keep
-     emit changed(true);
- }
- 
-+void KPasswordConfig::slotSudo(bool sudo)
-+{
-+    m_bSudo = sudo;
-+    emit changed(true);
-+}
- 
- int KPasswordConfig::buttons()
- {
diff --git a/x11/kde/base3/patches/patch-kcontrol_passwords_passwords_h b/x11/kde/base3/patches/patch-kcontrol_passwords_passwords_h
deleted file mode 100644
index 23e202959ed..00000000000
--- a/x11/kde/base3/patches/patch-kcontrol_passwords_passwords_h
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-kcontrol_passwords_passwords_h,v 1.2 2003/01/27 19:22:50 espie Exp $
---- kcontrol/passwords/passwords.h.orig	Mon Nov  4 16:44:18 2002
-+++ kcontrol/passwords/passwords.h	Sat Jan 11 05:41:35 2003
-@@ -40,15 +40,17 @@ private slots:
- 
-     void slotEchoMode(int);
-     void slotKeep(bool);
-+    void slotSudo(bool);
-     void configChanged(){emit changed(true);}
- private:
-     QButtonGroup *m_EMGroup;
-     QCheckBox *m_KeepBut;
-+    QCheckBox *m_SudoBut;
-     KIntNumInput *m_TimeoutEdit;
-     KConfig *m_pConfig;
- 
-     int m_Echo, m_Timeout;
--    bool m_bKeep;
-+    bool m_bKeep, m_bSudo;
- };
- 
- #endif
diff --git a/x11/kde/base3/patches/patch-kdesktop_kdeeject b/x11/kde/base3/patches/patch-kdesktop_kdeeject
deleted file mode 100644
index 4241541a978..00000000000
--- a/x11/kde/base3/patches/patch-kdesktop_kdeeject
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-kdesktop_kdeeject,v 1.1 2004/02/03 02:22:28 espie Exp $
---- kdesktop/kdeeject.orig	2004-02-03 03:11:46.000000000 +0100
-+++ kdesktop/kdeeject	2004-02-03 03:17:21.000000000 +0100
-@@ -9,6 +9,9 @@ if [ $# = 1 -a "$1" != "--help" ]; then
-   # I guess this is the reason for making this a kde app...
-   OS=`uname -s`
-   case "$OS" in
-+    OpenBSD)
-+      cdio -f $1 eject >/dev/null 2>&1
-+      ;;
-     *BSD)
-       dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
-       cdcontrol -f $dev eject >/dev/null 2>&1
diff --git a/x11/kde/base3/patches/patch-konqueror_konq_mainwindow_cc b/x11/kde/base3/patches/patch-konqueror_konq_mainwindow_cc
deleted file mode 100644
index 7ef6c4a750f..00000000000
--- a/x11/kde/base3/patches/patch-konqueror_konq_mainwindow_cc
+++ /dev/null
@@ -1,114 +0,0 @@
-$OpenBSD: patch-konqueror_konq_mainwindow_cc,v 1.1 2004/08/14 18:03:48 brad Exp $
---- konqueror/konq_mainwindow.cc.orig	Sun May 30 07:41:54 2004
-+++ konqueror/konq_mainwindow.cc	Fri Aug 13 17:08:05 2004
-@@ -856,6 +856,7 @@ void KonqMainWindow::slotOpenURLRequest(
- {
-   kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
- 
-+  KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
-   QString frameName = args.frameName;
- 
-   if ( !frameName.isEmpty() )
-@@ -876,11 +877,11 @@ void KonqMainWindow::slotOpenURLRequest(
-          frameName.lower() != _parent )
-     {
-       KParts::BrowserHostExtension *hostExtension = 0;
--      KonqView *view = childView( frameName, &hostExtension, 0 );
-+      KonqView *view = childView( callingPart, frameName, &hostExtension, 0 );
-       if ( !view )
-       {
-         KonqMainWindow *mainWindow = 0;
--        view = findChildView( frameName, &mainWindow, &hostExtension, 0 );
-+        view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 );
- 
-         if ( !view || !mainWindow )
-         {
-@@ -903,8 +904,7 @@ void KonqMainWindow::slotOpenURLRequest(
-     }
-   }
- 
--  KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
--  KonqView *view = childView( part );
-+  KonqView *view = childView( callingPart );
-   openURL( view, url, args );
- }
- 
-@@ -1039,7 +1039,7 @@ void KonqMainWindow::slotCreateNewWindow
-     if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" )
-     {
-         KParts::BrowserHostExtension *hostExtension = 0;
--        if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) )
-+        if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) )
-         {
-             // Found a view. If url isn't empty, we should open it - but this never happens currently
-             // findChildView put the resulting part in 'part', so we can just return now
-@@ -2091,9 +2091,9 @@ KonqView * KonqMainWindow::childView( KP
-     return 0L;
- }
- 
--KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
-+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
- {
--  //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
-+  kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
- 
-   MapViews::ConstIterator it = m_mapViews.begin();
-   MapViews::ConstIterator end = m_mapViews.end();
-@@ -2101,11 +2101,11 @@ KonqView * KonqMainWindow::childView( co
-   {
-     KonqView* view = it.data();
-     QString viewName = view->viewName();
--    //kdDebug() << "       - viewName=" << viewName << "   "
--    //          << "frame names:" << view->frameNames().join( "," ) << endl;
-+    kdDebug() << "       - viewName=" << viewName << "   "
-+              << "frame names:" << view->frameNames().join( "," ) << endl;
-     if ( !viewName.isEmpty() && viewName == name )
-     {
--      //kdDebug() << "found existing view by name: " << view << endl;
-+      kdDebug() << "found existing view by name: " << view << endl;
-       if ( hostExtension )
-         *hostExtension = 0;
-       if ( part )
-@@ -2114,8 +2114,13 @@ KonqView * KonqMainWindow::childView( co
-     }
- 
-     // First look for a hostextension containing this frame name
--    // (KonqView looks for it recursively)
--    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+    }
-+    
-+//    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
-     {
-@@ -2125,7 +2130,7 @@ KonqView * KonqMainWindow::childView( co
-       {
-         if ( frameIt.current()->name() == name )
-         {
--          //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
-+          kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
-           if ( hostExtension )
-             *hostExtension = ext;
-           if ( part )
-@@ -2140,7 +2145,7 @@ KonqView * KonqMainWindow::childView( co
- }
- 
- // static
--KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
-+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
- {
-   if ( !s_lstViews )
-     return 0;
-@@ -2148,7 +2153,7 @@ KonqView * KonqMainWindow::findChildView
-   QPtrListIterator<KonqMainWindow> it( *s_lstViews );
-   for (; it.current(); ++it )
-   {
--    KonqView *res = it.current()->childView( name, hostExtension, part );
-+    KonqView *res = it.current()->childView( callingPart, name, hostExtension, part );
-     if ( res )
-     {
-       if ( mainWindow )
diff --git a/x11/kde/base3/patches/patch-konqueror_konq_mainwindow_h b/x11/kde/base3/patches/patch-konqueror_konq_mainwindow_h
deleted file mode 100644
index 792d3cb7f66..00000000000
--- a/x11/kde/base3/patches/patch-konqueror_konq_mainwindow_h
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-konqueror_konq_mainwindow_h,v 1.1 2004/08/14 18:03:48 brad Exp $
---- konqueror/konq_mainwindow.h.orig	Sun May 30 07:41:54 2004
-+++ konqueror/konq_mainwindow.h	Fri Aug 13 17:08:05 2004
-@@ -145,10 +145,10 @@ public:
-   void insertChildView( KonqView *childView );
-   void removeChildView( KonqView *childView );
-   KonqView *childView( KParts::ReadOnlyPart *view );
--  KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-+  KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
- 
-   // dcop idl bug! it can't handle KonqMainWindow *&mainWindow
--  static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-+  static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
- 
-   // Total number of views
-   int viewCount() const { return m_mapViews.count(); }
diff --git a/x11/kde/bindings3/patches/patch-kdec_clib_Makefile_am b/x11/kde/bindings3/patches/patch-kdec_clib_Makefile_am
deleted file mode 100644
index 4352ce23420..00000000000
--- a/x11/kde/bindings3/patches/patch-kdec_clib_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-kdec_clib_Makefile_am,v 1.1 2004/02/02 13:04:35 espie Exp $
---- kdec/clib/Makefile.am.orig	2004-02-02 13:01:26.000000000 +0100
-+++ kdec/clib/Makefile.am	2004-02-02 13:01:40.000000000 +0100
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = clib
- clib_SOURCES = main.c
--clib_LDADD   = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la  $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid  $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
-+clib_LDADD   = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la  $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid  $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET) -lstdc++
- 
- SUBDIRS = kdec 
- 
diff --git a/x11/kde/bindings3/patches/patch-kdec_clib_Makefile_in b/x11/kde/bindings3/patches/patch-kdec_clib_Makefile_in
deleted file mode 100644
index f2e624f34e5..00000000000
--- a/x11/kde/bindings3/patches/patch-kdec_clib_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kdec_clib_Makefile_in,v 1.2 2004/07/24 12:47:14 espie Exp $
---- kdec/clib/Makefile.in.orig	Sun May 30 18:36:08 2004
-+++ kdec/clib/Makefile.in	Tue Jul 20 19:39:02 2004
-@@ -404,7 +404,7 @@ xdg_menudir = @xdg_menudir@
- xparts_SUBDIR_included_FALSE = @xparts_SUBDIR_included_FALSE@
- xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
- clib_SOURCES = main.c
--clib_LDADD = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la  $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid  $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
-+clib_LDADD = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la  $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid  $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET) -lstdc++
- SUBDIRS = kdec 
- EXTRA_DIST = main.c
- INCLUDES = -I$(top_srcdir)/kdec/clib -I$(top_srcdir)/qtc/clib $(all_includes)
diff --git a/x11/kde/bindings3/patches/patch-kjsembed_Makefile_am b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_am
deleted file mode 100644
index fda0026b32a..00000000000
--- a/x11/kde/bindings3/patches/patch-kjsembed_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kjsembed_Makefile_am,v 1.2 2004/02/02 13:04:35 espie Exp $
---- kjsembed/Makefile.am.orig	2004-01-17 13:49:57.000000000 +0100
-+++ kjsembed/Makefile.am	2004-02-02 11:56:25.000000000 +0100
-@@ -70,7 +70,7 @@ libkjsembed_la_LDFLAGS = -version-info 1
- 
- libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
- 			builtins/libkjsembedbuiltins.la \
--			-lqui \
-+			-lqui-mt \
- 			$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
- 			$(LIB_KFILE) -lkjs $(LIBSOCKET)
- 
diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am b/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am
deleted file mode 100644
index e0d0d26d276..00000000000
--- a/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-qtc_clib_Makefile_am,v 1.2 2004/02/02 13:04:35 espie Exp $
---- qtc/clib/Makefile.am.orig	2003-08-05 16:54:00.000000000 +0200
-+++ qtc/clib/Makefile.am	2004-02-02 12:29:29.000000000 +0100
-@@ -5,7 +5,7 @@ SOURCES = qtc/qt_QAccessibleInterface.cp
- INTERFACES = 
- TRANSLATIONS = 
- KDE_OPTIONS = qtonly
--clib_LDADD   = ./qtc/libqtc.la $(QT_LIBS) -lqui $(LIBSOCKET)
-+clib_LDADD   = ./qtc/libqtc.la $(QT_LIBS) -lqui-mt $(LIBSOCKET) -lstdc++
- 
- SUBDIRS = qtc 
- 
diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in b/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in
deleted file mode 100644
index 0c9bdbcd298..00000000000
--- a/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-qtc_clib_Makefile_in,v 1.5 2004/07/24 12:47:14 espie Exp $
---- qtc/clib/Makefile.in.orig	Sun May 30 18:36:09 2004
-+++ qtc/clib/Makefile.in	Tue Jul 20 19:39:41 2004
-@@ -404,7 +404,7 @@ SOURCES = qtc/qt_QAccessibleInterface.cp
- INTERFACES = 
- TRANSLATIONS = 
- KDE_OPTIONS = qtonly
--clib_LDADD = ./qtc/libqtc.la $(QT_LIBS) -lqui $(LIBSOCKET)
-+clib_LDADD = ./qtc/libqtc.la $(QT_LIBS) -lqui-mt $(LIBSOCKET) -lstdc++
- SUBDIRS = qtc 
- EXTRA_DIST = main.c
- 
-@@ -415,7 +415,7 @@ INCLUDES = $(all_includes)
- #>- clib_METASOURCES = AUTO
- 
- # the library search path. 
--clib_LDFLAGS = $(all_libraries) 
-+clib_LDFLAGS = $(all_libraries) -pthread
- 
- # them while "make clean", use CLEANFILES
- DISTCLEANFILES = $(clib_METASOURCES)
diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am b/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am
deleted file mode 100644
index 70db1d05bf5..00000000000
--- a/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-qtc_clib_qtc_Makefile_am,v 1.2 2003/06/12 19:16:15 espie Exp $
---- qtc/clib/qtc/Makefile.am.orig	Wed May  7 13:44:32 2003
-+++ qtc/clib/qtc/Makefile.am	Wed Jun 11 11:35:39 2003
-@@ -29,7 +29,7 @@ include_HEADERS =
- # here you should add all header files, which shouldn´t be installed
- noinst_HEADERS =
- 
--libqtc_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
-+libqtc_la_LDFLAGS = -pthread $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
- 
- # add here the libraries which have to be include
- # for building the shared lib
-@@ -41,5 +41,5 @@ libqtc_la_LDFLAGS = $(all_libraries) -no
- #  in here.
- #  The following line is only a suggestion!
- #
--libqtc_la_LIBADD = -lqt-mt -lXext -lX11 -lqui
-+libqtc_la_LIBADD = -lqt-mt -lXext -lX11 -lqui-mt
- 
diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in b/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in
deleted file mode 100644
index c92e8745a6b..00000000000
--- a/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-qtc_clib_qtc_Makefile_in,v 1.5 2004/07/24 12:47:14 espie Exp $
---- qtc/clib/qtc/Makefile.in.orig	Sun May 30 18:36:10 2004
-+++ qtc/clib/qtc/Makefile.in	Tue Jul 20 19:39:19 2004
-@@ -1671,7 +1671,7 @@ libqtc_la_LDFLAGS = $(all_libraries) -no
- #  in here.
- #  The following line is only a suggestion!
- #
--libqtc_la_LIBADD = -lqt-mt -lXext -lX11 -lqui
-+libqtc_la_LIBADD = -lqt-mt -lXext -lX11 -lqui-mt
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
diff --git a/x11/kde/edu3/patches/patch-kbruch_src_mainqtwidget_cpp b/x11/kde/edu3/patches/patch-kbruch_src_mainqtwidget_cpp
deleted file mode 100644
index e01d76276a4..00000000000
--- a/x11/kde/edu3/patches/patch-kbruch_src_mainqtwidget_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kbruch_src_mainqtwidget_cpp,v 1.1 2004/07/24 12:50:50 espie Exp $
---- kbruch/src/mainqtwidget.cpp.orig	Sat Jul 24 13:39:33 2004
-+++ kbruch/src/mainqtwidget.cpp	Sat Jul 24 13:39:48 2004
-@@ -92,7 +92,7 @@ void MainQtWidget::readOptions()
- 	m_maxMainDenominator = m_config->readNumEntry("max_main_denominator", 10);
- 
-    /* make sure that we can load config files with corrupted values */
--   if (m_mulDiv == true and pow(2, m_nrRatios) > m_maxMainDenominator)
-+   if (m_mulDiv == true && pow(2, m_nrRatios) > m_maxMainDenominator)
-    {
-       m_nrRatios = 2;
-       m_maxMainDenominator = 10;
diff --git a/x11/kde/kdoc3/pkg/PLIST b/x11/kde/kdoc3/pkg/PLIST
index be4499ff5a8..925d7e7f110 100644
--- a/x11/kde/kdoc3/pkg/PLIST
+++ b/x11/kde/kdoc3/pkg/PLIST
@@ -1,12 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/05/11 00:34:17 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/09/18 09:46:36 espie Exp $
 bin/kdoc
 bin/makekdedoc
 bin/qt2kdoc
-man/man1/kdoc.1
-man/man1/makekdedoc.1
-man/man1/qt2kdoc.1
+@man man/man1/kdoc.1
+@man man/man1/makekdedoc.1
+@man man/man1/qt2kdoc.1
+share/doc/kdoc/
 share/doc/kdoc/README
 share/doc/kdoc/index.docbook
+share/kdoc/
 share/kdoc/Ast.pm
 share/kdoc/Iter.pm
 share/kdoc/kdocAstGen.pm
@@ -26,5 +28,3 @@ share/kdoc/kdocParsePy.pm
 share/kdoc/kdocParser.pm
 share/kdoc/kdocUtil.pm
 share/kdoc/kdoctexi.pm
-@dirrm share/kdoc
-@dirrm share/doc/kdoc
diff --git a/x11/kde/libs3/patches/patch-dcop_dcopserver_cpp b/x11/kde/libs3/patches/patch-dcop_dcopserver_cpp
deleted file mode 100644
index 9856692464c..00000000000
--- a/x11/kde/libs3/patches/patch-dcop_dcopserver_cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-$OpenBSD: patch-dcop_dcopserver_cpp,v 1.1 2004/08/14 18:03:47 brad Exp $
---- dcop/dcopserver.cpp.orig	Sun May 30 08:23:44 2004
-+++ dcop/dcopserver.cpp	Fri Aug 13 16:04:38 2004
-@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE
-     fprintf (addfp, "\n");
- }
- 
-+#ifndef HAVE_MKSTEMPS
-+#include <string.h>
-+#include <strings.h>
- 
--#ifndef HAVE_MKSTEMP
--static char *unique_filename (const char *path, const char *prefix)
--#else
--static char *unique_filename (const char *path, const char *prefix, int *pFd)
--#endif
-+/* this is based on code taken from the GNU libc, distributed under the LGPL license */
-+
-+/* Generate a unique temporary file name from TEMPLATE.
-+
-+   TEMPLATE has the form:
-+
-+   <path>/ccXXXXXX<suffix>
-+
-+   SUFFIX_LEN tells us how long <suffix> is (it can be zero length).
-+
-+   The last six characters of TEMPLATE before <suffix> must be "XXXXXX";
-+   they are replaced with a string that makes the filename unique.
-+
-+   Returns a file descriptor open on the file for reading and writing.  */
-+
-+int mkstemps (char* _template, int suffix_len)
- {
--#ifndef HAVE_MKSTEMP
--#ifndef X_NOT_POSIX
--    return ((char *) tempnam (path, prefix));
--#else
--    char tempFile[PATH_MAX];
--    char *tmp;
-+  static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-+  char *XXXXXX;
-+  int len;
-+  int count;
-+  int value;
- 
--    snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix);
--    tmp = (char *) mktemp (tempFile);
--    if (tmp)
--	{
--	    char *ptr = (char *) malloc (strlen (tmp) + 1);
--        if (ptr != NULL)
--        {
--	        strcpy (ptr, tmp);
--        }
--	    return (ptr);
--	}
--    else
--	return (NULL);
-+  len = strlen (_template);
-+
-+  if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6))
-+      return -1;
-+
-+  XXXXXX = &_template[len - 6 - suffix_len];
-+
-+  value = rand();
-+  for (count = 0; count < 256; ++count)
-+  {
-+      int v = value;
-+      int fd;
-+
-+      /* Fill in the random bits.  */
-+      XXXXXX[0] = letters[v % 62];
-+      v /= 62;
-+      XXXXXX[1] = letters[v % 62];
-+      v /= 62;
-+      XXXXXX[2] = letters[v % 62];
-+      v /= 62;
-+      XXXXXX[3] = letters[v % 62];
-+      v /= 62;
-+      XXXXXX[4] = letters[v % 62];
-+      v /= 62;
-+      XXXXXX[5] = letters[v % 62];
-+
-+      fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600);
-+      if (fd >= 0)
-+	/* The file does not exist.  */
-+	return fd;
-+
-+      /* This is a random value.  It is only necessary that the next
-+	 TMP_MAX values generated by adding 7777 to VALUE are different
-+	 with (module 2^32).  */
-+      value += 7777;
-+    }
-+  /* We return the null string if we can't find a unique file name.  */
-+  _template[0] = '\0';
-+  return -1;
-+}
-+
- #endif
--#else
-+
-+static char *unique_filename (const char *path, const char *prefix, int *pFd)
-+{
-     char tempFile[PATH_MAX];
-     char *ptr;
- 
-@@ -480,44 +523,11 @@ static char *unique_filename (const char
-     if (ptr != NULL)
- 	{
- 	    strcpy(ptr, tempFile);
--	    *pFd =  mkstemp(ptr);
-+	    *pFd =  mkstemps(ptr, 0);
- 	}
-     return ptr;
--#endif
- }
- 
--#if 0
--Status SetAuthentication_local (int count, IceListenObj *listenObjs)
--{
--    int i;
--    for (i = 0; i < count; i ++) {
--	char *prot = IceGetListenConnectionString(listenObjs[i]);
--	if (!prot) continue;
--	char *host = strchr(prot, '/');
--	char *sock = 0;
--	if (host) {
--	    *host=0;
--	    host++;
--	    sock = strchr(host, ':');
--	    if (sock) {
--		*sock = 0;
--		sock++;
--	    }
--	}
--#ifndef NDEBUG
--	qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s",
--		(unsigned)i, prot, sock);
--#endif
--	if (sock && !strcmp(prot, "local")) {
--	    chmod(sock, 0700);
--	}
--	IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc);
--	free(prot);
--    }
--    return 1;
--}
--#endif
--
- #define MAGIC_COOKIE_LEN 16
- 
- Status
-@@ -529,28 +539,19 @@ SetAuthentication (int count, IceListenO
-     int         original_umask;
-     int         i;
-     QCString command;    
--#ifdef HAVE_MKSTEMP
-     int         fd;
--#endif
- 
-     original_umask = umask (0077);      /* disallow non-owner access */
- 
-     path = getenv ("DCOP_SAVE_DIR");
-     if (!path)
- 	path = "/tmp";
--#ifndef HAVE_MKSTEMP
--    if ((addAuthFile = unique_filename (path, "dcop")) == NULL)
--	goto bad;
- 
--    if (!(addfp = fopen (addAuthFile, "w")))
--	goto bad;
--#else
-     if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL)
- 	goto bad;
- 
-     if (!(addfp = fdopen(fd, "wb")))
- 	goto bad;
--#endif
- 
-     if ((*_authDataEntries = static_cast<IceAuthDataEntry *>(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL)
- 	goto bad;
diff --git a/x11/kde/libs3/patches/patch-kdecore_kstandarddirs_cpp b/x11/kde/libs3/patches/patch-kdecore_kstandarddirs_cpp
deleted file mode 100644
index 0fb6daa9c88..00000000000
--- a/x11/kde/libs3/patches/patch-kdecore_kstandarddirs_cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$OpenBSD: patch-kdecore_kstandarddirs_cpp,v 1.1 2004/08/14 18:03:48 brad Exp $
---- kdecore/kstandarddirs.cpp.orig	Sun May 30 08:24:00 2004
-+++ kdecore/kstandarddirs.cpp	Fri Aug 13 16:04:57 2004
-@@ -650,7 +650,28 @@ void KStandardDirs::createSpecialResourc
-    char link[1024];
-    link[1023] = 0;
-    int result = readlink(QFile::encodeName(dir).data(), link, 1023);
--   if ((result == -1) && (errno == ENOENT))
-+   bool relink = (result == -1) && (errno == ENOENT);
-+   if ((result > 0) && (link[0] == '/'))
-+   {
-+      link[result] = 0;
-+      struct stat stat_buf;
-+      int res = lstat(link, &stat_buf);
-+      if ((res == -1) && (errno == ENOENT))
-+      {
-+         relink = true;
-+      }
-+      else if ((res == -1) || (!S_ISDIR(stat_buf.st_mode)))
-+      {
-+         fprintf(stderr, "Error: \"%s\" is not a directory.\n", link);
-+         relink = true;
-+      }
-+      else if (stat_buf.st_uid != getuid())
-+      {
-+         fprintf(stderr, "Error: \"%s\" is owned by uid %d instead of uid %d.\n", link, stat_buf.st_uid, getuid());
-+         relink = true;
-+      }
-+   }
-+   if (relink)
-    {
-       QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin"));
-       if (srv.isEmpty())
diff --git a/x11/kde/libs3/patches/patch-khtml_khtml_ext_cpp b/x11/kde/libs3/patches/patch-khtml_khtml_ext_cpp
deleted file mode 100644
index 4b05048e6eb..00000000000
--- a/x11/kde/libs3/patches/patch-khtml_khtml_ext_cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-khtml_khtml_ext_cpp,v 1.1 2004/08/14 18:03:48 brad Exp $
---- khtml/khtml_ext.cpp.orig	Sun May 30 08:24:21 2004
-+++ khtml/khtml_ext.cpp	Fri Aug 13 16:04:21 2004
-@@ -646,6 +646,19 @@ bool KHTMLPartBrowserHostExtension::open
-   return m_part->openURLInFrame( url, urlArgs );
- }
- 
-+void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
-+{ 
-+  if (id == VIRTUAL_FIND_FRAME_PARENT)
-+  {
-+    FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data);
-+    KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame);
-+    if (parentPart)
-+       param->parent = parentPart->browserHostExtension();
-+    return;
-+  }
-+  BrowserHostExtension::virtual_hook( id, data );
-+}
-+
- // BCI: remove in KDE 4
- KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const QString &text, const QString &icon, const QObject *receiver, const char *slot, QObject *parent, const char *name )
-     : KAction( text, icon, 0, receiver, slot, parent, name )
diff --git a/x11/kde/libs3/patches/patch-khtml_khtml_ext_h b/x11/kde/libs3/patches/patch-khtml_khtml_ext_h
deleted file mode 100644
index aca4268789b..00000000000
--- a/x11/kde/libs3/patches/patch-khtml_khtml_ext_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-khtml_khtml_ext_h,v 1.1 2004/08/14 18:03:48 brad Exp $
---- khtml/khtml_ext.h.orig	Mon Mar  1 01:25:08 2004
-+++ khtml/khtml_ext.h	Fri Aug 13 16:04:21 2004
-@@ -98,6 +98,9 @@ public:
-   virtual const QPtrList<KParts::ReadOnlyPart> frames() const;
- 
-   virtual bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs );
-+
-+protected:
-+  virtual void virtual_hook( int id, void* data );
- private:
-   KHTMLPart *m_part;
- };
diff --git a/x11/kde/libs3/patches/patch-khtml_khtml_part_cpp b/x11/kde/libs3/patches/patch-khtml_khtml_part_cpp
deleted file mode 100644
index a12e32ee992..00000000000
--- a/x11/kde/libs3/patches/patch-khtml_khtml_part_cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-$OpenBSD: patch-khtml_khtml_part_cpp,v 1.2 2004/08/14 18:03:48 brad Exp $
---- khtml/khtml_part.cpp.orig	Sun May 30 08:24:22 2004
-+++ khtml/khtml_part.cpp	Fri Aug 13 16:04:22 2004
-@@ -734,12 +734,16 @@ DOM::Document KHTMLPart::document() cons
-     return d->m_doc;
- }
- 
--
- KParts::BrowserExtension *KHTMLPart::browserExtension() const
- {
-   return d->m_extension;
- }
- 
-+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const
-+{
-+  return d->m_hostExtension;
-+}
-+
- KHTMLView *KHTMLPart::view() const
- {
-   return d->m_view;
-@@ -857,30 +861,19 @@ QVariant KHTMLPart::crossFrameExecuteScr
-     // we always allow these
-   }
-   else {
--    while (destpart->parentPart())
--      destpart = destpart->parentPart();
--    destpart = destpart->findFrame(target);
--
-+    destpart = findFrame(target);
-     if (!destpart)
--      destpart = this; // ### doesn't make sense, does it?
-+       destpart = this;
-   }
- 
-   // easy way out?
-   if (destpart == this)
-     return executeScript(DOM::Node(), script);
- 
--
-   // now compare the domains
--  if (!destpart->htmlDocument().isNull() &&
--      !htmlDocument().isNull())  {
--    DOM::DOMString actDomain = htmlDocument().domain();
--    DOM::DOMString destDomain = destpart->htmlDocument().domain();
-+  if (destpart->checkFrameAccess(this))
-+    return destpart->executeScript(DOM::Node(), script);
- 
--    if (actDomain == destDomain)
--      return destpart->executeScript(DOM::Node(), script);
--  }
--
--
-   // eww, something went wrong. better execute it in our frame
-   return executeScript(DOM::Node(), script);
- }
-@@ -3331,7 +3324,7 @@ void KHTMLPart::urlSelected( const QStri
-   if ( hasTarget )
-   {
-     // unknown frame names should open in a new window.
--    khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false );
-+    khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
-     if ( frame )
-     {
-       args.metaData()["referrer"] = d->m_referrer;
-@@ -4337,6 +4330,7 @@ void KHTMLPart::slotChildDocCreated()
- void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
- {
-   khtml::ChildFrame *child = frame( sender()->parent() );
-+  KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
- 
-   // TODO: handle child target correctly! currently the script are always executed fur the parent
-   QString urlStr = url.url();
-@@ -4368,7 +4362,7 @@ void KHTMLPart::slotChildURLRequest( con
-     }
-     else if ( frameName != QString::fromLatin1( "_self" ) )
-     {
--      khtml::ChildFrame *_frame = recursiveFrameRequest( url, args );
-+      khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
- 
-       if ( !_frame )
-       {
-@@ -4412,46 +4406,92 @@ khtml::ChildFrame *KHTMLPart::frame( con
- 
- //#define DEBUG_FINDFRAME
- 
--KHTMLPart *KHTMLPart::findFrame( const QString &f )
-+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
- {
-+  if (callingHtmlPart == this)
-+    return true; // trivial
-+
-+  if (htmlDocument().isNull()) {
- #ifdef DEBUG_FINDFRAME
--  kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl;
--  FrameIt it2 = d->m_frames.begin();
--  FrameIt end = d->m_frames.end();
--  for (; it2 != end; ++it2 )
--      kdDebug(6050) << "  - having frame '" << (*it2).m_name << "'" << endl;
-+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl;
- #endif
--  // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames
--  ConstFrameIt it = d->m_frames.find( f );
--  if ( it == d->m_frames.end() )
-+    return false; // we are empty?
-+  }
-+
-+  // now compare the domains
-+  if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() &&
-+      !htmlDocument().isNull())  {
-+    DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain();
-+    DOM::DOMString destDomain = htmlDocument().domain();
-+
-+#ifdef DEBUG_FINDFRAME
-+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl;
-+#endif
-+
-+    if (actDomain == destDomain)
-+      return true;
-+  }
-+#ifdef DEBUG_FINDFRAME
-+  else
-   {
-+    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl;
-+  }
-+#endif
-+  return false;
-+}
-+
-+KHTMLPart *
-+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
-+{
- #ifdef DEBUG_FINDFRAME
--    kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl;
-+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
- #endif
--    return 0L;
-+  // Check access
-+  KHTMLPart *callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
-+  
-+  if (!checkFrameAccess(callingHtmlPart))
-+     return 0;
-+
-+  FrameIt it = d->m_frames.find( f );
-+  FrameIt end = d->m_frames.end();
-+  if ( it != end )
-+  {
-+#ifdef DEBUG_FINDFRAME
-+     kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl;
-+#endif
-+     if (childFrame)
-+        *childFrame = &(*it);
-+     return this;
-   }
--  else {
-+     
-+  it = d->m_frames.begin();
-+  for (; it != end; ++it )
-+  {
-     KParts::ReadOnlyPart *p = (*it).m_part;
-     if ( p && p->inherits( "KHTMLPart" ))
-     {
--#ifdef DEBUG_FINDFRAME
--      kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl;
--#endif
--      return (KHTMLPart*)p;
-+      KHTMLPart *frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
-+      if (frameParent)
-+         return frameParent;
-     }
--    else
--    {
--#ifdef DEBUG_FINDFRAME
--      if (p)
--        kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl;
--      else
--        kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl;
--#endif
--      return 0L;
--    }
-   }
-+  return 0;
- }
- 
-+
-+KHTMLPart *KHTMLPart::findFrame( const QString &f )
-+{
-+  khtml::ChildFrame *childFrame;
-+  KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
-+  if (parentFrame)
-+  {
-+     KParts::ReadOnlyPart *p = childFrame->m_part;
-+     if ( p && p->inherits( "KHTMLPart" ))
-+        return static_cast<KHTMLPart *>(p);
-+  }
-+  return 0;
-+}
-+
- KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
- {
-   KParts::ReadOnlyPart* part = (KParts::ReadOnlyPart*)(this);
-@@ -4487,37 +4527,29 @@ KHTMLPart *KHTMLPart::parentPart()
-   return (KHTMLPart *)parent();
- }
- 
--khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args,
--                                                     bool callParent )
-+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, 
-+                                                     const KParts::URLArgs &args, bool callParent )
- {
--  FrameIt it = d->m_frames.find( args.frameName );
-+#ifdef DEBUG_FINDFRAME
-+  kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
-+#endif  
-+  khtml::ChildFrame *childFrame;
-+  KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
-+  if (childPart)
-+  {
-+     if (childPart == this)
-+        return childFrame;
-+     
-+     childPart->requestObject( childFrame, url, args );
-+     return 0;
-+  }
- 
--  if ( it != d->m_frames.end() )
--    return &(*it);
--
--  it = d->m_frames.begin();
--  FrameIt end = d->m_frames.end();
--  for (; it != end; ++it )
--    if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) )
--    {
--      KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part;
--
--      khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false );
--      if ( !res )
--        continue;
--
--      childPart->requestObject( res, url, args );
--      return 0L;
--    }
--
-   if ( parentPart() && callParent )
-   {
--    khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args );
-+     khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
- 
--    if ( res )
--      parentPart()->requestObject( res, url, args );
--
--    return 0L;
-+     if ( res )
-+       parentPart()->requestObject( res, url, args );
-   }
- 
-   return 0L;
-@@ -4525,7 +4557,7 @@ khtml::ChildFrame *KHTMLPart::recursiveF
- 
- void KHTMLPart::saveState( QDataStream &stream )
- {
--  kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl;
-+  kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl;
- 
-   stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY()
-          << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight();
diff --git a/x11/kde/libs3/patches/patch-khtml_khtml_part_h b/x11/kde/libs3/patches/patch-khtml_khtml_part_h
deleted file mode 100644
index 322735307ae..00000000000
--- a/x11/kde/libs3/patches/patch-khtml_khtml_part_h
+++ /dev/null
@@ -1,46 +0,0 @@
-$OpenBSD: patch-khtml_khtml_part_h,v 1.2 2004/08/14 18:03:48 brad Exp $
---- khtml/khtml_part.h.orig	Sun Apr  4 03:08:39 2004
-+++ khtml/khtml_part.h	Fri Aug 13 16:04:22 2004
-@@ -287,6 +287,7 @@ public:
-    */
-   KParts::BrowserExtension *browserExtension() const;
-   KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const;
-+  KParts::BrowserHostExtension *browserHostExtension() const;
- 
-   /**
-    * Returns a pointer to the HTML document's view.
-@@ -812,6 +813,16 @@ public:
-   KHTMLPart *findFrame( const QString &f );
- 
-   /**
-+   * @internal
-+   * Recursively finds the part containing the frame with name @p f 
-+   * and checks if it is accessible by @p callingPart
-+   * Returns 0L if no suitable frame can't be found.
-+   * Returns parent part if a suitable frame was found and
-+   * frame info in @p *childFrame
-+   */
-+  KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame=0 );
-+
-+  /**
-    * Return the current frame (the one that has focus)
-    * Not necessarily a direct child of ours, framesets can be nested.
-    * Returns "this" if this part isn't a frameset.
-@@ -1368,6 +1379,8 @@ private:
- 
-   bool restoreURL( const KURL &url );
-   void emitSelectionChanged();
-+  // Returns whether callingHtmlPart may access this part
-+  bool checkFrameAccess(KHTMLPart *callingHtmlPart);
-   bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs );
-   void startAutoScroll();
-   void stopAutoScroll();
-@@ -1426,7 +1439,7 @@ private:
-   DOM::DocumentImpl *xmlDocImpl() const;
-   khtml::ChildFrame *frame( const QObject *obj );
- 
--  khtml::ChildFrame *recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, bool callParent = true );
-+  khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true );
- 
-   bool checkLinkSecurity( const KURL &linkURL,const QString &message = QString::null, const QString &button = QString::null );
-   QVariant executeScript( const QString& filename, int baseLine, const DOM::Node &n, const QString& script );
diff --git a/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_cpp b/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_cpp
deleted file mode 100644
index a24055eb739..00000000000
--- a/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-$OpenBSD: patch-kioslave_http_kcookiejar_kcookiejar_cpp,v 1.1 2004/08/25 21:48:39 robert Exp $
---- kioslave/http/kcookiejar/kcookiejar.cpp.orig	Sun May 30 16:24:43 2004
-+++ kioslave/http/kcookiejar/kcookiejar.cpp	Tue Aug 24 00:15:39 2004
-@@ -244,6 +244,14 @@
-     m_globalAdvice = KCookieDunno;
-     m_configChanged = false;
-     m_cookiesChanged = false;
-+
-+    QString twoLevelTLD="name,ai,au,bd,bh,ck,eg,et,fk,il,in,kh,kr,mk,mt,na,np,nz,pg,pk,qa,sa,sb,sg,sv,ua,ug,uk,uy,vn,za,zw";
-+    QStringList countries = QStringList::split(',', twoLevelTLD);
-+    for(QStringList::ConstIterator it = countries.begin();
-+        it != countries.end(); ++it)
-+    {
-+       m_twoLevelTLD.replace(*it, (int *) 1);
-+    }
- }
- 
- //
-@@ -528,14 +536,14 @@
- 
- }
- 
--static void stripDomain(const QString &_fqdn, QString &_domain)
-+void KCookieJar::stripDomain(const QString &_fqdn, QString &_domain)
- {
-    QStringList domains;
--   KCookieJar::extractDomains(_fqdn, domains);
-+   extractDomains(_fqdn, domains);
-    _domain = domains[0];
- }
- 
--static QString stripDomain( KHttpCookiePtr cookiePtr)
-+QString KCookieJar::stripDomain( KHttpCookiePtr cookiePtr)
- {
-     QString domain; // We file the cookie under this domain.
-     if (cookiePtr->domain().isEmpty())
-@@ -620,6 +628,13 @@
-     {
-        if (partList.count() == 1)
-          break; // We only have a TLD left.
-+       
-+       if ((partList.count() == 2) && (m_twoLevelTLD[partList[1].lower()]))
-+       {
-+          // This domain uses two-level TLDs in the form xxxx.yy
-+          break;
-+       }
-+       
-        if ((partList.count() == 2) && (partList[1].length() == 2))
-        {
-           // If this is a TLD, we should stop. (e.g. co.uk)
-@@ -633,14 +648,6 @@
-           if ((t == "com") || (t == "net") || (t == "org") || (t == "gov") || (t == "edu") || (t == "mil") || (t == "int"))
-               break;
-        }
--
--       // The .name domain uses <name>.<surname>.name
--       // Although the TLD is striclty speaking .name, for our purpose
--       // it should be <surname>.name since people should not be able
--       // to set cookies for everyone with the same surname.
--       // Matches <surname>.name
--       if ((partList.count() == 2)&& (partList[1].lower() == L1("name")))
--          break;
- 
-        QString domain = partList.join(L1("."));
-        _domains.append('.' + domain);
diff --git a/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_h b/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_h
deleted file mode 100644
index 84eb0b3669d..00000000000
--- a/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_h
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-kioslave_http_kcookiejar_kcookiejar_h,v 1.1 2004/08/25 21:48:39 robert Exp $
---- kioslave/http/kcookiejar/kcookiejar.h.orig	Sun Nov 30 10:47:10 2003
-+++ kioslave/http/kcookiejar/kcookiejar.h	Tue Aug 24 00:15:39 2004
-@@ -306,8 +306,8 @@
-     /**
-      * Returns a list of domains (_domainList) relevant for this host.
-      */
--    static void extractDomains(const QString &_fqdn,
--                               QStringList &_domainList);
-+    void extractDomains(const QString &_fqdn,
-+                        QStringList &_domainList);
- 
-     static QString adviceToStr(KCookieAdvice _advice);
-     static KCookieAdvice strToAdvice(const QString &_str);
-@@ -329,11 +329,15 @@
-       */
-      void setShowCookieDetails (bool value) { m_showCookieDetails = value; }
- 
-+protected:
-+     void stripDomain(const QString &_fqdn, QString &_domain);
-+     QString stripDomain( KHttpCookiePtr cookiePtr);
- 
- protected:
-     QStringList m_domainList;
-     KCookieAdvice m_globalAdvice;
-     QDict<KHttpCookieList> m_cookieDomains;
-+    QDict<int> m_twoLevelTLD;
- 
-     bool m_configChanged;
-     bool m_cookiesChanged;
diff --git a/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_kcookieserver_cpp b/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_kcookieserver_cpp
deleted file mode 100644
index e981afd58a5..00000000000
--- a/x11/kde/libs3/patches/patch-kioslave_http_kcookiejar_kcookiejar_kcookieserver_cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-kioslave_http_kcookiejar_kcookiejar_kcookieserver_cpp,v 1.1 2004/08/25 21:48:39 robert Exp $
---- kioslave/http/kcookiejar/kcookieserver.cpp.orig	Wed Jun 11 16:13:29 2003
-+++ kioslave/http/kcookiejar/kcookieserver.cpp	Tue Aug 24 00:15:39 2004
-@@ -131,7 +131,7 @@
-   if (!KCookieJar::parseURL(url, fqdn, path))
-      return false;
- 
--  KCookieJar::extractDomains( fqdn, domains );
-+  mCookieJar->extractDomains( fqdn, domains );
-   for( KHttpCookie *cookie = mPendingCookies->first();
-        cookie != 0L;
-        cookie = mPendingCookies->next())
-@@ -557,7 +557,7 @@
-    if (KCookieJar::parseURL(url, fqdn, dummy))
-    {
-       QStringList domains;
--      KCookieJar::extractDomains(fqdn, domains);
-+      mCookieJar->extractDomains(fqdn, domains);
-       mCookieJar->setDomainAdvice(domains[0],
-                                   KCookieJar::strToAdvice(advice));
-    }
-@@ -573,7 +573,7 @@
-    if (KCookieJar::parseURL(url, fqdn, dummy))
-    {
-       QStringList domains;
--      KCookieJar::extractDomains(fqdn, domains);
-+      mCookieJar->extractDomains(fqdn, domains);
-       advice = mCookieJar->getDomainAdvice(domains[0]);
-    }
-    return KCookieJar::adviceToStr(advice);
diff --git a/x11/kde/libs3/patches/patch-kparts_browserextension_cpp b/x11/kde/libs3/patches/patch-kparts_browserextension_cpp
deleted file mode 100644
index 40d638444e8..00000000000
--- a/x11/kde/libs3/patches/patch-kparts_browserextension_cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-kparts_browserextension_cpp,v 1.1 2004/08/14 18:03:48 brad Exp $
---- kparts/browserextension.cpp.orig	Sun May 30 08:24:45 2004
-+++ kparts/browserextension.cpp	Fri Aug 13 16:04:22 2004
-@@ -636,6 +636,17 @@ BrowserHostExtension *BrowserHostExtensi
- void BrowserExtension::virtual_hook( int, void* )
- { /*BASE::virtual_hook( id, data );*/ }
- 
-+BrowserHostExtension *
-+BrowserHostExtension::findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame)
-+{
-+    FindFrameParentParams param;
-+    param.parent = 0;
-+    param.callingPart = callingPart;
-+    param.frame = frame;
-+    virtual_hook(VIRTUAL_FIND_FRAME_PARENT, &param);
-+    return param.parent;
-+}
-+
- void BrowserHostExtension::virtual_hook( int, void* )
- { /*BASE::virtual_hook( id, data );*/ }
- 
diff --git a/x11/kde/libs3/patches/patch-kparts_browserextension_h b/x11/kde/libs3/patches/patch-kparts_browserextension_h
deleted file mode 100644
index 699ba0090ed..00000000000
--- a/x11/kde/libs3/patches/patch-kparts_browserextension_h
+++ /dev/null
@@ -1,41 +0,0 @@
-$OpenBSD: patch-kparts_browserextension_h,v 1.1 2004/08/14 18:03:48 brad Exp $
---- kparts/browserextension.h.orig	Sun Oct 26 03:54:24 2003
-+++ kparts/browserextension.h	Fri Aug 13 16:04:22 2004
-@@ -671,10 +671,16 @@ public:
-    *
-    * Note that this method does not query the child objects recursively.
-    */
--
-   virtual const QPtrList<KParts::ReadOnlyPart> frames() const;
- 
-   /**
-+   * @internal
-+   * Returns the part that contains @p frame and that may be accessed
-+   * by @p callingPart
-+   */
-+  BrowserHostExtension *findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame);
-+
-+  /**
-    * Opens the given url in a hosted child frame. The frame name is specified in the
-    * frameName variable in the urlArgs argument structure (see KParts::URLArgs ) .
-    */
-@@ -687,6 +693,19 @@ public:
-   static BrowserHostExtension *childObject( QObject *obj );
- 
- protected:
-+  /** This 'enum' along with the structure below is NOT part of the public API.
-+   * It's going to disappear in KDE 4.0 and is likely to change inbetween.
-+   *
-+   * @internal
-+   */
-+  enum { VIRTUAL_FIND_FRAME_PARENT = 0x10 };
-+  struct FindFrameParentParams
-+  {
-+      BrowserHostExtension *parent;
-+      KParts::ReadOnlyPart *callingPart;
-+      QString frame;
-+  };
-+                                                    
-   virtual void virtual_hook( int id, void* data );
- private:
-   class BrowserHostExtensionPrivate;
diff --git a/x11/kde/multimedia3/patches/patch-kioslave_audiocd_audiocd_cpp b/x11/kde/multimedia3/patches/patch-kioslave_audiocd_audiocd_cpp
deleted file mode 100644
index bf71c23034d..00000000000
--- a/x11/kde/multimedia3/patches/patch-kioslave_audiocd_audiocd_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-kioslave_audiocd_audiocd_cpp,v 1.3 2004/07/24 12:47:15 espie Exp $
---- kioslave/audiocd/audiocd.cpp.orig	Sun Apr  4 11:10:58 2004
-+++ kioslave/audiocd/audiocd.cpp	Mon Jul 19 17:00:13 2004
-@@ -1559,6 +1559,7 @@ AudioCDProtocol::parseArgs(const KURL & 
- 
- }
- 
-+#undef swap16
- inline int16_t swap16 (int16_t i)
- {
-   return (((i >> 8) & 0xFF) | ((i << 8) & 0xFF00));
diff --git a/x11/kde/multimedia3/patches/patch-kmix_kmix-platforms_cpp b/x11/kde/multimedia3/patches/patch-kmix_kmix-platforms_cpp
deleted file mode 100644
index 033db94205f..00000000000
--- a/x11/kde/multimedia3/patches/patch-kmix_kmix-platforms_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-kmix_kmix-platforms_cpp,v 1.1 2004/02/07 23:35:00 espie Exp $
---- kmix/kmix-platforms.cpp.orig	2004-02-08 00:22:11.000000000 +0100
-+++ kmix/kmix-platforms.cpp	2004-02-08 00:22:23.000000000 +0100
-@@ -42,7 +42,7 @@
- #define OSS_MIXER
- #endif
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(_UNIXWARE)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(_UNIXWARE) || defined(__OpenBSD__)
- #define OSS_MIXER
- #endif
- 
diff --git a/x11/kde/network3/patches/patch-kopete_protocols_gadu_libgadu_libgadu-config_h_in b/x11/kde/network3/patches/patch-kopete_protocols_gadu_libgadu_libgadu-config_h_in
deleted file mode 100644
index 79849430477..00000000000
--- a/x11/kde/network3/patches/patch-kopete_protocols_gadu_libgadu_libgadu-config_h_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-kopete_protocols_gadu_libgadu_libgadu-config_h_in,v 1.1 2004/07/24 12:50:50 espie Exp $
---- kopete/protocols/gadu/libgadu/libgadu-config.h.in.orig	Tue Jul 20 18:35:07 2004
-+++ kopete/protocols/gadu/libgadu/libgadu-config.h.in	Tue Jul 20 18:40:31 2004
-@@ -24,7 +24,12 @@
- /* Defined if libgadu was compiled and linked with TLS support. */
- #undef __GG_LIBGADU_HAVE_OPENSSL
- 
-+/* Defined if we have stdint.h headers. */
-+#undef HAVE_STDINT_H
-+
-+#if defined(HAVE_STDINT_H)
- /* Include file containing uintXX_t declarations. */
- #include <stdint.h>
-+#endif
- 
- #endif /* __GG_LIBGADU_CONFIG_H */
diff --git a/x11/kde/okle/pkg/PLIST b/x11/kde/okle/pkg/PLIST
index be2e2787baa..1bfbbaa7a3c 100644
--- a/x11/kde/okle/pkg/PLIST
+++ b/x11/kde/okle/pkg/PLIST
@@ -1,8 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/12/15 20:56:40 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.5 2004/09/18 09:46:37 espie Exp $
 bin/okle
 bin/okle_gui
+share/applnk/
+share/applnk/Multimedia/
 share/applnk/Multimedia/okle.desktop
+share/apps/okle/
 share/apps/okle/okleui.rc
+share/apps/okle/pics/
 share/apps/okle/pics/angleselect.png
 share/apps/okle/pics/audioselect.png
 share/apps/okle/pics/back.png
@@ -25,24 +29,13 @@ share/apps/okle/pics/stepreverse.png
 share/apps/okle/pics/stop.png
 share/apps/okle/pics/subtitleselect.png
 share/apps/okle/pics/up.png
+share/icons/hicolor/16x16/
+share/icons/hicolor/16x16/apps/
 share/icons/hicolor/16x16/apps/okle.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/okle.png
 share/locale/de/LC_MESSAGES/okle-0.3.mo
 share/locale/hu/LC_MESSAGES/okle-0.3.mo
 share/locale/it/LC_MESSAGES/okle-0.3.mo
 share/locale/sv/LC_MESSAGES/okle-0.3.mo
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/apps/okle/pics
-@dirrm share/apps/okle
-@dirrm share/apps
-@dirrm share/applnk/Multimedia
diff --git a/x11/kde/patches-3.2.3/patch-acinclude_m4 b/x11/kde/patches-3.2.3/patch-acinclude_m4
index 9a5f58771a1..38b512f803e 100644
--- a/x11/kde/patches-3.2.3/patch-acinclude_m4
+++ b/x11/kde/patches-3.2.3/patch-acinclude_m4
@@ -1,7 +1,7 @@
-$OpenBSD: patch-acinclude_m4,v 1.2 2004/08/14 18:00:22 brad Exp $
---- acinclude.m4.orig	Sun May 30 12:24:10 2004
-+++ acinclude.m4	Thu Aug 12 16:57:18 2004
-@@ -6073,6 +6073,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+$OpenBSD: patch-acinclude_m4,v 1.3 2004/09/18 09:46:37 espie Exp $
+--- acinclude.m4.orig	Sat Aug 14 01:39:40 2004
++++ acinclude.m4	Mon Sep  6 01:08:05 2004
+@@ -6168,6 +6168,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-acinclude_m4,v 1.2 2004/08/14 18:00:22 brad Exp $
   *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
-@@ -7609,13 +7622,7 @@ nto-qnx*)
+@@ -7708,13 +7721,7 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -36,7 +36,7 @@ $OpenBSD: patch-acinclude_m4,v 1.2 2004/08/14 18:00:22 brad Exp $
    ;;
  
  osf3* | osf4* | osf5*)
-@@ -8567,6 +8574,22 @@ case $host_os in
+@@ -8666,6 +8673,22 @@ case $host_os in
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -59,7 +59,7 @@ $OpenBSD: patch-acinclude_m4,v 1.2 2004/08/14 18:00:22 brad Exp $
    osf3*)
      case $cc_basename in
        KCC)
-@@ -10884,6 +10907,7 @@ EOF
+@@ -10983,6 +11006,7 @@ EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
diff --git a/x11/kde/patches-3.2.3/patch-admin_cvs_sh b/x11/kde/patches-3.2.3/patch-admin_cvs_sh
index 559c1c51230..8444b7b940d 100644
--- a/x11/kde/patches-3.2.3/patch-admin_cvs_sh
+++ b/x11/kde/patches-3.2.3/patch-admin_cvs_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-admin_cvs_sh,v 1.1 2004/07/24 12:47:15 espie Exp $
---- admin/cvs.sh.orig	Sat Feb 28 10:58:06 2004
-+++ admin/cvs.sh	Fri Jul 16 02:04:25 2004
-@@ -621,8 +621,10 @@ if test -f Makefile.am.in; then
+$OpenBSD: patch-admin_cvs_sh,v 1.2 2004/09/18 09:46:37 espie Exp $
+--- admin/cvs.sh.orig	Wed Aug  4 14:53:05 2004
++++ admin/cvs.sh	Mon Sep  6 01:08:05 2004
+@@ -640,8 +640,10 @@ if test -f Makefile.am.in; then
    rm -f $makefile_wo
  fi
  
diff --git a/x11/kde/patches-3.2.3/patch-admin_libtool_m4_in b/x11/kde/patches-3.2.3/patch-admin_libtool_m4_in
index 6ea890cf133..0875c3c367e 100644
--- a/x11/kde/patches-3.2.3/patch-admin_libtool_m4_in
+++ b/x11/kde/patches-3.2.3/patch-admin_libtool_m4_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-admin_libtool_m4_in,v 1.2 2004/08/14 18:00:23 brad Exp $
---- admin/libtool.m4.in.orig	Thu Oct 30 06:13:16 2003
-+++ admin/libtool.m4.in	Thu Aug 12 17:02:22 2004
+$OpenBSD: patch-admin_libtool_m4_in,v 1.3 2004/09/18 09:46:37 espie Exp $
+--- admin/libtool.m4.in.orig	Fri Apr  2 17:39:50 2004
++++ admin/libtool.m4.in	Mon Sep  6 01:08:05 2004
 @@ -672,6 +672,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
@@ -21,7 +21,7 @@ $OpenBSD: patch-admin_libtool_m4_in,v 1.2 2004/08/14 18:00:23 brad Exp $
   *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
-@@ -2208,13 +2221,7 @@ nto-qnx*)
+@@ -2212,13 +2225,7 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -36,7 +36,7 @@ $OpenBSD: patch-admin_libtool_m4_in,v 1.2 2004/08/14 18:00:23 brad Exp $
    ;;
  
  osf3* | osf4* | osf5*)
-@@ -3166,6 +3173,22 @@ case $host_os in
+@@ -3170,6 +3177,22 @@ case $host_os in
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -59,7 +59,7 @@ $OpenBSD: patch-admin_libtool_m4_in,v 1.2 2004/08/14 18:00:23 brad Exp $
    osf3*)
      case $cc_basename in
        KCC)
-@@ -5483,6 +5506,7 @@ EOF
+@@ -5487,6 +5510,7 @@ EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'