Changes 3.3.0:

* New:
  + Make order of quick access frames configurable.
  + Support separators and submenus in user action context menu.
  + Restore defaults button in settings dialog.
  + CSV import from multiple directories.
  + Support for lyrics.wikia.com in embed lyrics script.
  + Support for chapter and table of contents audiobook frames.
  + Mac, Windows: Support for podcast frames.

* Improved:
  + Display user friendly names for all supported frames.
  + Updated Czech translation.
  + Change file permissions in the case of modified file names.

* Fixed:
  + Wrong and missing translations.
  + Removing ID3v1 genre with id3lib.
  + KDE 5: Name filters used in file dialogs, blocking file dialogs.
  + KDE 5: Invoking help in settings dialog.
  + KDE 4: Build with kdelibs-4.14.11.
  + Qt 5.5: Spurious popping up of download dialog.
  + Do not abort build if qmlplugindump cannot be started.

3 files changed, 47 insertions, 23 deletions

diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 19722c623e6..1abdf4befc5 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.60 2015/10/10 01:57:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2015/11/01 09:13:16 adam Exp $
 
-DISTNAME=		kid3-3.1
-PKGREVISION=		8
-CATEGORIES=		kde audio
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kid3/}
+DISTNAME=	kid3-3.3.0
+CATEGORIES=	kde audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kid3/}
 
-MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://kid3.sourceforge.net/
-COMMENT=		ID3 tagger for QT
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	wiz@NetBSD.org
+HOMEPAGE=	http://kid3.sourceforge.net/
+COMMENT=	ID3 tagger for QT
+LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
@@ -25,6 +24,14 @@ CMAKE_ARGS+=		-DWITH_MANDIR:STRING=${PKGMANDIR}
 # -DCMAKE_SKIP_RPATH:BOOL=TRUE, so re-add it manually
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3
 
+SUBST_CLASSES+=		apple
+SUBST_MESSAGE.apple=	Avoiding Mac OS X application bundles
+SUBST_STAGE.apple=	pre-configure
+SUBST_FILES.apple+=	src/app/cli/CMakeLists.txt
+SUBST_FILES.apple+=	src/app/qt/CMakeLists.txt
+SUBST_FILES.apple+=	src/plugins/kid3qml/CMakeLists.txt
+SUBST_SED.apple=	-e 's,APPLE,ELPPA,g'
+
 .include "../../audio/chromaprint/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/id3lib/buildlink3.mk"
@@ -32,7 +39,6 @@ LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.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"
diff --git a/audio/kid3/PLIST b/audio/kid3/PLIST
index 58b14173a8d..e3cf8cb5717 100644
--- a/audio/kid3/PLIST
+++ b/audio/kid3/PLIST
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.8 2014/04/30 12:43:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/11/01 09:13:16 adam Exp $
 bin/kid3-cli
 bin/kid3-qt
 lib/kid3/libkid3-core.so
-lib/kid3/libkid3-core.so.${PKGVERSION}.0
+lib/kid3/libkid3-core.so.3.3.0
 lib/kid3/libkid3-gui.so
-lib/kid3/libkid3-gui.so.${PKGVERSION}.0
+lib/kid3/libkid3-gui.so.3.3.0
+lib/kid3/plugins/imports/Kid3/Kid3Script.qml
+lib/kid3/plugins/imports/Kid3/libkid3qml.so
+lib/kid3/plugins/imports/Kid3/qmldir
 lib/kid3/plugins/libacoustidimport.so
 lib/kid3/plugins/libamazonimport.so
 lib/kid3/plugins/libdiscogsimport.so
@@ -12,13 +15,15 @@ lib/kid3/plugins/libfreedbimport.so
 lib/kid3/plugins/libid3libmetadata.so
 lib/kid3/plugins/libmusicbrainzimport.so
 lib/kid3/plugins/liboggflacmetadata.so
+lib/kid3/plugins/libqmlcommand.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
+man/de/man1/kid3-cli.1
+man/de/man1/kid3-qt.1
+man/de/man1/kid3.1
+man/man1/kid3-cli.1
+man/man1/kid3-qt.1
+man/man1/kid3.1
+share/appdata/kid3-qt.appdata.xml
 share/applications/kid3-qt.desktop
 share/doc/kid3-qt/kid3_de.html
 share/doc/kid3-qt/kid3_en.html
@@ -28,6 +33,16 @@ 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/qml/script/EmbedAlbumArt.qml
+share/kid3/qml/script/EmbedLyrics.qml
+share/kid3/qml/script/ExportCsv.qml
+share/kid3/qml/script/ExportHtmlPlayer.qml
+share/kid3/qml/script/ExtractAlbumArt.qml
+share/kid3/qml/script/ImportCsv.qml
+share/kid3/qml/script/QmlConsole.qml
+share/kid3/qml/script/ReplayGain2SoundCheck.qml
+share/kid3/qml/script/ResizeAlbumArt.qml
+share/kid3/qml/script/ShowTextEncodingV1.qml
 share/kid3/translations/kid3_cs.qm
 share/kid3/translations/kid3_de.qm
 share/kid3/translations/kid3_es.qm
@@ -43,4 +58,5 @@ 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_CN.qm
 share/kid3/translations/kid3_zh_TW.qm
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index 731d13b148d..7029770952f 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2014/04/30 12:43:46 wiz Exp $
+$NetBSD: distinfo,v 1.11 2015/11/01 09:13:16 adam Exp $
 
-SHA1 (kid3-3.1.tar.gz) = b58e6444ddc318af2232f1642d34f0a2d0738614
-RMD160 (kid3-3.1.tar.gz) = 40e4df5002b3c9ce36c97b2d672e85191b079b29
-Size (kid3-3.1.tar.gz) = 1087087 bytes
+SHA1 (kid3-3.3.0.tar.gz) = 5d9d02b2063b87023459fea0283444052978329e
+RMD160 (kid3-3.3.0.tar.gz) = 2442e95724a71fcd63f6de5dba0d689c4acec8b4
+SHA512 (kid3-3.3.0.tar.gz) = 42b238c2cc7023477606419a13bb677b8bfcc044a78ec36b8fa96db40ece8a2e623c581a2274d319c760fa6e101625dd282e1c7a39a63b8a2c6f0b1265be6eca
+Size (kid3-3.3.0.tar.gz) = 1258378 bytes
+SHA1 (patch-CMakeLists.txt) = 81e4ee22279dd9acf0619380f3b41e8316f7c2ea