From tkato432@yahoo.com  Fri Nov  1 18:30:54 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id ECA54F0A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  1 Nov 2013 18:30:46 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from omta03.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67])
	by mx1.freebsd.org (Postfix) with ESMTP id AF4082F6E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  1 Nov 2013 18:30:46 +0000 (UTC)
Received: from coppermine.my.domain (ZT034086.ppp.dion.ne.jp [59.128.34.86])
	by omta03.auone-net.jp (au one net mail) with ESMTP id 046FA1880195
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  2 Nov 2013 03:30:42 +0900 (JST)
Message-Id: <20131102032035.edcdb86999168b84cc883b68@yahoo.com>
Date: Sat, 2 Nov 2013 03:20:35 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: multimedia/kmplayer-kde4: Update to version 0.11.3d

>Number:         183565
>Category:       ports
>Synopsis:       multimedia/kmplayer-kde4: Update to version 0.11.3d
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 01 18:40:03 UTC 2013
>Closed-Date:    Sat Nov 02 15:09:25 UTC 2013
>Last-Modified:  Sat Nov  2 15:10:00 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 0.11.3d

New file:
files/patch-src__kmplayershared.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/multimedia/kmplayer-kde4/Makefile multimedia/kmplayer-kde4/Makefile
--- /usr/ports/multimedia/kmplayer-kde4/Makefile	2013-10-09 18:34:45.000000000 +0900
+++ multimedia/kmplayer-kde4/Makefile	2013-11-02 00:00:00.000000000 +0900
@@ -2,32 +2,26 @@
 # $FreeBSD: head/multimedia/kmplayer-kde4/Makefile 329796 2013-10-08 15:09:18Z kmoore $
 
 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 -urN /usr/ports/multimedia/kmplayer-kde4/distinfo multimedia/kmplayer-kde4/distinfo
--- /usr/ports/multimedia/kmplayer-kde4/distinfo	2013-06-21 03:47:36.000000000 +0900
+++ multimedia/kmplayer-kde4/distinfo	2013-11-02 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h
--- /usr/ports/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h	1970-01-01 09:00:00.000000000 +0900
+++ multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h	2013-11-02 00:00:00.000000000 +0900
@@ -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 -urN /usr/ports/multimedia/kmplayer-kde4/pkg-descr multimedia/kmplayer-kde4/pkg-descr
--- /usr/ports/multimedia/kmplayer-kde4/pkg-descr	2013-06-21 03:47:36.000000000 +0900
+++ multimedia/kmplayer-kde4/pkg-descr	2013-11-02 00:00:00.000000000 +0900
@@ -1,3 +1,3 @@
-KDE frontend to MPlayer, Xine, GStreamer
+KMPlayer, a simple frontend for MPlayer/FFMpeg/Phonon.
 
 WWW: http://kmplayer.kde.org/
diff -urN /usr/ports/multimedia/kmplayer-kde4/pkg-plist multimedia/kmplayer-kde4/pkg-plist
--- /usr/ports/multimedia/kmplayer-kde4/pkg-plist	2013-06-21 03:47:36.000000000 +0900
+++ multimedia/kmplayer-kde4/pkg-plist	2013-11-02 00:00:00.000000000 +0900
@@ -29,16 +29,23 @@
 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/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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sat Nov 2 12:19:45 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183565 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat Nov 2 15:09:24 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183565 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183565: commit references a PR
Date: Sat,  2 Nov 2013 15:09:30 +0000 (UTC)

 Author: wg
 Date: Sat Nov  2 15:09:22 2013
 New Revision: 332495
 URL: http://svnweb.freebsd.org/changeset/ports/332495
 
 Log:
   multimedia/kmplayer-kde4: update to 0.11.3d
   
   - Update to 0.11.3d
   - Allow staging
   - Add LICENSE
   - Convert lib depends to new format
   
   PR:		ports/183565
   Submitted by:	KATO Tsuguru <tkato432 yahoo.com>
 
 Added:
   head/multimedia/kmplayer-kde4/files/
   head/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h   (contents, props changed)
 Modified:
   head/multimedia/kmplayer-kde4/Makefile
   head/multimedia/kmplayer-kde4/distinfo
   head/multimedia/kmplayer-kde4/pkg-descr
   head/multimedia/kmplayer-kde4/pkg-plist
 
 Modified: head/multimedia/kmplayer-kde4/Makefile
 ==============================================================================
 --- head/multimedia/kmplayer-kde4/Makefile	Sat Nov  2 15:05:30 2013	(r332494)
 +++ head/multimedia/kmplayer-kde4/Makefile	Sat Nov  2 15:09:22 2013	(r332495)
 @@ -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>
 
 Modified: head/multimedia/kmplayer-kde4/distinfo
 ==============================================================================
 --- head/multimedia/kmplayer-kde4/distinfo	Sat Nov  2 15:05:30 2013	(r332494)
 +++ head/multimedia/kmplayer-kde4/distinfo	Sat Nov  2 15:09:22 2013	(r332495)
 @@ -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
 
 Added: head/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/kmplayer-kde4/files/patch-src__kmplayershared.h	Sat Nov  2 15:09:22 2013	(r332495)
 @@ -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; }
 
 Modified: head/multimedia/kmplayer-kde4/pkg-descr
 ==============================================================================
 --- head/multimedia/kmplayer-kde4/pkg-descr	Sat Nov  2 15:05:30 2013	(r332494)
 +++ head/multimedia/kmplayer-kde4/pkg-descr	Sat Nov  2 15:09:22 2013	(r332495)
 @@ -1,3 +1,3 @@
 -KDE frontend to MPlayer, Xine, GStreamer
 +KMPlayer, a simple frontend for MPlayer/FFMpeg/Phonon.
  
  WWW: http://kmplayer.kde.org/
 
 Modified: head/multimedia/kmplayer-kde4/pkg-plist
 ==============================================================================
 --- head/multimedia/kmplayer-kde4/pkg-plist	Sat Nov  2 15:05:30 2013	(r332494)
 +++ head/multimedia/kmplayer-kde4/pkg-plist	Sat Nov  2 15:09:22 2013	(r332495)
 @@ -29,16 +29,23 @@ share/icons/hicolor/48x48/apps/kmplayer.
  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.
  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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
