5 files changed, 139 insertions, 39 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index c92baf44c0db..913d99367ed4 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Network applications
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		idn.17:${PORTSDIR}/dns/libidn \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
@@ -22,36 +21,50 @@ LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		otr.4:${PORTSDIR}/security/libotr \
 		vncserver.0:${PORTSDIR}/net/libvncserver \
 		msn.0:${PORTSDIR}/net-im/libmsn \
-		gadu:${PORTSDIR}/polish/libgadu \
-		gmp.10:${PORTSDIR}/math/gmp \
-		ortp.5:${PORTSDIR}/net/ortp \
-		telepathy-qt4.1:${PORTSDIR}/net-im/telepathy-qt4 \
-		meanwhile.1:${PORTSDIR}/net-im/meanwhile \
+		gadu.3:${PORTSDIR}/polish/libgadu \
+		ortp.8:${PORTSDIR}/net/linphone-base \
+		mediastreamer.0:${PORTSDIR}/net/linphone-base \
 		speex.1:${PORTSDIR}/audio/speex \
+		expat.6:${PORTSDIR}/textproc/expat2 \
+		meanwhile.1:${PORTSDIR}/net-im/meanwhile \
 		v4l2.0:${PORTSDIR}/multimedia/libv4l \
-		ktorrent.3:${PORTSDIR}/net-p2p/libktorrent
-RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
+		ktorrent.3:${PORTSDIR}/net-p2p/libktorrent \
+		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
+
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
+		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
+
+RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
+		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_BZIP2=	yes
-USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 kdebase workspace
+USE_GNOME=	glib20 libxml2 libxslt
+USE_KDE4=	automoc4 baseapps kdehier kdelibs kdeprefix pimlibs workspace
 KDE4_BUILDENV=	yes
+USE_OPENSSL=	yes
 USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui network qt3support sql xml \
+		moc_build qmake_build rcc_build uic_build uic3_build
 USE_SQLITE=	yes
-QT_COMPONENTS=	corelib opengl dbus qt3support gui network xml porting_build \
-		qmake_build moc_build rcc_build uic_build uic3_build
-USE_OPENSSL=	yes
+USE_XORG=	x11 xdamage xext xscrnsaver xtst
+USE_BZIP2=	yes
 MAKE_JOBS_SAFE=	yes
 
-# Explicitly disable alsa, see for details:
-# http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
-#CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
+# Explicitly disable ALSA, as it's not used (Jabber Jingle support is
+# not built).
+CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
 
-# Route mozilla plugin by standard path
+# Route Mozilla plugin by standard path.
 CMAKE_ARGS+=	-DMOZPLUGIN_INSTALL_DIR=${PREFIX}/lib/browser_plugins
 
-# Fix build with fresh multimedia/v4l_compat installed
+# Fix build with fresh multimedia/v4l_compat installed.
 CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES=1
 
 OPTIONS=	XMMS "Enable XMMS Kopete nowlistening plugin" off
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 64c6b7b6c59b..82053566a819 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdenetwork-4.6.5.tar.bz2) = 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
-SIZE (KDE/kdenetwork-4.6.5.tar.bz2) = 8685421
+SHA256 (KDE/kdenetwork-4.7.2.tar.bz2) = c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
+SIZE (KDE/kdenetwork-4.7.2.tar.bz2) = 9945067
diff --git a/net/kdenetwork4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc b/net/kdenetwork4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc
new file mode 100644
index 000000000000..5aebcd5d4a19
--- /dev/null
+++ b/net/kdenetwork4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc
@@ -0,0 +1,22 @@
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc.orig	2008-09-06 23:18:41.000000000 -0300
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc	2008-09-06 23:31:38.000000000 -0300
+@@ -25,6 +25,10 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #include <time.h>
+ 
+ #ifdef WIN32
+@@ -369,7 +373,7 @@
+     }
+     gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
+   }
+-#ifdef OSX
++#if defined(OSX) || defined(__FreeBSD__)
+   tm *tm_for_timezone = localtime((time_t *)&gmt);
+   *seconds = gmt + tm_for_timezone->tm_gmtoff;
+ #else
diff --git a/net/kdenetwork4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc b/net/kdenetwork4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc
new file mode 100644
index 000000000000..3679a3e12031
--- /dev/null
+++ b/net/kdenetwork4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc
@@ -0,0 +1,36 @@
+Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc
+===================================================================
+--- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc	(revision 1242947)
++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc	(working copy)
+@@ -29,10 +29,6 @@
+ #include <malloc.h>
+ #endif  // WIN32
+ #include <stdlib.h>
+-#ifdef POSIX
+-#include <alloca.h>
+-#define _alloca alloca
+-#endif  // POSIX
+ 
+ #include "talk/base/basictypes.h"
+ #include "talk/base/common.h"
+@@ -477,16 +473,18 @@
+ 
+ void transform(std::string& value, size_t maxlen, const std::string& source,
+                Transform t) {
+-  char * buffer = static_cast<char *>(_alloca(maxlen + 1));
++  char * buffer = new char[maxlen + 1];
+   value.assign(buffer, t(buffer, maxlen + 1, source.data(), source.length()));
++  delete [] buffer;
+ }
+ 
+ std::string s_transform(const std::string& source, Transform t) {
+   // Ask transformation function to approximate the destination size (returns upper bound)
+   size_t maxlen = t(NULL, 0, source.data(), source.length());
+-  char * buffer = static_cast<char *>(_alloca(maxlen));
++  char * buffer = new char[maxlen];
+   size_t len = t(buffer, maxlen, source.data(), source.length());
+   std::string result(buffer, len);
++  delete [] buffer;
+   return result;
+ }
+ 
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index 5b2c2887d5b0..515234f63295 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -1,8 +1,9 @@
+bin/googletalk-call
 bin/kget
 bin/kopete
 bin/kopete_latexconvert.sh
-%%KPPP%%bin/kppplogview
 %%KPPP%%bin/kppp
+%%KPPP%%bin/kppplogview
 bin/krdc
 bin/krfb
 bin/winpopup-install
@@ -79,14 +80,11 @@ include/krdc/hostpreferences.h
 include/krdc/remoteview.h
 include/krdc/remoteviewfactory.h
 lib/browser_plugins/skypebuttons.so
-lib/kde4/fileshare_propsdlgplugin.so
-lib/kde4/kcm_fileshare.so
-lib/kde4/kcm_kcmsambaconf.so
 lib/kde4/kcm_kget_bittorrentfactory.so
 lib/kde4/kcm_kget_checksumsearchfactory.so
-lib/kde4/kcm_kget_contentfetchfactory.so
 lib/kde4/kcm_kget_metalinkfactory.so
 lib/kde4/kcm_kget_mirrorsearchfactory.so
+lib/kde4/kcm_kget_mmsfactory.so
 lib/kde4/kcm_kget_multisegkiofactory.so
 lib/kde4/kcm_kopete_accountconfig.so
 lib/kde4/kcm_kopete_addbookmarks.so
@@ -114,10 +112,10 @@ lib/kde4/kded_dnssdwatcher.so
 lib/kde4/kget_bittorrentfactory.so
 lib/kde4/kget_browser_integration.so
 lib/kde4/kget_checksumsearchfactory.so
-lib/kde4/kget_contentfetchfactory.so
 lib/kde4/kget_kiofactory.so
 lib/kde4/kget_metalinkfactory.so
 lib/kde4/kget_mirrorsearchfactory.so
+lib/kde4/kget_mmsfactory.so
 lib/kde4/kget_multisegkiofactory.so
 lib/kde4/kio_zeroconf.so
 lib/kde4/kopete_addbookmarks.so
@@ -161,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/sambausershareplugin.so
 lib/libkgetcore.so
 lib/libkgetcore.so.5
 lib/libkgetcore.so.5.0.1
@@ -233,10 +232,6 @@ share/apps/kconf_update/kopete-update_icq_server.pl
 share/apps/kconf_update/kopete-update_icq_server.upd
 share/apps/kconf_update/kopete-update_yahoo_server.pl
 share/apps/kconf_update/kopete-update_yahoo_server.upd
-share/apps/kget/content_fetch_scripts/youtubedl/kget_youtubedl.py
-share/apps/kget/content_fetch_scripts/youtubedl/kget_youtubedl_option.py
-share/apps/kget/content_fetch_scripts/youtubedl/ui_youtube_option.py
-share/apps/kget/content_fetch_scripts/youtubedl/youtube_option.ui
 share/apps/kget/kget.notifyrc
 share/apps/kget/kgetui.rc
 share/apps/kget/pics/kget_splash.png
@@ -1212,8 +1207,8 @@ share/apps/remoteview/zeroconf.desktop
 share/config.kcfg/historyconfig.kcfg
 share/config.kcfg/kget.kcfg
 share/config.kcfg/kget_checksumsearchfactory.kcfg
-share/config.kcfg/kget_contentfetchfactory.kcfg
 share/config.kcfg/kget_mirrorsearchfactory.kcfg
+share/config.kcfg/kget_mmsfactory.kcfg
 share/config.kcfg/kget_multisegkiofactory.kcfg
 share/config.kcfg/kopete_otr.kcfg
 share/config.kcfg/kopeteappearancesettings.kcfg
@@ -1251,10 +1246,49 @@ share/doc/HTML/en/kget/metalink0.png
 share/doc/HTML/en/kget/metalink1.png
 share/doc/HTML/en/kget/metalink2.png
 share/doc/HTML/en/kget/metalink3.png
+share/doc/HTML/en/kopete/Kopete_icq_account_preferences.png
+share/doc/HTML/en/kopete/Kopete_icq_account_setup.png
+share/doc/HTML/en/kopete/Kopete_icq_activate_new_account1.png
+share/doc/HTML/en/kopete/Kopete_icq_add_contact.png
+share/doc/HTML/en/kopete/Kopete_icq_added.png
+share/doc/HTML/en/kopete/Kopete_icq_chat_window.png
+share/doc/HTML/en/kopete/Kopete_icq_create_new_account.png
+share/doc/HTML/en/kopete/Kopete_icq_first_start.png
+share/doc/HTML/en/kopete/Kopete_icq_go_to_profile.png
+share/doc/HTML/en/kopete/Kopete_icq_information.png
+share/doc/HTML/en/kopete/Kopete_icq_log_in.png
+share/doc/HTML/en/kopete/Kopete_icq_logged_in.png
+share/doc/HTML/en/kopete/Kopete_icq_new_account.png
+share/doc/HTML/en/kopete/Kopete_icq_search_contact.png
+share/doc/HTML/en/kopete/Kopete_icq_uin.png
+share/doc/HTML/en/kopete/Kopete_snap021_groupchat.png
+share/doc/HTML/en/kopete/Kopeteicon.png
+share/doc/HTML/en/kopete/Kopetetutoial_snap003_selectserver.png
+share/doc/HTML/en/kopete/Kopetetutorial_jabbernetwork.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap001_emptykopete.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap002_configacc.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap004_createacc.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap005_enterjid.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap006_connection.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap007_conf-ready.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap008_goonline.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap009_addfriend.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap010_exlamationmarkfriend.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap011_addedbyfriend.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap012_fullauthorized.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap013_firstchat.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap014_setidentity.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap015_otrgenerate.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap016_otrfirstuse.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap017_seqretquestion.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap018_otrsuccess.png
+share/doc/HTML/en/kopete/Kopetetutorial_snap019_otrauth.png
 share/doc/HTML/en/kopete/chatstyle.docbook
 share/doc/HTML/en/kopete/common
+share/doc/HTML/en/kopete/icq.docbook
 share/doc/HTML/en/kopete/index.cache.bz2
 share/doc/HTML/en/kopete/index.docbook
+share/doc/HTML/en/kopete/jabber.docbook
 share/doc/HTML/en/kopete/menus.docbook
 share/doc/HTML/en/kopete/otr-auth-1.png
 share/doc/HTML/en/kopete/pipes.docbook
@@ -1313,7 +1347,6 @@ share/icons/hicolor/128x128/apps/kget.png
 share/icons/hicolor/128x128/apps/kopete-offline.png
 share/icons/hicolor/128x128/apps/kopete.png
 %%KPPP%%share/icons/hicolor/128x128/apps/kppp.png
-share/icons/hicolor/16x16/apps/kcmsambaconf.png
 share/icons/hicolor/16x16/apps/kget.png
 share/icons/hicolor/16x16/apps/kopete-offline.png
 share/icons/hicolor/16x16/apps/kopete.png
@@ -1398,9 +1431,6 @@ share/kde4/services/aim.protocol
 share/kde4/services/callto.protocol
 share/kde4/services/chatwindow.desktop
 share/kde4/services/emailwindow.desktop
-share/kde4/services/fileshare.desktop
-share/kde4/services/fileshare_propsdlgplugin.desktop
-share/kde4/services/kcmsambaconf.desktop
 share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
 share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
 share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
@@ -1419,13 +1449,13 @@ share/kde4/services/kget_bittorrentfactory.desktop
 share/kde4/services/kget_bittorrentfactory_config.desktop
 share/kde4/services/kget_checksumsearchfactory.desktop
 share/kde4/services/kget_checksumsearchfactory_config.desktop
-share/kde4/services/kget_contentfetchfactory.desktop
-share/kde4/services/kget_contentfetchfactory_config.desktop
 share/kde4/services/kget_kiofactory.desktop
 share/kde4/services/kget_metalinkfactory.desktop
 share/kde4/services/kget_metalinkfactory_config.desktop
 share/kde4/services/kget_mirrorsearchfactory.desktop
 share/kde4/services/kget_mirrorsearchfactory_config.desktop
+share/kde4/services/kget_mmsfactory.desktop
+share/kde4/services/kget_mmsfactory_config.desktop
 share/kde4/services/kget_multisegkiofactory.desktop
 share/kde4/services/kget_multisegkiofactory_config.desktop
 share/kde4/services/kgetbarapplet-default.desktop
@@ -1476,6 +1506,7 @@ share/kde4/services/krfb_framebuffer_x11.desktop
 share/kde4/services/plasma-engine-kget.desktop
 share/kde4/services/plasma-runner-kget.desktop
 share/kde4/services/rdp.protocol
+share/kde4/services/sambausershareplugin.desktop
 share/kde4/services/skype.protocol
 share/kde4/services/tel.protocol
 share/kde4/services/vnc.protocol
@@ -1682,8 +1713,6 @@ share/sounds/Kopete_User_is_Online.ogg
 @dirrm share/apps/kopete
 @dirrm share/apps/kget/www
 @dirrm share/apps/kget/pics
-@dirrm share/apps/kget/content_fetch_scripts/youtubedl
-@dirrm share/apps/kget/content_fetch_scripts
 @dirrm share/apps/kget
 @dirrmtry lib/browser_plugins
 @dirrm include/krdc