The KDE FreeBSD team is proud to announce the release

of KDE 3.5.9 for FreeBSD. The official KDE 3.5.9 release
notes can be found at:
http://www.kde.org/announcements/announce-3.5.9.php

After the KDE 4.1.0 import the team found time to make
KDE 3.5.9 ready for the Ports tree.

KDE 3.5.9 was released six months ago and 3.5.10 is coming
soon. We are not sure we have time to get 3.5.10 for FreeBSD
7.1/6.4 release, but we would have minimum 3.5.9 for those
people who prefer to stay with KDE3.

Of course Thanks to all Testers.

14 files changed, 73 insertions, 173 deletions

diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index ac5a553d427d..31f547d1ba0b 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME?=	kde
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 8334f1010544..a2aa415ccdfd 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -17,8 +17,11 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
+RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env \
+		kompmgr:${PORTSDIR}/x11-wm/kompmgr
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -56,10 +59,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS+=	kompmgr:${PORTSDIR}/x11-wm/kompmgr
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index f19401f591dd..6b8209d665fc 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.8.tar.bz2) = 9990c669229daaaa8fca4c5e354441fd
-SHA256 (KDE/kdebase-3.5.8.tar.bz2) = 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
-SIZE (KDE/kdebase-3.5.8.tar.bz2) = 24200172
+MD5 (KDE/kdebase-3.5.9.tar.bz2) = c8c35389a238aa1b73e68ef5298eadf8
+SHA256 (KDE/kdebase-3.5.9.tar.bz2) = 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
+SIZE (KDE/kdebase-3.5.9.tar.bz2) = 24239563
diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
index 61403676bbcb..fbc1aed98555 100644
--- a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
+++ b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
@@ -1,5 +1,5 @@
---- kioslave/media/mediamanager/halbackend.cpp.orig	Mon May 14 09:55:40 2007
-+++ kioslave/media/mediamanager/halbackend.cpp	Sat Jun  2 11:40:22 2007
+--- kioslave/media/mediamanager/halbackend.cpp.orig	2008-02-13 10:40:36.000000000 +0100
++++ kioslave/media/mediamanager/halbackend.cpp	2008-02-27 15:37:00.000000000 +0100
 @@ -17,9 +17,15 @@
  */
  
@@ -28,7 +28,7 @@
          const QPtrList<Medium> medlist = m_mediaList.list();
          QPtrListIterator<Medium> it (medlist);
          for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
-@@ -184,6 +194,10 @@
+@@ -187,6 +197,10 @@
  
      libhal_free_string_array( halDeviceList );
  
@@ -39,7 +39,7 @@
      return true;
  }
  
-@@ -245,11 +259,11 @@
+@@ -248,11 +262,11 @@
              }
          }
          QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
@@ -53,8 +53,8 @@
          }
          m_mediaList.addMedium(medium, allowNotification);
  
-@@ -264,6 +278,11 @@
-         {
+@@ -269,6 +283,11 @@
+                 allowNotification = false;
              /* Create medium */
              Medium* medium = new Medium(udi, "");
 +#ifdef Q_OS_FREEBSD
@@ -65,7 +65,7 @@
              // if the storage has a volume, we ignore it
              if ( setFloppyProperties(medium) )
                  m_mediaList.addMedium(medium, allowNotification);
-@@ -290,12 +309,23 @@
+@@ -295,11 +314,23 @@
  
  void HALBackend::RemoveDevice(const char *udi)
  {
@@ -79,7 +79,6 @@
  
  void HALBackend::ModifyDevice(const char *udi, const char* key)
  {
--    Q_UNUSED(key);
 +    if (
 +        !( strcmp(key, "info.hal_mount.created_mount_point")
 +        && strcmp(key, "info.hal_mount.mounted_by_uid")
@@ -90,7 +89,7 @@
      const char* mediumUdi = findMediumUdiFromUdi(udi);
      if (!mediumUdi)
          return;
-@@ -331,7 +361,7 @@
+@@ -338,7 +369,7 @@
      }
  
      const char* mediumUdi = findMediumUdiFromUdi(udi);
@@ -99,24 +98,24 @@
      if (!mediumUdi)
          return;
  
-@@ -389,7 +419,7 @@
+@@ -396,7 +427,7 @@
          {
              Medium m( *cmedium );
              if ( setFstabProperties( &m ) ) {
 -                kdDebug() << "setFstabProperties worked" << endl;
 +                kdDebug(1219) << "setFstabProperties worked" << endl;
-                 m_mediaList.changeMediumState(m, false);
+                 m_mediaList.changeMediumState(m, allowNotification);
              }
              return;
-@@ -404,6 +434,7 @@
+@@ -411,6 +442,7 @@
          setFloppyProperties(m);
      if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL))
          setCameraProperties(m);
 +    m->setHalMounted(libhal_device_get_property_string(m_halContext, mediumUdi, "info.hal_mount.created_mount_point", NULL));
  
-     m_mediaList.changeMediumState(*m, false);
+     m_mediaList.changeMediumState(*m, allowNotification);
  
-@@ -476,28 +507,23 @@
+@@ -483,28 +515,23 @@
              else
                  mimeType = "media/dvd" + MOUNT_SUFFIX;
  
@@ -156,7 +155,7 @@
      }
      else
      {
-@@ -581,7 +607,7 @@
+@@ -588,7 +615,7 @@
              }
          }
  
@@ -165,7 +164,7 @@
          QString fstype = medium->fsType();
          if ( fstype.isNull() )
              fstype = "auto";
-@@ -766,7 +792,32 @@
+@@ -778,7 +805,32 @@
      if (medium && !isInFstab(medium).isNull())
          return QStringList(); // not handled by HAL - fstab entry
  
@@ -198,7 +197,7 @@
      config.setGroup(name);
  
      char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL);
-@@ -777,25 +828,68 @@
+@@ -789,25 +841,68 @@
          if (t.endsWith("="))
              t = t.left(t.length() - 1);
          valids[t] = true;
@@ -270,7 +269,7 @@
      config.setGroup(name);
  
      if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL)
-@@ -809,44 +903,98 @@
+@@ -821,44 +916,98 @@
  
      if (valids.contains("ro"))
      {
@@ -375,7 +374,7 @@
          if (svalue == "winnt")
              result << "shortname=winnt";
          else if (svalue == "win95")
-@@ -856,28 +1004,36 @@
+@@ -868,28 +1017,36 @@
          else
              result << "shortname=lower";
      }
@@ -415,7 +414,7 @@
  
      if (!mount_point.startsWith("/"))
          mount_point = "/media/" + mount_point;
-@@ -887,7 +1043,9 @@
+@@ -899,7 +1056,9 @@
  
      if (valids.contains("data"))
      {
@@ -426,7 +425,7 @@
          if (svalue == "ordered")
              result << "journaling=ordered";
          else if (svalue == "writeback")
-@@ -896,6 +1054,82 @@
+@@ -908,6 +1067,82 @@
              result << "journaling=data";
          else
              result << "journaling=ordered";
@@ -509,7 +508,7 @@
      }
  
      return result;
-@@ -903,32 +1137,82 @@
+@@ -915,32 +1150,82 @@
  
  bool HALBackend::setMountoptions(const QString &name, const QStringList &options )
  {
@@ -604,7 +603,7 @@
  
      return true;
  }
-@@ -943,7 +1227,7 @@
+@@ -955,7 +1240,7 @@
      if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
                                                  "org.freedesktop.Hal.Device.Volume",
                                                  "Mount"))) {
@@ -613,7 +612,7 @@
          return i18n("Internal Error");
      }
  
-@@ -951,7 +1235,7 @@
+@@ -963,7 +1248,7 @@
                                     DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions,
                                     DBUS_TYPE_INVALID))
      {
@@ -622,7 +621,7 @@
          dbus_message_unref (dmesg);
          return i18n("Internal Error");
      }
-@@ -979,7 +1263,7 @@
+@@ -991,7 +1276,7 @@
          return qerror;
      }
  
@@ -631,7 +630,7 @@
  
      dbus_message_unref (dmesg);
      dbus_message_unref (reply);
-@@ -991,8 +1275,13 @@
+@@ -1003,8 +1288,13 @@
  QString HALBackend::listUsingProcesses(const Medium* medium)
  {
      QString proclist, fullmsg;
@@ -646,7 +645,7 @@
  
      uint counter = 0;
      if (fuser) {
-@@ -1027,7 +1316,7 @@
+@@ -1039,7 +1329,7 @@
  
  void HALBackend::slotResult(KIO::Job *job)
  {
@@ -655,7 +654,7 @@
  
      struct mount_job_data *data = mount_jobs[job];
      QString& qerror = data->errorMessage;
-@@ -1054,7 +1343,6 @@
+@@ -1066,7 +1356,6 @@
          qerror = job->errorText();
      }
  
@@ -663,7 +662,7 @@
      mount_jobs.remove(job);
  
      /* Job completed. Notify the caller */
-@@ -1063,6 +1351,25 @@
+@@ -1075,6 +1364,25 @@
      kapp->eventLoop()->exitLoop();
  }
  
@@ -689,7 +688,7 @@
  QString HALBackend::isInFstab(const Medium *medium)
  {
      KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName);
-@@ -1075,11 +1382,13 @@
+@@ -1087,11 +1395,13 @@
          QString reald = (*it)->realDeviceName();
          if ( reald.endsWith( "/" ) )
              reald = reald.left( reald.length() - 1 );
@@ -704,7 +703,7 @@
                  return (*it)->mountPoint();
          }
      }
-@@ -1099,7 +1408,7 @@
+@@ -1111,7 +1421,7 @@
          data.completed = false;
          data.medium = medium;
  
@@ -713,7 +712,7 @@
          KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
          connect(job, SIGNAL( result (KIO::Job *)),
                  SLOT( slotResult( KIO::Job *)));
-@@ -1117,7 +1426,7 @@
+@@ -1129,7 +1439,7 @@
  
      QStringList soptions;
  
@@ -722,7 +721,7 @@
  
      QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id()));
      if (valids["flush"] == "true")
-@@ -1125,15 +1434,19 @@
+@@ -1137,15 +1447,19 @@
  
      if (valids["uid"] == "true")
      {
@@ -744,7 +743,7 @@
      if (valids["quiet"] == "true")
          soptions << "quiet";
  
-@@ -1149,7 +1462,19 @@
+@@ -1161,7 +1475,19 @@
  
      if (valids.contains("shortname"))
      {
@@ -764,7 +763,7 @@
      }
  
      if (valids.contains("journaling"))
-@@ -1163,6 +1488,41 @@
+@@ -1175,6 +1501,41 @@
              soptions << QString("data=ordered");
      }
  
@@ -806,7 +805,7 @@
      const char **options = new const char*[soptions.size() + 1];
      uint noptions = 0;
      for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
-@@ -1175,9 +1535,6 @@
+@@ -1187,9 +1548,6 @@
          return qerror;
      }
  
@@ -816,7 +815,7 @@
      return QString();
  }
  
-@@ -1238,7 +1595,7 @@
+@@ -1250,7 +1608,7 @@
      const char *options[2];
  
      const char *udi = medium->id().latin1();
@@ -825,7 +824,7 @@
  
      dbus_error_init(&error);
      DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
-@@ -1251,7 +1608,7 @@
+@@ -1263,7 +1621,7 @@
      if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
                                                  "org.freedesktop.Hal.Device.Volume",
                                                  "Unmount"))) {
@@ -834,7 +833,7 @@
          return i18n("Internal Error");
      }
  
-@@ -1261,7 +1618,7 @@
+@@ -1273,7 +1631,7 @@
      if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0,
                                     DBUS_TYPE_INVALID))
      {
@@ -843,7 +842,7 @@
          dbus_message_unref (dmesg);
          return i18n("Internal Error");
      }
-@@ -1271,7 +1628,7 @@
+@@ -1283,7 +1641,7 @@
      {
          QString qerror, reason;
  
@@ -852,7 +851,7 @@
          qerror = "<qt>";
          qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
                         "currently mounted at <b>%4</b> could not be unmounted. ").arg(
-@@ -1301,13 +1658,10 @@
+@@ -1313,14 +1671,11 @@
          return qerror;
      }
  
@@ -861,9 +860,10 @@
  
      dbus_message_unref (dmesg);
      dbus_message_unref (reply);
--
+ 
 -    medium->setHalMounted(false);
 -    ResetProperties(udi);
- 
+-
      return QString();
  }
+ 
diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist
index 346ddd4ff1db..f4fd4c7f60af 100644
--- a/x11/kdelibs3-nocups/pkg-plist
+++ b/x11/kdelibs3-nocups/pkg-plist
@@ -1160,7 +1160,6 @@ lib/libvcard.a
 lib/libvcard.la
 lib/libvcard.so
 lib/libvcard.so.0
-libdata/ldconfig/kdelibs
 share/applications/kde/kresources.desktop
 share/apps/LICENSES/ARTISTIC
 share/apps/LICENSES/BSD
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 7772d47a51a7..8912d7ef164d 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -30,10 +30,12 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 RUN_DEPENDS=	kdehier>0:${PORTSDIR}/misc/kdehier \
 		${FONTSCALE}:${X_FONTS_TTF_PORT} \
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+		iceauth:${PORTSDIR}/x11/iceauth
 
 CONFLICTS+=	kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
 .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
@@ -62,8 +64,8 @@ CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--disable-as-needed \
 		--enable-mt \
 		--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--with-libthai=yes \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
+		--with-libthai=yes \
 		--with-lua=no \
 		--with-ssl-dir=${OPENSSLBASE}
 CONFIGURE_ENV+=	libltdl_cv_shlibext=".so"
@@ -79,9 +81,6 @@ FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
 
-BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-RUN_DEPENDS+=	iceauth:${PORTSDIR}/x11/iceauth
-
 pre-configure:
 	${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp
 	${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 96d54b9e3d7a..caacbae9e927 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.8.tar.bz2) = acaa37e79e840d10dca326277a20863c
-SHA256 (KDE/kdelibs-3.5.8.tar.bz2) = 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
-SIZE (KDE/kdelibs-3.5.8.tar.bz2) = 15557343
+MD5 (KDE/kdelibs-3.5.9.tar.bz2) = 55e5f00874933d1a7ba7c95e369a205e
+SHA256 (KDE/kdelibs-3.5.9.tar.bz2) = 4f92553f3ff50de87a83435fce3bae440c43f0d37a8e80a1736d007f80d8f755
+SIZE (KDE/kdelibs-3.5.9.tar.bz2) = 15568675
diff --git a/x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp b/x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp
deleted file mode 100644
index 62be701bb371..000000000000
--- a/x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdecore/kstartupinfo.cpp	2007/10/08 11:32:36	722993
-+++ kdecore/kstartupinfo.cpp	2007/10/12 12:13:00	724472
-@@ -545,7 +545,7 @@
- 
- void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
-     {
--    long activate = true;
-+    bool activate = true;
-     kapp->setStartupId( startup_id );
-     if( window != NULL )
-         {
-@@ -937,7 +937,7 @@
- #ifdef Q_WS_X11
-     extern Time qt_x_user_time;
- #else
--    long qt_x_user_time = 0;
-+    unsigned long qt_x_user_time = 0;
- #endif
-     QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
-         .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
-@@ -1078,7 +1078,9 @@
-     if( pos >= 0 )
-         {
-         bool ok;
--        long time = d->id.mid( pos + 5 ).toLong( &ok );
-+        unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
-+        if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+            time = d->id.mid( pos + 5 ).toLong( &ok );
-         if( ok )
-             return time;
-         }
-@@ -1093,7 +1095,9 @@
-         if( pos2 >= 0 )
-             {
-             bool ok;
--            long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
-+            unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
-+            if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+                time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
-             if( ok )
-                 return time;
-             }
diff --git a/x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp b/x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp
deleted file mode 100644
index caee9f862c62..000000000000
--- a/x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdeui/kactionclasses.cpp	2007/10/08 11:32:36	722993
-+++ kdeui/kactionclasses.cpp	2007/10/20 20:49:01	727528
-@@ -667,8 +667,8 @@
-     KToolBar* bar = static_cast<KToolBar*>( widget );
-     int id_ = KAction::getToolButtonID();
-     bar->insertCombo( comboItems(), id_, isEditable(),
--                      SIGNAL( activated( int ) ), this,
--                      SLOT( slotActivated( int ) ), isEnabled(),
-+                      SIGNAL( activated( const QString & ) ), this,
-+                      SLOT( slotActivated( const QString & ) ), isEnabled(),
-                       toolTip(), -1, index );
- 
-     QComboBox *cb = bar->getCombo( id_ );
diff --git a/x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c b/x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c
deleted file mode 100644
index 396ca8af4ff2..000000000000
--- a/x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kinit/start_kdeinit_wrapper.c.orig	2007-10-29 22:49:04.000000000 +0100
-+++ kinit/start_kdeinit_wrapper.c	2007-10-29 22:49:21.000000000 +0100
-@@ -85,7 +85,7 @@
-    if(argc == 0)
-       return 1;
-    argv[0] = "start_kdeinit";
--   execv("start_kdeinit",argv);
-+   execvp("start_kdeinit",argv);
-    perror("start_kdeinit");
-    return 1;
- }
diff --git a/x11/kdelibs3/files/patch-kioslave_http-http.cc b/x11/kdelibs3/files/patch-kioslave_http-http.cc
deleted file mode 100644
index 73929be6efcf..000000000000
--- a/x11/kdelibs3/files/patch-kioslave_http-http.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- kioslave/http/http.cc	2007/09/26 17:08:43	717341
-+++ kioslave/http/http.cc	2007/10/17 04:11:51	726097
-@@ -3409,10 +3409,6 @@
- 
-   } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
- 
--  // Send the current response before processing starts or it
--  // might never get sent...
--  forwardHttpResponseHeader();
--
-   // Now process the HTTP/1.1 upgrade
-   QStringList::Iterator opt = upgradeOffers.begin();
-   for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
-     mimeType( m_strMimeType );
-   }
- 
-+  // Do not move send response header before any redirection as it seems
-+  // to screw up some sites. See BR# 150904.
-+  forwardHttpResponseHeader();
-+
-   if (m_request.method == HTTP_HEAD)
-      return true;
- 
-@@ -3830,10 +3830,10 @@
-         // Check...
-         createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
-         if (!m_request.fcache)
--	    {
--		m_request.bCachedWrite = false; // Error creating cache entry.
--		kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
--	    }
-+        {
-+          m_request.bCachedWrite = false; // Error creating cache entry.
-+          kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-+        }
-         m_request.expireDate = expireDate;
-         m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
-      }
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index d6638277a638..bee68f17e256 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xscreensaver-kde
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo
index eed8d3cdb721..eba5e0711651 100644
--- a/x11/xscreensaver-kde/distinfo
+++ b/x11/xscreensaver-kde/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeartwork-3.5.8.tar.bz2) = 03becf82a233e6007e9372ffa5756d0b
-SHA256 (KDE/kdeartwork-3.5.8.tar.bz2) = edb99200bdfe6ec1ffe497297c92c5b1d3de203959c0f833a2eb4a6bfef34516
-SIZE (KDE/kdeartwork-3.5.8.tar.bz2) = 16602701
+MD5 (KDE/kdeartwork-3.5.9.tar.bz2) = ec526eba38421fd3b143682b8d683c86
+SHA256 (KDE/kdeartwork-3.5.9.tar.bz2) = 03b3e80b974c81e4b0acebdde8ad2ba7cbc1b17c1d6c0f26d08b0018ed1f5c79
+SIZE (KDE/kdeartwork-3.5.9.tar.bz2) = 16616282
diff --git a/x11/xscreensaver-kde/pkg-plist b/x11/xscreensaver-kde/pkg-plist
index 3528cb73300b..7fbabc4fa0d8 100644
--- a/x11/xscreensaver-kde/pkg-plist
+++ b/x11/xscreensaver-kde/pkg-plist
@@ -1,5 +1,6 @@
 bin/kxsconfig
 bin/kxsrun
+share/applnk/System/ScreenSavers/abstractile.desktop
 share/applnk/System/ScreenSavers/anemone.desktop
 share/applnk/System/ScreenSavers/anemotaxis.desktop
 share/applnk/System/ScreenSavers/antinspect.desktop
@@ -39,6 +40,7 @@ share/applnk/System/ScreenSavers/crystal.desktop
 share/applnk/System/ScreenSavers/cube21.desktop
 share/applnk/System/ScreenSavers/cubenetic.desktop
 share/applnk/System/ScreenSavers/cubestorm.desktop
+share/applnk/System/ScreenSavers/cwaves.desktop
 share/applnk/System/ScreenSavers/cynosure.desktop
 share/applnk/System/ScreenSavers/dangerball.desktop
 share/applnk/System/ScreenSavers/decayscreen.desktop
@@ -73,12 +75,14 @@ share/applnk/System/ScreenSavers/galaxy.desktop
 share/applnk/System/ScreenSavers/gears.desktop
 share/applnk/System/ScreenSavers/gflux.desktop
 share/applnk/System/ScreenSavers/glblur.desktop
+share/applnk/System/ScreenSavers/glcells.desktop
 share/applnk/System/ScreenSavers/gleidescope.desktop
 share/applnk/System/ScreenSavers/glforestfire.desktop
 share/applnk/System/ScreenSavers/glhanoi.desktop
 share/applnk/System/ScreenSavers/glknots.desktop
 share/applnk/System/ScreenSavers/glmatrix.desktop
 share/applnk/System/ScreenSavers/glplanet.desktop
+share/applnk/System/ScreenSavers/glschool.desktop
 share/applnk/System/ScreenSavers/glslideshow.desktop
 share/applnk/System/ScreenSavers/glsnake.desktop
 share/applnk/System/ScreenSavers/gltext.desktop
@@ -112,7 +116,9 @@ share/applnk/System/ScreenSavers/lightning.desktop
 share/applnk/System/ScreenSavers/lisa.desktop
 share/applnk/System/ScreenSavers/lissie.desktop
 share/applnk/System/ScreenSavers/lmorph.desktop
+share/applnk/System/ScreenSavers/lockward.desktop
 share/applnk/System/ScreenSavers/loop.desktop
+share/applnk/System/ScreenSavers/m6502.desktop
 share/applnk/System/ScreenSavers/maze.desktop
 share/applnk/System/ScreenSavers/memscroller.desktop
 share/applnk/System/ScreenSavers/menger.desktop
@@ -120,6 +126,7 @@ share/applnk/System/ScreenSavers/metaballs.desktop
 share/applnk/System/ScreenSavers/mirrorblob.desktop
 share/applnk/System/ScreenSavers/mismunch.desktop
 share/applnk/System/ScreenSavers/moebius.desktop
+share/applnk/System/ScreenSavers/moebiusgears.desktop
 share/applnk/System/ScreenSavers/moire.desktop
 share/applnk/System/ScreenSavers/moire2.desktop
 share/applnk/System/ScreenSavers/molecule.desktop
@@ -181,12 +188,14 @@ share/applnk/System/ScreenSavers/t3d.desktop
 share/applnk/System/ScreenSavers/tangram.desktop
 share/applnk/System/ScreenSavers/thornbird.desktop
 share/applnk/System/ScreenSavers/timetunnel.desktop
+share/applnk/System/ScreenSavers/topblock.desktop
 share/applnk/System/ScreenSavers/triangle.desktop
 share/applnk/System/ScreenSavers/truchet.desktop
 share/applnk/System/ScreenSavers/twang.desktop
 share/applnk/System/ScreenSavers/vermiculate.desktop
 share/applnk/System/ScreenSavers/vidwhacker.desktop
 share/applnk/System/ScreenSavers/vines.desktop
+share/applnk/System/ScreenSavers/voronoi.desktop
 share/applnk/System/ScreenSavers/wander.desktop
 share/applnk/System/ScreenSavers/webcollage.desktop
 share/applnk/System/ScreenSavers/whirlwindwarp.desktop