Update to 2.1.7, the new stable version. Changes compared to

easytag-current (2.1.6):

2.1.7 - Jan 14th, 2012 :
========================
    * Gaute Amundsen's ConfirmWhenUnsavedFiles.patch
    * Mark Ferry's albumartist patch for ogg and flac
    * Götz Waschk's update for German translation
    * Kip's optimized base64 decoder for album art
    * Updated contributor credits
    * Debianized
    * Updated version to 2.1.7

6 files changed, 55 insertions, 47 deletions

diff --git a/audio/easytag/DESCR b/audio/easytag/DESCR
index 9e8e2cb3c9b..33916d0dca8 100644
--- a/audio/easytag/DESCR
+++ b/audio/easytag/DESCR
@@ -2,23 +2,26 @@ EasyTAG is an utility to easily and quickly view, edit and write your audio
 files' tags from a nice GTK+ interface.
 
 Its main features include:
-o View, edit and write tags of MP3, MP2 files (ID3 tag with pictures), FLAC
-  files (FLAC Vorbis tag), Ogg Vorbis files (Ogg Vorbis tag), MP4/AAC
-  (MP4/AAC tag), MusePack and Monkey's Audio files (APE tag).
-o Can edit many tag fields : Title, Artist, Album, Disc Album, Year, Track
-  Number, Genre, Comment, Composer, Original Artist/Performer, Copyright,
-  URL and Encoder name.
-o Auto tagging: parse file name and directory to automatically complete the
-  fields (using masks).
-o Ability to rename files and directories from the tag (using masks) or by
-  loading a text file.
-o Process all of the selected directory.
-o Recursion for tagging, removing, renaming, saving...
-o Can set a field (artist, title...) to all other files.
-o Read file header informations (bitrate, time...) and display them.
-o Auto completion of a date if a partial one is entered.
-o Ability to process fields of tag and file name (convert letters into
-  uppercase, downcase, ...).
-o CDDB support using Freedb.org servers (manual and automatic search).
-o A tree-based browser or a view by Artist & Album.
+o View, edit, write tags of MP3, MP2 files (ID3 tag with pictures).
+  FLAC files (FLAC Vorbis tag), Ogg Vorbis files (Ogg Vorbis tag).
+  MP4/AAC (MP4/AAC tag), MusePack, Monkey's Audio files, Speex,
+  and WavPack files (APE tag).
+o Auto tagging: parse filename and directory to complete automatically
+  the fields (using masks).
+o Ability to rename files and directories from the tag (using masks)
+  or by loading a text file.
+o Process selected files of the selected directory.
+o Recursion for tagging, removing, renaming, saving....
+o Can set a field (artist, title,...) to all other files.
+o Read file header informations (bitrate, time, ...) and display them.
+o Auto completion of the date if a partial is entered.
+o Undo and redo last changes.
+o Ability to process fields of tag and file name (convert letters
+  into uppercase, downcase, ...).
+o Ability to open a directory or a file with an external program.
+o CDDB support using Freedb.org and Gnudb.org servers (manual and
+  automatic search).
+o A tree based browser or a view by Artist & Album.
+o A list to select files.
 o A playlist generator window.
+o A file searching window.
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index a7304342059..6ff1576d266 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.71 2012/03/03 00:12:38 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2012/03/08 09:49:26 wiz Exp $
 #
 
-DISTNAME=	easytag-2.1
-PKGREVISION=	10
+DISTNAME=	easytag-2.1.7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	GTK+ tag editor for MP3, Ogg Vorbis files, and others
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -24,7 +24,8 @@ USE_TOOLS+=		pkg-config xgettext
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.1
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.1
 
-.include "../../audio/id3lib/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/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 90e89f1f82b..8e5337d8604 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 17:32:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2012/03/08 09:49:26 wiz Exp $
 bin/easytag
 man/man1/easytag.1
 share/applications/easytag.desktop
@@ -11,6 +11,7 @@ share/locale/de/LC_MESSAGES/easytag.mo
 share/locale/el/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
 share/locale/hu/LC_MESSAGES/easytag.mo
 share/locale/it/LC_MESSAGES/easytag.mo
 share/locale/ja/LC_MESSAGES/easytag.mo
@@ -19,7 +20,10 @@ share/locale/pl/LC_MESSAGES/easytag.mo
 share/locale/pt_BR/LC_MESSAGES/easytag.mo
 share/locale/ro/LC_MESSAGES/easytag.mo
 share/locale/ru/LC_MESSAGES/easytag.mo
+share/locale/sr/LC_MESSAGES/easytag.mo
+share/locale/sr@Latn/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/locale/zh_CN/LC_MESSAGES/easytag.mo
-share/pixmaps/EasyTAG.xpm
+share/locale/zh_TW/LC_MESSAGES/easytag.mo
+share/pixmaps/EasyTAG_icon.xpm
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 72e34018bed..3cd20fe3396 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.29 2007/11/21 21:47:25 drochner Exp $
+$NetBSD: distinfo,v 1.30 2012/03/08 09:49:26 wiz Exp $
 
-SHA1 (easytag-2.1.tar.bz2) = 6da0125ab0dcc7e7ecabe488147ecdf0e75f6f2a
-RMD160 (easytag-2.1.tar.bz2) = b553458c8cff008dd044412a95674aa26478b2eb
-Size (easytag-2.1.tar.bz2) = 2924032 bytes
-SHA1 (patch-aa) = bfb67a2d37317243f197f6a497fff67adf38df0b
+SHA1 (easytag-2.1.7.tar.bz2) = 7b56ba18be2f1bec0171e5de4447ba763a264f92
+RMD160 (easytag-2.1.7.tar.bz2) = abe8df519ed41b9424080d73cb16c4a75dcb511f
+Size (easytag-2.1.7.tar.bz2) = 3303491 bytes
diff --git a/audio/easytag/options.mk b/audio/easytag/options.mk
index a901e4051ea..7dea8ad70fe 100644
--- a/audio/easytag/options.mk
+++ b/audio/easytag/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2007/11/21 21:47:25 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2012/03/08 09:49:26 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.easytag
-PKG_SUPPORTED_OPTIONS=	flac mpeg4ip ogg
-PKG_SUGGESTED_OPTIONS=	flac mpeg4ip ogg
+PKG_SUPPORTED_OPTIONS=	flac mpeg4ip ogg speex wavpack
+PKG_SUGGESTED_OPTIONS=	flac mpeg4ip ogg speex wavpack
 
 .include "../../mk/bsd.options.mk"
 
@@ -27,3 +27,17 @@ CONFIGURE_ARGS+=	--enable-ogg
 .else
 CONFIGURE_ARGS+=	--disable-ogg
 .endif
+
+.if !empty(PKG_OPTIONS:Mspeex)
+.  include "../../audio/speex/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-speex
+.else
+CONFIGURE_ARGS+=	--disable-speex
+.endif
+
+.if !empty(PKG_OPTIONS:Mwavpack)
+.  include "../../audio/wavpack/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-wavpack
+.else
+CONFIGURE_ARGS+=	--disable-wavpack
+.endif
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
deleted file mode 100644
index 892fb95b6fb..00000000000
--- a/audio/easytag/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2007/11/21 21:47:25 drochner Exp $
-
---- src/mp4_tag.c.orig	2007-11-19 19:27:42.000000000 +0100
-+++ src/mp4_tag.c
-@@ -185,7 +185,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *fi
-      * Picture *
-      ***********/
-     // There is only one picture!
--    if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
-+    if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize, 0 ) )
-     {
-         Picture *pic = Picture_Allocate();
-         pic->size = coverSize;