6 files changed, 15 insertions, 154 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 927d80a791f7..f72461ffa31d 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -18,7 +18,6 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		artsc.0:${PORTSDIR}/audio/arts \
@@ -32,7 +31,6 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	kdehier>0:${PORTSDIR}/misc/kdehier \
-		iceauth:${X_CLIENTS_PORT} \
 		${FONTSCALE}:${X_FONTS_TTF_PORT} \
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
@@ -81,6 +79,14 @@ FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
 
+.if ${X_WINDOW_SYSTEM:L} != xorg
+BUILD_DEPENDS+=	mkfontdir:${X_CLIENTS_PORT}
+RUN_DEPENDS+=	iceauth:${X_CLIENTS_PORT}
+.else
+BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDS+=	iceauth:${PORTSDIR}/x11/iceauth
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp
 	${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index c4f0914142c7..6a0bc34dc3fa 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.6.tar.bz2) = e4d137879a66e92b895b3de5413a61d8
-SHA256 (KDE/kdelibs-3.5.6.tar.bz2) = 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c
-SIZE (KDE/kdelibs-3.5.6.tar.bz2) = 15509460
+MD5 (KDE/kdelibs-3.5.7.tar.bz2) = 50ed644f2ec91963570fe2b155652957
+SHA256 (KDE/kdelibs-3.5.7.tar.bz2) = 05bc5d0d18b787d964f7c45cc078b047d450d3ddc28b1bde839a26a2eda2c5d9
+SIZE (KDE/kdelibs-3.5.7.tar.bz2) = 15576038
diff --git a/x11/kdelibs3/files/patch-CVE-2007-1564-kdelibs-3.5.6 b/x11/kdelibs3/files/patch-CVE-2007-1564-kdelibs-3.5.6
deleted file mode 100644
index b026d67a3db0..000000000000
--- a/x11/kdelibs3/files/patch-CVE-2007-1564-kdelibs-3.5.6
+++ /dev/null
@@ -1,81 +0,0 @@
---- khtml/ecma/kjs_html.cpp
-+++ khtml/ecma/kjs_html.cpp
-@@ -1866,9 +1866,11 @@ Value KJS::HTMLElement::getValueProperty
- 				      getDOMNode(exec, frameElement.contentDocument()) : Undefined();
-     case FrameContentWindow:   {
-         KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
--        if (part)
--            return Value(Window::retrieveWindow(part));
--        else
-+        if (part) {
-+          Window *w = Window::retrieveWindow(part);
-+          if (w)
-+            return Value(w);
-+        }
-             return Undefined();
-     }
-     case FrameFrameBorder:     return String(frameElement.frameBorder());
-@@ -1899,9 +1901,11 @@ Value KJS::HTMLElement::getValueProperty
- 				       getDOMNode(exec, iFrame.contentDocument()) : Undefined();
-     case IFrameContentWindow:       {
-         KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
--        if (part)
--            return Value(Window::retrieveWindow(part));
--        else
-+        if (part) {
-+          Window *w = Window::retrieveWindow(part);
-+          if (w)
-+            return Value(w);
-+        }
-             return Undefined();
-     }
-     case IFrameFrameBorder:     return String(iFrame.frameBorder());
---- kioslave/ftp/ftp.cc
-+++ kioslave/ftp/ftp.cc
-@@ -58,6 +58,7 @@
- #include <kmimemagic.h>
- #include <kmimetype.h>
- #include <ksockaddr.h>
-+#include <ksocketaddress.h>
- #include <kio/ioslave_defaults.h>
- #include <kio/slaveconfig.h>
- #include <kremoteencoding.h>
-@@ -835,7 +836,6 @@ bool Ftp::ftpSendCmd( const QCString& cm
-   return true;
- }
- 
--
- /*
-  * ftpOpenPASVDataConnection - set up data connection, using PASV mode
-  *
-@@ -853,6 +853,8 @@ int Ftp::ftpOpenPASVDataConnection()
-   if (sa != NULL && sa->family() != PF_INET)
-     return ERR_INTERNAL;       // no PASV for non-PF_INET connections
- 
-+  const KInetSocketAddress *sin = static_cast<const KInetSocketAddress*>(sa);
-+
-   if (m_extControl & pasvUnknown)
-     return ERR_INTERNAL;       // already tried and got "unknown command"
- 
-@@ -886,14 +888,17 @@ int Ftp::ftpOpenPASVDataConnection()
-   }
- 
-   // Make hostname and port number ...
--  QString host;
--  host.sprintf("%d.%d.%d.%d", i[0], i[1], i[2], i[3]);
-   int port = i[4] << 8 | i[5];
- 
-+  // we ignore the host part on purpose for two reasons
-+  // a) it might be wrong anyway
-+  // b) it would make us being suceptible to a port scanning attack
-+
-   // now connect the data socket ...
-   m_data = new FtpSocket("PASV");
--  m_data->setAddress(host, port);
--  kdDebug(7102) << "Connecting to " << host << " on port " << port << endl;
-+  m_data->setAddress(sin->nodeName(), port);
-+
-+  kdDebug(7102) << "Connecting to " << sin->nodeName() << " on port " << port << endl;
-   return m_data->connectSocket(connectTimeout(), false);
- }
- 
diff --git a/x11/kdelibs3/files/patch-kdelibs-kjs b/x11/kdelibs3/files/patch-kdelibs-kjs
deleted file mode 100644
index ca4456320ee9..000000000000
--- a/x11/kdelibs3/files/patch-kdelibs-kjs
+++ /dev/null
@@ -1,38 +0,0 @@
-------------------------------------------------------------------------
-r645387 | porten | 2007-03-22 15:01:13 +0100 (Thu, 22 Mar 2007) | 4 lines
-
-substitute some of the invalid sequences with the standard replacement
-char. this matches Mozilla but not IE which leaves them unchanged (or
-throws an exception)
-
-------------------------------------------------------------------------
---- kjs/function.cpp
-+++ kjs/function.cpp
-@@ -244,11 +244,15 @@ UString decodeURI(ExecState *exec, UStri
-       }
- 
-       // UTF-8 transform
-+      const unsigned long replacementChar = 0xFFFD;
-       unsigned long V;
-       if (n == 2) {
- 	unsigned long yyyyy = octets[0] & 0x1F;
- 	unsigned long zzzzzz = octets[1] & 0x3F;
- 	V = (yyyyy << 6) | zzzzzz;
-+	// 2-byte sequence overlong for this value?
-+	if (V < 0xFF)
-+	  V = replacementChar;
- 	C = UChar((unsigned short)V);
-       }
-       else if (n == 3) {
-@@ -256,6 +260,11 @@ UString decodeURI(ExecState *exec, UStri
- 	unsigned long yyyyyy = octets[1] & 0x3F;
- 	unsigned long zzzzzz = octets[2] & 0x3F;
- 	V = (xxxx << 12) | (yyyyyy << 6) | zzzzzz;
-+	// 3-byte sequence overlong for this value,
-+	// an invalid value or UTF-16 surrogate?
-+	if (V < 0x800 || V == 0xFFFE || V == 0xFFFF ||
-+	    (V >= 0xD800 && V <= 0xDFFF))
-+	  V = replacementChar;
- 	C = UChar((unsigned short)V);
-       }
-       else {
diff --git a/x11/kdelibs3/files/patch-post-3.5.6-kdelibs.diff b/x11/kdelibs3/files/patch-post-3.5.6-kdelibs.diff
deleted file mode 100644
index 5b44a47ef7a5..000000000000
--- a/x11/kdelibs3/files/patch-post-3.5.6-kdelibs.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- khtml/html/htmltokenizer.cpp
-+++ khtml/html/htmltokenizer.cpp
-@@ -316,7 +316,7 @@ void HTMLTokenizer::parseSpecial(Tokeniz
-     while ( !src.isEmpty() ) {
-         checkScriptBuffer();
-         unsigned char ch = src->latin1();
--        if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-+        if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-             comment = true;
-             scriptCode[ scriptCodeSize++ ] = ch;
-             ++src;
-@@ -495,7 +495,7 @@ void HTMLTokenizer::parseComment(Tokeniz
- 
-             if (canClose || handleBrokenComments || scriptEnd ){
-                 ++src;
--                if ( !( script || xmp || textarea || style) ) {
-+                if ( !( title || script || xmp || textarea || style) ) {
- #ifdef COMMENTS_IN_DOM
-                     checkScriptBuffer();
-                     scriptCode[ scriptCodeSize ] = 0;
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 90183447454b..2f6befae1caa 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -144,7 +144,6 @@ include/kabc/resource.h
 include/kabc/resourcedir.h
 include/kabc/resourcefile.h
 include/kabc/resourceldapkio.h
-include/kabc/resourcenet.h
 include/kabc/resourceselectdialog.h
 include/kabc/secrecy.h
 include/kabc/sortmode.h
@@ -771,9 +770,6 @@ lib/kde3/kabc_file.so
 lib/kde3/kabc_ldapkio.a
 lib/kde3/kabc_ldapkio.la
 lib/kde3/kabc_ldapkio.so
-lib/kde3/kabc_net.a
-lib/kde3/kabc_net.la
-lib/kde3/kabc_net.so
 lib/kde3/kabcformat_binary.a
 lib/kde3/kabcformat_binary.la
 lib/kde3/kabcformat_binary.so
@@ -1008,10 +1004,6 @@ lib/libkabc_ldapkio.a
 lib/libkabc_ldapkio.la
 lib/libkabc_ldapkio.so
 lib/libkabc_ldapkio.so.1
-lib/libkabc_net.a
-lib/libkabc_net.la
-lib/libkabc_net.so
-lib/libkabc_net.so.1
 lib/libkatepartinterfaces.a
 lib/libkatepartinterfaces.la
 lib/libkatepartinterfaces.so
@@ -1646,6 +1638,7 @@ share/apps/ksgmltools2/customization/de/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/de/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/de/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/de/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/de/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/de/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/de/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/de/lang.entities
@@ -1792,6 +1785,7 @@ share/apps/ksgmltools2/customization/fr/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/fr/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/fr/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/fr/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/fr/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/fr/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/fr/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/fr/lang.entities
@@ -5282,6 +5276,7 @@ share/mimelnk/audio/x-mpegurl.desktop
 share/mimelnk/audio/x-ms-wma.desktop
 share/mimelnk/audio/x-musepack.desktop
 share/mimelnk/audio/x-oggflac.desktop
+share/mimelnk/audio/x-pn-realaudio-plugin.desktop
 share/mimelnk/audio/x-pn-realaudio.desktop
 share/mimelnk/audio/x-scpls.desktop
 share/mimelnk/audio/x-speex.desktop
@@ -5438,7 +5433,6 @@ share/services/knotify.desktop
 share/services/kresources/kabc/dir.desktop
 share/services/kresources/kabc/file.desktop
 share/services/kresources/kabc/ldapkio.desktop
-share/services/kresources/kabc/net.desktop
 share/services/kresources/kabc_manager.desktop
 share/services/kspell_aspell.desktop
 share/services/kspell_ispell.desktop