KDE FreeBSD team presents KDE SC 4.5.1.

New ports added:
	misc/kde4-l10n-ia - Interlingua localization for KDE

4 files changed, 41 insertions, 51 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 79d032da8fc..636e5f4066a 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdenetwork
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	net kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,7 +14,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Network applications
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
+		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		idn.16:${PORTSDIR}/dns/libidn \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
@@ -29,7 +29,9 @@ LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp \
 		telepathy-qt4.8:${PORTSDIR}/net-im/telepathy-qt4 \
 		meanwhile.1:${PORTSDIR}/net-im/meanwhile \
 		speex.1:${PORTSDIR}/audio/speex \
-		v4l2.0:${PORTSDIR}/multimedia/libv4l
+		v4l2.0:${PORTSDIR}/multimedia/libv4l \
+		kwebkit.1:${PORTSDIR}/www/kwebkitpart \
+		ktorrent.2:${PORTSDIR}/net-p2p/libktorrent
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
 LATEST_LINK=	${PORTNAME}4
@@ -48,18 +50,13 @@ MAKE_JOBS_SAFE=	yes
 # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
 CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
 
-# Embedded btcore support already disconnected from the build and outdated
-CMAKE_ARGS+=	-DENABLE_EMBEDDED_TORRENT_SUPPORT=FALSE
-
 # Route mozilla plugin by standard path
 CMAKE_ARGS+=	-DMOZPLUGIN_INSTALL_DIR=${PREFIX}/lib/browser_plugins
 
 # Fix build with fresh multimedia/v4l_compat installed
 CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES=1
 
-OPTIONS=	BTCORE "Enable Bittorrent support in KGet" off \
-		WEBKIT "Enable KWebKit support in KGet" off \
-		XMMS "Enable XMMS Kopete nowlistening plugin" off
+OPTIONS=	XMMS "Enable XMMS Kopete nowlistening plugin" off
 
 .include <bsd.port.options.mk>
 
@@ -79,26 +76,4 @@ LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 CMAKE_ARGS+=	-DWITH_Xmms:BOOL=OFF
 .endif
 
-.if defined(WITH_BTCORE)
-LIB_DEPENDS+=	btcore.12:${PORTSDIR}/net-p2p/ktorrent
-PLIST_SUB+=	BTCORE=""
-.else
-PLIST_SUB+=	BTCORE="@comment "
-.endif
-
-.ifdef(WITH_WEBKIT)
-LIB_DEPENDS+=	kwebkit.1:${PORTSDIR}/www/kwebkitpart
-CMAKE_ARGS+=	-DWITH_KWebKitPart:BOOL=ON
-PLIST_SUB+=	WEBKIT=""
-.else
-CMAKE_ARGS+=	-DWITH_KWebKitPart:BOOL=OFF
-PLIST_SUB+=	WEBKIT="@comment "
-.endif
-
-pre-configure:
-.if !defined(WITH_BTCORE)
-	${REINPLACE_CMD} -e '/bittorrent/ d' \
-		${WRKSRC}/kget/transfer-plugins/CMakeLists.txt
-.endif
-
 .include <bsd.port.mk>
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 25a21402be9..04a9c328afe 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdenetwork-4.4.5.tar.bz2) = 597e8c8259a625088defbaed322119f6
-SHA256 (KDE/kdenetwork-4.4.5.tar.bz2) = ca9ff22ce3fb44f4025fe864a4be8524efb252e817bd24e93e9c0dc6ea2ceee6
-SIZE (KDE/kdenetwork-4.4.5.tar.bz2) = 8324754
+MD5 (KDE/kdenetwork-4.5.1.tar.bz2) = f8a20b6120ac72d5a90b3840367f548e
+SHA256 (KDE/kdenetwork-4.5.1.tar.bz2) = d670fcdaf2862742d89707b74fddd8baefa71c97c5612c0669a4fd4524cceb73
+SIZE (KDE/kdenetwork-4.5.1.tar.bz2) = 8156627
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
index 5c7b7b640f9..8b5a53543e7 100644
--- a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
+++ b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
@@ -1,6 +1,6 @@
 --- ./kopete/libkopete/avdevice/videodevice.h.orig	2009-03-18 13:00:00.000000000 +0300
 +++ ./kopete/libkopete/avdevice/videodevice.h	2010-03-28 14:25:38.820037067 +0400
-@@ -62,6 +62,13 @@
+@@ -63,6 +63,13 @@
  
  #endif // __linux__
  
@@ -23,12 +23,30 @@
          ,
  	VIDEODEV_DRIVER_V4L
  #ifdef V4L2_CAP_VIDEO_CAPTURE
-@@ -294,7 +301,7 @@
- 	int descriptor;
+@@ -327,7 +334,7 @@
+ 	QVector<Kopete::AV::VideoInput> m_input;
  
- //protected:
+ protected:
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 	/*!
+ 	    \enum VideoDevice::imgctrl_id Control-IDs used for V4L1- and software-controls
+ 	 */
+@@ -356,7 +363,7 @@
+ 	int descriptor;
+ 	videodev_driver m_driver;
+ 	QString m_model;
 -#if defined(__linux__) && defined(ENABLE_AV)
 +#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
  #ifdef V4L2_CAP_VIDEO_CAPTURE
  	struct v4l2_capability V4L2_capabilities;
- 	struct v4l2_cropcap cropcap;
+ 	struct v4l2_format fmt;
+@@ -388,7 +395,7 @@
+ 	virtual int initDevice();
+ 
+ 	void setupControls();
+-#if defined(__linux__) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
++#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
+ 	bool getMenuCtrlOptions(quint32 id, quint32 maxindex, QStringList * options);
+ 	void saveV4L2ControlData(struct v4l2_queryctrl qctrl);
+ 	const char *getUnifiedV4L2StdCtrlName(quint32 std_ctrl_id);
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index cbd136d966f..a57cf8cf863 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -83,7 +83,7 @@ lib/browser_plugins/skypebuttons.so
 lib/kde4/fileshare_propsdlgplugin.so
 lib/kde4/kcm_fileshare.so
 lib/kde4/kcm_kcmsambaconf.so
-%%BTCORE%%lib/kde4/kcm_kget_bittorrentfactory.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
@@ -112,14 +112,14 @@ lib/kde4/kcm_kopete_webpresence.so
 lib/kde4/kcm_krdc_rdpplugin.so
 lib/kde4/kcm_krdc_vncplugin.so
 lib/kde4/kded_dnssdwatcher.so
-%%BTCORE%%lib/kde4/kget_bittorrentfactory.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_multisegkiofactory.so
-lib/kde4/khtml_kget.so
 lib/kde4/kio_zeroconf.so
 lib/kde4/kopete_addbookmarks.so
 lib/kde4/kopete_aim.so
@@ -213,6 +213,7 @@ share/applications/kde4/kopete.desktop
 %%KPPP%%share/applications/kde4/kppplogview.desktop
 share/applications/kde4/krdc.desktop
 share/applications/kde4/krfb.desktop
+share/apps/dolphinpart/kpartplugins/kget_plug_in.rc
 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
@@ -1204,7 +1205,7 @@ share/apps/krdc/pics/pointcursor.png
 share/apps/krdc/pics/pointcursormask.png
 share/apps/krdc_rfb_approver/krdc_rfb_approver.notifyrc
 share/apps/krfb/krfb.notifyrc
-%%WEBKIT%%share/apps/kwebkitpart/kpartplugins/kget_plug_in.rc
+share/apps/kwebkitpart/kpartplugins/kget_plug_in.rc
 share/apps/remoteview/zeroconf.desktop
 share/config.kcfg/historyconfig.kcfg
 share/config.kcfg/kget.kcfg
@@ -1232,7 +1233,6 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service
 share/dbus-1/services/org.kde.kget.service
 share/doc/HTML/en/kget/common
 share/doc/HTML/en/kget/file.png
-share/doc/HTML/en/kget/fileopen.png
 share/doc/HTML/en/kget/import_link.png
 share/doc/HTML/en/kget/index.cache.bz2
 share/doc/HTML/en/kget/index.docbook
@@ -1300,15 +1300,12 @@ share/doc/HTML/en/krdc/view-restore.png
 share/doc/HTML/en/krdc/vnc_host_configuration.png
 share/doc/HTML/en/krdc/vnc_preferences.png
 share/doc/HTML/en/krfb/common
-share/doc/HTML/en/krfb/configuration_access.png
 share/doc/HTML/en/krfb/configuration_network.png
 share/doc/HTML/en/krfb/configuration_security.png
-share/doc/HTML/en/krfb/configuration_session.png
 share/doc/HTML/en/krfb/connection.png
 share/doc/HTML/en/krfb/email_invitation.png
 share/doc/HTML/en/krfb/index.cache.bz2
 share/doc/HTML/en/krfb/index.docbook
-share/doc/HTML/en/krfb/invitation_management.png
 share/doc/HTML/en/krfb/personal_invitation.png
 share/doc/HTML/en/krfb/screenshot.png
 share/icons/hicolor/128x128/apps/kget.png
@@ -1417,8 +1414,8 @@ share/kde4/services/kconfiguredialog/kopete_translator_config.desktop
 share/kde4/services/kconfiguredialog/kopete_urlpicpreview_config.desktop
 share/kde4/services/kconfiguredialog/kopete_webpresence_config.desktop
 share/kde4/services/kded/dnssdwatcher.desktop
-%%BTCORE%%share/kde4/services/kget_bittorrentfactory.desktop
-%%BTCORE%%share/kde4/services/kget_bittorrentfactory_config.desktop
+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
@@ -1503,8 +1500,8 @@ share/telepathy/clients/krdc_rfb_handler.client
 %%KPPP%%@dirrm share/doc/HTML/en/kppp
 @dirrm share/doc/HTML/en/kopete
 @dirrm share/doc/HTML/en/kget
-%%WEBKIT%%@dirrmtry share/apps/kwebkitpart/kpartplugins
-%%WEBKIT%%@dirrmtry share/apps/kwebkitpart
+@dirrmtry share/apps/kwebkitpart/kpartplugins
+@dirrmtry share/apps/kwebkitpart
 @dirrm share/apps/krfb
 @dirrm share/apps/krdc_rfb_approver
 @dirrm share/apps/krdc/pics