5 files changed, 38 insertions, 23 deletions

diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index b864c96360f1..0c9f5e65b85e 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -2,32 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.11.2b
-PORTREVISION=	2
+PORTVERSION=	0.11.3d
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 PKGNAMESUFFIX=	-kde4
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE frontend to Phonon / KDE4
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		cairo.2:${PORTSDIR}/graphics/cairo
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libcairo.so:${PORTSDIR}/graphics/cairo
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-USE_GNOME=	gtk20
 USE_BZIP2=	yes
-USES=		cmake
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
-USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
-
-NO_STAGE=	yes
-post-patch:
-#Fix build with kdelibs>=4.5.0
-	${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \
-		${WRKSRC}/doc/index.docbook
-	${REINPLACE_CMD} -e 's,glib/gthread.h,glib.h,g' \
-		${WRKSRC}/src/npplayer.cpp
+USES=		cmake pkgconfig
+USE_GNOME=	gtk20
+USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
+USE_KDE4=	automoc4 kdelibs kdeprefix
 
 .include <bsd.port.mk>
diff --git a/multimedia/kmplayer-kde4/distinfo b/multimedia/kmplayer-kde4/distinfo
index 2661d964a240..4b0bf2752b68 100644
--- a/multimedia/kmplayer-kde4/distinfo
+++ b/multimedia/kmplayer-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmplayer-0.11.2b.tar.bz2) = 27cfdddb55467da1fe2ec2e41d45f426ab14ad44d1f9a9df6289a01b06bf4101
-SIZE (kmplayer-0.11.2b.tar.bz2) = 528616
+SHA256 (kmplayer-0.11.3d.tar.bz2) = 7ebecbc906edcc13e1ae94f4791da80ed4ef73164ef6b81d76c71708c39a6bfb
+SIZE (kmplayer-0.11.3d.tar.bz2) = 573173
diff --git a/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h b/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h
new file mode 100644
index 000000000000..20300f33f499
--- /dev/null
+++ b/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h
@@ -0,0 +1,13 @@
+--- src/kmplayershared.h.orig
++++ src/kmplayershared.h
+@@ -214,8 +214,8 @@
+     // operator bool () const { return data && !!data->ptr; }
+     bool operator == (const WeakPtr<T> & w) const { return data == w.data; }
+     bool operator == (const SharedPtr<T> & s) const { return data == s.data; }
+-    bool operator == (const T * t) const { return (!t && !data) || (data && data.ptr == t); }
+-    bool operator == (T * t) const { return (!t && !data) || (data && data.ptr == t); }
++    bool operator == (const T * t) const { return (!t && !data) || (data && data->ptr == t); }
++    bool operator == (T * t) const { return (!t && !data) || (data && data->ptr == t); }
+     bool operator != (const WeakPtr<T> & w) const { return data != w.data; }
+     bool operator != (const SharedPtr<T> & s) const { return data != s.data; }
+     operator T * () { return data ? data->ptr : 0L; }
diff --git a/multimedia/kmplayer-kde4/pkg-descr b/multimedia/kmplayer-kde4/pkg-descr
index ebdc5482d334..00a1ec18b7f2 100644
--- a/multimedia/kmplayer-kde4/pkg-descr
+++ b/multimedia/kmplayer-kde4/pkg-descr
@@ -1,3 +1,3 @@
-KDE frontend to MPlayer, Xine, GStreamer
+KMPlayer, a simple frontend for MPlayer/FFMpeg/Phonon.
 
 WWW: http://kmplayer.kde.org/
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index 877423d70119..bd207ca0d6f7 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -29,16 +29,23 @@ share/icons/hicolor/48x48/apps/kmplayer.png
 share/icons/hicolor/64x64/apps/kmplayer.png
 share/icons/hicolor/scalable/apps/kmplayer.svgz
 share/kde4/services/kmplayer_part.desktop
+share/locale/bg/LC_MESSAGES/kmplayer.mo
+share/locale/bs/LC_MESSAGES/kmplayer.mo
+share/locale/ca/LC_MESSAGES/kmplayer.mo
+share/locale/ca@valencia/LC_MESSAGES/kmplayer.mo
 share/locale/cs/LC_MESSAGES/kmplayer.mo
 share/locale/da/LC_MESSAGES/kmplayer.mo
 share/locale/de/LC_MESSAGES/kmplayer.mo
 share/locale/el/LC_MESSAGES/kmplayer.mo
 share/locale/en_GB/LC_MESSAGES/kmplayer.mo
+share/locale/eo/LC_MESSAGES/kmplayer.mo
 share/locale/es/LC_MESSAGES/kmplayer.mo
 share/locale/et/LC_MESSAGES/kmplayer.mo
 share/locale/fr/LC_MESSAGES/kmplayer.mo
 share/locale/ga/LC_MESSAGES/kmplayer.mo
 share/locale/gl/LC_MESSAGES/kmplayer.mo
+share/locale/hr/LC_MESSAGES/kmplayer.mo
+share/locale/hu/LC_MESSAGES/kmplayer.mo
 share/locale/it/LC_MESSAGES/kmplayer.mo
 share/locale/ja/LC_MESSAGES/kmplayer.mo
 share/locale/km/LC_MESSAGES/kmplayer.mo
@@ -56,14 +63,15 @@ share/locale/pt_BR/LC_MESSAGES/kmplayer.mo
 share/locale/ro/LC_MESSAGES/kmplayer.mo
 share/locale/ru/LC_MESSAGES/kmplayer.mo
 share/locale/sk/LC_MESSAGES/kmplayer.mo
+share/locale/sr/LC_MESSAGES/kmplayer.mo
+share/locale/sr@latin/LC_MESSAGES/kmplayer.mo
 share/locale/sv/LC_MESSAGES/kmplayer.mo
+share/locale/th/LC_MESSAGES/kmplayer.mo
 share/locale/tr/LC_MESSAGES/kmplayer.mo
+share/locale/ug/LC_MESSAGES/kmplayer.mo
 share/locale/uk/LC_MESSAGES/kmplayer.mo
-share/locale/x-test/LC_MESSAGES/kmplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
 share/locale/zh_TW/LC_MESSAGES/kmplayer.mo
 @dirrmtry share/doc/HTML/en/kmplayer
 @dirrmtry share/apps/kmplayer/generators
 @dirrmtry share/apps/kmplayer
-@dirrmtry share/locale/x-test/LC_MESSAGES
-@dirrmtry share/locale/x-test