- Update kplayer-kde4 to 0.7 release

- Pass maintainership to submitter

PR:		147899
Submitted by:	Andriy Gapon <avg AT icyb DOT net DOT ua

6 files changed, 86 insertions, 65 deletions

diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index a2e78119fc05..4a6456669028 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -6,24 +6,29 @@
 #
 
 PORTNAME=	kplayer
-PORTVERSION=	0.6.3
-PORTREVISION=	5
+PORTVERSION=	0.7
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Movie player based on mplayer
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
+LATEST_LINK=	${PORTNAME}-kde4
+
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_KDELIBS_VER=3
 USE_GETTEXT=	yes
-USE_PERL5_BUILD=yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22
+USE_LDCONFIG=	yes
+USE_CMAKE=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_KDE4=	kdehier kdeprefix kdelibs
 
-pre-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
+post-extract:
+.for lang in da en es it pt sv
+	${REINPLACE_CMD} -e "s,HTML_INSTALL_DIR},HTML_INSTALL_DIR}/${lang} SUBDIR kplayer,g" \
+	 ${WRKSRC}/doc/${lang}/CMakeLists.txt
+.endfor
 
 .include <bsd.port.mk>
diff --git a/multimedia/kplayer-kde4/distinfo b/multimedia/kplayer-kde4/distinfo
index 0273d41894d4..8bc7bf8f0ced 100644
--- a/multimedia/kplayer-kde4/distinfo
+++ b/multimedia/kplayer-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kplayer-0.6.3.tar.bz2) = f55dab07cefb666f745015ac4dc5de2a
-SHA256 (kplayer-0.6.3.tar.bz2) = 750c8f3d4e3e3d7bcf79c8a3a626f894d3f32089ceee59fba9300a54db4919cc
-SIZE (kplayer-0.6.3.tar.bz2) = 4912815
+MD5 (kplayer-0.7.tar.bz2) = 563d5297bccd6f96f58ec3cfa37646db
+SHA256 (kplayer-0.7.tar.bz2) = 642fa861b8cee1a45c92a0378c07203c36c7f922ae2bcb38b9e674d5bf0ee0b7
+SIZE (kplayer-0.7.tar.bz2) = 4769797
diff --git a/multimedia/kplayer-kde4/files/patch-CMakeLists.txt b/multimedia/kplayer-kde4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..f54ec72632d0
--- /dev/null
+++ b/multimedia/kplayer-kde4/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2008-01-11 15:27:09.000000000 +0200
++++ CMakeLists.txt	2010-06-15 12:42:01.296412170 +0300
+@@ -10,7 +10,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
+ 
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
++include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${X11_X11_INCLUDE_PATH} )
+ 
+ add_subdirectory(doc)
+ add_subdirectory(icons)
diff --git a/multimedia/kplayer-kde4/files/patch-kplayer_kplayerengine.h b/multimedia/kplayer-kde4/files/patch-kplayer_kplayerengine.h
new file mode 100644
index 000000000000..50646412c78e
--- /dev/null
+++ b/multimedia/kplayer-kde4/files/patch-kplayer_kplayerengine.h
@@ -0,0 +1,34 @@
+--- kplayer/kplayerengine.h.orig	2010-06-15 14:26:22.055340072 +0300
++++ kplayer/kplayerengine.h	2010-06-15 14:23:27.311957650 +0300
+@@ -559,26 +559,31 @@ inline KPlayerEngine* kPlayerEngine (voi
+ 
+ inline KPlayerProcess* kPlayerProcess (void)
+ {
++  if ( kPlayerEngine() == 0 ) return 0;
+   return kPlayerEngine() -> process();
+ }
+ 
+ inline KConfig* kPlayerConfig (void)
+ {
++  if ( kPlayerEngine() == 0 ) return 0;
+   return kPlayerEngine() -> config();
+ }
+ 
+ inline KPlayerSettings* kPlayerSettings (void)
+ {
++  if ( kPlayerEngine() == 0 ) return 0;
+   return kPlayerEngine() -> settings();
+ }
+ 
+ inline KPlayerWidget* kPlayerWidget (void)
+ {
++  if ( kPlayerEngine() == 0 ) return 0;
+   return kPlayerEngine() -> widget();
+ }
+ 
+ inline KPlayerWorkspace* kPlayerWorkspace (void)
+ {
++  if ( kPlayerEngine() == 0 ) return 0;
+   return kPlayerEngine() -> workspace();
+ }
+ 
diff --git a/multimedia/kplayer-kde4/files/patch-kplayer_kplayerproperties.cpp b/multimedia/kplayer-kde4/files/patch-kplayer_kplayerproperties.cpp
new file mode 100644
index 000000000000..c12fb4293277
--- /dev/null
+++ b/multimedia/kplayer-kde4/files/patch-kplayer_kplayerproperties.cpp
@@ -0,0 +1,11 @@
+--- kplayer/kplayerproperties.cpp.orig	2010-06-15 12:54:50.164151273 +0300
++++ kplayer/kplayerproperties.cpp	2010-06-15 12:42:10.543902731 +0300
+@@ -1788,7 +1788,7 @@ void KPlayerProperties::initialize (void
+   info = new KPlayerBooleanPropertyInfo;
+   m_info.insert ("Direct Rendering", info);
+   strinfo = new KPlayerStringPropertyInfo;
+-  strinfo -> setDefaultValue ("alsa");
++  strinfo -> setDefaultValue ("oss");
+   m_info.insert ("Audio Driver", strinfo);
+   info = new KPlayerStringPropertyInfo;
+   m_info.insert ("Audio Device", info);
diff --git a/multimedia/kplayer-kde4/pkg-plist b/multimedia/kplayer-kde4/pkg-plist
index 75b8a0902b1e..860c6e25c10e 100644
--- a/multimedia/kplayer-kde4/pkg-plist
+++ b/multimedia/kplayer-kde4/pkg-plist
@@ -1,8 +1,6 @@
 bin/kplayer
-lib/kde3/libkplayerpart.a
-lib/kde3/libkplayerpart.la
-lib/kde3/libkplayerpart.so
-share/applications/kde/kplayer.desktop
+lib/kde4/libkplayerpart.so
+share/applications/kde4/kplayer.desktop
 share/apps/konqueror/servicemenus/kplayer-actions.desktop
 share/apps/konqueror/servicemenus/kplayer-directory.desktop
 share/apps/konqueror/servicemenus/kplayer-next.desktop
@@ -10,67 +8,22 @@ share/apps/konqueror/servicemenus/kplayer-play-queue.desktop
 share/apps/kplayer/COPYING
 share/apps/kplayer/icons/hicolor/16x16/actions/brightness.png
 share/apps/kplayer/icons/hicolor/16x16/actions/contrast.png
-share/apps/kplayer/icons/hicolor/16x16/actions/fileopen.png
-share/apps/kplayer/icons/hicolor/16x16/actions/fileopenurl.png
 share/apps/kplayer/icons/hicolor/16x16/actions/hue.png
-share/apps/kplayer/icons/hicolor/16x16/actions/lock.png
 share/apps/kplayer/icons/hicolor/16x16/actions/loop.png
-share/apps/kplayer/icons/hicolor/16x16/actions/mute.png
-share/apps/kplayer/icons/hicolor/16x16/actions/player_fwd.png
-share/apps/kplayer/icons/hicolor/16x16/actions/player_pause.png
-share/apps/kplayer/icons/hicolor/16x16/actions/player_play.png
-share/apps/kplayer/icons/hicolor/16x16/actions/player_rew.png
-share/apps/kplayer/icons/hicolor/16x16/actions/player_stop.png
-share/apps/kplayer/icons/hicolor/16x16/actions/properties.png
 share/apps/kplayer/icons/hicolor/16x16/actions/saturation.png
 share/apps/kplayer/icons/hicolor/16x16/actions/shuffle.png
-share/apps/kplayer/icons/hicolor/16x16/actions/viewmag+.png
-share/apps/kplayer/icons/hicolor/16x16/actions/viewmag-.png
-share/apps/kplayer/icons/hicolor/16x16/actions/viewmagfit.png
-share/apps/kplayer/icons/hicolor/16x16/actions/volume.png
-share/apps/kplayer/icons/hicolor/16x16/actions/window_fullscreen.png
 share/apps/kplayer/icons/hicolor/22x22/actions/brightness.png
 share/apps/kplayer/icons/hicolor/22x22/actions/contrast.png
-share/apps/kplayer/icons/hicolor/22x22/actions/fileopen.png
-share/apps/kplayer/icons/hicolor/22x22/actions/fileopenurl.png
 share/apps/kplayer/icons/hicolor/22x22/actions/hue.png
-share/apps/kplayer/icons/hicolor/22x22/actions/lock.png
 share/apps/kplayer/icons/hicolor/22x22/actions/loop.png
-share/apps/kplayer/icons/hicolor/22x22/actions/mute.png
-share/apps/kplayer/icons/hicolor/22x22/actions/player_fwd.png
-share/apps/kplayer/icons/hicolor/22x22/actions/player_pause.png
-share/apps/kplayer/icons/hicolor/22x22/actions/player_play.png
-share/apps/kplayer/icons/hicolor/22x22/actions/player_rew.png
-share/apps/kplayer/icons/hicolor/22x22/actions/player_stop.png
-share/apps/kplayer/icons/hicolor/22x22/actions/properties.png
 share/apps/kplayer/icons/hicolor/22x22/actions/saturation.png
 share/apps/kplayer/icons/hicolor/22x22/actions/shuffle.png
-share/apps/kplayer/icons/hicolor/22x22/actions/viewmag+.png
-share/apps/kplayer/icons/hicolor/22x22/actions/viewmag-.png
-share/apps/kplayer/icons/hicolor/22x22/actions/viewmagfit.png
-share/apps/kplayer/icons/hicolor/22x22/actions/volume.png
-share/apps/kplayer/icons/hicolor/22x22/actions/window_fullscreen.png
 share/apps/kplayer/icons/hicolor/32x32/actions/brightness.png
 share/apps/kplayer/icons/hicolor/32x32/actions/contrast.png
-share/apps/kplayer/icons/hicolor/32x32/actions/fileopen.png
-share/apps/kplayer/icons/hicolor/32x32/actions/fileopenurl.png
 share/apps/kplayer/icons/hicolor/32x32/actions/hue.png
-share/apps/kplayer/icons/hicolor/32x32/actions/lock.png
 share/apps/kplayer/icons/hicolor/32x32/actions/loop.png
-share/apps/kplayer/icons/hicolor/32x32/actions/mute.png
-share/apps/kplayer/icons/hicolor/32x32/actions/player_fwd.png
-share/apps/kplayer/icons/hicolor/32x32/actions/player_pause.png
-share/apps/kplayer/icons/hicolor/32x32/actions/player_play.png
-share/apps/kplayer/icons/hicolor/32x32/actions/player_rew.png
-share/apps/kplayer/icons/hicolor/32x32/actions/player_stop.png
-share/apps/kplayer/icons/hicolor/32x32/actions/properties.png
 share/apps/kplayer/icons/hicolor/32x32/actions/saturation.png
 share/apps/kplayer/icons/hicolor/32x32/actions/shuffle.png
-share/apps/kplayer/icons/hicolor/32x32/actions/viewmag+.png
-share/apps/kplayer/icons/hicolor/32x32/actions/viewmag-.png
-share/apps/kplayer/icons/hicolor/32x32/actions/viewmagfit.png
-share/apps/kplayer/icons/hicolor/32x32/actions/volume.png
-share/apps/kplayer/icons/hicolor/32x32/actions/window_fullscreen.png
 share/apps/kplayer/input.conf
 share/apps/kplayer/kplayerpartui.rc
 share/apps/kplayer/kplayerui.rc
@@ -84,6 +37,7 @@ share/doc/HTML/da/kplayer/howto-configuration.docbook
 share/doc/HTML/da/kplayer/howto-devices.docbook
 share/doc/HTML/da/kplayer/howto-full-screen.docbook
 share/doc/HTML/da/kplayer/howto-installation.docbook
+share/doc/HTML/da/kplayer/howto-library.docbook
 share/doc/HTML/da/kplayer/howto-playlist.docbook
 share/doc/HTML/da/kplayer/howto-properties.docbook
 share/doc/HTML/da/kplayer/howto-settings.docbook
@@ -166,6 +120,7 @@ share/doc/HTML/es/kplayer/howto-configuration.docbook
 share/doc/HTML/es/kplayer/howto-devices.docbook
 share/doc/HTML/es/kplayer/howto-full-screen.docbook
 share/doc/HTML/es/kplayer/howto-installation.docbook
+share/doc/HTML/es/kplayer/howto-library.docbook
 share/doc/HTML/es/kplayer/howto-playlist.docbook
 share/doc/HTML/es/kplayer/howto-properties.docbook
 share/doc/HTML/es/kplayer/howto-settings.docbook
@@ -212,6 +167,7 @@ share/doc/HTML/it/kplayer/howto-configuration.docbook
 share/doc/HTML/it/kplayer/howto-devices.docbook
 share/doc/HTML/it/kplayer/howto-full-screen.docbook
 share/doc/HTML/it/kplayer/howto-installation.docbook
+share/doc/HTML/it/kplayer/howto-library.docbook
 share/doc/HTML/it/kplayer/howto-playlist.docbook
 share/doc/HTML/it/kplayer/howto-properties.docbook
 share/doc/HTML/it/kplayer/howto-settings.docbook
@@ -236,6 +192,7 @@ share/doc/HTML/pt/kplayer/howto-configuration.docbook
 share/doc/HTML/pt/kplayer/howto-devices.docbook
 share/doc/HTML/pt/kplayer/howto-full-screen.docbook
 share/doc/HTML/pt/kplayer/howto-installation.docbook
+share/doc/HTML/pt/kplayer/howto-library.docbook
 share/doc/HTML/pt/kplayer/howto-playlist.docbook
 share/doc/HTML/pt/kplayer/howto-properties.docbook
 share/doc/HTML/pt/kplayer/howto-settings.docbook
@@ -261,6 +218,7 @@ share/doc/HTML/sv/kplayer/howto-configuration.docbook
 share/doc/HTML/sv/kplayer/howto-devices.docbook
 share/doc/HTML/sv/kplayer/howto-full-screen.docbook
 share/doc/HTML/sv/kplayer/howto-installation.docbook
+share/doc/HTML/sv/kplayer/howto-library.docbook
 share/doc/HTML/sv/kplayer/howto-playlist.docbook
 share/doc/HTML/sv/kplayer/howto-properties.docbook
 share/doc/HTML/sv/kplayer/howto-settings.docbook
@@ -302,9 +260,7 @@ share/icons/hicolor/22x22/apps/kplayer.png
 share/icons/hicolor/32x32/apps/kplayer.png
 share/icons/hicolor/48x48/apps/kplayer.png
 share/icons/hicolor/64x64/apps/kplayer.png
-share/icons/locolor/16x16/apps/kplayer.png
-share/icons/locolor/22x22/apps/kplayer.png
-share/icons/locolor/32x32/apps/kplayer.png
+share/kde4/services/kplayerpart.desktop
 share/locale/be/LC_MESSAGES/kplayer.mo
 share/locale/br/LC_MESSAGES/kplayer.mo
 share/locale/ca/LC_MESSAGES/kplayer.mo
@@ -316,6 +272,7 @@ share/locale/el/LC_MESSAGES/kplayer.mo
 share/locale/en_GB/LC_MESSAGES/kplayer.mo
 share/locale/es/LC_MESSAGES/kplayer.mo
 share/locale/et/LC_MESSAGES/kplayer.mo
+share/locale/eu/LC_MESSAGES/kplayer.mo
 share/locale/fi/LC_MESSAGES/kplayer.mo
 share/locale/fr/LC_MESSAGES/kplayer.mo
 share/locale/ga/LC_MESSAGES/kplayer.mo
@@ -325,7 +282,9 @@ share/locale/hu/LC_MESSAGES/kplayer.mo
 share/locale/it/LC_MESSAGES/kplayer.mo
 share/locale/ja/LC_MESSAGES/kplayer.mo
 share/locale/nb/LC_MESSAGES/kplayer.mo
+share/locale/nds/LC_MESSAGES/kplayer.mo
 share/locale/nl/LC_MESSAGES/kplayer.mo
+share/locale/oc/LC_MESSAGES/kplayer.mo
 share/locale/pa/LC_MESSAGES/kplayer.mo
 share/locale/pl/LC_MESSAGES/kplayer.mo
 share/locale/pt/LC_MESSAGES/kplayer.mo
@@ -336,7 +295,6 @@ share/locale/sr@Latn/LC_MESSAGES/kplayer.mo
 share/locale/sv/LC_MESSAGES/kplayer.mo
 share/locale/tr/LC_MESSAGES/kplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kplayer.mo
-share/services/kplayerpart.desktop
 @dirrm share/doc/HTML/sv/kplayer
 @dirrm share/doc/HTML/pt/kplayer
 @dirrm share/doc/HTML/it/kplayer
@@ -352,4 +310,6 @@ share/services/kplayerpart.desktop
 @dirrm share/apps/kplayer/icons/hicolor
 @dirrm share/apps/kplayer/icons
 @dirrm share/apps/kplayer
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
 @dirrmtry share/applications/kde