Update to 2.0, based on audio/easytag-devel.

Changes to previous version in easytag-devel (1.99.13):

2.0 - February 21th, 2007 :
===========================
    * Added buttons in toolbar to search files, to search in cddb and to write
      playlist,
    * Added in the cddb window the option to match lines with the Levenshtein
      algorithm,
    * Fixed crash when no audio player is defined and problem of checking in the
      preferences window,
    * Added automatically removing of APE tag in a MP3 file,
    * Improved decoding of Arabic characters,
    * Added French Users Guide (Than to Emmanuel Brun),
    * Swedish translation updated (thanks to Anders Strömer),
    * Brazilian Portuguese translation updated (thanks to doutor.zero),
    * Czech translation updated (thanks to Zbynek Mrkvicka),
    * German translation updated (thanks to Götz Waschk),
    * Italian translation updated (thanks to Costantino Ceoldo),
    * Japanese translation updated (thanks to Takeshi Aihana),
    * French translation updated and typo fixed (thanks to Emmanuel Brun).


    Windows version :
    * Fixed autocompletion of year when a partial one was entered,
    * Fixed crash when no audio player selected in preferences window,
    * Improved detection of the locale.

6 files changed, 75 insertions, 169 deletions

diff --git a/audio/easytag/DESCR b/audio/easytag/DESCR
index b49ceaa4e0d..9e8e2cb3c9b 100644
--- a/audio/easytag/DESCR
+++ b/audio/easytag/DESCR
@@ -1,22 +1,24 @@
-EasyTAG is a utility for easily and quickly viewing, editing and writing
-the ID3 tags of your MP3 files, using a nice GTK+ interface.
+EasyTAG is an utility to easily and quickly view, edit and write your audio
+files' tags from a nice GTK+ interface.
 
-Some of EasyTAG's features:
-o View, edit, write tags of MP3, MP2, FLAC files (supporting
-  ID3v2.3 and ID3v1.x specifications) and OGG files
-o Auto tagging: parse filename and directory to complete
-  automatically the fields (using masks)
-o Ability to rename files from the tag (using masks) or by
-  loading a txt file
-o Process all files of the selected directory
-o Ability to browse subdirectories
+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 Read file header informations (bitrate, time, ...) and display them
-o Auto completion of the date if a partial is entered
-o Undo last changes
-o Ability to process fields of tag and file name (convert letters
-  into uppercase, downcase, ...)
-o A tree based browser
-o A list to select files
-o A playlist generator window
-o A file searching window
+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 A playlist generator window.
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index d33d8eaad0e..95df38f61ae 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,24 +1,28 @@
-# $NetBSD: Makefile,v 1.54 2007/01/12 20:16:04 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2007/02/27 09:58:49 wiz Exp $
 #
 
-DISTNAME=	easytag-1.1
-PKGREVISION=	2
+DISTNAME=	easytag-2.0
 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=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
+COMMENT=	GTK+ tag editor for MP3, Ogg Vorbis files, and others
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		gmake xgettext
-USE_PKGLOCALEDIR=	yes
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config xgettext
+
+.include "options.mk"
+
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.1
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.1
 
-.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index c12c0c2d1c3..4e1f2cbad40 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.14 2007/02/22 19:01:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/02/27 09:58:49 wiz Exp $
 bin/easytag
 man/man1/easytag.1
 share/applications/easytag.desktop
 share/easytag/ChangeLog
 share/easytag/EasyTAG_logo.xpm
+share/locale/bg/LC_MESSAGES/easytag.mo
 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/es/LC_MESSAGES/easytag.mo
 share/locale/fr/LC_MESSAGES/easytag.mo
 share/locale/hu/LC_MESSAGES/easytag.mo
@@ -14,10 +16,13 @@ share/locale/it/LC_MESSAGES/easytag.mo
 share/locale/ja/LC_MESSAGES/easytag.mo
 share/locale/nl/LC_MESSAGES/easytag.mo
 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/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
+share/locale/zh_CN/LC_MESSAGES/easytag.mo
 share/pixmaps/EasyTAG.xpm
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/easytag
-@comment in xdg-x11-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 81ea2417fa2..efc1f0f15c8 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.24 2007/01/12 20:16:04 wiz Exp $
+$NetBSD: distinfo,v 1.25 2007/02/27 09:58:49 wiz Exp $
 
-SHA1 (easytag-1.1.tar.bz2) = 2441ab3ccb80f9b8d9301c1cd302670c10782d1a
-RMD160 (easytag-1.1.tar.bz2) = 997fda51f555743b8a9647fc6bba9b40f704991a
-Size (easytag-1.1.tar.bz2) = 1112302 bytes
-SHA1 (patch-aa) = c6c91e6d9369c1830e20cd9412272617c08cbc1f
+SHA1 (easytag-2.0.tar.bz2) = 07d38a9192d4759904c2aec0530efa82c683af76
+RMD160 (easytag-2.0.tar.bz2) = 11fe2acea3c0c017ed904eb1171669024ab54301
+Size (easytag-2.0.tar.bz2) = 2889829 bytes
diff --git a/audio/easytag/options.mk b/audio/easytag/options.mk
new file mode 100644
index 00000000000..e428f0fb718
--- /dev/null
+++ b/audio/easytag/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2007/02/27 09:58:49 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.easytag-gtk2
+PKG_SUPPORTED_OPTIONS=	flac mpeg4ip ogg
+PKG_SUGGESTED_OPTIONS=	flac mpeg4ip ogg
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mflac)
+.  include "../../audio/flac/buildlink3.mk"
+.  include "../../audio/libvorbis/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-flac
+.else
+CONFIGURE_ARGS+=	--disable-flac
+.endif
+
+.if !empty(PKG_OPTIONS:Mmpeg4ip)
+.include "../../multimedia/libmp4v2/buildlink3.mk"
+# for mpeg4ip.h
+CPPFLAGS+=		-DHAVE_GTK
+.endif
+
+.if !empty(PKG_OPTIONS:Mogg)
+.  include "../../audio/libvorbis/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-ogg
+.else
+CONFIGURE_ARGS+=	--disable-ogg
+.endif
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
deleted file mode 100644
index cd0ed505b6e..00000000000
--- a/audio/easytag/patches/patch-aa
+++ /dev/null
@@ -1,132 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2007/01/12 20:16:04 wiz Exp $
-
---- src/flac_header.c.orig	2004-01-22 22:17:10.000000000 +0000
-+++ src/flac_header.c
-@@ -40,6 +40,13 @@
- #include "misc.h"
- #include "i18n.h"
- 
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+/* by LEGACY_FLAC we mean pre-FLAC 1.1.3; in FLAC 1.1.3 the FLAC__FileDecoder was merged into the FLAC__StreamDecoder  */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
- 
- 
- 
-@@ -75,9 +82,15 @@ static unsigned reservoir_samples_ = 0;
- /**************
-  * Prototypes *
-  **************/
-+#ifdef LEGACY_FLAC
- static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
- static void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
- static void error_callback_   (const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback_   (const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#endif
- 
- 
- 
-@@ -95,7 +108,11 @@ gboolean Flac_Header_Read_File_Info (gch
-     gdouble duration = 0;
-     gulong filesize;
- 
-+#ifdef LEGACY_FLAC
-     FLAC__FileDecoder *tmp_decoder;
-+#else
-+    FLAC__StreamDecoder *tmp_decoder;
-+#endif
-     file_info_struct tmp_file_info;
- 
- 
-@@ -110,11 +127,16 @@ gboolean Flac_Header_Read_File_Info (gch
-     fclose(file);
- 
-     /* Decoding FLAC file */
-+#ifdef LEGACY_FLAC
-     tmp_decoder = FLAC__file_decoder_new();
-+#else
-+    tmp_decoder = FLAC__stream_decoder_new();
-+#endif
-     if(tmp_decoder == 0)
-         return FALSE;
- 
-     tmp_file_info.abort_flag = false;
-+#ifdef LEGACY_FLAC
-     FLAC__file_decoder_set_md5_checking     (tmp_decoder, false);
-     FLAC__file_decoder_set_filename         (tmp_decoder, filename);
-     FLAC__file_decoder_set_write_callback   (tmp_decoder, write_callback_);
-@@ -123,7 +145,13 @@ gboolean Flac_Header_Read_File_Info (gch
-     FLAC__file_decoder_set_client_data      (tmp_decoder, &tmp_file_info);
-     if(FLAC__file_decoder_init(tmp_decoder) != FLAC__FILE_DECODER_OK)
-         return FALSE;
-+#else
-+    FLAC__stream_decoder_set_md5_checking     (tmp_decoder, false);
-+    if(FLAC__stream_decoder_init_file(tmp_decoder, filename, write_callback_, metadata_callback_, error_callback_, &tmp_file_info) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+        return FALSE;
-+#endif
- 
-+#ifdef LEGACY_FLAC
-     // In FLAC 1.0.3, is used : FLAC__file_decoder_process_metadata
-     // In FLAC 1.0.4, is used : FLAC__file_decoder_process_until_end_of_metadata
- #if ( (LIBFLAC_MAJOR <= 1) && (LIBFLAC_MINOR <= 0) && (LIBFLAC_PATCH <= 3) )
-@@ -131,10 +159,18 @@ gboolean Flac_Header_Read_File_Info (gch
- #else
-     if(!FLAC__file_decoder_process_until_end_of_metadata(tmp_decoder)) // FLAC 1.0.4 (Bastian Kleineidam)
- #endif
-+#else
-+    if(!FLAC__stream_decoder_process_until_end_of_metadata(tmp_decoder))
-+#endif
-         return FALSE;
- 
-+#ifdef LEGACY_FLAC
-     FLAC__file_decoder_finish(tmp_decoder);
-     FLAC__file_decoder_delete(tmp_decoder);
-+#else
-+    FLAC__stream_decoder_finish(tmp_decoder);
-+    FLAC__stream_decoder_delete(tmp_decoder);
-+#endif
-     /* End of decoding FLAC file */
- 
- 
-@@ -154,7 +190,11 @@ gboolean Flac_Header_Read_File_Info (gch
- 
- 
- 
-+#ifdef LEGACY_FLAC
- FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
-     file_info_struct *file_info = (file_info_struct *)client_data;
-     const unsigned bps = file_info->bits_per_sample, channels = file_info->channels, wide_samples = frame->header.blocksize;
-@@ -187,7 +227,11 @@ FLAC__StreamDecoderWriteStatus write_cal
-     return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
- 
-+#ifdef LEGACY_FLAC
- void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
-     file_info_struct *file_info = (file_info_struct *)client_data;
-     (void)decoder;
-@@ -212,7 +256,11 @@ void metadata_callback_(const FLAC__File
-     }
- }
- 
-+#ifdef LEGACY_FLAC
- void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {
-     file_info_struct *file_info = (file_info_struct *)client_data;
-     (void)decoder;