From d57e6aad6f754194fae2022d10cfa752c3cf0bc4 Mon Sep 17 00:00:00 2001
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Thu, 1 May 2014 14:35:29 +0000
Subject: [PATCH] audio/kid3-kde4: - Update to 3.1 - Remove upstreamed patch

---
 audio/kid3-kde4/Makefile                           |  5 ++---
 audio/kid3-kde4/distinfo                           |  4 ++--
 .../files/patch-src__app__cli__kid3cli.cpp         | 14 --------------
 audio/kid3-kde4/pkg-plist                          |  4 ++++
 4 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp

diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 31c3cc83211e..bf6e1238fb31 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kid3
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.1
 CATEGORIES=	audio kde
 MASTER_SITES=	SF
 
@@ -64,7 +63,7 @@ CMAKE_ARGS+=	-DWITH_APPS="${KID3_CLI}KDE"
 PLIST_SUB+=	QT="@comment " KDE=""
 .endif
 
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION}
+PLIST_SUB+=	SHLIB_VER=${PORTVERSION}.0
 
 CLI_DESC=	Build and install command line utility
 CLI_USES=	readline
diff --git a/audio/kid3-kde4/distinfo b/audio/kid3-kde4/distinfo
index bb06abf9ee81..7641f3de95ae 100644
--- a/audio/kid3-kde4/distinfo
+++ b/audio/kid3-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kid3-3.0.2.tar.gz) = 31492e01039e78d2e73ba342a2d2c837395597eb48a101366b160c36fcdcfab4
-SIZE (kid3-3.0.2.tar.gz) = 997961
+SHA256 (kid3-3.1.tar.gz) = 08661266250670620a51e3d55b97b00fe545625c74f7cf0834b5308572ffcc51
+SIZE (kid3-3.1.tar.gz) = 1087087
diff --git a/audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp b/audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp
deleted file mode 100644
index e5d162d7a53f..000000000000
--- a/audio/kid3-kde4/files/patch-src__app__cli__kid3cli.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/app/cli/kid3cli.cpp.orig	2013-11-29 06:55:07.000000000 +0000
-+++ ./src/app/cli/kid3cli.cpp	2013-12-02 14:35:10.196660693 +0000
-@@ -276,7 +276,10 @@
-          << new CopyCommand(this)
-          << new PasteCommand(this)
-          << new RemoveCommand(this)
--         << new PlayCommand(this);
-+#if defined HAVE_PHONON || QT_VERSION >= 0x050000
-+         << new PlayCommand(this)
-+#endif
-+         ;
-   connect(m_app, SIGNAL(fileSelectionUpdateRequested()),
-           this, SLOT(updateSelectedFiles()));
-   connect(m_app, SIGNAL(selectedFilesUpdated()),
diff --git a/audio/kid3-kde4/pkg-plist b/audio/kid3-kde4/pkg-plist
index 1fd9db3180bc..49685263c4cd 100644
--- a/audio/kid3-kde4/pkg-plist
+++ b/audio/kid3-kde4/pkg-plist
@@ -32,12 +32,16 @@ man/man1/kid3.1.gz
 %%KDE%%share/doc/HTML/en/kid3/index.docbook
 %%QT%%share/doc/kid3-qt/kid3_de.html
 %%QT%%share/doc/kid3-qt/kid3_en.html
+%%QT%%share/icons/hicolor/128x128/apps/kid3-qt.png
+%%KDE%%share/icons/hicolor/128x128/apps/kid3.png
 %%QT%%share/icons/hicolor/16x16/apps/kid3-qt.png
 %%KDE%%share/icons/hicolor/16x16/apps/kid3.png
 %%QT%%share/icons/hicolor/32x32/apps/kid3-qt.png
 %%KDE%%share/icons/hicolor/32x32/apps/kid3.png
 %%QT%%share/icons/hicolor/48x48/apps/kid3-qt.png
 %%KDE%%share/icons/hicolor/48x48/apps/kid3.png
+%%QT%%share/icons/hicolor/64x64/apps/kid3-qt.png
+%%KDE%%share/icons/hicolor/64x64/apps/kid3.png
 %%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg
 %%KDE%%share/icons/hicolor/scalable/apps/kid3.svgz
 %%DATADIR%%/translations/kid3_cs.qm