aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2006-02-01 17:13:29 +0800
committerlofi <lofi@FreeBSD.org>2006-02-01 17:13:29 +0800
commitf64e4755fbed6f29a3b7a0cc6ffa15edeee393eb (patch)
treeea576a9270931313cf4d1ebe844d978da0cb0b30 /x11
parentdca0ecf1934038f462563ad8cfad39699af659f2 (diff)
downloadfreebsd-ports-gnome-f64e4755fbed6f29a3b7a0cc6ffa15edeee393eb.tar.gz
freebsd-ports-gnome-f64e4755fbed6f29a3b7a0cc6ffa15edeee393eb.tar.zst
freebsd-ports-gnome-f64e4755fbed6f29a3b7a0cc6ffa15edeee393eb.zip
Update to KDE 3.5.1.
Diffstat (limited to 'x11')
-rw-r--r--x11/kde3/Makefile1
-rw-r--r--x11/kde4-baseapps/distinfo6
-rw-r--r--x11/kde4-baseapps/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kde4-baseapps/pkg-plist6
-rw-r--r--x11/kde4-runtime/distinfo6
-rw-r--r--x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kde4-runtime/pkg-plist6
-rw-r--r--x11/kde4-workspace/distinfo6
-rw-r--r--x11/kde4-workspace/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kde4-workspace/pkg-plist6
-rw-r--r--x11/kde4/Makefile1
-rw-r--r--x11/kdebase3/distinfo6
-rw-r--r--x11/kdebase3/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kdebase3/pkg-plist6
-rw-r--r--x11/kdebase4-runtime/distinfo6
-rw-r--r--x11/kdebase4-runtime/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kdebase4-runtime/pkg-plist6
-rw-r--r--x11/kdebase4-workspace/distinfo6
-rw-r--r--x11/kdebase4-workspace/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kdebase4-workspace/pkg-plist6
-rw-r--r--x11/kdebase4/distinfo6
-rw-r--r--x11/kdebase4/files/patch-nsplugins_viewer-viewer.cpp17
-rw-r--r--x11/kdebase4/pkg-plist6
-rw-r--r--x11/kdelibs3-nocups/pkg-plist6
-rw-r--r--x11/kdelibs3/Makefile1
-rw-r--r--x11/kdelibs3/distinfo6
-rw-r--r--x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp36
-rw-r--r--x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp11
-rw-r--r--x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs49
-rw-r--r--x11/kdelibs3/pkg-plist6
-rw-r--r--x11/kdelibs4/Makefile1
-rw-r--r--x11/kdelibs4/distinfo6
-rw-r--r--x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp36
-rw-r--r--x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp11
-rw-r--r--x11/kdelibs4/files/patch-post-3.4.3-kdelibs-kjs49
-rw-r--r--x11/kdelibs4/pkg-plist6
-rw-r--r--x11/xscreensaver-kde/Makefile1
-rw-r--r--x11/xscreensaver-kde/distinfo6
38 files changed, 98 insertions, 338 deletions
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 99bf524bb03a..c0b437043022 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -8,7 +8,6 @@
PORTNAME?= kde
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kde4-baseapps/files/patch-nsplugins_viewer-viewer.cpp b/x11/kde4-baseapps/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kde4-baseapps/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp b/x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kde4-workspace/files/patch-nsplugins_viewer-viewer.cpp b/x11/kde4-workspace/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kde4-workspace/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 99bf524bb03a..c0b437043022 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -8,7 +8,6 @@
PORTNAME?= kde
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kdebase3/files/patch-nsplugins_viewer-viewer.cpp b/x11/kdebase3/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kdebase3/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kdebase4-runtime/files/patch-nsplugins_viewer-viewer.cpp b/x11/kdebase4-runtime/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kdebase4-runtime/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kdebase4-workspace/files/patch-nsplugins_viewer-viewer.cpp b/x11/kdebase4-workspace/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kdebase4-workspace/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 2e26a5c31b82..97718cb26462 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.0.tar.bz2) = b86622c029ee8ab656a67c6467fff887
-SHA256 (KDE/kdebase-3.5.0.tar.bz2) = 383aa9e02e375b959cf0885e48b38dd7e6c7a5adafb316f37cff1cca99360f63
-SIZE (KDE/kdebase-3.5.0.tar.bz2) = 23233185
+MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc
+SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434
+SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827
diff --git a/x11/kdebase4/files/patch-nsplugins_viewer-viewer.cpp b/x11/kdebase4/files/patch-nsplugins_viewer-viewer.cpp
deleted file mode 100644
index 4f51bfc6bab8..000000000000
--- a/x11/kdebase4/files/patch-nsplugins_viewer-viewer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- nsplugins/viewer/viewer.cpp.orig Mon Dec 19 00:30:44 2005
-+++ nsplugins/viewer/viewer.cpp Mon Dec 19 00:43:33 2005
-@@ -54,7 +54,14 @@
- #include "qxteventloop.h"
- #endif
-
-+/**
-+ * Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
-+ * such as FreeBSD 4.
-+ */
-
-+#ifndef RLIMIT_AS
-+#define RLIMIT_AS RLIMIT_DATA
-+#endif
-
- /**
- * The error handler catches all X errors, writes the error
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 8d57d63b6b42..0896035d8195 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -334,8 +334,8 @@ lib/kde3/khelpcenter.la
lib/kde3/khelpcenter.so
lib/kde3/khotkeys.la
lib/kde3/khotkeys.so
-lib/kde3/khotkeys_shared_arts.la
-lib/kde3/khotkeys_shared_arts.so
+lib/kde3/khotkeys_arts.la
+lib/kde3/khotkeys_arts.so
lib/kde3/kicker.la
lib/kde3/kicker.so
lib/kde3/kickermenu_find.la
@@ -2199,6 +2199,7 @@ share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-news-account.png
share/doc/HTML/en/khelpcenter/userguide/knode-start.png
share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
@@ -2845,6 +2846,7 @@ share/icons/crystalsvg/32x32/apps/pan.png
share/icons/crystalsvg/32x32/apps/penguin.png
share/icons/crystalsvg/32x32/apps/personal.png
share/icons/crystalsvg/32x32/apps/phppg.png
+share/icons/crystalsvg/32x32/apps/pinguin.png
share/icons/crystalsvg/32x32/apps/plan.png
share/icons/crystalsvg/32x32/apps/planner.png
share/icons/crystalsvg/32x32/apps/proxy.png
diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist
index a7c044fdfda7..20d3f770cc42 100644
--- a/x11/kdelibs3-nocups/pkg-plist
+++ b/x11/kdelibs3-nocups/pkg-plist
@@ -1484,6 +1484,7 @@ share/apps/ksgmltools2/customization/da/entities/underArtisticLicense.docbook
share/apps/ksgmltools2/customization/da/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/da/entities/underFDL.docbook
share/apps/ksgmltools2/customization/da/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/da/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/da/entities/underX11License.docbook
share/apps/ksgmltools2/customization/da/entities/update-doc.docbook
share/apps/ksgmltools2/customization/da/lang.entities
@@ -4302,10 +4303,12 @@ share/icons/crystalsvg/48x48/actions/lock.png
share/icons/crystalsvg/48x48/actions/mail_new.png
share/icons/crystalsvg/48x48/actions/mail_post_to.png
share/icons/crystalsvg/48x48/actions/misc.png
+share/icons/crystalsvg/48x48/actions/next.png
share/icons/crystalsvg/48x48/actions/player_playlist.png
share/icons/crystalsvg/48x48/actions/presence_away.png
share/icons/crystalsvg/48x48/actions/presence_offline.png
share/icons/crystalsvg/48x48/actions/presence_online.png
+share/icons/crystalsvg/48x48/actions/previous.png
share/icons/crystalsvg/48x48/actions/reload.png
share/icons/crystalsvg/48x48/actions/reload_all_tabs.png
share/icons/crystalsvg/48x48/actions/reload_page.png
@@ -4925,6 +4928,7 @@ share/mimelnk/application/fits.desktop
share/mimelnk/application/illustrator.desktop
share/mimelnk/application/java.desktop
share/mimelnk/application/mathml+xml.desktop
+share/mimelnk/application/mbox.desktop
share/mimelnk/application/msexcel.desktop
share/mimelnk/application/mspowerpoint.desktop
share/mimelnk/application/msword.desktop
@@ -4945,6 +4949,7 @@ share/mimelnk/application/smil.desktop
share/mimelnk/application/vnd.mozilla.xul+xml.desktop
share/mimelnk/application/vnd.ms-asf.desktop
share/mimelnk/application/vnd.ms-excel.desktop
+share/mimelnk/application/vnd.ms-powerpoint.desktop
share/mimelnk/application/vnd.ms-word.desktop
share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
@@ -5140,6 +5145,7 @@ share/mimelnk/image/tiff.desktop
share/mimelnk/image/wmf.desktop
share/mimelnk/image/x-bmp.desktop
share/mimelnk/image/x-dds.desktop
+share/mimelnk/image/x-djvu-2.desktop
share/mimelnk/image/x-djvu.desktop
share/mimelnk/image/x-eps.desktop
share/mimelnk/image/x-exr.desktop
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 81055f3a36c5..5224784522b3 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index a717fb72cd59..26aac0e8f6ec 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.0.tar.bz2) = 2b11d654e2ea1a3cd16dcfdcbb7d1915
-SHA256 (KDE/kdelibs-3.5.0.tar.bz2) = 6a5387dbdf8ba7c18e7dd2ca477819daee70b8eeb89ca0d9732dedfd192c0224
-SIZE (KDE/kdelibs-3.5.0.tar.bz2) = 15379557
+MD5 (KDE/kdelibs-3.5.1.tar.bz2) = 2a22193ae7c23f3759b02723dab02d30
+SHA256 (KDE/kdelibs-3.5.1.tar.bz2) = 1798452314d36987898faa7de24cbebd6fed06487d45bbfac7146d87815ee981
+SIZE (KDE/kdelibs-3.5.1.tar.bz2) = 15459894
diff --git a/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp b/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp
deleted file mode 100644
index 564ca63085d8..000000000000
--- a/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- khtml/ecma/kjs_window.cpp 2005/11/11 21:07:48 479809
-+++ khtml/ecma/kjs_window.cpp 2005/11/25 18:54:04 483261
-@@ -21,6 +21,16 @@
- */
- #include "config.h"
-
-+#include "khtmlview.h"
-+#include "khtml_part.h"
-+#include "khtmlpart_p.h"
-+#include "khtml_settings.h"
-+#include "xml/dom2_eventsimpl.h"
-+#include "xml/dom_docimpl.h"
-+#include "misc/htmltags.h"
-+#include "html/html_documentimpl.h"
-+#include "rendering/render_frames.h"
-+
- #include <qstylesheet.h>
- #include <qtimer.h>
- #include <qpaintdevicemetrics.h>
-@@ -60,16 +70,6 @@
- #include "xmlserializer.h"
- #include "domparser.h"
-
--#include "khtmlview.h"
--#include "khtml_part.h"
--#include "khtmlpart_p.h"
--#include "khtml_settings.h"
--#include "xml/dom2_eventsimpl.h"
--#include "xml/dom_docimpl.h"
--#include "misc/htmltags.h"
--#include "html/html_documentimpl.h"
--#include "rendering/render_frames.h"
--
- using namespace KJS;
-
- namespace KJS {
diff --git a/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp b/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp
new file mode 100644
index 000000000000..2d6b721339f2
--- /dev/null
+++ b/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp
@@ -0,0 +1,11 @@
+--- khtml/html/html_formimpl.cpp.orig Sun Jan 29 01:15:24 2006
++++ khtml/html/html_formimpl.cpp Sun Jan 29 01:43:42 2006
+@@ -2303,7 +2303,7 @@
+ NodeImpl* const parent = current->parentNode();
+ current = current->nextSibling();
+ if (!current) {
+- if (parent != this)
++ if (static_cast<HTMLSelectElementImpl*>(parent) != this)
+ current = parent->nextSibling();
+ }
+ }
diff --git a/x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs b/x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs
deleted file mode 100644
index 998f389edfb1..000000000000
--- a/x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: kjs/function.cpp
-===================================================================
---- kjs/function.cpp (revision 495921)
-+++ kjs/function.cpp (working copy)
-@@ -77,7 +77,8 @@ UString encodeURI(ExecState *exec, UStri
- }
- else if (C.uc >= 0xD800 && C.uc <= 0xDBFF) {
-
-- if (k == string.size()) {
-+ // we need two chars
-+ if (k + 1 >= string.size()) {
- Object err = Error::create(exec,URIError);
- exec->setException(err);
- free(encbuf);
-@@ -197,6 +198,10 @@ UString decodeURI(ExecState *exec, UStri
- }
-
- k += 2;
-+
-+ if (decbufLen+2 >= decbufAlloc)
-+ decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-+
- if ((B & 0x80) == 0) {
- // Single-byte character
- C = B;
-@@ -257,6 +262,12 @@ UString decodeURI(ExecState *exec, UStri
- assert(n == 4);
- unsigned long uuuuu = ((octets[0] & 0x07) << 2) | ((octets[1] >> 4) & 0x03);
- unsigned long vvvv = uuuuu-1;
-+ if (vvvv > 0x0F) {
-+ Object err = Error::create(exec,URIError);
-+ exec->setException(err);
-+ free(decbuf);
-+ return UString();
-+ }
- unsigned long wwww = octets[1] & 0x0F;
- unsigned long xx = (octets[2] >> 4) & 0x03;
- unsigned long yyyy = octets[2] & 0x0F;
-@@ -270,9 +281,7 @@ UString decodeURI(ExecState *exec, UStri
- }
-
- if (reservedSet.find(C) < 0) {
-- if (decbufLen+1 >= decbufAlloc)
-- decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-- decbuf[decbufLen++] = C;
-+ decbuf[decbufLen++] = C;
- }
- else {
- while (decbufLen+k-start >= decbufAlloc)
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 6402b345124f..c1eba5281984 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -1499,6 +1499,7 @@ share/apps/ksgmltools2/customization/da/entities/underArtisticLicense.docbook
share/apps/ksgmltools2/customization/da/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/da/entities/underFDL.docbook
share/apps/ksgmltools2/customization/da/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/da/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/da/entities/underX11License.docbook
share/apps/ksgmltools2/customization/da/entities/update-doc.docbook
share/apps/ksgmltools2/customization/da/lang.entities
@@ -4318,10 +4319,12 @@ share/icons/crystalsvg/48x48/actions/lock.png
share/icons/crystalsvg/48x48/actions/mail_new.png
share/icons/crystalsvg/48x48/actions/mail_post_to.png
share/icons/crystalsvg/48x48/actions/misc.png
+share/icons/crystalsvg/48x48/actions/next.png
share/icons/crystalsvg/48x48/actions/player_playlist.png
share/icons/crystalsvg/48x48/actions/presence_away.png
share/icons/crystalsvg/48x48/actions/presence_offline.png
share/icons/crystalsvg/48x48/actions/presence_online.png
+share/icons/crystalsvg/48x48/actions/previous.png
share/icons/crystalsvg/48x48/actions/reload.png
share/icons/crystalsvg/48x48/actions/reload_all_tabs.png
share/icons/crystalsvg/48x48/actions/reload_page.png
@@ -4941,6 +4944,7 @@ share/mimelnk/application/fits.desktop
share/mimelnk/application/illustrator.desktop
share/mimelnk/application/java.desktop
share/mimelnk/application/mathml+xml.desktop
+share/mimelnk/application/mbox.desktop
share/mimelnk/application/msexcel.desktop
share/mimelnk/application/mspowerpoint.desktop
share/mimelnk/application/msword.desktop
@@ -4961,6 +4965,7 @@ share/mimelnk/application/smil.desktop
share/mimelnk/application/vnd.mozilla.xul+xml.desktop
share/mimelnk/application/vnd.ms-asf.desktop
share/mimelnk/application/vnd.ms-excel.desktop
+share/mimelnk/application/vnd.ms-powerpoint.desktop
share/mimelnk/application/vnd.ms-word.desktop
share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
@@ -5156,6 +5161,7 @@ share/mimelnk/image/tiff.desktop
share/mimelnk/image/wmf.desktop
share/mimelnk/image/x-bmp.desktop
share/mimelnk/image/x-dds.desktop
+share/mimelnk/image/x-djvu-2.desktop
share/mimelnk/image/x-djvu.desktop
share/mimelnk/image/x-eps.desktop
share/mimelnk/image/x-exr.desktop
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 81055f3a36c5..5224784522b3 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index a717fb72cd59..26aac0e8f6ec 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.0.tar.bz2) = 2b11d654e2ea1a3cd16dcfdcbb7d1915
-SHA256 (KDE/kdelibs-3.5.0.tar.bz2) = 6a5387dbdf8ba7c18e7dd2ca477819daee70b8eeb89ca0d9732dedfd192c0224
-SIZE (KDE/kdelibs-3.5.0.tar.bz2) = 15379557
+MD5 (KDE/kdelibs-3.5.1.tar.bz2) = 2a22193ae7c23f3759b02723dab02d30
+SHA256 (KDE/kdelibs-3.5.1.tar.bz2) = 1798452314d36987898faa7de24cbebd6fed06487d45bbfac7146d87815ee981
+SIZE (KDE/kdelibs-3.5.1.tar.bz2) = 15459894
diff --git a/x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp b/x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp
deleted file mode 100644
index 564ca63085d8..000000000000
--- a/x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- khtml/ecma/kjs_window.cpp 2005/11/11 21:07:48 479809
-+++ khtml/ecma/kjs_window.cpp 2005/11/25 18:54:04 483261
-@@ -21,6 +21,16 @@
- */
- #include "config.h"
-
-+#include "khtmlview.h"
-+#include "khtml_part.h"
-+#include "khtmlpart_p.h"
-+#include "khtml_settings.h"
-+#include "xml/dom2_eventsimpl.h"
-+#include "xml/dom_docimpl.h"
-+#include "misc/htmltags.h"
-+#include "html/html_documentimpl.h"
-+#include "rendering/render_frames.h"
-+
- #include <qstylesheet.h>
- #include <qtimer.h>
- #include <qpaintdevicemetrics.h>
-@@ -60,16 +70,6 @@
- #include "xmlserializer.h"
- #include "domparser.h"
-
--#include "khtmlview.h"
--#include "khtml_part.h"
--#include "khtmlpart_p.h"
--#include "khtml_settings.h"
--#include "xml/dom2_eventsimpl.h"
--#include "xml/dom_docimpl.h"
--#include "misc/htmltags.h"
--#include "html/html_documentimpl.h"
--#include "rendering/render_frames.h"
--
- using namespace KJS;
-
- namespace KJS {
diff --git a/x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp b/x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp
new file mode 100644
index 000000000000..2d6b721339f2
--- /dev/null
+++ b/x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp
@@ -0,0 +1,11 @@
+--- khtml/html/html_formimpl.cpp.orig Sun Jan 29 01:15:24 2006
++++ khtml/html/html_formimpl.cpp Sun Jan 29 01:43:42 2006
+@@ -2303,7 +2303,7 @@
+ NodeImpl* const parent = current->parentNode();
+ current = current->nextSibling();
+ if (!current) {
+- if (parent != this)
++ if (static_cast<HTMLSelectElementImpl*>(parent) != this)
+ current = parent->nextSibling();
+ }
+ }
diff --git a/x11/kdelibs4/files/patch-post-3.4.3-kdelibs-kjs b/x11/kdelibs4/files/patch-post-3.4.3-kdelibs-kjs
deleted file mode 100644
index 998f389edfb1..000000000000
--- a/x11/kdelibs4/files/patch-post-3.4.3-kdelibs-kjs
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: kjs/function.cpp
-===================================================================
---- kjs/function.cpp (revision 495921)
-+++ kjs/function.cpp (working copy)
-@@ -77,7 +77,8 @@ UString encodeURI(ExecState *exec, UStri
- }
- else if (C.uc >= 0xD800 && C.uc <= 0xDBFF) {
-
-- if (k == string.size()) {
-+ // we need two chars
-+ if (k + 1 >= string.size()) {
- Object err = Error::create(exec,URIError);
- exec->setException(err);
- free(encbuf);
-@@ -197,6 +198,10 @@ UString decodeURI(ExecState *exec, UStri
- }
-
- k += 2;
-+
-+ if (decbufLen+2 >= decbufAlloc)
-+ decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-+
- if ((B & 0x80) == 0) {
- // Single-byte character
- C = B;
-@@ -257,6 +262,12 @@ UString decodeURI(ExecState *exec, UStri
- assert(n == 4);
- unsigned long uuuuu = ((octets[0] & 0x07) << 2) | ((octets[1] >> 4) & 0x03);
- unsigned long vvvv = uuuuu-1;
-+ if (vvvv > 0x0F) {
-+ Object err = Error::create(exec,URIError);
-+ exec->setException(err);
-+ free(decbuf);
-+ return UString();
-+ }
- unsigned long wwww = octets[1] & 0x0F;
- unsigned long xx = (octets[2] >> 4) & 0x03;
- unsigned long yyyy = octets[2] & 0x0F;
-@@ -270,9 +281,7 @@ UString decodeURI(ExecState *exec, UStri
- }
-
- if (reservedSet.find(C) < 0) {
-- if (decbufLen+1 >= decbufAlloc)
-- decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-- decbuf[decbufLen++] = C;
-+ decbuf[decbufLen++] = C;
- }
- else {
- while (decbufLen+k-start >= decbufAlloc)
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 6402b345124f..c1eba5281984 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -1499,6 +1499,7 @@ share/apps/ksgmltools2/customization/da/entities/underArtisticLicense.docbook
share/apps/ksgmltools2/customization/da/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/da/entities/underFDL.docbook
share/apps/ksgmltools2/customization/da/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/da/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/da/entities/underX11License.docbook
share/apps/ksgmltools2/customization/da/entities/update-doc.docbook
share/apps/ksgmltools2/customization/da/lang.entities
@@ -4318,10 +4319,12 @@ share/icons/crystalsvg/48x48/actions/lock.png
share/icons/crystalsvg/48x48/actions/mail_new.png
share/icons/crystalsvg/48x48/actions/mail_post_to.png
share/icons/crystalsvg/48x48/actions/misc.png
+share/icons/crystalsvg/48x48/actions/next.png
share/icons/crystalsvg/48x48/actions/player_playlist.png
share/icons/crystalsvg/48x48/actions/presence_away.png
share/icons/crystalsvg/48x48/actions/presence_offline.png
share/icons/crystalsvg/48x48/actions/presence_online.png
+share/icons/crystalsvg/48x48/actions/previous.png
share/icons/crystalsvg/48x48/actions/reload.png
share/icons/crystalsvg/48x48/actions/reload_all_tabs.png
share/icons/crystalsvg/48x48/actions/reload_page.png
@@ -4941,6 +4944,7 @@ share/mimelnk/application/fits.desktop
share/mimelnk/application/illustrator.desktop
share/mimelnk/application/java.desktop
share/mimelnk/application/mathml+xml.desktop
+share/mimelnk/application/mbox.desktop
share/mimelnk/application/msexcel.desktop
share/mimelnk/application/mspowerpoint.desktop
share/mimelnk/application/msword.desktop
@@ -4961,6 +4965,7 @@ share/mimelnk/application/smil.desktop
share/mimelnk/application/vnd.mozilla.xul+xml.desktop
share/mimelnk/application/vnd.ms-asf.desktop
share/mimelnk/application/vnd.ms-excel.desktop
+share/mimelnk/application/vnd.ms-powerpoint.desktop
share/mimelnk/application/vnd.ms-word.desktop
share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
@@ -5156,6 +5161,7 @@ share/mimelnk/image/tiff.desktop
share/mimelnk/image/wmf.desktop
share/mimelnk/image/x-bmp.desktop
share/mimelnk/image/x-dds.desktop
+share/mimelnk/image/x-djvu-2.desktop
share/mimelnk/image/x-djvu.desktop
share/mimelnk/image/x-eps.desktop
share/mimelnk/image/x-exr.desktop
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index e1e9e5556ff1..df3a81c2fea7 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,7 +7,6 @@
PORTNAME= xscreensaver-kde
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
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 7086a4aa4244..d4c539b672cc 100644
--- a/x11/xscreensaver-kde/distinfo
+++ b/x11/xscreensaver-kde/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeartwork-3.5.0.tar.bz2) = 052c736c9c12defbb2e7de04ff0b2ae6
-SHA256 (KDE/kdeartwork-3.5.0.tar.bz2) = 3477cd6822bb988b7216fa07f4e6cb256d662cdb5fca54525b439acd10dbc284
-SIZE (KDE/kdeartwork-3.5.0.tar.bz2) = 16610564
+MD5 (KDE/kdeartwork-3.5.1.tar.bz2) = 8053bb1a1b2a5844b29f5f96328b1d96
+SHA256 (KDE/kdeartwork-3.5.1.tar.bz2) = 9108de84f71319ee1e49f1c3515c5ca293ec89985da563855dd8dd64b3aea418
+SIZE (KDE/kdeartwork-3.5.1.tar.bz2) = 16595339