Update to 2.2.0:

Changes since 2.1.10:

* Several stability fixes, found with Valgrind and the Fedora retrace
  server
* Use GTK+ 3 by default, but still allow building against GTK+ 2
* Support extended tag fields in MP4 files
* Support GIF images in tags
* Abhinav Jangda’s Ogg Opus support, asynchronous image loading, scanner
  function tests and new Vorbis cover art support
* Santtu Lakkala’s MP4 cover art and GIO support, fix for Roman numeral
  capitalization
* Ask for confirmation before overwriting during renaming
* Ekaterina Gerasimova’s Mallard help updates
* Avoid truncating Vorbis audio data when saving
* Gianvito Cavasoli’s Italian translation update
* Alexandre Franke’s French translation updates and typo fix
* Wolfgang Stöggl’s German translation updates
* Piotr Drąg’s Polish translation updates
* Мирослав Николић’s Serbian translation update
* Daniel Mustieles’ Spanish translation updates
* Balázs Úr and Attila Hammer’s Hungarian translation updates
* Enrico Nicoletto and Rafael Ferrera’s Brazilian Portuguese translation
  updates
* Marek Černocký’s Czech translation updates
* Aurimas Černius’s Lithuanian translation update

4 files changed, 24 insertions, 15 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index acac715acbb..309beac5243 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2014/02/20 07:56:02 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2014/04/12 06:45:31 wiz Exp $
 
-DISTNAME=	easytag-2.1.10
+DISTNAME=	easytag-2.2.0
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/easytag/2.1/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/easytag/2.2/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	wiz@NetBSD.org
@@ -19,12 +19,9 @@ USE_TOOLS+=		gmake intltool pkg-config xgettext
 
 .include "options.mk"
 
-.include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.24
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index 0119fa519ee..c80bf7ceee2 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2014/02/20 07:56:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2014/04/12 06:45:31 wiz Exp $
 bin/easytag
 share/appdata/easytag.appdata.xml
 share/applications/easytag.desktop
@@ -15,6 +15,8 @@ share/help/C/easytag/keyboard-shortcuts.page
 share/help/C/easytag/legal.xml
 share/help/C/easytag/media/icon.png
 share/help/C/easytag/playlist-generate.page
+share/help/C/easytag/problems-id3.page
+share/help/C/easytag/problems-ogg-split.page
 share/help/C/easytag/scanner.page
 share/help/C/easytag/starting.page
 share/help/C/easytag/tag-field.page
@@ -34,6 +36,7 @@ share/locale/cs/LC_MESSAGES/easytag.mo
 share/locale/da/LC_MESSAGES/easytag.mo
 share/locale/de/LC_MESSAGES/easytag.mo
 share/locale/el/LC_MESSAGES/easytag.mo
+share/locale/en_GB/LC_MESSAGES/easytag.mo
 share/locale/es/LC_MESSAGES/easytag.mo
 share/locale/fr/LC_MESSAGES/easytag.mo
 share/locale/he/LC_MESSAGES/easytag.mo
@@ -50,6 +53,7 @@ share/locale/sl/LC_MESSAGES/easytag.mo
 share/locale/sr/LC_MESSAGES/easytag.mo
 share/locale/sr@latin/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
+share/locale/te/LC_MESSAGES/easytag.mo
 share/locale/tr/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/locale/zh_CN/LC_MESSAGES/easytag.mo
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index f7d4e867e41..f13baa1cba8 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2014/02/20 07:56:02 wiz Exp $
+$NetBSD: distinfo,v 1.37 2014/04/12 06:45:31 wiz Exp $
 
-SHA1 (easytag-2.1.10.tar.xz) = 9176c300d3c12e51a1060f3fa0c2fb4fac6636ce
-RMD160 (easytag-2.1.10.tar.xz) = 8fcea42d21256b69ed3a85928c3078537cd77ff2
-Size (easytag-2.1.10.tar.xz) = 927332 bytes
+SHA1 (easytag-2.2.0.tar.xz) = 018e9efed5d7d561472098ccdc1140d16a647be8
+RMD160 (easytag-2.2.0.tar.xz) = 68dc19fc3975780f21795e0cd628702cf484f540
+Size (easytag-2.2.0.tar.xz) = 949080 bytes
diff --git a/audio/easytag/options.mk b/audio/easytag/options.mk
index 1a650513c95..c69480c3574 100644
--- a/audio/easytag/options.mk
+++ b/audio/easytag/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2013/02/11 08:56:40 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2014/04/12 06:45:31 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.easytag
-PKG_SUPPORTED_OPTIONS=	flac ogg speex wavpack
-PKG_SUGGESTED_OPTIONS=	flac ogg speex wavpack
+PKG_SUPPORTED_OPTIONS=	flac ogg opus speex wavpack
+PKG_SUGGESTED_OPTIONS=	flac ogg opus speex wavpack
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,6 +21,14 @@ CONFIGURE_ARGS+=	--enable-ogg
 CONFIGURE_ARGS+=	--disable-ogg
 .endif
 
+.if !empty(PKG_OPTIONS:Mopus)
+.  include "../../audio/libopus/buildlink3.mk"
+.  include "../../audio/opusfile/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-opus
+.else
+CONFIGURE_ARGS+=	--disable-opus
+.endif
+
 .if !empty(PKG_OPTIONS:Mspeex)
 .  include "../../audio/speex/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-speex