Update to 1.2.2, the KDE4 version.

Packaged for wip by othyro.

9 files changed, 51 insertions, 207 deletions

diff --git a/multimedia/kaffeine/DESCR b/multimedia/kaffeine/DESCR
index 9b0840ac517..d4d5c3b89a0 100644
--- a/multimedia/kaffeine/DESCR
+++ b/multimedia/kaffeine/DESCR
@@ -7,3 +7,5 @@ kaffeine is a xine-based multimedia player for KDE.
 * Edit Xine-Options via GUI
 * Support for saving screenshots as PNG, BMP or XBM
 * The ability to prevent the screensaver from activating OSD Titles
+
+This is the KDE4 version of kaffeine.
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 6bb3f13f0da..45665878b84 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,47 +1,23 @@
-# $NetBSD: Makefile,v 1.32 2012/12/16 01:52:26 obache Exp $
+# $NetBSD: Makefile,v 1.33 2013/01/23 21:51:36 wiz Exp $
 #
 
-DISTNAME=	kaffeine-0.8.3
-PKGREVISION=	25
-CATEGORIES=	multimedia kde
+DISTNAME=	kaffeine-1.2.2
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kaffeine.sourceforge.net/
-COMMENT=	Full featured Multimedia-Player for KDE
+HOMEPAGE=	http://kaffeine.kde.org/
+COMMENT=	Full featured Multimedia-Player for KDE4
+LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=		yes
-SET_LIBDIR=		yes
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake msgfmt perl pkg-config
+BUILD_DEPENDS+=	automoc4>=0.9.87:../../devel/automoc4
 
-CONFIGURE_ARGS+=	--without-gstreamer
-CONFIGURE_ARGS+=	--without-dpms
-CONFIGURE_ARGS+=	--without-xinerama
-CONFIGURE_ARGS+=	--without-dvb
+USE_TOOLS+=	msgfmt
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
 
-BUILDLINK_FNAME_TRANSFORM.cdparanoia+=	-e "s|/cdparanoia/|/|g"
-
-# Hardcoded paths for libdvdcss and win32-codecs
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	kaffeine/src/instwizard.cpp
-SUBST_SED.path=		-e "s|/usr/lib|${PREFIX}/lib|g"
-SUBST_MESSAGE.path=	Fixing hardcoded paths.
-
-.include "../../meta-pkgs/kde3/kde3.mk"
-
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kaffeine/PLIST b/multimedia/kaffeine/PLIST
index 4949c83ca73..01cdc4a0743 100644
--- a/multimedia/kaffeine/PLIST
+++ b/multimedia/kaffeine/PLIST
@@ -1,117 +1,73 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:08:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/01/23 21:51:36 wiz Exp $
 bin/kaffeine
-include/kaffeine/kaffeineaudioencoder.h
-include/kaffeine/kaffeinepart.h
-include/kaffeine/mrl.h
-include/kaffeine/xine_part.h
-include/kaffeine/xine_part_iface.h
-lib/kde3/libkaffeinemp3lame.la
-lib/kde3/libkaffeineoggvorbis.la
-lib/kde3/libxinepart.la
-lib/libkaffeineaudioencoder.la
-lib/libkaffeinepart.la
-share/applications/kde/kaffeine.desktop
-share/doc/kde/HTML/en/kaffeine/common
-share/doc/kde/HTML/en/kaffeine/discwindow.png
-share/doc/kde/HTML/en/kaffeine/dvbbroadcast.png
-share/doc/kde/HTML/en/kaffeine/dvbclient.png
-share/doc/kde/HTML/en/kaffeine/dvbconfig.png
-share/doc/kde/HTML/en/kaffeine/dvbepg.png
-share/doc/kde/HTML/en/kaffeine/dvblive.jpg
-share/doc/kde/HTML/en/kaffeine/dvbscan.png
-share/doc/kde/HTML/en/kaffeine/dvbtimers.png
-share/doc/kde/HTML/en/kaffeine/dvbwin.png
-share/doc/kde/HTML/en/kaffeine/gstpart.png
-share/doc/kde/HTML/en/kaffeine/index.cache.bz2
-share/doc/kde/HTML/en/kaffeine/index.docbook
-share/doc/kde/HTML/en/kaffeine/kaffeinepart.png
-share/doc/kde/HTML/en/kaffeine/playlistwin.png
-share/doc/kde/HTML/en/kaffeine/startwindow.png
+bin/kaffeine-xbu
+share/applications/kde4/kaffeine.desktop
 share/icons/hicolor/128x128/apps/kaffeine.png
-share/icons/hicolor/16x16/actions/player_mute.png
-share/icons/hicolor/16x16/actions/player_record.png
 share/icons/hicolor/16x16/apps/kaffeine.png
-share/icons/hicolor/16x16/apps/kdvbra.png
-share/icons/hicolor/16x16/apps/kdvbrac.png
-share/icons/hicolor/16x16/apps/kdvbtv.png
-share/icons/hicolor/16x16/apps/kdvbtvc.png
-share/icons/hicolor/16x16/apps/kilogram.png
-share/icons/hicolor/16x16/mimetypes/mime_kaffeine.png
-share/icons/hicolor/22x22/actions/player_mute.png
-share/icons/hicolor/22x22/actions/player_record.png
 share/icons/hicolor/22x22/apps/kaffeine.png
-share/icons/hicolor/22x22/apps/kilogram.png
-share/icons/hicolor/32x32/actions/player_mute.png
-share/icons/hicolor/32x32/actions/player_record.png
-share/icons/hicolor/32x32/apps/kaffeine-pause.png
-share/icons/hicolor/32x32/apps/kaffeine-play.png
-share/icons/hicolor/32x32/apps/kaffeine-record.png
 share/icons/hicolor/32x32/apps/kaffeine.png
-share/icons/hicolor/32x32/apps/kilogram.png
-share/icons/hicolor/32x32/mimetypes/mime_kaffeine.png
 share/icons/hicolor/48x48/apps/kaffeine.png
-share/icons/hicolor/48x48/mimetypes/mime_kaffeine.png
 share/icons/hicolor/64x64/apps/kaffeine.png
-share/kde/apps/kaffeine/dvbdata.tar.gz
-share/kde/apps/kaffeine/kaffeinedisc.rc
-share/kde/apps/kaffeine/kaffeineplaylist.rc
-share/kde/apps/kaffeine/kaffeineui.rc
-share/kde/apps/kaffeine/logo
-share/kde/apps/kaffeine/logo.mpg
-share/kde/apps/kaffeine/mms.protocol
-share/kde/apps/kaffeine/nocover.png
-share/kde/apps/kaffeine/pics/playing.png
-share/kde/apps/kaffeine/rtsp.protocol
-share/kde/apps/kaffeine/xine_part.rc
-share/kde/apps/konqueror/servicemenus/kaffeine_append_file.desktop
-share/kde/apps/konqueror/servicemenus/kaffeine_open_directory.desktop
-share/kde/apps/konqueror/servicemenus/kaffeine_play_audiocd.desktop
-share/kde/apps/konqueror/servicemenus/kaffeine_play_dvd.desktop
-share/kde/apps/konqueror/servicemenus/kaffeine_play_vcd.desktop
+share/icons/hicolor/scalable/apps/kaffeine.svgz
+share/icons/oxygen/16x16/actions/audio-radio-encrypted.png
+share/icons/oxygen/16x16/actions/video-television-encrypted.png
+share/icons/oxygen/22x22/actions/audio-radio-encrypted.png
+share/icons/oxygen/22x22/actions/video-television-encrypted.png
+share/icons/oxygen/32x32/actions/audio-radio-encrypted.png
+share/icons/oxygen/32x32/actions/video-television-encrypted.png
+share/icons/oxygen/48x48/actions/audio-radio-encrypted.png
+share/icons/oxygen/48x48/actions/video-television-encrypted.png
+share/kde/apps/kaffeine/scanfile.dvb
 share/kde/apps/profiles/kaffeine.profile.xml
-share/kde/mimelnk/application/x-kaffeine.desktop
-share/kde/services/kaffeinemp3lame.desktop
-share/kde/services/kaffeineoggvorbis.desktop
-share/kde/services/xine_part.desktop
-share/kde/servicetypes/kaffeineaudioencoder.desktop
+share/kde/apps/solid/actions/kaffeine_play_audiocd.desktop
+share/kde/apps/solid/actions/kaffeine_play_dvd.desktop
+share/kde/apps/solid/actions/kaffeine_play_videocd.desktop
 share/locale/ar/LC_MESSAGES/kaffeine.mo
+share/locale/ast/LC_MESSAGES/kaffeine.mo
+share/locale/be/LC_MESSAGES/kaffeine.mo
 share/locale/bg/LC_MESSAGES/kaffeine.mo
-share/locale/bn/LC_MESSAGES/kaffeine.mo
-share/locale/br/LC_MESSAGES/kaffeine.mo
 share/locale/ca/LC_MESSAGES/kaffeine.mo
+share/locale/ca@valencia/LC_MESSAGES/kaffeine.mo
 share/locale/cs/LC_MESSAGES/kaffeine.mo
 share/locale/da/LC_MESSAGES/kaffeine.mo
 share/locale/de/LC_MESSAGES/kaffeine.mo
 share/locale/el/LC_MESSAGES/kaffeine.mo
+share/locale/en_GB/LC_MESSAGES/kaffeine.mo
+share/locale/eo/LC_MESSAGES/kaffeine.mo
 share/locale/es/LC_MESSAGES/kaffeine.mo
 share/locale/et/LC_MESSAGES/kaffeine.mo
 share/locale/fi/LC_MESSAGES/kaffeine.mo
 share/locale/fr/LC_MESSAGES/kaffeine.mo
 share/locale/ga/LC_MESSAGES/kaffeine.mo
 share/locale/gl/LC_MESSAGES/kaffeine.mo
-share/locale/he/LC_MESSAGES/kaffeine.mo
+share/locale/hr/LC_MESSAGES/kaffeine.mo
 share/locale/hu/LC_MESSAGES/kaffeine.mo
 share/locale/it/LC_MESSAGES/kaffeine.mo
 share/locale/ja/LC_MESSAGES/kaffeine.mo
-share/locale/ka/LC_MESSAGES/kaffeine.mo
 share/locale/km/LC_MESSAGES/kaffeine.mo
+share/locale/ko/LC_MESSAGES/kaffeine.mo
+share/locale/ku/LC_MESSAGES/kaffeine.mo
 share/locale/lt/LC_MESSAGES/kaffeine.mo
-share/locale/mk/LC_MESSAGES/kaffeine.mo
+share/locale/mai/LC_MESSAGES/kaffeine.mo
 share/locale/nb/LC_MESSAGES/kaffeine.mo
+share/locale/nds/LC_MESSAGES/kaffeine.mo
 share/locale/nl/LC_MESSAGES/kaffeine.mo
 share/locale/nn/LC_MESSAGES/kaffeine.mo
 share/locale/pa/LC_MESSAGES/kaffeine.mo
 share/locale/pl/LC_MESSAGES/kaffeine.mo
 share/locale/pt/LC_MESSAGES/kaffeine.mo
 share/locale/pt_BR/LC_MESSAGES/kaffeine.mo
+share/locale/ro/LC_MESSAGES/kaffeine.mo
 share/locale/ru/LC_MESSAGES/kaffeine.mo
+share/locale/se/LC_MESSAGES/kaffeine.mo
 share/locale/sk/LC_MESSAGES/kaffeine.mo
 share/locale/sr/LC_MESSAGES/kaffeine.mo
-share/locale/sr@Latn/LC_MESSAGES/kaffeine.mo
+share/locale/sr@ijekavian/LC_MESSAGES/kaffeine.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/kaffeine.mo
+share/locale/sr@latin/LC_MESSAGES/kaffeine.mo
 share/locale/sv/LC_MESSAGES/kaffeine.mo
+share/locale/th/LC_MESSAGES/kaffeine.mo
 share/locale/tr/LC_MESSAGES/kaffeine.mo
 share/locale/uk/LC_MESSAGES/kaffeine.mo
-share/locale/uz/LC_MESSAGES/kaffeine.mo
-share/locale/xx/LC_MESSAGES/kaffeine.mo
 share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
 share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
diff --git a/multimedia/kaffeine/distinfo b/multimedia/kaffeine/distinfo
index 16491e087c5..b9284b42251 100644
--- a/multimedia/kaffeine/distinfo
+++ b/multimedia/kaffeine/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/04/08 02:23:46 dholland Exp $
+$NetBSD: distinfo,v 1.3 2013/01/23 21:51:36 wiz Exp $
 
-SHA1 (kaffeine-0.8.3.tar.bz2) = 6198ffe59422124855007a42443e2a69f6451e66
-RMD160 (kaffeine-0.8.3.tar.bz2) = f22a971481e8fd1a96063fef66d156d119c1e596
-Size (kaffeine-0.8.3.tar.bz2) = 2940941 bytes
-SHA1 (patch-aa) = ae70b289c384e3ec33874ba79a5f3c6642d18c8f
-SHA1 (patch-ab) = 3089b793f485b161543981267de146dd57b11092
-SHA1 (patch-ac) = 0a52e900c9e79683aca8f27d0c65045574e81d31
-SHA1 (patch-ad) = 85183e84ec7593cee6f18321242bad5a4611e888
-SHA1 (patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp) = 36638519eaac6679f69a88e861759037a95627d9
+SHA1 (kaffeine-1.2.2.tar.gz) = 5ba44be69995d24159a185ede3b9a00959ae2ed6
+RMD160 (kaffeine-1.2.2.tar.gz) = a432de95b0808e85f0467d1745d216559f10e9a3
+Size (kaffeine-1.2.2.tar.gz) = 489727 bytes
diff --git a/multimedia/kaffeine/patches/patch-aa b/multimedia/kaffeine/patches/patch-aa
deleted file mode 100644
index da70089e640..00000000000
--- a/multimedia/kaffeine/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/12/06 18:30:11 xtraeme Exp $
-
---- kaffeine/src/kaffeine.cpp.orig	Fri Dec  1 19:17:37 2006
-+++ kaffeine/src/kaffeine.cpp	Fri Dec  1 19:18:01 2006
-@@ -26,6 +26,7 @@
- #include "kaffeine.h"
- 
- #include <dcopref.h>
-+#include <kapplication.h>
- #include <kkeydialog.h>
- #include <kfiledialog.h>
- #include <kdirselectdialog.h>
diff --git a/multimedia/kaffeine/patches/patch-ab b/multimedia/kaffeine/patches/patch-ab
deleted file mode 100644
index ff21160aa33..00000000000
--- a/multimedia/kaffeine/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/06 18:30:11 xtraeme Exp $
-
---- kaffeine/mimetypes/application/Makefile.in.orig	Wed Sep 27 16:44:00 2006
-+++ kaffeine/mimetypes/application/Makefile.in	Wed Sep 27 16:44:21 2006
-@@ -337,7 +337,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--mime_DATA = x-kaffeine.desktop x-mplayer2.desktop
-+mime_DATA = x-kaffeine.desktop
- mimedir = $(kde_mimedir)/application
- EXTRA_DIST = $(mime_DATA)
- #>- all: all-am
-@@ -544,7 +544,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=x-kaffeine.desktop x-mplayer2.desktop Makefile.in Makefile.am 
-+KDE_DIST=x-kaffeine.desktop Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
diff --git a/multimedia/kaffeine/patches/patch-ac b/multimedia/kaffeine/patches/patch-ac
deleted file mode 100644
index 7ba3523c93c..00000000000
--- a/multimedia/kaffeine/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/12/06 18:30:11 xtraeme Exp $
-
---- kaffeine/src/instwizard.h.orig	2006-12-06 18:35:21.000000000 +0100
-+++ kaffeine/src/instwizard.h	2006-12-06 18:35:41.000000000 +0100
-@@ -45,7 +45,7 @@
- 
- 	void internalWizard();
- 
--	QString stdout;
-+	QString stdout_local;
- 
- 	InstWizard(const InstWizard &);
- 	InstWizard operator=(const InstWizard &);
diff --git a/multimedia/kaffeine/patches/patch-ad b/multimedia/kaffeine/patches/patch-ad
deleted file mode 100644
index c07f4fa42bf..00000000000
--- a/multimedia/kaffeine/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/12/06 18:30:11 xtraeme Exp $
-
---- kaffeine/src/instwizard.cpp.orig	2006-12-06 18:36:17.000000000 +0100
-+++ kaffeine/src/instwizard.cpp	2006-12-06 18:37:58.000000000 +0100
-@@ -149,9 +149,9 @@
- 	connect(&process, SIGNAL(receivedStdout(KProcess*,char*,int)), this, SLOT(slotStdout(KProcess*, char*, int)));
- 	process.start(KProcess::Block, KProcess::Stdout);
- 
--	if (stdout.contains('1'))
-+	if (stdout_local.contains('1'))
- 		info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
--	else if (stdout.contains('0'))
-+	else if (stdout_local.contains('0'))
- 		info << "<font color=\"DarkRed\">" << i18n("DMA mode off! For smooth DVD playback run as root:") +  " \"hdparm -d1 /dev/dvd\".</font>";
- 	else
- 		info << "<font color=\"DarkBlue\">" << i18n("Can't check DMA mode. Permission denied or no such device:")
-@@ -274,5 +274,5 @@
- {
- 	QString output = QString::fromLatin1(buffer, buflen);
- 	kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";
--	stdout.append(output);
-+	stdout_local.append(output);
- }
diff --git a/multimedia/kaffeine/patches/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp b/multimedia/kaffeine/patches/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp
deleted file mode 100644
index 287b3cbcabb..00000000000
--- a/multimedia/kaffeine/patches/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp,v 1.1 2012/04/08 02:23:46 dholland Exp $
-
-Fix build with current xine-lib.
-
---- kaffeine/src/player-parts/xine-part/kxinewidget.cpp~	2006-11-26 19:12:24.000000000 +0000
-+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp
-@@ -2494,7 +2494,7 @@ void KXineWidget::getAutoplayPlugins(QSt
- 
- bool KXineWidget::getAutoplayPluginURLS(const QString& plugin, QStringList& list)
- {
--	char** urls = NULL;
-+	const char *const *urls = NULL;
- 	int num;
- 	int i = 0;
-