Update to 3.1. Switch from kde3 to qt5.

(kde and qt4 options would be possible, if someone wants to add them)

Changes since 1.6:
3.1
Support for synchronized lyrics and event timing codes, find and
replace strings in tags and file names, details and sort columns
in file list, bug fixes and usability improvements.

3.0.2
This bugfix release solves the problem that translations and the
documentation were not found on Mac OS X 10.9 Mavericks. The
application is now correctly terminated when the main window is
closed while the handbook is open. Session restoration and the
genres list have been improved. A few build system issues are fixed
too.

3.0.1
This is a bug fix release for 3.0. It fixes the incorrect configuration
conversion and toolbar configuration in the KDE version, the filename
format configuration, bugs in the fingerprint import and several
build issues for different Linux distributions.

3.0
Flexible architecture with common shared libraries and plugins for
metadata libraries and importers, new command-line application,
support for Opus format, bug fixes and usability improvements.

2.3
Automatic batch import for multiple directories, improved import,
configurable quick access tag frames, better responsiveness when
working with a huge number of files, long operations can be aborted,
bug fixes and usability improvements.

2.2.1
This is a bug fix release for 2.2. It fixes the selection of a
wrong language if the primary language is not supported and the
first fallback language should be English and that the English
instead of the German handbook was displayed for a German locale.

2.2
Improved Discogs and AcoustID audio fingerprint import, bug fixes
and usability improvements.

2.1
Chromaprint Acoustid fingerprint import, keyboard shortcuts, improved
iTunes support, icons, bug fixes.

2.0.1
Minor bugfixes. The build system is also improved and should work
out of the box on most distributions.

2.0
Extract and move information between tags, many improvements and
refactorings, e.g. in file list, import, numbering tracks, renaming
directories, GUI and usability.

6 files changed, 99 insertions, 110 deletions

diff --git a/audio/kid3/DESCR b/audio/kid3/DESCR
index e58eb35ab4a..ac5705b28fb 100644
--- a/audio/kid3/DESCR
+++ b/audio/kid3/DESCR
@@ -1,19 +1,23 @@
-Kid3 - Efficient Audio Tagger
+If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
+MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF
+files (e.g. full albums) without typing the same information again
+and again and have control over both ID3v1 and ID3v2 tags, then
+Kid3 is the program you are looking for.
 
-With Kid3 you can:
-
-    * Edit ID3v1.1 tags
-    * Edit all ID3v2.3 and ID3v2.4 frames
+Features:
+    * Edit ID3v1.1 and all ID3v2.3 and ID3v2.4 frames
     * Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
-    * Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Speex,
-      TrueAudio and WavPack files.
-    * Edit tags of multiple files, e.g. the artist, album, year and genre
-      of all files of an album typically have the same values and can be
-      set together.
-    * Generate tags from filenames
-    * Generate filenames from tags
-    * Rename directories from tags
+    * Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus,
+    Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker
+    modules (MOD, S3M, IT, XM)
+    * Edit tags of multiple files
+    * Generate tags from filenames and vice versa
+    * Generate tags from the contents of tag fields
+    * Rename and create directories from tags
     * Generate playlist files
-    * Automatic case conversion and string translation
-    * Import and export album data
-    * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs
+    * Automatically convert upper and lower case and replace strings
+    * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs,
+    Amazon and other sources of album data
+    * Export tags as CSV, HTML, playlists, Kover XML, etc.
+    * Edit synchronized lyrics and event timing codes, import and
+    export LRC files
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 33fa022d998..4113e84bf72 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,35 +1,47 @@
-# $NetBSD: Makefile,v 1.48 2014/04/10 06:21:21 obache Exp $
-#
+# $NetBSD: Makefile,v 1.49 2014/04/30 12:43:46 wiz Exp $
 
-DISTNAME=		kid3-1.6
-PKGREVISION=		22
+DISTNAME=		kid3-3.1
 CATEGORIES=		kde audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kid3/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kid3.sourceforge.net/
-COMMENT=		ID3 tagger for KDE 3
+COMMENT=		ID3 tagger for QT
 LICENSE=		gnu-gpl-v2
 
-GNU_CONFIGURE=		yes
-SET_LIBDIR=		yes
-USE_LIBTOOL=		yes
+BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
+USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		msgfmt
+USE_TOOLS+=		perl:build pkg-config
+CMAKE_ARGS+=		-DQt5Core_DIR:PATH=${QTDIR}
+CMAKE_ARGS+=		-DQT_QMAKE_EXECUTABLE:PATH=${QTDIR}/bin/qmake
+CMAKE_ARGS+=		-DWITH_DOCBOOKDIR:PATH=${PREFIX}/share/xsl/docbook
+CMAKE_ARGS+=		-DWITH_APPS:STRING="Qt;CLI"
+CMAKE_ARGS+=		-DWITH_MANDIR:STRING=${PKGMANDIR}
+# seems to be ignored, so put it into LDFLAGS
+CMAKE_ARGS+=		-DCMAKE_INSTALL_RPATH:PATH=${PREFIX}/lib/kid3
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3
 
-CHECK_PORTABILITY_SKIP+=	make_qtonly.sh
+# workaround: qt5-dbus does not install these tools, but
+# CMake expects them to be there, since they are referenced from
+# qt5-installed .cmake files
+pre-configure:
+	cd ${PREFIX}/qt5/bin && \
+		if [ ! -f qdbuscpp2xml ]; then touch qdbuscpp2xml; fi; \
+		if [ ! -f qdbusxml2cpp ]; then touch qdbusxml2cpp; fi;
 
-.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../audio/chromaprint/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/libtunepimp/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/qt5-dbus/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/kid3/PLIST b/audio/kid3/PLIST
index 00e2d82964d..58b14173a8d 100644
--- a/audio/kid3/PLIST
+++ b/audio/kid3/PLIST
@@ -1,26 +1,46 @@
-@comment $NetBSD: PLIST,v 1.7 2010/12/18 11:26:14 shattered Exp $
-bin/kid3
-share/applications/kde/kid3.desktop
-share/doc/kde/HTML/de/kid3/common
-share/doc/kde/HTML/de/kid3/index.cache.bz2
-share/doc/kde/HTML/de/kid3/index.docbook
-share/doc/kde/HTML/en/kid3/common
-share/doc/kde/HTML/en/kid3/index.cache.bz2
-share/doc/kde/HTML/en/kid3/index.docbook
-share/icons/hicolor/16x16/apps/kid3.png
-share/icons/hicolor/32x32/apps/kid3.png
-share/icons/hicolor/48x48/apps/kid3.png
-share/icons/hicolor/scalable/apps/kid3.svgz
-share/kde/apps/kid3/kid3ui.rc
-share/locale/cs/LC_MESSAGES/kid3.mo
-share/locale/de/LC_MESSAGES/kid3.mo
-share/locale/es/LC_MESSAGES/kid3.mo
-share/locale/et/LC_MESSAGES/kid3.mo
-share/locale/fi/LC_MESSAGES/kid3.mo
-share/locale/fr/LC_MESSAGES/kid3.mo
-share/locale/it/LC_MESSAGES/kid3.mo
-share/locale/nl/LC_MESSAGES/kid3.mo
-share/locale/pl/LC_MESSAGES/kid3.mo
-share/locale/ru/LC_MESSAGES/kid3.mo
-share/locale/tr/LC_MESSAGES/kid3.mo
-share/locale/zh_TW/LC_MESSAGES/kid3.mo
+@comment $NetBSD: PLIST,v 1.8 2014/04/30 12:43:46 wiz Exp $
+bin/kid3-cli
+bin/kid3-qt
+lib/kid3/libkid3-core.so
+lib/kid3/libkid3-core.so.${PKGVERSION}.0
+lib/kid3/libkid3-gui.so
+lib/kid3/libkid3-gui.so.${PKGVERSION}.0
+lib/kid3/plugins/libacoustidimport.so
+lib/kid3/plugins/libamazonimport.so
+lib/kid3/plugins/libdiscogsimport.so
+lib/kid3/plugins/libfreedbimport.so
+lib/kid3/plugins/libid3libmetadata.so
+lib/kid3/plugins/libmusicbrainzimport.so
+lib/kid3/plugins/liboggflacmetadata.so
+lib/kid3/plugins/libtaglibmetadata.so
+man/de/man1/kid3-cli.1.gz
+man/de/man1/kid3-qt.1.gz
+man/de/man1/kid3.1.gz
+man/man1/kid3-cli.1.gz
+man/man1/kid3-qt.1.gz
+man/man1/kid3.1.gz
+share/applications/kid3-qt.desktop
+share/doc/kid3-qt/kid3_de.html
+share/doc/kid3-qt/kid3_en.html
+share/icons/hicolor/128x128/apps/kid3-qt.png
+share/icons/hicolor/16x16/apps/kid3-qt.png
+share/icons/hicolor/32x32/apps/kid3-qt.png
+share/icons/hicolor/48x48/apps/kid3-qt.png
+share/icons/hicolor/64x64/apps/kid3-qt.png
+share/icons/hicolor/scalable/apps/kid3-qt.svg
+share/kid3/translations/kid3_cs.qm
+share/kid3/translations/kid3_de.qm
+share/kid3/translations/kid3_es.qm
+share/kid3/translations/kid3_et.qm
+share/kid3/translations/kid3_fi.qm
+share/kid3/translations/kid3_fr.qm
+share/kid3/translations/kid3_it.qm
+share/kid3/translations/kid3_nl.qm
+share/kid3/translations/kid3_pl.qm
+share/kid3/translations/kid3_ru.qm
+share/kid3/translations/kid3_sr.qm
+share/kid3/translations/kid3_sr@ijekavian.qm
+share/kid3/translations/kid3_sr@ijekavianlatin.qm
+share/kid3/translations/kid3_sr@latin.qm
+share/kid3/translations/kid3_tr.qm
+share/kid3/translations/kid3_zh_TW.qm
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index 161304f905a..731d13b148d 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2011/02/12 11:05:56 shattered Exp $
+$NetBSD: distinfo,v 1.10 2014/04/30 12:43:46 wiz Exp $
 
-SHA1 (kid3-1.6.tar.gz) = 64701fa5ee575c6f66e4d0fb70fdaf6c16e54a82
-RMD160 (kid3-1.6.tar.gz) = 7ad7aaf58957be112cea2b2b4962b81fdbb6b6e9
-Size (kid3-1.6.tar.gz) = 1478393 bytes
-SHA1 (patch-ab) = beeba458ad9d3ec6af34bac42b5d101240527d59
-SHA1 (patch-ac) = 20c6b755c31117c34693a0d95207995116c986dc
+SHA1 (kid3-3.1.tar.gz) = b58e6444ddc318af2232f1642d34f0a2d0738614
+RMD160 (kid3-3.1.tar.gz) = 40e4df5002b3c9ce36c97b2d672e85191b079b29
+Size (kid3-3.1.tar.gz) = 1087087 bytes
diff --git a/audio/kid3/patches/patch-ab b/audio/kid3/patches/patch-ab
deleted file mode 100644
index e51094f8c79..00000000000
--- a/audio/kid3/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/02/12 11:05:56 shattered Exp $
-
---- configure.orig	2011-02-02 05:05:29.000000000 +0000
-+++ configure
-@@ -29153,7 +29153,7 @@ if test "${ac_cv_lib_tunepimp_tr_GetPUID
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltunepimp  $LIBS"
-+LIBS="-ltunepimp $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -29194,7 +29194,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltunepimp  $LIBS"
-+LIBS="-ltunepimp $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
diff --git a/audio/kid3/patches/patch-ac b/audio/kid3/patches/patch-ac
deleted file mode 100644
index 3c54b1f69e2..00000000000
--- a/audio/kid3/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/07/30 08:49:18 obache Exp $
-
---- kid3/oggfile.cpp.orig	2008-02-18 20:01:40.000000000 +0000
-+++ kid3/oggfile.cpp
-@@ -34,6 +34,9 @@
- #if QT_VERSION >= 0x040000
- #include <QByteArray>
- #endif
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
- #include <sys/stat.h>
- #ifdef WIN32
- #include <sys/utime.h>
-@@ -811,7 +814,7 @@ bool OggFile::FileInfo::read(const char*
- 					bitrate = vi->bitrate_lower;
- 				}
- 			}
--#ifdef WIN32
-+#if defined(WIN32) || (defined(__NetBSD__) && __NetBSD_Version__ < 299000000)
- 			duration = (long)::ov_time_total(&vf, -1);
- #else
- 			duration = ::lrint(::ov_time_total(&vf, -1));