5 files changed, 88 insertions, 23 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 3c55d896833f..97056b3d5cd3 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	net kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +16,6 @@ COMMENT=	KDE Network applications
 
 LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		idn.17:${PORTSDIR}/dns/libidn \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca \
 		otr.4:${PORTSDIR}/security/libotr \
 		vncserver.0:${PORTSDIR}/net/libvncserver \
@@ -33,21 +31,18 @@ LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		gif.5:${PORTSDIR}/graphics/giflib \
-		soprano.4:${PORTSDIR}/textproc/soprano \
 		mms.0:${PORTSDIR}/net/libmms \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		searchclient.0:${PORTSDIR}/deskutils/strigi
+		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
-		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 
-RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
-		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
 LATEST_LINK=	${PORTNAME}4
 
 USE_GNOME=	glib20 libxml2 libxslt
-USE_KDE4=	automoc4 baseapps kdehier kdelibs kdeprefix pimlibs workspace
+USE_KDE4=	kdehier kdelibs kdeprefix libkonq pimlibs workspace \
+		automoc4 ontologies qimageblitz soprano strigi
 KDE4_BUILDENV=	yes
 USE_OPENSSL=	yes
 USE_QT_VER=	4
@@ -55,7 +50,7 @@ QT_COMPONENTS=	dbus gui network qt3support sql xml \
 		moc_build qmake_build rcc_build uic_build uic3_build
 USE_SQLITE=	yes
 USE_XORG=	x11 xdamage xext xscrnsaver xtst
-USE_BZIP2=	yes
+USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
 # Explicitly disable ALSA, as it's not used (Jabber Jingle support is
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 3b3e022fe26f..bc6297cdb0c3 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdenetwork-4.7.4.tar.bz2) = 6521b32bd35f2f86f87e50251eff953d48a9238593301ae9b7b6f05da85f987f
-SIZE (KDE/kdenetwork-4.7.4.tar.bz2) = 9966358
+SHA256 (KDE/kdenetwork-4.8.3.tar.xz) = 9acf05bc77b3cc500b7364936882f5c5f07f3938f426ce262d4065de11cae380
+SIZE (KDE/kdenetwork-4.8.3.tar.xz) = 9267740
diff --git a/net/kdenetwork4/files/extra-patch-CMakeLists.txt b/net/kdenetwork4/files/extra-patch-CMakeLists.txt
index cf3878a68ac2..729d38d76e2b 100644
--- a/net/kdenetwork4/files/extra-patch-CMakeLists.txt
+++ b/net/kdenetwork4/files/extra-patch-CMakeLists.txt
@@ -1,12 +1,12 @@
---- ./CMakeLists.txt.orig	2010-03-27 03:29:39.000000000 +1000
-+++ ./CMakeLists.txt	2010-05-16 16:29:43.300835439 +1100
-@@ -78,9 +78,7 @@
- 
+--- ./CMakeLists.txt.orig	2011-12-20 21:00:23.000000000 +0000
++++ ./CMakeLists.txt	2012-02-28 15:15:47.088880908 +0000
+@@ -86,9 +86,7 @@
+ if(Q_WS_X11)
    # kppp is broken on FreeBSD >= 8.0
    # disabling until a fix appears
--  if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD AND NOT APPLE)
+-  if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL GNU)
      macro_optional_add_subdirectory(kppp)
--  endif(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD AND NOT APPLE)
+-  endif(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL GNU)
  
-   if(LIBVNCSERVER_FOUND)
-     macro_optional_add_subdirectory(krfb)
+   macro_optional_add_subdirectory(krfb)
+ endif(Q_WS_X11)
diff --git a/net/kdenetwork4/files/patch-svn_1292762.diff b/net/kdenetwork4/files/patch-svn_1292762.diff
new file mode 100644
index 000000000000..81071b21da48
--- /dev/null
+++ b/net/kdenetwork4/files/patch-svn_1292762.diff
@@ -0,0 +1,65 @@
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	(revision 1292761)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	(revision 1292762)
+@@ -31,6 +31,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <unistd.h>
+ #endif
+ 
+ #include <cstring>
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	(revision 1292761)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	(revision 1292762)
+@@ -27,6 +27,12 @@
+ 
+ #include "talk/base/ssladapter.h"
+ 
++#ifdef POSIX
++extern "C" {
++#include <unistd.h>
++}
++#endif
++
+ #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
+ #ifdef WIN32
+ #define SSL_USE_SCHANNEL 1
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	(revision 1292761)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	(revision 1292762)
+@@ -198,15 +198,6 @@
+ }
+ 
+ template<class CTYPE>
+-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
+-  va_list args;
+-  va_start(args, format);
+-  size_t len = vsprintfn(buffer, buflen, format, args);
+-  va_end(args);
+-  return len;
+-}
+-
+-template<class CTYPE>
+ size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
+                  va_list args) {
+   int len = vsnprintf(buffer, buflen, format, args);
+@@ -217,6 +208,15 @@
+   return len;
+ }
+ 
++template<class CTYPE>
++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
++  va_list args;
++  va_start(args, format);
++  size_t len = vsprintfn(buffer, buflen, format, args);
++  va_end(args);
++  return len;
++}
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // Allow safe comparing and copying ascii (not UTF-8) with both wide and
+ // non-wide character strings.
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index 515234f63295..e5d00d393733 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -159,6 +159,7 @@ lib/kde4/libchattexteditpart.so
 lib/kde4/plasma_engine_kget.so
 lib/kde4/plasma_kget_barapplet.so
 lib/kde4/plasma_kget_piechart.so
+lib/kde4/plugins/accessible/chatwindowaccessiblewidgetfactory.so
 lib/kde4/sambausershareplugin.so
 lib/libkgetcore.so
 lib/libkgetcore.so.5
@@ -212,6 +213,9 @@ share/applications/kde4/krdc.desktop
 share/applications/kde4/krfb.desktop
 share/apps/dolphinpart/kpartplugins/kget_plug_in.desktop
 share/apps/dolphinpart/kpartplugins/kget_plug_in.rc
+share/apps/kconf_update/kget.upd
+share/apps/kconf_update/kget_limitdownloads.pl
+share/apps/kconf_update/kget_sensitive.pl
 share/apps/kconf_update/kopete-account-0.10.pl
 share/apps/kconf_update/kopete-account-kconf_update.sh
 share/apps/kconf_update/kopete-account-kconf_update.upd
@@ -1523,8 +1527,6 @@ share/sounds/Kopete_Event.ogg
 share/sounds/Kopete_Received.ogg
 share/sounds/Kopete_Sent.ogg
 share/sounds/Kopete_User_is_Online.ogg
-@dirrmtry share/telepathy/clients
-@dirrmtry share/telepathy
 @dirrm share/kde4/services/kconfiguredialog
 @dirrm share/doc/HTML/en/krfb
 @dirrm share/doc/HTML/en/krdc
@@ -1714,6 +1716,9 @@ share/sounds/Kopete_User_is_Online.ogg
 @dirrm share/apps/kget/www
 @dirrm share/apps/kget/pics
 @dirrm share/apps/kget
+@dirrmtry share/apps/dolphinpart/kpartplugins
+@dirrmtry share/apps/dolphinpart
+@dirrmtry lib/kde4/plugins/accessible
 @dirrmtry lib/browser_plugins
 @dirrm include/krdc
 @dirrm include/kopete/ui