10 files changed, 14 insertions, 950 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index a2aa415ccdfd..b4cf171f4767 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--without-java			\
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
-		HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \
+		HAL "Use HAL backend for media:/" on \
 		HTDIG "Depend on htdig, used to build manual indices" off
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
@@ -68,8 +68,6 @@ RUN_DEPENDS+=	htdig:${PORTSDIR}/textproc/htdig
 .endif
 
 .if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \
-		${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h
 LIB_DEPENDS+=	dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \
 		hal.1:${PORTSDIR}/sysutils/hal
 PLIST_SUB+=	MEDIA=""
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 6b8209d665fc..a9380241106d 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdebase-3.5.10.tar.bz2) = 88237188271fbf1e6bcd40180a75d953
+SHA256 (KDE/kdebase-3.5.10.tar.bz2) = 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
+SIZE (KDE/kdebase-3.5.10.tar.bz2) = 24339704
diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
deleted file mode 100644
index fbc1aed98555..000000000000
--- a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp
+++ /dev/null
@@ -1,869 +0,0 @@
---- 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 @@
- */
- 
- #include "halbackend.h"
--#include "linuxcdpolling.h"
- 
- #include <stdlib.h>
-+#ifdef Q_OS_FREEBSD
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+#include <langinfo.h>
-+#include <qregexp.h>
-+#endif
- 
- #include <kapplication.h>
- #include <qeventloop.h>
-@@ -71,6 +77,10 @@
-     /* Close HAL connection */
-     if (m_halContext)
-     {
-+#ifdef Q_OS_FREEBSD
-+        m_pollTimer.stop();
-+        m_pollMediaList.clear();
-+#endif
-         const QPtrList<Medium> medlist = m_mediaList.list();
-         QPtrListIterator<Medium> it (medlist);
-         for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
-@@ -187,6 +197,10 @@
- 
-     libhal_free_string_array( halDeviceList );
- 
-+#ifdef Q_OS_FREEBSD
-+    connect(&m_pollTimer, SIGNAL(timeout()),
-+        this, SLOT(pollMediaList()));
-+#endif
-     return true;
- }
- 
-@@ -248,11 +262,11 @@
-             }
-         }
-         QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
--        kdDebug() << "automount " << options["automount"] << endl;
-+        kdDebug(1219) << "automount " << options["automount"] << endl;
-         if (options["automount"] == "true" && allowNotification ) {
-             QString error = mount(medium);
-             if (!error.isEmpty())
--                kdDebug() << "error " << error << endl;
-+                kdDebug(1219) << "error " << error << endl;
-         }
-         m_mediaList.addMedium(medium, allowNotification);
- 
-@@ -269,6 +283,11 @@
-                 allowNotification = false;
-             /* Create medium */
-             Medium* medium = new Medium(udi, "");
-+#ifdef Q_OS_FREEBSD
-+            m_pollTimer.stop();
-+            m_pollMediaList.append(medium);
-+            m_pollTimer.start(250);
-+#endif
-             // if the storage has a volume, we ignore it
-             if ( setFloppyProperties(medium) )
-                 m_mediaList.addMedium(medium, allowNotification);
-@@ -295,11 +314,23 @@
- 
- void HALBackend::RemoveDevice(const char *udi)
- {
-+#ifdef Q_OS_FREEBSD
-+    m_pollMediaList.remove(m_mediaList.findById(udi));
-+    if (m_pollMediaList.isEmpty())
-+        m_pollTimer.stop();
-+#endif
-     m_mediaList.removeMedium(udi, true);
- }
- 
- void HALBackend::ModifyDevice(const char *udi, const char* key)
- {
-+    if (
-+        !( strcmp(key, "info.hal_mount.created_mount_point")
-+        && strcmp(key, "info.hal_mount.mounted_by_uid")
-+        && strcmp(key, "volume.mount_point")
-+        && strcmp(key, "volume.is_mounted_read_only")))
-+        return;
-+
-     const char* mediumUdi = findMediumUdiFromUdi(udi);
-     if (!mediumUdi)
-         return;
-@@ -338,7 +369,7 @@
-     }
- 
-     const char* mediumUdi = findMediumUdiFromUdi(udi);
--    kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl;
-+    kdDebug(1219) << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl;
-     if (!mediumUdi)
-         return;
- 
-@@ -396,7 +427,7 @@
-         {
-             Medium m( *cmedium );
-             if ( setFstabProperties( &m ) ) {
--                kdDebug() << "setFstabProperties worked" << endl;
-+                kdDebug(1219) << "setFstabProperties worked" << endl;
-                 m_mediaList.changeMediumState(m, allowNotification);
-             }
-             return;
-@@ -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, allowNotification);
- 
-@@ -483,28 +515,23 @@
-             else
-                 mimeType = "media/dvd" + MOUNT_SUFFIX;
- 
--        if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
--        {
--            mimeType = "media/audiocd";
--            medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) );
--        }
--
--        medium->setIconName(QString::null);
--
-         /* check if the disc id a vcd or a video dvd */
--        DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
--        switch (type)
-+        if (libhal_volume_disc_has_data(halVolume))
-         {
--        case DiscType::VCD:
-+        if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL))
-             mimeType = "media/vcd";
--            break;
--        case DiscType::SVCD:
-+        else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL))
-             mimeType = "media/svcd";
--            break;
--        case DiscType::DVD:
-+        else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL))
-             mimeType = "media/dvdvideo";
--            break;
-         }
-+        else if (libhal_volume_disc_has_audio(halVolume))
-+	{
-+            mimeType = "media/audiocd";
-+            medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) );
-+        }
-+
-+        medium->setIconName(QString::null);
-     }
-     else
-     {
-@@ -588,7 +615,7 @@
-             }
-         }
- 
--        kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " <<  endl;
-+        kdDebug(1219) << mp << " " << mounted << " " << medium->deviceNode() << " " <<  endl;
-         QString fstype = medium->fsType();
-         if ( fstype.isNull() )
-             fstype = "auto";
-@@ -778,7 +805,32 @@
-     if (medium && !isInFstab(medium).isNull())
-         return QStringList(); // not handled by HAL - fstab entry
- 
-+		const char *boolOptionNames[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
-+		const char *stringOptionNames[] = { "shortname", "journaling", "mountpoint", "automount",
-+#ifdef Q_OS_FREEBSD
-+				"filemask", "dirmask", "charset", "locale", "doscodepage",
-+#endif
-+				0 };
-+
-     KConfig config("mediamanagerrc");
-+    config.setGroup("General");
-+    QMap<QString,QString> options;
-+    for (int index = 0; boolOptionNames[index]; ++index)
-+        if (config.hasKey(boolOptionNames[index]))
-+            options.insert(boolOptionNames[index],
-+                config.readBoolEntry(boolOptionNames[index]) ? "true" : "false");
-+    for (int index = 0; stringOptionNames[index]; ++index)
-+        if (config.hasKey(stringOptionNames[index]))
-+            options.insert(stringOptionNames[index],
-+                config.readEntry(stringOptionNames[index]));
-+    if (!libhal_device_exists(m_halContext, name.latin1(), NULL))
-+    {
-+        QStringList result;
-+        if (name.lower() == "general")
-+        for (QMap<QString,QString>::ConstIterator it = options.begin(); it != options.end(); ++it)
-+            result << it.key() + '=' + it.data();
-+        return result;
-+    }		
-     config.setGroup(name);
- 
-     char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL);
-@@ -789,25 +841,68 @@
-         if (t.endsWith("="))
-             t = t.left(t.length() - 1);
-         valids[t] = true;
--        kdDebug() << "valid " << t << endl;
-+        kdDebug(1219) << "valid " << t << endl;
-     }
-     libhal_free_string_array(array);
-     QStringList result;
-     QString tmp;
- 
-+    QMap<QString,QString> halOptions;
-+    LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, name.latin1());
-+    if (!halVolume)
-+    {
-+        LibHalDrive *halDrive  = libhal_drive_from_udi(m_halContext, name.latin1());
-+        if (halDrive)
-+        {
-+            tmp = QString::fromLatin1(libhal_drive_policy_get_mount_options(halDrive, NULL));
-+            libhal_drive_free(halDrive);
-+        }
-+    }
-+    else
-+    {
-+        const char *driveUdi = libhal_volume_get_storage_device_udi(halVolume);
-+        LibHalDrive *halDrive  = !driveUdi ? 0 : libhal_drive_from_udi(m_halContext, driveUdi);
-+        if (halDrive)
-+        {
-+            tmp = QString::fromLatin1(libhal_volume_policy_get_mount_options(halDrive, halVolume, NULL));
-+            libhal_drive_free(halDrive);
-+        }
-+        libhal_volume_free(halVolume);
-+    }
-+    if (!tmp.isEmpty())
-+    {
-+        uint start = 0;
-+        while(start < tmp.length())
-+        {
-+            int end = tmp.find(',', start);
-+            if (end == -1) end = tmp.length();
-+            QString opt = tmp.mid( start, end - start );
-+            start = end + 1;
-+            end = opt.find('=');
-+            QString key = opt.left(end);
-+            if (valids.contains(key))
-+                halOptions.insert(key, end == -1 ? QString::null : opt.mid(end + 1));
-+        }
-+    }
-+
-     QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype");
-     if (fstype.isNull())
-         fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem");
- 
-     QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
- 
-+    bool value = false;
-     bool removable = false;
-     if ( !drive_udi.isNull() )
-+    {
-+        value = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.automount_enabled_hint", NULL);
-         removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
--                     || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);
-+                     || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);				
-+    }
- 
-     config.setGroup(drive_udi);
--    bool value = config.readBoolEntry("automount", false);
-+    value = config.readBoolEntry("automount",
-+        !options.contains("automount") ? value : options["automount"] == "true" );
-     config.setGroup(name);
- 
-     if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL)
-@@ -821,44 +916,98 @@
- 
-     if (valids.contains("ro"))
-     {
--        value = config.readBoolEntry("ro", false);
-+        value = options.contains("ro") ? options["ro"] == "true"
-+            : halOptions.contains("ro");
-+        value = config.readBoolEntry("ro", value);
-         tmp = QString("ro=%1").arg(value ? "true" : "false");
-         if (fstype != "iso9660") // makes no sense
-             result << tmp;
-+        halOptions.remove("ro");
-     }
- 
-     if (valids.contains("quiet"))
-     {
--        value = config.readBoolEntry("quiet", false);
-+        value = options.contains("quiet") ? options["quiet"] == "true"
-+            : halOptions.contains("quiet");
-+        value = config.readBoolEntry("quiet",  value);
-         tmp = QString("quiet=%1").arg(value ? "true" : "false");
-         if (fstype != "iso9660") // makes no sense
-             result << tmp;
-+        halOptions.remove("quiet");
-     }
- 
-     if (valids.contains("flush"))
-     {
--        value = config.readBoolEntry("flush", fstype.endsWith("fat"));
-+        value = options.contains("flush") ? options["flush"] == "true"
-+            : (halOptions.contains("flush") || fstype.endsWith("fat"));
-+        value = config.readBoolEntry("flush", value);
-         tmp = QString("flush=%1").arg(value ? "true" : "false");
-         result << tmp;
-+        halOptions.remove("flush");
-     }
- 
-+#ifdef Q_OS_FREEBSD
-+    if (valids.contains("-u"))
-+#else
-     if (valids.contains("uid"))
-+#endif
-     {
--        value = config.readBoolEntry("uid", true);
-+        value = !options.contains("uid") ? true : options["uid"] == "true";
-+        value = config.readBoolEntry("uid", value);
-         tmp = QString("uid=%1").arg(value ? "true" : "false");
-         result << tmp;
-+#ifdef Q_OS_FREEBSD
-+        halOptions.remove("-u");
-+#else
-+        halOptions.remove("uid");
-+#endif
-     }
- 
-     if (valids.contains("utf8"))
-     {
--        value = config.readBoolEntry("utf8", true);
-+        value = !options.contains("iocharset") && !halOptions.contains("iocharset") 
-+            && (options.contains("utf8") ? options["utf8"] == "true"
-+            : halOptions.contains("utf8"));
-+        value = config.readBoolEntry("utf8", value);
-         tmp = QString("utf8=%1").arg(value ? "true" : "false");
-         result << tmp;
-+        halOptions.remove("utf8");
-     }
- 
-+#ifdef Q_OS_FREEBSD
-+    if (valids.contains("nowin95")
-+        && valids.contains("longnames")
-+        && valids.contains("shortnames"))
-+    {
-+        QString svalue = "winnt";
-+        if (halOptions.contains("longnames") && !halOptions.contains("shortnames") && !halOptions.contains("nowin95"))
-+            svalue = "winnt";
-+        else if (!halOptions.contains("longnames") && halOptions.contains("shortnames") && !halOptions.contains("nowin95"))
-+            svalue = "win95";
-+        else if (halOptions.contains("longnames") && halOptions.contains("shortnames") && !halOptions.contains("nowin95"))
-+            svalue = "mixed";
-+        else if (halOptions.contains("nowin95"))
-+            svalue = "lower";
-+        svalue = config.readEntry("shortname",
-+            options.contains("shortname") ? options["shortname"] : svalue);
-+        if (svalue == "winnt")
-+            result << "shortname=winnt";
-+        else if (svalue == "win95")
-+            result << "shortname=win95";
-+        else if (svalue == "mixed")
-+            result << "shortname=mixed";
-+        else
-+            result << "shortname=lower";
-+        halOptions.remove("nowin95");
-+        halOptions.remove("longnames");
-+        halOptions.remove("shortnames");
-+    }
-+#else
-     if (valids.contains("shortname"))
-     {
--        QString svalue = config.readEntry("shortname", "lower").lower();
-+        QString svalue = options.contains("shortname") ? options["shortname"]
-+						: (halOptions.contains("shortname") ? halOptions["shortname"] : "winnt");
-+        svalue = config.readEntry("shortname", svalue).lower();
-         if (svalue == "winnt")
-             result << "shortname=winnt";
-         else if (svalue == "win95")
-@@ -868,28 +1017,36 @@
-         else
-             result << "shortname=lower";
-     }
--
-+#endif
-     if (valids.contains("sync"))
-     {
--        value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
-+        value = options.contains("sync") ? options["sync"] == "true"
-+                                               : (halOptions.contains("sync") || ((valids.contains("flush") && !fstype.endsWith("fat")) && removable));
-+        value = config.readBoolEntry("sync", value);
-         tmp = QString("sync=%1").arg(value ? "true" : "false");
-         if (fstype != "iso9660") // makes no sense
-             result << tmp;
-+        halOptions.remove("sync");
-     }
- 
-     if (valids.contains("noatime"))
-     {
-         value = config.readBoolEntry("atime", !fstype.endsWith("fat"));
-+        value = options.contains("atime") ? options["atime"] == "true"
-+                                               : (halOptions.contains("noatime") ? false : !fstype.endsWith("fat"));
-+        value = config.readBoolEntry("atime", value);
-         tmp = QString("atime=%1").arg(value ? "true" : "false");
-         if (fstype != "iso9660") // makes no sense
-             result << tmp;
-+        halOptions.remove("noatime");
-     }
- 
-     QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point");
-     if (mount_point.isEmpty())
-         mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point");
- 
--    mount_point = config.readEntry("mountpoint", mount_point);
-+    mount_point = config.readEntry("mountpoint",
-+        options.contains("mountpoint") ? options["mountpoint"] : mount_point);
- 
-     if (!mount_point.startsWith("/"))
-         mount_point = "/media/" + mount_point;
-@@ -899,7 +1056,9 @@
- 
-     if (valids.contains("data"))
-     {
--        QString svalue = config.readEntry("journaling").lower();
-+        QString svalue = options.contains("journaling") ? options["journaling"]
-+						: (halOptions.contains("data") ? halOptions["data"] : "ordered");
-+        svalue = config.readEntry("journaling", svalue).lower();
-         if (svalue == "ordered")
-             result << "journaling=ordered";
-         else if (svalue == "writeback")
-@@ -908,6 +1067,82 @@
-             result << "journaling=data";
-         else
-             result << "journaling=ordered";
-+        halOptions.remove("data");
-+    }
-+
-+#ifdef Q_OS_FREEBSD
-+    if (valids.contains("-m"))
-+    {
-+        QString svalue = options.contains("filemask") ? options["filemask"]
-+            : (halOptions.contains("-m") ? halOptions["-m"] : QString::null);
-+        svalue = config.readEntry("filemask", svalue);
-+        if (!svalue.isEmpty())
-+            result << QString("filemask=%1").arg(svalue);
-+        halOptions.remove("-m");
-+        kdDebug(1219) << "mount properties " << result << " " << endl;
-+    }
-+
-+    if (valids.contains("-M"))
-+    {
-+        QString svalue = options.contains("dirmask") ? options["dirmask"]
-+            : (halOptions.contains("-M") ? halOptions["-M"] : QString::null);
-+        svalue = config.readEntry("dirmask", svalue);
-+        if (!svalue.isEmpty())
-+            result << QString("dirmask=%1").arg(svalue);
-+        halOptions.remove("-M");
-+        kdDebug(1219) << "mount properties " << result << " " << endl;
-+    }
-+
-+    if (valids.contains("-C"))
-+    {
-+        QString svalue = options.contains("charset") ? options["charset"]
-+            : (halOptions.contains("-C") ? halOptions["-C"] : nl_langinfo(CODESET));
-+        svalue = config.readEntry("charset", svalue);
-+        if (!svalue.isEmpty())
-+            result << QString("charset=%1").arg(svalue);
-+        halOptions.remove("-C");
-+        kdDebug(1219) << "mount properties " << result << " " << endl;
-+    }
-+
-+    if (valids.contains("-L"))
-+    {
-+        QString locale = getenv("LANG");
-+        if (locale.isEmpty()) locale = getenv("LC_ALL");
-+        QString svalue = options.contains("locale") ? options["locale"]
-+            : (halOptions.contains("-L") ? halOptions["-L"] : locale );
-+        svalue = config.readEntry("locale", svalue);
-+        if (!svalue.isEmpty())
-+            result << QString("locale=%1").arg(svalue);
-+        halOptions.remove("-L");
-+        kdDebug(1219) << "mount properties " << result << " " << endl;
-+    }
-+
-+    if (valids.contains("-D"))
-+    {
-+        QString svalue = options.contains("doscodepage") ? options["doscodepage"]
-+            : (halOptions.contains("-D") ? halOptions["-D"] : nl_langinfo(CODESET));
-+        svalue = config.readEntry("doscodepage", svalue);
-+        if (!svalue.isEmpty())
-+            result << QString("doscodepage=%1").arg(svalue);
-+        halOptions.remove("-D");
-+        kdDebug(1219) << "mount properties " << result << " " << endl;
-+    }
-+#endif
-+
-+    if (!halOptions.isEmpty())
-+    {
-+        QString svalue;
-+        for (QMap<QString,QString>::ConstIterator it = halOptions.begin(); it != halOptions.end(); ++it)
-+        {
-+            if (it != halOptions.begin())
-+								svalue += ',';
-+            svalue += it.key();
-+            if (!it.data().isEmpty())
-+            svalue += '=' + it.data();
-+        }
-+        if (!svalue.isEmpty())
-+            result << QString("options=%1").arg(svalue);
-+        kdDebug(1219) << "mount properties " << result << " " << endl;
-     }
- 
-     return result;
-@@ -915,32 +1150,82 @@
- 
- bool HALBackend::setMountoptions(const QString &name, const QStringList &options )
- {
--    kdDebug() << "setMountoptions " << name << " " << options << endl;
-+    kdDebug(1219) << "setMountoptions " << name << " " << options << endl;
- 
-     KConfig config("mediamanagerrc");
--    config.setGroup(name);
-+    config.setGroup(name.lower() == "general" ? "General" : name);
- 
-     QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
- 
-     const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
-     for (int index = 0; names[index]; ++index)
-         if (valids.contains(names[index]))
--            config.writeEntry(names[index], valids[names[index]] == "true");
-+            if (valids[names[index]].isEmpty())
-+                config.deleteEntry(names[index]);
-+            else
-+                config.writeEntry(names[index], valids[names[index]] == "true");
- 
-     if (valids.contains("shortname"))
--        config.writeEntry("shortname", valids["shortname"]);
-+        if (valids["shortname"].isEmpty())
-+            config.deleteEntry("shortname");
-+        else
-+            config.writeEntry("shortname", valids["shortname"]);
- 
-     if (valids.contains("journaling"))
--        config.writeEntry("journaling", valids["journaling"]);
-+        if (valids["journaling"].isEmpty())
-+            config.deleteEntry("journaling");
-+        else
-+            config.writeEntry("journaling", valids["journaling"]);
- 
--    if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"])))
--        config.writeEntry("mountpoint", valids["mountpoint"]);
-+        if (valids.contains("mountpoint"))
-+        if (valids["mountpoint"].isEmpty())
-+            config.deleteEntry("mountpoint");
-+        else if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"])))
-+            config.writeEntry("mountpoint", valids["mountpoint"]);
-+
-+        if (valids.contains("automount"))
-+            if (valids["automount"].isEmpty())
-+                config.deleteEntry("automount");
-+            else
-+            {
-+                QString drive_udi = libhal_device_exists(m_halContext, name.latin1(), NULL)
-+                    ? libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device")
-+                    : (name.lower() == "general" ? "General" : name);
-+                config.setGroup(drive_udi);
-+                config.writeEntry("automount", valids["automount"]);
-+            }
- 
--    if (valids.contains("automount")) {
--        QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
--        config.setGroup(drive_udi);
--        config.writeEntry("automount", valids["automount"]);
--    }
-+#ifdef Q_OS_FREEBSD
-+    if (valids.contains("filemask"))
-+        if (valids["filemask"].isEmpty())
-+						config.deleteEntry("filemask");
-+        else
-+						config.writeEntry("filemask", valids["filemask"]);
-+
-+    if (valids.contains("dirmask"))
-+        if (valids["dirmask"].isEmpty())
-+						config.deleteEntry("dirmask");
-+        else
-+						config.writeEntry("dirmask", valids["dirmask"]);
-+
-+    if (valids.contains("charset"))
-+        if (valids["charset"].isEmpty())
-+						config.deleteEntry("charset");
-+        else
-+						config.writeEntry("charset", valids["charset"]);
-+
-+    if (valids.contains("locale"))
-+        if (valids["locale"].isEmpty())
-+						config.deleteEntry("locale");
-+        else
-+						config.writeEntry("locale", valids["locale"]);
-+
-+    if (valids.contains("doscodepage"))
-+        if (valids["doscodepage"].isEmpty())
-+						config.deleteEntry("doscodepage");
-+        else
-+						config.writeEntry("doscodepage", valids["doscodepage"]);
-+#endif
- 
-     return true;
- }
-@@ -955,7 +1240,7 @@
-     if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
-                                                 "org.freedesktop.Hal.Device.Volume",
-                                                 "Mount"))) {
--        kdDebug() << "mount failed for " << udi << ": could not create dbus message\n";
-+        kdDebug(1219) << "mount failed for " << udi << ": could not create dbus message\n";
-         return i18n("Internal Error");
-     }
- 
-@@ -963,7 +1248,7 @@
-                                    DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions,
-                                    DBUS_TYPE_INVALID))
-     {
--        kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n";
-+        kdDebug(1219) << "mount failed for " << udi << ": could not append args to dbus message\n";
-         dbus_message_unref (dmesg);
-         return i18n("Internal Error");
-     }
-@@ -991,7 +1276,7 @@
-         return qerror;
-     }
- 
--    kdDebug() << "mount queued for " << udi << endl;
-+    kdDebug(1219) << "mount queued for " << udi << endl;
- 
-     dbus_message_unref (dmesg);
-     dbus_message_unref (reply);
-@@ -1003,8 +1288,13 @@
- QString HALBackend::listUsingProcesses(const Medium* medium)
- {
-     QString proclist, fullmsg;
-+#ifndef Q_OS_FREEBSD
-     QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
--    FILE *fuser = popen(cmdline.latin1(), "r");
-+#else
-+    QString cmdline = QString("{ fstat -m | awk '$5~/^(MOUNT|%1)/' | column -t; } 2>&1")
-+			.arg(QRegExp::escape(medium->mountPoint()).replace('/', "\\/"));
-+#endif
-+    FILE *fuser = popen(cmdline.local8Bit(), "r");
- 
-     uint counter = 0;
-     if (fuser) {
-@@ -1039,7 +1329,7 @@
- 
- void HALBackend::slotResult(KIO::Job *job)
- {
--    kdDebug() << "slotResult " << mount_jobs[job] << endl;
-+    kdDebug(1219) << "slotResult " << mount_jobs[job] << endl;
- 
-     struct mount_job_data *data = mount_jobs[job];
-     QString& qerror = data->errorMessage;
-@@ -1066,7 +1356,6 @@
-         qerror = job->errorText();
-     }
- 
--    ResetProperties( medium->id().latin1() );
-     mount_jobs.remove(job);
- 
-     /* Job completed. Notify the caller */
-@@ -1075,6 +1364,25 @@
-     kapp->eventLoop()->exitLoop();
- }
- 
-+#ifdef Q_OS_FREEBSD
-+void HALBackend::pollMediaList()
-+{
-+    struct statfs *mntBuf;
-+    int mntNum = getmntinfo(&mntBuf, MNT_NOWAIT);
-+    QPtrList<Medium>::iterator it = m_pollMediaList.begin();
-+    QPtrList<Medium>::iterator end = m_pollMediaList.end();
-+    for (; it!=end; ++it)
-+    {
-+        bool mounted = false;
-+        const char *dev = (*it)->deviceNode().ascii();
-+        for (int n = mntNum-1; n >= 0 && !mounted; n--)
-+            mounted = !strcmp(dev, mntBuf[n].f_mntfromname);
-+        if ((*it)->isMounted() != mounted)
-+            ResetProperties((*it)->id().latin1());
-+    }
-+}
-+#endif
-+
- QString HALBackend::isInFstab(const Medium *medium)
- {
-     KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName);
-@@ -1087,11 +1395,13 @@
-         QString reald = (*it)->realDeviceName();
-         if ( reald.endsWith( "/" ) )
-             reald = reald.left( reald.length() - 1 );
--        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
-+        kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
-         if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) )
- 	{
-+#ifndef Q_OS_FREEBSD
-             QStringList opts = (*it)->mountOptions();
-             if (opts.contains("user") || opts.contains("users"))
-+#endif
-                 return (*it)->mountPoint();
-         }
-     }
-@@ -1111,7 +1421,7 @@
-         data.completed = false;
-         data.medium = medium;
- 
--        kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
-+        kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
-         KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
-         connect(job, SIGNAL( result (KIO::Job *)),
-                 SLOT( slotResult( KIO::Job *)));
-@@ -1129,7 +1439,7 @@
- 
-     QStringList soptions;
- 
--    kdDebug() << "mounting " << medium->id() << "..." << endl;
-+    kdDebug(1219) << "mounting " << medium->id() << "..." << endl;
- 
-     QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id()));
-     if (valids["flush"] == "true")
-@@ -1137,15 +1447,19 @@
- 
-     if (valids["uid"] == "true")
-     {
-+#ifdef Q_OS_FREEBSD
-+        soptions << QString("-u=%1").arg(getuid());
-+#else
-         soptions << QString("uid=%1").arg(getuid());
-+#endif
-     }
- 
-     if (valids["ro"] == "true")
-         soptions << "ro";
--
-+#if 0
-     if (valids["atime"] != "true")
-         soptions << "noatime";
--
-+#endif
-     if (valids["quiet"] == "true")
-         soptions << "quiet";
- 
-@@ -1161,7 +1475,19 @@
- 
-     if (valids.contains("shortname"))
-     {
-+#ifdef Q_OS_FREEBSD
-+        QString option = valids["shortname"];
-+        if (option == "win95")
-+						soptions << QString("shortnames");
-+        else if (option == "mixed")
-+						soptions << QString("shortnames") << QString("longnames");
-+        else if (option == "lower")
-+						soptions << QString("nowin95");
-+        else
-+						soptions << QString("longnames");
-+#else
-         soptions << QString("shortname=%1").arg(valids["shortname"]);
-+#endif
-     }
- 
-     if (valids.contains("journaling"))
-@@ -1175,6 +1501,41 @@
-             soptions << QString("data=ordered");
-     }
- 
-+#ifdef Q_OS_FREEBSD
-+    if (valids.contains("filemask"))
-+    {
-+        soptions << QString("-m=%1").arg(valids["filemask"]);
-+    }
-+    if (valids.contains("dirmask"))
-+    {
-+        soptions << QString("-M=%1").arg(valids["dirmask"]);
-+    }
-+    if (valids.contains("charset"))
-+    {
-+        soptions << QString("-C=%1").arg(valids["charset"]);
-+    }
-+    if (valids.contains("locale"))
-+    {
-+        soptions << QString("-L=%1").arg(valids["locale"]);
-+    }
-+    if (valids.contains("doscodepage"))
-+    {
-+        soptions << QString("-D=%1").arg(valids["doscodepage"]);
-+    }
-+#endif
-+    if (valids.contains("options"))
-+    {
-+        uint start = 0;
-+        QString tmp = valids["options"];
-+        while(start < tmp.length())
-+        {
-+        		int end = tmp.find(',', start);
-+        		if (end == -1) end = tmp.length();
-+        		soptions << tmp.mid( start, end - start );
-+        		start = end + 1;
-+        }
-+    }
-+
-     const char **options = new const char*[soptions.size() + 1];
-     uint noptions = 0;
-     for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
-@@ -1187,9 +1548,6 @@
-         return qerror;
-     }
- 
--    medium->setHalMounted(true);
--    ResetProperties(medium->id().latin1());
--
-     return QString();
- }
- 
-@@ -1250,7 +1608,7 @@
-     const char *options[2];
- 
-     const char *udi = medium->id().latin1();
--    kdDebug() << "unmounting " << udi << "..." << endl;
-+    kdDebug(1219) << "unmounting " << udi << "..." << endl;
- 
-     dbus_error_init(&error);
-     DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
-@@ -1263,7 +1621,7 @@
-     if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
-                                                 "org.freedesktop.Hal.Device.Volume",
-                                                 "Unmount"))) {
--        kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n";
-+        kdDebug(1219) << "unmount failed for " << udi << ": could not create dbus message\n";
-         return i18n("Internal Error");
-     }
- 
-@@ -1273,7 +1631,7 @@
-     if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0,
-                                    DBUS_TYPE_INVALID))
-     {
--        kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n";
-+        kdDebug(1219) << "unmount failed for " << udi << ": could not append args to dbus message\n";
-         dbus_message_unref (dmesg);
-         return i18n("Internal Error");
-     }
-@@ -1283,7 +1641,7 @@
-     {
-         QString qerror, reason;
- 
--        kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl;
-+        kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl;
-         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(
-@@ -1313,14 +1671,11 @@
-         return qerror;
-     }
- 
--    kdDebug() << "unmount queued for " << udi << endl;
-+    kdDebug(1219) << "unmount queued for " << udi << endl;
- 
-     dbus_message_unref (dmesg);
-     dbus_message_unref (reply);
- 
--    medium->setHalMounted(false);
--    ResetProperties(udi);
--
-     return QString();
- }
- 
diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h
deleted file mode 100644
index 21672b565977..000000000000
--- a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- kioslave/media/mediamanager/halbackend.h.orig	Mon Jan 15 12:31:32 2007
-+++ kioslave/media/mediamanager/halbackend.h	Wed Feb 21 15:01:12 2007
-@@ -34,6 +34,9 @@
- #include <qobject.h>
- #include <qstringlist.h>
- #include <qstring.h>
-+#ifdef Q_OS_FREEBSD
-+#include <qtimer.h>
-+#endif
- 
- #include <config.h>
- 
-@@ -156,6 +159,9 @@
- 
- private slots:
- 	void slotResult(KIO::Job *job);
-+#ifdef Q_OS_FREEBSD
-+	void pollMediaList();
-+#endif
- 
- /* Hal call-backs -- from gvm*/
- public:
-@@ -233,6 +239,10 @@
- 	};
- 
- 	QMap<KIO::Job *, struct mount_job_data*> mount_jobs;
-+#ifdef Q_OS_FREEBSD
-+	QTimer m_pollTimer;
-+	QPtrList<Medium> m_pollMediaList;
-+#endif
- };
- 
- #endif /* _HALBACKEND_H_ */
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index a33e2e7cedc9..1c0ca484705d 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -17,6 +17,7 @@ bin/kcontrol
 bin/kcontroledit
 bin/kdcop
 bin/kdebugdialog
+bin/kde3
 bin/kdeeject
 bin/kdeinstallktheme
 bin/kdepasswd
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index dce1b6fee566..8912d7ef164d 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -59,9 +59,11 @@ PREFIX=		${KDE_PREFIX}
 USE_LDCONFIG=	${PREFIX}/lib/kde3
 
 USE_AUTOTOOLS=  libtool:15
+CONFIGURE_TARGET=# empty
 CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--disable-as-needed \
 		--enable-mt \
+		--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
 		--with-libthai=yes \
 		--with-lua=no \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index caacbae9e927..bcf90f086630 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdelibs-3.5.10.tar.bz2) = 43cd55ed15f63b5738d620ef9f9fd568
+SHA256 (KDE/kdelibs-3.5.10.tar.bz2) = 617e9cb01c70ed4c1b554b373f55deffbd0e12e2cdfeacd7b3d9409372285c72
+SIZE (KDE/kdelibs-3.5.10.tar.bz2) = 15614607
diff --git a/x11/kdelibs3/files/patch-kdecore-kpty.cpp b/x11/kdelibs3/files/patch-kdecore-kpty.cpp
deleted file mode 100644
index ec773d0c07c1..000000000000
--- a/x11/kdelibs3/files/patch-kdecore-kpty.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
---- kdecore/kpty.cpp
-+++ kdecore/kpty.cpp
-@@ -127,10 +127,15 @@
- #include <kdebug.h>
- #include <kstandarddirs.h>	// locate
- 
--// not defined on HP-UX for example
--#ifndef CTRL
--# define CTRL(x) ((x) & 037)
--#endif
-+#ifndef CINTR
-+#define CINTR	0x03
-+#endif
-+#ifndef CQUIT
-+#define CQUIT	0x1c
-+#endif
-+#ifndef CERASE
-+#define CERASE	0x7f
-+#endif
- 
- #define TTY_GROUP "tty"
- 
-@@ -333,9 +339,9 @@
-     ttmode.c_iflag |= IUTF8;
- #endif
- 
--  ttmode.c_cc[VINTR] = CTRL('C' - '@');
--  ttmode.c_cc[VQUIT] = CTRL('\\' - '@');
--  ttmode.c_cc[VERASE] = 0177;
-+  ttmode.c_cc[VINTR] = CINTR;
-+  ttmode.c_cc[VQUIT] = CQUIT;
-+  ttmode.c_cc[VERASE] = CERASE;
- 
-   _tcsetattr(d->slaveFd, &ttmode);
- 
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 eba5e0711651..4ee189789945 100644
--- a/x11/xscreensaver-kde/distinfo
+++ b/x11/xscreensaver-kde/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeartwork-3.5.10.tar.bz2) = 6e6f089dc0f1dabb0f138641600d0b59
+SHA256 (KDE/kdeartwork-3.5.10.tar.bz2) = 93b2d59e55fac2a5f0633d53fc0ad0587b6285c3ad570a7c178968a18465cad4
+SIZE (KDE/kdeartwork-3.5.10.tar.bz2) = 16621355