KDE FreeBSD team presents KDE SC 4.5.1.

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

4 files changed, 54 insertions, 117 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index bf2249a2c805..4e0d00af1407 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,6 +14,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Multimedia applications
 
+BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
 		ogg.7:${PORTSDIR}/audio/libogg \
@@ -22,7 +22,8 @@ LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
-		xine.1:${PORTSDIR}/multimedia/libxine
+		xine.1:${PORTSDIR}/multimedia/libxine \
+		swscale.1:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
 .if !defined(PACKAGE_BUILDING)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 1a09c36242bb..d1896bb5f99f 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-4.4.5.tar.bz2) = 00511c7efe14c7d0e89e2728f29201ef
-SHA256 (KDE/kdemultimedia-4.4.5.tar.bz2) = 7f76c17c4d7d1881667b469d3292c5d13930f1c001e8ec0fd1e294c35151d4a0
-SIZE (KDE/kdemultimedia-4.4.5.tar.bz2) = 1519221
+MD5 (KDE/kdemultimedia-4.5.1.tar.bz2) = 906f62dca51234f2ea056e30f4854da9
+SHA256 (KDE/kdemultimedia-4.5.1.tar.bz2) = 4e56ba55d5bbcdd59074d3c5a2d113faf26ed658fac5e322d571fa6dff7eb9a8
+SIZE (KDE/kdemultimedia-4.5.1.tar.bz2) = 1539538
diff --git a/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp b/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp
index 8abaaa1c208d..715610f1b3e8 100644
--- a/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp
+++ b/multimedia/kdemultimedia4/files/patch-kioslave-audiocd-audiocd.cpp
@@ -1,110 +1,43 @@
---- kioslave/audiocd/audiocd.cpp.orig	2009-12-31 13:30:01.000000000 +0000
-+++ kioslave/audiocd/audiocd.cpp	2010-01-11 00:05:10.235745679 +0000
-@@ -215,52 +215,6 @@
- 	return encoderFromExtension(filename.right(len - pos));
- }
- 
--static void setDeviceToCd(KCompactDisc *cd, struct cdrom_drive *drive)
--{
--#if defined(HAVE_CDDA_IOCTL_DEVICE)
--	cd->setDevice(drive->ioctl_device_name, 50, false);
--#elif defined(__FreeBSD__) || defined(__DragonFly__)
--	// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
--	// support for non-SCSI devices. Although it finds ATA cdroms just
--	// fine, there is no straightforward way to discover the device
--	// name associated with the device, which throws the rest of audiocd
--	// for a loop.
--	//
--	if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) )
--	{
--		// For ATAPI devices, we have no real choice. Use the
--		// user selected value, even if there is none.
--		//
--		kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user.";
--		cd->setDevice( d->device );
--	}
--	else
--	{
--		kDebug(7117) << "Found a SCSI or ATAPICAM device.";
--		if ( strlen(drive->dev->device_path) > 0 )
--		{
+--- ./kioslave/audiocd/audiocd.cpp.orig	2010-06-06 08:15:20.000000000 -0400
++++ ./kioslave/audiocd/audiocd.cpp	2010-06-06 08:18:01.000000000 -0400
+@@ -229,20 +229,21 @@
+ 	// name associated with the device, which throws the rest of audiocd
+ 	// for a loop.
+ 	//
++	QString devname;
+ 	if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) )
+ 	{
+ 		// For ATAPI devices, we have no real choice. Use the
+ 		// user selected value, even if there is none.
+ 		//
+ 		kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user.";
+-		cd->setDevice( drive->cdda_device_name );
++		devname = drive->cdda_device_name;
+ 	}
+ 	else
+ 	{
+ 		kDebug(7117) << "Found a SCSI or ATAPICAM device.";
+ 		if ( strlen(drive->dev->device_path) > 0 )
+ 		{
 -			cd->setDevice( drive->dev->device_path );
--		}
--		else
--		{
--			// But the device_path can be empty under some
--			// circumstances, so build a representation from
--			// the unit number and SCSI device name.
--			//
++			devname = drive->dev->device_path;
+ 		}
+ 		else
+ 		{
+@@ -250,13 +251,14 @@
+ 			// circumstances, so build a representation from
+ 			// the unit number and SCSI device name.
+ 			//
 -			QString devname = QString::fromLatin1( "/dev/%1%2" )
--				.arg( drive->dev->given_dev_name )
--				.arg( drive->dev->given_unit_number ) ;
--			kDebug(7117) << "  Using derived name " << devname;
++			devname = QString::fromLatin1( "/dev/%1%2" )
+ 				.arg( drive->dev->given_dev_name )
+ 				.arg( drive->dev->given_unit_number ) ;
+ 			kDebug(7117) << "  Using derived name " << devname;
 -			cd->setDevice( devname );
--		}
--	}
--#else
--#ifdef __GNUC__
--	#warning audiocd ioslave is not going to work for you
--#endif
--#endif
--}
--
- struct cdrom_drive * AudioCDProtocol::initRequest(const KUrl & url)
- {
- 	if (url.hasHost())
-@@ -284,7 +238,53 @@
- 	{
- 		// Update our knowledge of the disc
- 		KCompactDisc cd(KCompactDisc::Asynchronous);
--		setDeviceToCd(&cd, drive);
-+#if defined(HAVE_CDDA_IOCTL_DEVICE)
-+		cd.setDevice(drive->ioctl_device_name, 50, false);
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+		// FreeBSD's cdparanoia as of january 5th 2006 has
-+		// rather broken support for non-SCSI devices.
-+		// Although it finds ATA cdroms just fine, there is
-+		// no straightforward way to discover the device name
-+		// associated with the device, which throws the rest
-+		// of audiocd for a loop.
-+		//
-+		QString devname;
-+		if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) )
-+		{
-+			// For ATAPI devices, we have no real choice.
-+			// Use the user selected value, even if there
-+			// is none.
-+			//
-+			kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user.";
-+			devname = d->device;
-+		}
-+		else
-+		{
-+			kDebug(7117) << "Found a SCSI or ATAPICAM device.";
-+			if ( strlen(drive->dev->device_path) > 0 )
-+			{
-+				devname = drive->dev->device_path;
-+			}
-+			else
-+			{
-+				// But the device_path can be empty
-+				// under some circumstances, so build
-+				// a representation from the unit
-+				// number and SCSI device name.
-+				//
-+				devname = QString::fromLatin1( "/dev/%1%2" )
-+					.arg( drive->dev->given_dev_name )
-+					.arg( drive->dev->given_unit_number ) ;
-+				kDebug(7117) << "  Using derived name " << devname;
-+			}
-+		}
-+		if ( cd.deviceName() != devname )
-+			cd.setDevice( devname );
-+#else
-+#ifdef __GNUC__
-+	#warning audiocd ioslave is not going to work for you
-+#endif
-+#endif
- 		d->setToc(drive);
- 		
- 		d->tracks = cd.tracks();
+ 		}
+ 	}
++	if ( cd->deviceName() != devname )
++		cd->setDevice( devname );
+ #else
+ #ifdef __GNUC__
+ 	#warning audiocd ioslave is not going to work for you
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index a88f9ea9f295..fd3db62f2786 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -15,6 +15,7 @@ include/libkcddb/kcddb_export.h
 include/libkcddb/kcddbconfig.h
 include/libkcompactdisc/kcompactdisc.h
 lib/kde4/dragonpart.so
+lib/kde4/ffmpegthumbs.so
 lib/kde4/kcm_audiocd.so
 lib/kde4/kcm_cddb.so
 lib/kde4/kio_audiocd.so
@@ -75,7 +76,6 @@ share/apps/kscd/skin/Chrome.svg
 share/apps/kscd/skin/Obsidian-Coast.svg
 share/apps/kscd/skin/Steel.svg
 share/apps/kscd/skin/default.svg
-share/apps/profiles/kscd.profile.xml
 share/apps/solid/actions/dragonplayer-opendvd.desktop
 share/apps/solid/actions/kscd-play-audiocd.desktop
 share/apps/solid/actions/solid_audiocd.desktop
@@ -122,10 +122,12 @@ share/doc/HTML/en/kioslave/audiocd/index.docbook
 share/doc/HTML/en/kmix/common
 share/doc/HTML/en/kmix/index.cache.bz2
 share/doc/HTML/en/kmix/index.docbook
-share/doc/HTML/en/kmix/kmix-channel-playback.png
-share/doc/HTML/en/kmix/kmix-channel-record.png
-share/doc/HTML/en/kmix/kmix-channel-switches.png
-share/doc/HTML/en/kmix/kmix-window.png
+share/doc/HTML/en/kmix/kmix-channels.png
+share/doc/HTML/en/kmix/kmix-configure.png
+share/doc/HTML/en/kmix/kmix-file.png
+share/doc/HTML/en/kmix/kmix-master.png
+share/doc/HTML/en/kmix/kmix-options.png
+share/doc/HTML/en/kmix/kmix.png
 share/icons/hicolor/128x128/apps/dragonplayer.png
 share/icons/hicolor/128x128/apps/juk.png
 share/icons/hicolor/128x128/apps/kmix.png
@@ -159,6 +161,7 @@ share/kde4/services/ServiceMenus/jukservicemenu.desktop
 share/kde4/services/audiocd.desktop
 share/kde4/services/audiocd.protocol
 share/kde4/services/dragonplayer_part.desktop
+share/kde4/services/ffmpegthumbs.desktop
 share/kde4/services/kmixctrl_restore.desktop
 share/kde4/services/libkcddb.desktop
 share/kde4/services/videopreview.desktop