summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/kdelibs2/Makefile4
-rw-r--r--x11/kdelibs2/distinfo2
-rw-r--r--x11/kdelibs2/files/patch-global.cpp54
-rw-r--r--x11/kdelibs2/files/patch-http.cc100
-rw-r--r--x11/kdelibs2/files/patch-http.h26
-rw-r--r--x11/kdelibs2/files/patch-kdesu_stub.c84
-rw-r--r--x11/kdelibs2/files/patch-midfile.cc34
-rw-r--r--x11/kdelibs2/pkg-plist38
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/pkg-plist38
-rw-r--r--x11/kdelibs4/Makefile4
-rw-r--r--x11/kdelibs4/distinfo2
-rw-r--r--x11/kdelibs4/pkg-plist38
14 files changed, 111 insertions, 319 deletions
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 405bf219d7b1..3845c6bcff06 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/src
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index be16692f3af0..33a18bf1202a 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
+MD5 (kdelibs-2.1.2.tar.bz2) = 7da819efb418b4ebae65a1ea5ed0ba5c
diff --git a/x11/kdelibs2/files/patch-global.cpp b/x11/kdelibs2/files/patch-global.cpp
deleted file mode 100644
index 9f423c75cbf1..000000000000
--- a/x11/kdelibs2/files/patch-global.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
---- kio/global.cpp Sun Feb 18 10:27:06 2001
-+++ kio/global.cpp.new Thu Feb 22 23:47:34 2001
-@@ -30,6 +30,12 @@
- #include <string.h>
- #include <unistd.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+#endif
-+
- #include "kio/global.h"
- #include "kio/job.h"
-
-@@ -567,6 +573,30 @@
-
- /* Get the list of mounted file systems */
-
-+#ifdef __FreeBSD__
-+
-+ QString result;
-+ struct statfs *mounted;
-+
-+ int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
-+
-+ for (int i=0;i<num_fs;i++) {
-+
-+ QCString device_name = mounted[i].f_mntfromname;
-+
-+ // If the path contains symlinks, get
-+ // the real name
-+ if (realpath(device_name, realpath_buffer) != 0)
-+ // succes, use result from realpath
-+ device_name = realpath_buffer;
-+
-+ if (realname == device_name) {
-+ result = mounted[i].f_mntonname;
-+ break;
-+ }
-+ }
-+
-+#else
- if ((mtab = SETMNTENT(MNTTAB, "r")) == 0) {
- perror("setmntent");
- return QString::null;
-@@ -612,6 +642,7 @@
- #endif /* GET_MNTINFO */
-
- //kdDebug( 7007 ) << "Returning result " << result << endl;
-+#endif
- return result;
- }
-
diff --git a/x11/kdelibs2/files/patch-http.cc b/x11/kdelibs2/files/patch-http.cc
deleted file mode 100644
index a06a1d7810fb..000000000000
--- a/x11/kdelibs2/files/patch-http.cc
+++ /dev/null
@@ -1,100 +0,0 @@
---- kio/http/http.cc 2001/03/16 05:55:57 1.319.2.7
-+++ kio/http/http.cc 2001/03/30 22:52:10 1.319.2.10
-@@ -48,6 +48,7 @@
-
- #include <kapp.h>
- #include <klocale.h>
-+#include <kcharsets.h>
- #include <kprotocolmanager.h>
- #include <kdatastream.h>
- #include <ksock.h>
-@@ -804,6 +805,8 @@ bool HTTPProtocol::http_open()
-
- // Let's also clear out some things, so bogus values aren't used.
- // m_HTTPrev = HTTP_Unknown;
-+ m_iWWWAuthCount = 0;
-+ m_iProxyAuthCount = 0;
- m_sContentMD5 = QString::null;
- m_strMimeType = QString::null;
- m_qContentEncodings.clear();
-@@ -1184,7 +1187,6 @@ bool HTTPProtocol::readHeader()
-
- // read in 4096 bytes at a time (HTTP cookies can be quite large.)
- int len = 0;
-- int proxyAuthCount = 1;
- char buffer[4097];
- bool cont = false;
- bool cacheValidated = false; // Revalidation was successfull
-@@ -1495,9 +1497,6 @@ bool HTTPProtocol::readHeader()
-
- // check for proxy-based authentication
- else if (strncasecmp(buffer, "Proxy-Authenticate:", 19) == 0) {
-- if ( proxyAuthCount++ > 1 )
-- configAuth(trimLead(buffer + 19), true, false);
-- else
- configAuth(trimLead(buffer + 19), true);
- }
-
-@@ -1867,9 +1866,9 @@ void HTTPProtocol::addEncoding(QString e
- }
- }
-
--void HTTPProtocol::configAuth( const char *p, bool b, bool firstCall )
-+void HTTPProtocol::configAuth( const char *p, bool b )
- {
-- HTTP_AUTH f;
-+ HTTP_AUTH f = AUTH_None;
- const char *strAuth = p;
-
- while( *p == ' ' ) p++;
-@@ -1894,15 +1893,33 @@ void HTTPProtocol::configAuth( const cha
- {
- kdWarning(7103) << "Unsupported or invalid authorization type requested" << endl;
- kdWarning(7103) << "Request Authorization: " << p << endl;
-- if ( firstCall && b )
-- ProxyAuthentication = AUTH_None;
-- return;
- }
-
-- // Always prefer the stronger authentication mode:
-- // AUTH_NONE < AUTH_BASIC < AUTH_DIGEST...
-- if ( (b && f < ProxyAuthentication) || (!b && f < Authentication) )
-+ /*
-+ This check ensures the following:
-+ 1.) Rejection of any unknown/unsupported authentication schemes
-+ 2.) Useage of the strongest possible authentication schemes if
-+ and when multiple Proxy-Authenticate or WWW-Authenticate
-+ header field is sent.
-+ */
-+ if ( f == AUTH_None ||
-+ (b && m_iProxyAuthCount > 0 && f < ProxyAuthentication) ||
-+ (!b && m_iWWWAuthCount > 0 && f < Authentication) )
-+ {
-+ // Since I purposefully made the Proxy-Authentication settings
-+ // persistent to reduce the number of round-trips to kdesud we
-+ // have to take special care when an unknown/unsupported auth-
-+ // scheme is received. This check accomplishes just that...
-+ if ( b )
-+ {
-+ if ( !m_iProxyAuthCount )
-+ ProxyAuthentication = f;
-+ m_iProxyAuthCount++;
-+ }
-+ else
-+ m_iWWWAuthCount++;
- return;
-+ }
-
- while (*p)
- {
-@@ -3235,7 +3252,9 @@ void HTTPProtocol::reparseConfiguration(
- // Use commas not spaces.
- m_strLanguages = languageList.join( ", " );
- kdDebug(7103) << "Languages list set to " << m_strLanguages << endl;
-- m_strCharsets = KGlobal::locale()->charset() + QString::fromLatin1(";q=1.0, *;q=0.9, utf-8;q=0.8");
-+ // Ugly conversion. kdeglobals has the xName (e.g. iso8859-1 instead of iso-8859-1)
-+ m_strCharsets = KGlobal::charsets()->name(KGlobal::charsets()->xNameToID(KGlobal::locale()->charset()));
-+ m_strCharsets += QString::fromLatin1(";q=1.0, *;q=0.9, utf-8;q=0.8");
-
- // Launch the cookiejar if not already running
- KConfig *cookieConfig = new KConfig("kcookiejarrc", false, false);
diff --git a/x11/kdelibs2/files/patch-http.h b/x11/kdelibs2/files/patch-http.h
deleted file mode 100644
index dbd420b0391b..000000000000
--- a/x11/kdelibs2/files/patch-http.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- kio/http/http.h 2001/02/26 03:57:23 1.83.2.1
-+++ kio/http/http.h 2001/03/29 23:43:13 1.83.2.2
-@@ -1,4 +1,4 @@
--// $Id: http.h,v 1.83.2.1 2001/02/26 03:57:23 waba Exp $
-+// $Id: http.h,v 1.83.2.2 2001/03/29 23:43:13 adawit Exp $
-
- #ifndef __http_h__
- #define __http_h__
-@@ -178,7 +178,7 @@ protected:
- */
- void addEncoding(QString, QStringList &);
-
-- void configAuth(const char *, bool, bool firstCall = true );
-+ void configAuth(const char *, bool);
- #ifdef DO_SSL
- void initSSL();
- void closeSSL();
-@@ -362,6 +362,8 @@ protected:
- HTTP_AUTH Authentication;
- HTTP_AUTH ProxyAuthentication;
- bool m_bUnauthorized;
-+ short unsigned int m_iProxyAuthCount;
-+ short unsigned int m_iWWWAuthCount;
-
- // Persistant connections
- bool m_bKeepAlive;
diff --git a/x11/kdelibs2/files/patch-kdesu_stub.c b/x11/kdelibs2/files/patch-kdesu_stub.c
deleted file mode 100644
index c538fcedb635..000000000000
--- a/x11/kdelibs2/files/patch-kdesu_stub.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- kdesu/kdesu_stub.c.orig Wed Nov 22 10:10:17 2000
-+++ kdesu/kdesu_stub.c Wed Nov 22 10:31:12 2000
-@@ -276,9 +276,17 @@
- xsetenv("DISPLAY", params[P_DISPLAY].value);
- if (params[P_DISPLAY_AUTH].value[0])
- {
-+#ifdef HAVE_MKSTEMP
-+ int fd;
-+ strcpy(fname, "/tmp/kdesu.XXXXXXXX");
-+ fout = fdopen(fd, "w");
-+ fd = mkstemp(fname);
-+ if (fd == -1 || fout == NULL)
-+#else
- fname = tmpnam(0L);
- fout = fopen(fname, "w");
- if (!fout)
-+#endif
- {
- perror("kdesu_stub: fopen()");
- exit(1);
-@@ -286,7 +294,22 @@
- fprintf(fout, "add %s %s\n", params[P_DISPLAY].value,
- params[P_DISPLAY_AUTH].value);
- fclose(fout);
-+#ifdef HAVE_MKSTEMP
-+ strcpy(xauthority, "/tmp/xauth.XXXXXXXX");
-+ {
-+ int fd;
-+ fd = mkstemp(xauthority);
-+ if (fd == -1)
-+ {
-+ perror("kdesu_stub: mkstemp()");
-+ exit(1);
-+ }
-+ else
-+ close(fd);
-+ }
-+#else
- tmpnam(xauthority);
-+#endif
- xsetenv("XAUTHORITY", xauthority);
- sprintf(command, "xauth source %s >/dev/null 2>&1", fname);
- if (system(command))
-@@ -305,9 +328,17 @@
- auth = xstrsep(params[P_ICE_AUTH].value);
- if (host[0])
- {
-+#ifdef HAVE_MKSTEMP
-+ int fd;
-+ strcpy(fname, "/tmp/kdesu.XXXXXXXX");
-+ fd = mkstemp(fname);
-+ fout = fdopen(fd, "w");
-+ if (fd == -1 || fout == NULL)
-+#else
- fname = tmpnam(0L);
- fout = fopen(fname, "w");
- if (!fout)
-+#endif
- {
- perror("kdesu_stub: fopen()");
- exit(1);
-@@ -318,7 +349,22 @@
- for (i=0; host[i]; i++)
- fprintf(fout, "add DCOP \"\" %s %s\n", host[i], auth[i]);
- fclose(fout);
-+#ifdef HAVE_MKSTEMP
-+ strcpy(iceauthority, "/tmp/iceauth.XXXXXXXX");
-+ {
-+ int fd;
-+ fd = mkstemp(iceauthority);
-+ if (fd == -1)
-+ {
-+ perror("kdesu_stub: mkstemp()");
-+ exit(1);
-+ }
-+ else
-+ close(fd);
-+ }
-+#else
- tmpnam(iceauthority);
-+#endif
- xsetenv("ICEAUTHORITY", iceauthority);
- sprintf(command, "iceauth source %s >/dev/null 2>&1", fname);
- if (system(command))
diff --git a/x11/kdelibs2/files/patch-midfile.cc b/x11/kdelibs2/files/patch-midfile.cc
deleted file mode 100644
index c0ff4ff3e9f5..000000000000
--- a/x11/kdelibs2/files/patch-midfile.cc
+++ /dev/null
@@ -1,34 +0,0 @@
---- libkmid/midfile.cc.orig Tue Nov 21 10:21:43 2000
-+++ libkmid/midfile.cc Tue Nov 21 11:52:03 2000
-@@ -59,6 +59,23 @@
- {
- fprintf(stderr,"ERROR : popen failed : %s\n",cmd);
- }
-+#ifdef HAVE_MKSTEMP
-+ strcpy(tmpname,"/tmp/KMid.XXXXXXXX");
-+ int fd=mkstemp(tmpname);
-+ if (fd<0)
-+ {
-+ pclose(infile);
-+ delete cmd;
-+ return 1;
-+ }
-+ FILE *outfile= fdopen(fd,"wb");
-+ if (outfile==NULL)
-+ {
-+ pclose(infile);
-+ delete cmd;
-+ return 1;
-+ }
-+#else
- char *tmp=tempnam(NULL,"KMid");
- if (tmp==NULL)
- {
-@@ -74,6 +91,7 @@
- delete cmd;
- return 1;
- }
-+#endif
- int n=getc(infile);
- if (n==EOF)
- {
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index d716fe96d906..0977fac33fc1 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -15,6 +15,7 @@ bin/kdb2html
bin/kde-config
bin/kded
bin/kdeinit
+bin/kdeinit_shutdown
bin/kdeinit_wrapper
bin/kdesu_stub
bin/kio_http_cache_cleaner
@@ -1160,6 +1161,7 @@ share/icons/hicolor/16x16/actions/bookmark_add.png
share/icons/hicolor/16x16/actions/bookmark_folder.png
share/icons/hicolor/16x16/actions/bookmark_toolbar.png
share/icons/hicolor/16x16/actions/bottom.png
+share/icons/hicolor/16x16/actions/charset.png
share/icons/hicolor/16x16/actions/colorpicker.png
share/icons/hicolor/16x16/actions/configure.png
share/icons/hicolor/16x16/actions/connect_creating.png
@@ -1172,6 +1174,7 @@ share/icons/hicolor/16x16/actions/crop.png
share/icons/hicolor/16x16/actions/decrypted.png
share/icons/hicolor/16x16/actions/down.png
share/icons/hicolor/16x16/actions/edit.png
+share/icons/hicolor/16x16/actions/editclear.png
share/icons/hicolor/16x16/actions/editcopy.png
share/icons/hicolor/16x16/actions/editcut.png
share/icons/hicolor/16x16/actions/editdelete.png
@@ -1201,6 +1204,7 @@ share/icons/hicolor/16x16/actions/goto.png
share/icons/hicolor/16x16/actions/help.png
share/icons/hicolor/16x16/actions/history.png
share/icons/hicolor/16x16/actions/idea.png
+share/icons/hicolor/16x16/actions/locationbar_erase.png
share/icons/hicolor/16x16/actions/lock.png
share/icons/hicolor/16x16/actions/mail_forward.png
share/icons/hicolor/16x16/actions/mail_generic.png
@@ -1216,7 +1220,9 @@ share/icons/hicolor/16x16/actions/openterm.png
share/icons/hicolor/16x16/actions/previous.png
share/icons/hicolor/16x16/actions/redo.png
share/icons/hicolor/16x16/actions/reload.png
+share/icons/hicolor/16x16/actions/revert.png
share/icons/hicolor/16x16/actions/run.png
+share/icons/hicolor/16x16/actions/spellcheck.png
share/icons/hicolor/16x16/actions/start.png
share/icons/hicolor/16x16/actions/stop.png
share/icons/hicolor/16x16/actions/top.png
@@ -1265,6 +1271,7 @@ share/icons/hicolor/16x16/filesystems/www.png
share/icons/hicolor/16x16/mimetypes/applix.png
share/icons/hicolor/16x16/mimetypes/binary.png
share/icons/hicolor/16x16/mimetypes/binary2.png
+share/icons/hicolor/16x16/mimetypes/colorscm.png
share/icons/hicolor/16x16/mimetypes/core.png
share/icons/hicolor/16x16/mimetypes/deb.png
share/icons/hicolor/16x16/mimetypes/document.png
@@ -1328,6 +1335,7 @@ share/icons/hicolor/22x22/actions/bookmark.png
share/icons/hicolor/22x22/actions/bookmark_add.png
share/icons/hicolor/22x22/actions/bottom.png
share/icons/hicolor/22x22/actions/centrejust.png
+share/icons/hicolor/22x22/actions/charset.png
share/icons/hicolor/22x22/actions/colorize.png
share/icons/hicolor/22x22/actions/colorpicker.png
share/icons/hicolor/22x22/actions/configure.png
@@ -1335,11 +1343,13 @@ share/icons/hicolor/22x22/actions/connect_creating.png
share/icons/hicolor/22x22/actions/connect_established.png
share/icons/hicolor/22x22/actions/connect_no.png
share/icons/hicolor/22x22/actions/contents.png
+share/icons/hicolor/22x22/actions/contents2.png
share/icons/hicolor/22x22/actions/contexthelp.png
share/icons/hicolor/22x22/actions/crop.png
share/icons/hicolor/22x22/actions/decrypted.png
share/icons/hicolor/22x22/actions/down.png
share/icons/hicolor/22x22/actions/edit.png
+share/icons/hicolor/22x22/actions/editclear.png
share/icons/hicolor/22x22/actions/editcopy.png
share/icons/hicolor/22x22/actions/editcut.png
share/icons/hicolor/22x22/actions/editdelete.png
@@ -1349,6 +1359,8 @@ share/icons/hicolor/22x22/actions/edittrash.png
share/icons/hicolor/22x22/actions/encrypted.png
share/icons/hicolor/22x22/actions/eraser.png
share/icons/hicolor/22x22/actions/exec.png
+share/icons/hicolor/22x22/actions/exit.png
+share/icons/hicolor/22x22/actions/fileclose.png
share/icons/hicolor/22x22/actions/filefind.png
share/icons/hicolor/22x22/actions/filenew.png
share/icons/hicolor/22x22/actions/fileopen.png
@@ -1416,6 +1428,7 @@ share/icons/hicolor/22x22/actions/kde/0048.png
share/icons/hicolor/22x22/actions/kde/0049.png
share/icons/hicolor/22x22/actions/kde/0050.png
share/icons/hicolor/22x22/actions/leftjust.png
+share/icons/hicolor/22x22/actions/locationbar_erase.png
share/icons/hicolor/22x22/actions/lock.png
share/icons/hicolor/22x22/actions/mail_forward.png
share/icons/hicolor/22x22/actions/mail_generic.png
@@ -1439,6 +1452,7 @@ share/icons/hicolor/22x22/actions/previous.png
share/icons/hicolor/22x22/actions/queue.png
share/icons/hicolor/22x22/actions/redo.png
share/icons/hicolor/22x22/actions/reload.png
+share/icons/hicolor/22x22/actions/revert.png
share/icons/hicolor/22x22/actions/rightjust.png
share/icons/hicolor/22x22/actions/run.png
share/icons/hicolor/22x22/actions/showmenu.png
@@ -1483,13 +1497,19 @@ share/icons/hicolor/32x32/actions/bookmark_folder.png
share/icons/hicolor/32x32/actions/bookmark_toolbar.png
share/icons/hicolor/32x32/actions/bottom.png
share/icons/hicolor/32x32/actions/centrejust.png
+share/icons/hicolor/32x32/actions/charset.png
share/icons/hicolor/32x32/actions/colorize.png
share/icons/hicolor/32x32/actions/configure.png
+share/icons/hicolor/32x32/actions/connect_creating.png
+share/icons/hicolor/32x32/actions/connect_established.png
+share/icons/hicolor/32x32/actions/connect_no.png
share/icons/hicolor/32x32/actions/contents.png
+share/icons/hicolor/32x32/actions/contents2.png
share/icons/hicolor/32x32/actions/contexthelp.png
share/icons/hicolor/32x32/actions/decrypted.png
share/icons/hicolor/32x32/actions/down.png
share/icons/hicolor/32x32/actions/edit.png
+share/icons/hicolor/32x32/actions/editclear.png
share/icons/hicolor/32x32/actions/editcopy.png
share/icons/hicolor/32x32/actions/editcut.png
share/icons/hicolor/32x32/actions/editdelete.png
@@ -1498,6 +1518,9 @@ share/icons/hicolor/32x32/actions/editshred.png
share/icons/hicolor/32x32/actions/edittrash.png
share/icons/hicolor/32x32/actions/encrypted.png
share/icons/hicolor/32x32/actions/exec.png
+share/icons/hicolor/32x32/actions/exit.png
+share/icons/hicolor/32x32/actions/fileclose.png
+share/icons/hicolor/32x32/actions/filefind.png
share/icons/hicolor/32x32/actions/filenew.png
share/icons/hicolor/32x32/actions/fileopen.png
share/icons/hicolor/32x32/actions/fileprint.png
@@ -1508,6 +1531,7 @@ share/icons/hicolor/32x32/actions/finish.png
share/icons/hicolor/32x32/actions/folder_new.png
share/icons/hicolor/32x32/actions/fonts.png
share/icons/hicolor/32x32/actions/forward.png
+share/icons/hicolor/32x32/actions/frameprint.png
share/icons/hicolor/32x32/actions/gear.png
share/icons/hicolor/32x32/actions/gohome.png
share/icons/hicolor/32x32/actions/goto.png
@@ -1564,6 +1588,7 @@ share/icons/hicolor/32x32/actions/kde/0048.png
share/icons/hicolor/32x32/actions/kde/0049.png
share/icons/hicolor/32x32/actions/kde/0050.png
share/icons/hicolor/32x32/actions/leftjust.png
+share/icons/hicolor/32x32/actions/locationbar_erase.png
share/icons/hicolor/32x32/actions/lock.png
share/icons/hicolor/32x32/actions/mail_forward.png
share/icons/hicolor/32x32/actions/mail_generic.png
@@ -1585,6 +1610,7 @@ share/icons/hicolor/32x32/actions/previous.png
share/icons/hicolor/32x32/actions/queue.png
share/icons/hicolor/32x32/actions/redo.png
share/icons/hicolor/32x32/actions/reload.png
+share/icons/hicolor/32x32/actions/revert.png
share/icons/hicolor/32x32/actions/rightjust.png
share/icons/hicolor/32x32/actions/rotate.png
share/icons/hicolor/32x32/actions/rotate_ccw.png
@@ -1659,6 +1685,7 @@ share/icons/hicolor/32x32/filesystems/zip.png
share/icons/hicolor/32x32/mimetypes/applix.png
share/icons/hicolor/32x32/mimetypes/binary.png
share/icons/hicolor/32x32/mimetypes/binary2.png
+share/icons/hicolor/32x32/mimetypes/colorscm.png
share/icons/hicolor/32x32/mimetypes/core.png
share/icons/hicolor/32x32/mimetypes/deb.png
share/icons/hicolor/32x32/mimetypes/document.png
@@ -1810,6 +1837,7 @@ share/icons/hicolor/48x48/filesystems/zip.png
share/icons/hicolor/48x48/mimetypes/applix.png
share/icons/hicolor/48x48/mimetypes/binary.png
share/icons/hicolor/48x48/mimetypes/binary2.png
+share/icons/hicolor/48x48/mimetypes/colorscm.png
share/icons/hicolor/48x48/mimetypes/core.png
share/icons/hicolor/48x48/mimetypes/deb.png
share/icons/hicolor/48x48/mimetypes/document.png
@@ -1881,6 +1909,7 @@ share/icons/locolor/16x16/actions/bookmark.png
share/icons/locolor/16x16/actions/bookmark_add.png
share/icons/locolor/16x16/actions/bookmark_toolbar.png
share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/charset.png
share/icons/locolor/16x16/actions/colorize.png
share/icons/locolor/16x16/actions/colorpicker.png
share/icons/locolor/16x16/actions/completion.png
@@ -1906,6 +1935,7 @@ share/icons/locolor/16x16/actions/eraser.png
share/icons/locolor/16x16/actions/exec.png
share/icons/locolor/16x16/actions/exit.png
share/icons/locolor/16x16/actions/fileclose.png
+share/icons/locolor/16x16/actions/filefind.png
share/icons/locolor/16x16/actions/filenew.png
share/icons/locolor/16x16/actions/fileopen.png
share/icons/locolor/16x16/actions/fileprint.png
@@ -1918,10 +1948,12 @@ share/icons/locolor/16x16/actions/finish.png
share/icons/locolor/16x16/actions/flag.png
share/icons/locolor/16x16/actions/folder_new.png
share/icons/locolor/16x16/actions/forward.png
+share/icons/locolor/16x16/actions/frameprint.png
share/icons/locolor/16x16/actions/gear.png
share/icons/locolor/16x16/actions/gohome.png
share/icons/locolor/16x16/actions/goto.png
share/icons/locolor/16x16/actions/help.png
+share/icons/locolor/16x16/actions/history.png
share/icons/locolor/16x16/actions/idea.png
share/icons/locolor/16x16/actions/identity.png
share/icons/locolor/16x16/actions/kde/0001.png
@@ -2001,6 +2033,7 @@ share/icons/locolor/16x16/actions/queue.png
share/icons/locolor/16x16/actions/redo.png
share/icons/locolor/16x16/actions/reload.png
share/icons/locolor/16x16/actions/remove.png
+share/icons/locolor/16x16/actions/revert.png
share/icons/locolor/16x16/actions/rotate.png
share/icons/locolor/16x16/actions/rotate_ccw.png
share/icons/locolor/16x16/actions/rotate_cw.png
@@ -2261,6 +2294,7 @@ share/mimelnk/application/x-tzo.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/audio/basic.desktop
+share/mimelnk/audio/mpegurl.desktop
share/mimelnk/audio/vnd.rn-realaudio.desktop
share/mimelnk/audio/x-adpcm.desktop
share/mimelnk/audio/x-aiff.desktop
@@ -2392,14 +2426,11 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/icons/hicolor/32x32/filesystems
@dirrm share/icons/hicolor/32x32/actions/kde
@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
@dirrm share/icons/hicolor/22x22/actions/kde
@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
@dirrm share/icons/hicolor/16x16/mimetypes
@dirrm share/icons/hicolor/16x16/filesystems
@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/hicolor
@dirrm share/doc/HTML/en/kspell
@dirrm share/doc/HTML/en/common
@@ -2491,7 +2522,6 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/khtml
@dirrm share/apps/kdeui/pics
@dirrm share/apps/kdeui
-@dirrm share/apps/kab/pics
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm share/apps
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 405bf219d7b1..3845c6bcff06 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/src
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index be16692f3af0..33a18bf1202a 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
+MD5 (kdelibs-2.1.2.tar.bz2) = 7da819efb418b4ebae65a1ea5ed0ba5c
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index d716fe96d906..0977fac33fc1 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -15,6 +15,7 @@ bin/kdb2html
bin/kde-config
bin/kded
bin/kdeinit
+bin/kdeinit_shutdown
bin/kdeinit_wrapper
bin/kdesu_stub
bin/kio_http_cache_cleaner
@@ -1160,6 +1161,7 @@ share/icons/hicolor/16x16/actions/bookmark_add.png
share/icons/hicolor/16x16/actions/bookmark_folder.png
share/icons/hicolor/16x16/actions/bookmark_toolbar.png
share/icons/hicolor/16x16/actions/bottom.png
+share/icons/hicolor/16x16/actions/charset.png
share/icons/hicolor/16x16/actions/colorpicker.png
share/icons/hicolor/16x16/actions/configure.png
share/icons/hicolor/16x16/actions/connect_creating.png
@@ -1172,6 +1174,7 @@ share/icons/hicolor/16x16/actions/crop.png
share/icons/hicolor/16x16/actions/decrypted.png
share/icons/hicolor/16x16/actions/down.png
share/icons/hicolor/16x16/actions/edit.png
+share/icons/hicolor/16x16/actions/editclear.png
share/icons/hicolor/16x16/actions/editcopy.png
share/icons/hicolor/16x16/actions/editcut.png
share/icons/hicolor/16x16/actions/editdelete.png
@@ -1201,6 +1204,7 @@ share/icons/hicolor/16x16/actions/goto.png
share/icons/hicolor/16x16/actions/help.png
share/icons/hicolor/16x16/actions/history.png
share/icons/hicolor/16x16/actions/idea.png
+share/icons/hicolor/16x16/actions/locationbar_erase.png
share/icons/hicolor/16x16/actions/lock.png
share/icons/hicolor/16x16/actions/mail_forward.png
share/icons/hicolor/16x16/actions/mail_generic.png
@@ -1216,7 +1220,9 @@ share/icons/hicolor/16x16/actions/openterm.png
share/icons/hicolor/16x16/actions/previous.png
share/icons/hicolor/16x16/actions/redo.png
share/icons/hicolor/16x16/actions/reload.png
+share/icons/hicolor/16x16/actions/revert.png
share/icons/hicolor/16x16/actions/run.png
+share/icons/hicolor/16x16/actions/spellcheck.png
share/icons/hicolor/16x16/actions/start.png
share/icons/hicolor/16x16/actions/stop.png
share/icons/hicolor/16x16/actions/top.png
@@ -1265,6 +1271,7 @@ share/icons/hicolor/16x16/filesystems/www.png
share/icons/hicolor/16x16/mimetypes/applix.png
share/icons/hicolor/16x16/mimetypes/binary.png
share/icons/hicolor/16x16/mimetypes/binary2.png
+share/icons/hicolor/16x16/mimetypes/colorscm.png
share/icons/hicolor/16x16/mimetypes/core.png
share/icons/hicolor/16x16/mimetypes/deb.png
share/icons/hicolor/16x16/mimetypes/document.png
@@ -1328,6 +1335,7 @@ share/icons/hicolor/22x22/actions/bookmark.png
share/icons/hicolor/22x22/actions/bookmark_add.png
share/icons/hicolor/22x22/actions/bottom.png
share/icons/hicolor/22x22/actions/centrejust.png
+share/icons/hicolor/22x22/actions/charset.png
share/icons/hicolor/22x22/actions/colorize.png
share/icons/hicolor/22x22/actions/colorpicker.png
share/icons/hicolor/22x22/actions/configure.png
@@ -1335,11 +1343,13 @@ share/icons/hicolor/22x22/actions/connect_creating.png
share/icons/hicolor/22x22/actions/connect_established.png
share/icons/hicolor/22x22/actions/connect_no.png
share/icons/hicolor/22x22/actions/contents.png
+share/icons/hicolor/22x22/actions/contents2.png
share/icons/hicolor/22x22/actions/contexthelp.png
share/icons/hicolor/22x22/actions/crop.png
share/icons/hicolor/22x22/actions/decrypted.png
share/icons/hicolor/22x22/actions/down.png
share/icons/hicolor/22x22/actions/edit.png
+share/icons/hicolor/22x22/actions/editclear.png
share/icons/hicolor/22x22/actions/editcopy.png
share/icons/hicolor/22x22/actions/editcut.png
share/icons/hicolor/22x22/actions/editdelete.png
@@ -1349,6 +1359,8 @@ share/icons/hicolor/22x22/actions/edittrash.png
share/icons/hicolor/22x22/actions/encrypted.png
share/icons/hicolor/22x22/actions/eraser.png
share/icons/hicolor/22x22/actions/exec.png
+share/icons/hicolor/22x22/actions/exit.png
+share/icons/hicolor/22x22/actions/fileclose.png
share/icons/hicolor/22x22/actions/filefind.png
share/icons/hicolor/22x22/actions/filenew.png
share/icons/hicolor/22x22/actions/fileopen.png
@@ -1416,6 +1428,7 @@ share/icons/hicolor/22x22/actions/kde/0048.png
share/icons/hicolor/22x22/actions/kde/0049.png
share/icons/hicolor/22x22/actions/kde/0050.png
share/icons/hicolor/22x22/actions/leftjust.png
+share/icons/hicolor/22x22/actions/locationbar_erase.png
share/icons/hicolor/22x22/actions/lock.png
share/icons/hicolor/22x22/actions/mail_forward.png
share/icons/hicolor/22x22/actions/mail_generic.png
@@ -1439,6 +1452,7 @@ share/icons/hicolor/22x22/actions/previous.png
share/icons/hicolor/22x22/actions/queue.png
share/icons/hicolor/22x22/actions/redo.png
share/icons/hicolor/22x22/actions/reload.png
+share/icons/hicolor/22x22/actions/revert.png
share/icons/hicolor/22x22/actions/rightjust.png
share/icons/hicolor/22x22/actions/run.png
share/icons/hicolor/22x22/actions/showmenu.png
@@ -1483,13 +1497,19 @@ share/icons/hicolor/32x32/actions/bookmark_folder.png
share/icons/hicolor/32x32/actions/bookmark_toolbar.png
share/icons/hicolor/32x32/actions/bottom.png
share/icons/hicolor/32x32/actions/centrejust.png
+share/icons/hicolor/32x32/actions/charset.png
share/icons/hicolor/32x32/actions/colorize.png
share/icons/hicolor/32x32/actions/configure.png
+share/icons/hicolor/32x32/actions/connect_creating.png
+share/icons/hicolor/32x32/actions/connect_established.png
+share/icons/hicolor/32x32/actions/connect_no.png
share/icons/hicolor/32x32/actions/contents.png
+share/icons/hicolor/32x32/actions/contents2.png
share/icons/hicolor/32x32/actions/contexthelp.png
share/icons/hicolor/32x32/actions/decrypted.png
share/icons/hicolor/32x32/actions/down.png
share/icons/hicolor/32x32/actions/edit.png
+share/icons/hicolor/32x32/actions/editclear.png
share/icons/hicolor/32x32/actions/editcopy.png
share/icons/hicolor/32x32/actions/editcut.png
share/icons/hicolor/32x32/actions/editdelete.png
@@ -1498,6 +1518,9 @@ share/icons/hicolor/32x32/actions/editshred.png
share/icons/hicolor/32x32/actions/edittrash.png
share/icons/hicolor/32x32/actions/encrypted.png
share/icons/hicolor/32x32/actions/exec.png
+share/icons/hicolor/32x32/actions/exit.png
+share/icons/hicolor/32x32/actions/fileclose.png
+share/icons/hicolor/32x32/actions/filefind.png
share/icons/hicolor/32x32/actions/filenew.png
share/icons/hicolor/32x32/actions/fileopen.png
share/icons/hicolor/32x32/actions/fileprint.png
@@ -1508,6 +1531,7 @@ share/icons/hicolor/32x32/actions/finish.png
share/icons/hicolor/32x32/actions/folder_new.png
share/icons/hicolor/32x32/actions/fonts.png
share/icons/hicolor/32x32/actions/forward.png
+share/icons/hicolor/32x32/actions/frameprint.png
share/icons/hicolor/32x32/actions/gear.png
share/icons/hicolor/32x32/actions/gohome.png
share/icons/hicolor/32x32/actions/goto.png
@@ -1564,6 +1588,7 @@ share/icons/hicolor/32x32/actions/kde/0048.png
share/icons/hicolor/32x32/actions/kde/0049.png
share/icons/hicolor/32x32/actions/kde/0050.png
share/icons/hicolor/32x32/actions/leftjust.png
+share/icons/hicolor/32x32/actions/locationbar_erase.png
share/icons/hicolor/32x32/actions/lock.png
share/icons/hicolor/32x32/actions/mail_forward.png
share/icons/hicolor/32x32/actions/mail_generic.png
@@ -1585,6 +1610,7 @@ share/icons/hicolor/32x32/actions/previous.png
share/icons/hicolor/32x32/actions/queue.png
share/icons/hicolor/32x32/actions/redo.png
share/icons/hicolor/32x32/actions/reload.png
+share/icons/hicolor/32x32/actions/revert.png
share/icons/hicolor/32x32/actions/rightjust.png
share/icons/hicolor/32x32/actions/rotate.png
share/icons/hicolor/32x32/actions/rotate_ccw.png
@@ -1659,6 +1685,7 @@ share/icons/hicolor/32x32/filesystems/zip.png
share/icons/hicolor/32x32/mimetypes/applix.png
share/icons/hicolor/32x32/mimetypes/binary.png
share/icons/hicolor/32x32/mimetypes/binary2.png
+share/icons/hicolor/32x32/mimetypes/colorscm.png
share/icons/hicolor/32x32/mimetypes/core.png
share/icons/hicolor/32x32/mimetypes/deb.png
share/icons/hicolor/32x32/mimetypes/document.png
@@ -1810,6 +1837,7 @@ share/icons/hicolor/48x48/filesystems/zip.png
share/icons/hicolor/48x48/mimetypes/applix.png
share/icons/hicolor/48x48/mimetypes/binary.png
share/icons/hicolor/48x48/mimetypes/binary2.png
+share/icons/hicolor/48x48/mimetypes/colorscm.png
share/icons/hicolor/48x48/mimetypes/core.png
share/icons/hicolor/48x48/mimetypes/deb.png
share/icons/hicolor/48x48/mimetypes/document.png
@@ -1881,6 +1909,7 @@ share/icons/locolor/16x16/actions/bookmark.png
share/icons/locolor/16x16/actions/bookmark_add.png
share/icons/locolor/16x16/actions/bookmark_toolbar.png
share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/charset.png
share/icons/locolor/16x16/actions/colorize.png
share/icons/locolor/16x16/actions/colorpicker.png
share/icons/locolor/16x16/actions/completion.png
@@ -1906,6 +1935,7 @@ share/icons/locolor/16x16/actions/eraser.png
share/icons/locolor/16x16/actions/exec.png
share/icons/locolor/16x16/actions/exit.png
share/icons/locolor/16x16/actions/fileclose.png
+share/icons/locolor/16x16/actions/filefind.png
share/icons/locolor/16x16/actions/filenew.png
share/icons/locolor/16x16/actions/fileopen.png
share/icons/locolor/16x16/actions/fileprint.png
@@ -1918,10 +1948,12 @@ share/icons/locolor/16x16/actions/finish.png
share/icons/locolor/16x16/actions/flag.png
share/icons/locolor/16x16/actions/folder_new.png
share/icons/locolor/16x16/actions/forward.png
+share/icons/locolor/16x16/actions/frameprint.png
share/icons/locolor/16x16/actions/gear.png
share/icons/locolor/16x16/actions/gohome.png
share/icons/locolor/16x16/actions/goto.png
share/icons/locolor/16x16/actions/help.png
+share/icons/locolor/16x16/actions/history.png
share/icons/locolor/16x16/actions/idea.png
share/icons/locolor/16x16/actions/identity.png
share/icons/locolor/16x16/actions/kde/0001.png
@@ -2001,6 +2033,7 @@ share/icons/locolor/16x16/actions/queue.png
share/icons/locolor/16x16/actions/redo.png
share/icons/locolor/16x16/actions/reload.png
share/icons/locolor/16x16/actions/remove.png
+share/icons/locolor/16x16/actions/revert.png
share/icons/locolor/16x16/actions/rotate.png
share/icons/locolor/16x16/actions/rotate_ccw.png
share/icons/locolor/16x16/actions/rotate_cw.png
@@ -2261,6 +2294,7 @@ share/mimelnk/application/x-tzo.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/audio/basic.desktop
+share/mimelnk/audio/mpegurl.desktop
share/mimelnk/audio/vnd.rn-realaudio.desktop
share/mimelnk/audio/x-adpcm.desktop
share/mimelnk/audio/x-aiff.desktop
@@ -2392,14 +2426,11 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/icons/hicolor/32x32/filesystems
@dirrm share/icons/hicolor/32x32/actions/kde
@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
@dirrm share/icons/hicolor/22x22/actions/kde
@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
@dirrm share/icons/hicolor/16x16/mimetypes
@dirrm share/icons/hicolor/16x16/filesystems
@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/hicolor
@dirrm share/doc/HTML/en/kspell
@dirrm share/doc/HTML/en/common
@@ -2491,7 +2522,6 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/khtml
@dirrm share/apps/kdeui/pics
@dirrm share/apps/kdeui
-@dirrm share/apps/kab/pics
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm share/apps
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 405bf219d7b1..3845c6bcff06 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/src
MAINTAINER= will@FreeBSD.org
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index be16692f3af0..33a18bf1202a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
+MD5 (kdelibs-2.1.2.tar.bz2) = 7da819efb418b4ebae65a1ea5ed0ba5c
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index d716fe96d906..0977fac33fc1 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -15,6 +15,7 @@ bin/kdb2html
bin/kde-config
bin/kded
bin/kdeinit
+bin/kdeinit_shutdown
bin/kdeinit_wrapper
bin/kdesu_stub
bin/kio_http_cache_cleaner
@@ -1160,6 +1161,7 @@ share/icons/hicolor/16x16/actions/bookmark_add.png
share/icons/hicolor/16x16/actions/bookmark_folder.png
share/icons/hicolor/16x16/actions/bookmark_toolbar.png
share/icons/hicolor/16x16/actions/bottom.png
+share/icons/hicolor/16x16/actions/charset.png
share/icons/hicolor/16x16/actions/colorpicker.png
share/icons/hicolor/16x16/actions/configure.png
share/icons/hicolor/16x16/actions/connect_creating.png
@@ -1172,6 +1174,7 @@ share/icons/hicolor/16x16/actions/crop.png
share/icons/hicolor/16x16/actions/decrypted.png
share/icons/hicolor/16x16/actions/down.png
share/icons/hicolor/16x16/actions/edit.png
+share/icons/hicolor/16x16/actions/editclear.png
share/icons/hicolor/16x16/actions/editcopy.png
share/icons/hicolor/16x16/actions/editcut.png
share/icons/hicolor/16x16/actions/editdelete.png
@@ -1201,6 +1204,7 @@ share/icons/hicolor/16x16/actions/goto.png
share/icons/hicolor/16x16/actions/help.png
share/icons/hicolor/16x16/actions/history.png
share/icons/hicolor/16x16/actions/idea.png
+share/icons/hicolor/16x16/actions/locationbar_erase.png
share/icons/hicolor/16x16/actions/lock.png
share/icons/hicolor/16x16/actions/mail_forward.png
share/icons/hicolor/16x16/actions/mail_generic.png
@@ -1216,7 +1220,9 @@ share/icons/hicolor/16x16/actions/openterm.png
share/icons/hicolor/16x16/actions/previous.png
share/icons/hicolor/16x16/actions/redo.png
share/icons/hicolor/16x16/actions/reload.png
+share/icons/hicolor/16x16/actions/revert.png
share/icons/hicolor/16x16/actions/run.png
+share/icons/hicolor/16x16/actions/spellcheck.png
share/icons/hicolor/16x16/actions/start.png
share/icons/hicolor/16x16/actions/stop.png
share/icons/hicolor/16x16/actions/top.png
@@ -1265,6 +1271,7 @@ share/icons/hicolor/16x16/filesystems/www.png
share/icons/hicolor/16x16/mimetypes/applix.png
share/icons/hicolor/16x16/mimetypes/binary.png
share/icons/hicolor/16x16/mimetypes/binary2.png
+share/icons/hicolor/16x16/mimetypes/colorscm.png
share/icons/hicolor/16x16/mimetypes/core.png
share/icons/hicolor/16x16/mimetypes/deb.png
share/icons/hicolor/16x16/mimetypes/document.png
@@ -1328,6 +1335,7 @@ share/icons/hicolor/22x22/actions/bookmark.png
share/icons/hicolor/22x22/actions/bookmark_add.png
share/icons/hicolor/22x22/actions/bottom.png
share/icons/hicolor/22x22/actions/centrejust.png
+share/icons/hicolor/22x22/actions/charset.png
share/icons/hicolor/22x22/actions/colorize.png
share/icons/hicolor/22x22/actions/colorpicker.png
share/icons/hicolor/22x22/actions/configure.png
@@ -1335,11 +1343,13 @@ share/icons/hicolor/22x22/actions/connect_creating.png
share/icons/hicolor/22x22/actions/connect_established.png
share/icons/hicolor/22x22/actions/connect_no.png
share/icons/hicolor/22x22/actions/contents.png
+share/icons/hicolor/22x22/actions/contents2.png
share/icons/hicolor/22x22/actions/contexthelp.png
share/icons/hicolor/22x22/actions/crop.png
share/icons/hicolor/22x22/actions/decrypted.png
share/icons/hicolor/22x22/actions/down.png
share/icons/hicolor/22x22/actions/edit.png
+share/icons/hicolor/22x22/actions/editclear.png
share/icons/hicolor/22x22/actions/editcopy.png
share/icons/hicolor/22x22/actions/editcut.png
share/icons/hicolor/22x22/actions/editdelete.png
@@ -1349,6 +1359,8 @@ share/icons/hicolor/22x22/actions/edittrash.png
share/icons/hicolor/22x22/actions/encrypted.png
share/icons/hicolor/22x22/actions/eraser.png
share/icons/hicolor/22x22/actions/exec.png
+share/icons/hicolor/22x22/actions/exit.png
+share/icons/hicolor/22x22/actions/fileclose.png
share/icons/hicolor/22x22/actions/filefind.png
share/icons/hicolor/22x22/actions/filenew.png
share/icons/hicolor/22x22/actions/fileopen.png
@@ -1416,6 +1428,7 @@ share/icons/hicolor/22x22/actions/kde/0048.png
share/icons/hicolor/22x22/actions/kde/0049.png
share/icons/hicolor/22x22/actions/kde/0050.png
share/icons/hicolor/22x22/actions/leftjust.png
+share/icons/hicolor/22x22/actions/locationbar_erase.png
share/icons/hicolor/22x22/actions/lock.png
share/icons/hicolor/22x22/actions/mail_forward.png
share/icons/hicolor/22x22/actions/mail_generic.png
@@ -1439,6 +1452,7 @@ share/icons/hicolor/22x22/actions/previous.png
share/icons/hicolor/22x22/actions/queue.png
share/icons/hicolor/22x22/actions/redo.png
share/icons/hicolor/22x22/actions/reload.png
+share/icons/hicolor/22x22/actions/revert.png
share/icons/hicolor/22x22/actions/rightjust.png
share/icons/hicolor/22x22/actions/run.png
share/icons/hicolor/22x22/actions/showmenu.png
@@ -1483,13 +1497,19 @@ share/icons/hicolor/32x32/actions/bookmark_folder.png
share/icons/hicolor/32x32/actions/bookmark_toolbar.png
share/icons/hicolor/32x32/actions/bottom.png
share/icons/hicolor/32x32/actions/centrejust.png
+share/icons/hicolor/32x32/actions/charset.png
share/icons/hicolor/32x32/actions/colorize.png
share/icons/hicolor/32x32/actions/configure.png
+share/icons/hicolor/32x32/actions/connect_creating.png
+share/icons/hicolor/32x32/actions/connect_established.png
+share/icons/hicolor/32x32/actions/connect_no.png
share/icons/hicolor/32x32/actions/contents.png
+share/icons/hicolor/32x32/actions/contents2.png
share/icons/hicolor/32x32/actions/contexthelp.png
share/icons/hicolor/32x32/actions/decrypted.png
share/icons/hicolor/32x32/actions/down.png
share/icons/hicolor/32x32/actions/edit.png
+share/icons/hicolor/32x32/actions/editclear.png
share/icons/hicolor/32x32/actions/editcopy.png
share/icons/hicolor/32x32/actions/editcut.png
share/icons/hicolor/32x32/actions/editdelete.png
@@ -1498,6 +1518,9 @@ share/icons/hicolor/32x32/actions/editshred.png
share/icons/hicolor/32x32/actions/edittrash.png
share/icons/hicolor/32x32/actions/encrypted.png
share/icons/hicolor/32x32/actions/exec.png
+share/icons/hicolor/32x32/actions/exit.png
+share/icons/hicolor/32x32/actions/fileclose.png
+share/icons/hicolor/32x32/actions/filefind.png
share/icons/hicolor/32x32/actions/filenew.png
share/icons/hicolor/32x32/actions/fileopen.png
share/icons/hicolor/32x32/actions/fileprint.png
@@ -1508,6 +1531,7 @@ share/icons/hicolor/32x32/actions/finish.png
share/icons/hicolor/32x32/actions/folder_new.png
share/icons/hicolor/32x32/actions/fonts.png
share/icons/hicolor/32x32/actions/forward.png
+share/icons/hicolor/32x32/actions/frameprint.png
share/icons/hicolor/32x32/actions/gear.png
share/icons/hicolor/32x32/actions/gohome.png
share/icons/hicolor/32x32/actions/goto.png
@@ -1564,6 +1588,7 @@ share/icons/hicolor/32x32/actions/kde/0048.png
share/icons/hicolor/32x32/actions/kde/0049.png
share/icons/hicolor/32x32/actions/kde/0050.png
share/icons/hicolor/32x32/actions/leftjust.png
+share/icons/hicolor/32x32/actions/locationbar_erase.png
share/icons/hicolor/32x32/actions/lock.png
share/icons/hicolor/32x32/actions/mail_forward.png
share/icons/hicolor/32x32/actions/mail_generic.png
@@ -1585,6 +1610,7 @@ share/icons/hicolor/32x32/actions/previous.png
share/icons/hicolor/32x32/actions/queue.png
share/icons/hicolor/32x32/actions/redo.png
share/icons/hicolor/32x32/actions/reload.png
+share/icons/hicolor/32x32/actions/revert.png
share/icons/hicolor/32x32/actions/rightjust.png
share/icons/hicolor/32x32/actions/rotate.png
share/icons/hicolor/32x32/actions/rotate_ccw.png
@@ -1659,6 +1685,7 @@ share/icons/hicolor/32x32/filesystems/zip.png
share/icons/hicolor/32x32/mimetypes/applix.png
share/icons/hicolor/32x32/mimetypes/binary.png
share/icons/hicolor/32x32/mimetypes/binary2.png
+share/icons/hicolor/32x32/mimetypes/colorscm.png
share/icons/hicolor/32x32/mimetypes/core.png
share/icons/hicolor/32x32/mimetypes/deb.png
share/icons/hicolor/32x32/mimetypes/document.png
@@ -1810,6 +1837,7 @@ share/icons/hicolor/48x48/filesystems/zip.png
share/icons/hicolor/48x48/mimetypes/applix.png
share/icons/hicolor/48x48/mimetypes/binary.png
share/icons/hicolor/48x48/mimetypes/binary2.png
+share/icons/hicolor/48x48/mimetypes/colorscm.png
share/icons/hicolor/48x48/mimetypes/core.png
share/icons/hicolor/48x48/mimetypes/deb.png
share/icons/hicolor/48x48/mimetypes/document.png
@@ -1881,6 +1909,7 @@ share/icons/locolor/16x16/actions/bookmark.png
share/icons/locolor/16x16/actions/bookmark_add.png
share/icons/locolor/16x16/actions/bookmark_toolbar.png
share/icons/locolor/16x16/actions/bottom.png
+share/icons/locolor/16x16/actions/charset.png
share/icons/locolor/16x16/actions/colorize.png
share/icons/locolor/16x16/actions/colorpicker.png
share/icons/locolor/16x16/actions/completion.png
@@ -1906,6 +1935,7 @@ share/icons/locolor/16x16/actions/eraser.png
share/icons/locolor/16x16/actions/exec.png
share/icons/locolor/16x16/actions/exit.png
share/icons/locolor/16x16/actions/fileclose.png
+share/icons/locolor/16x16/actions/filefind.png
share/icons/locolor/16x16/actions/filenew.png
share/icons/locolor/16x16/actions/fileopen.png
share/icons/locolor/16x16/actions/fileprint.png
@@ -1918,10 +1948,12 @@ share/icons/locolor/16x16/actions/finish.png
share/icons/locolor/16x16/actions/flag.png
share/icons/locolor/16x16/actions/folder_new.png
share/icons/locolor/16x16/actions/forward.png
+share/icons/locolor/16x16/actions/frameprint.png
share/icons/locolor/16x16/actions/gear.png
share/icons/locolor/16x16/actions/gohome.png
share/icons/locolor/16x16/actions/goto.png
share/icons/locolor/16x16/actions/help.png
+share/icons/locolor/16x16/actions/history.png
share/icons/locolor/16x16/actions/idea.png
share/icons/locolor/16x16/actions/identity.png
share/icons/locolor/16x16/actions/kde/0001.png
@@ -2001,6 +2033,7 @@ share/icons/locolor/16x16/actions/queue.png
share/icons/locolor/16x16/actions/redo.png
share/icons/locolor/16x16/actions/reload.png
share/icons/locolor/16x16/actions/remove.png
+share/icons/locolor/16x16/actions/revert.png
share/icons/locolor/16x16/actions/rotate.png
share/icons/locolor/16x16/actions/rotate_ccw.png
share/icons/locolor/16x16/actions/rotate_cw.png
@@ -2261,6 +2294,7 @@ share/mimelnk/application/x-tzo.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/audio/basic.desktop
+share/mimelnk/audio/mpegurl.desktop
share/mimelnk/audio/vnd.rn-realaudio.desktop
share/mimelnk/audio/x-adpcm.desktop
share/mimelnk/audio/x-aiff.desktop
@@ -2392,14 +2426,11 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/icons/hicolor/32x32/filesystems
@dirrm share/icons/hicolor/32x32/actions/kde
@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/32x32
@dirrm share/icons/hicolor/22x22/actions/kde
@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/22x22
@dirrm share/icons/hicolor/16x16/mimetypes
@dirrm share/icons/hicolor/16x16/filesystems
@dirrm share/icons/hicolor/16x16/actions
-@dirrm share/icons/hicolor/16x16
@dirrm share/icons/hicolor
@dirrm share/doc/HTML/en/kspell
@dirrm share/doc/HTML/en/common
@@ -2491,7 +2522,6 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/khtml
@dirrm share/apps/kdeui/pics
@dirrm share/apps/kdeui
-@dirrm share/apps/kab/pics
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm share/apps