Update to 0.25b (including the patches for 0.25a and 0.25b in patches/).

* Ability to stop the saving of all files,
* Improvement of the directory browser, when renaming a directory,
* Ability to set also the filename from CDDB results,
* Ability to search a word in the album list of the CDDB window,
* Don't loose unsupported tag items for the Ogg files,
* Added CDDB support (from http protocol),
* New possibilities for sorting the list of files (type, size, duration, birate, ...),
* Old versions of ID3v2 tags are automatically updated to ID3v2.3,
* Fixed renaming files or directories (the old method was better than the newer one,
  with patch from Alan Swanson),
* Use of 'mkstemp' instead of 'mktemp',
* Added ability to open a file with an external program,
* Added ability to use arguments when opening a directory or a file with an external
  program (for example : 'xmms -e'),
* Some fixes when deleting files : the total size and total duration are updated,
* Invalid characters are replaced when renaming the file from the scanner,
* Re-added preprocessor instructions in the file vcedit.h (forgotten when updating this
  file from vorbis-tools-1.0),
* Fix for an unsupported ID3v2 tag : we get data of the ID3v1 tag (for example: ID3v2.4
  tag with id3lib-3.8.0),
* Added check of validity of playlist content mask,
* Fixed reading of informations of mpeg header, and calculation of song time, with files
  containing an ID3v2 tag (patch from Artur Polaczynski),
* Fixed the popup menu in entries field : now we don't need to click two times the left
  mouse button (patch from Maciej Kasprzyk),
* Corrections in text menu (thanks to Artur Polaczynski),
* Fixed renaming of directory,
* Number of files to save is displayed in the progress bar,
* Code clean up for scanners,
* Various fixes,
* Logo "updated",
* translation updates

6 files changed, 231 insertions, 12 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index e2c471aa491..054995a9eda 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2002/12/10 17:59:39 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2002/12/17 19:40:07 wiz Exp $
 #
 
-DISTNAME=	easytag-0.23.2
+DISTNAME=	easytag-0.25
+PKGNAME=	easytag-0.25.0.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 
@@ -16,7 +17,7 @@ USE_GMAKE=		yes
 USE_X11BASE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../audio/id3lib/buildlink2.mk"
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index abb8a6bbdd8..cb0adda8b89 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/09 21:53:52 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/12/17 19:40:07 wiz Exp $
 bin/easytag
 share/easytag/EasyTAG_logo.xpm
 share/gnome/apps/Multimedia/easytag.desktop
@@ -11,6 +11,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/easytag.mo
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 6f78222a5e2..b54eb4b225f 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/09/02 17:42:40 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/12/17 19:40:08 wiz Exp $
 
-SHA1 (easytag-0.23.2.tar.gz) = 2da05154fb5c3fbeea4ce1d3b0914e2e0ee4be07
-Size (easytag-0.23.2.tar.gz) = 1127801 bytes
-SHA1 (patch-aa) = c964640b93e8dfa0890932e3d68b3773ab9dbdde
+SHA1 (easytag-0.25.tar.gz) = 94b6bb5d921b278b1c0d3160e965a7908107f326
+Size (easytag-0.25.tar.gz) = 1296908 bytes
+SHA1 (patch-aa) = 0fbc6e7157de80c80a3d437dffc55b1d1bac9337
+SHA1 (patch-ab) = 9ba424262c5d035d1407f1cae941a9ff4e2b0480
+SHA1 (patch-ac) = d997763e09fe36d64b96c77c0290ba7b852590ef
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
index dec754c1e0b..b612468b0be 100644
--- a/audio/easytag/patches/patch-aa
+++ b/audio/easytag/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2002/08/31 02:14:39 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2002/12/17 19:40:08 wiz Exp $
 
---- configure.orig	Sat Aug 31 03:46:09 2002
+--- configure.orig	Mon Nov 11 11:19:08 2002
 +++ configure
-@@ -8016,7 +8016,7 @@ int
+@@ -1373,7 +1373,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ PACKAGE=easytag
+-VERSION=0.25
++VERSION=0.25b
+ 
+ ALL_LINGUAS="cs de es fr hu it ja nl pl ro ru sv uk"
+ 
+@@ -8312,7 +8312,7 @@ int
  main ()
  {
      FILE *output;
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.7 2002/08/31 02:14:39 wiz Exp $
      fprintf(output,"ID3LIB_MAJOR=%d\nID3LIB_MINOR=%d\nID3LIB_PATCH=%d\n",ID3LIB_MAJOR_VERSION,ID3LIB_MINOR_VERSION,ID3LIB_PATCH_VERSION);
      fclose(output);
      exit(0);
-@@ -8034,7 +8034,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8330,7 +8330,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/audio/easytag/patches/patch-ab b/audio/easytag/patches/patch-ab
new file mode 100644
index 00000000000..76519618a38
--- /dev/null
+++ b/audio/easytag/patches/patch-ab
@@ -0,0 +1,193 @@
+$NetBSD: patch-ab,v 1.3 2002/12/17 19:40:08 wiz Exp $
+
+--- src/cddb.c.orig	Sun Nov 10 15:42:26 2002
++++ src/cddb.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+ #include <errno.h>
+ 
+@@ -80,6 +81,7 @@ gint Cddb_Open_Connection  (gchar *host,
+ void Cddb_Close_Connection (gint socket_id);
+ gint Cddb_Read_Line        (gint socket_id, gchar *cddb_out);
+ gint Cddb_Read_Http_Header (gint socket_id, gchar *cddb_out);
++gint Cddb_Read_Cddb_Header (gint socket_id, gchar *cddb_out);
+ 
+ gboolean Cddb_Search_Album_List_From_String (void);
+ gboolean Cddb_Get_Album_Tracks_List        (GtkCList *clist, gint row, gint column);
+@@ -837,7 +839,7 @@ gint Cddb_Open_Connection (gchar *host, 
+     bzero((void *)&sockaddr,sizeof(sockaddr)); // Initialize with zero
+     memcpy(&sockaddr.sin_addr.s_addr,*(hostent->h_addr_list),sizeof(sockaddr.sin_addr.s_addr));
+     sockaddr.sin_family = AF_INET;
+-    sockaddr.sin_port   = g_htons(port);
++    sockaddr.sin_port   = htons(port);
+ 
+     // Create socket
+     if( (socket_id = socket(AF_INET,SOCK_STREAM,0)) < 0 )
+@@ -893,14 +895,14 @@ void Cddb_Close_Connection (gint socket_
+  * Read one line (of the connection) into cddb_out. And return the number of bytes read.
+  * If bytes_read=0 => no more data.
+  *
+- * Server answser is like this :
++ * Server answser is formated like this :
+  *
+- * HTTP/1.1 200 OK\r\n
+- * Server: Apache/1.3.19 (Unix) PHP/4.0.4pl1\r\n
+- * Connection: close\r\n
++ * HTTP/1.1 200 OK\r\n                              }
++ * Server: Apache/1.3.19 (Unix) PHP/4.0.4pl1\r\n    } "Header"
++ * Connection: close\r\n                            }
+  * \r\n
+- * <html>\n
+- * [...]
++ * <html>\n                                         }
++ * [...]                                            } "Body"
+  */
+ gint Cddb_Read_Line (gint socket_id, gchar *cddb_out)
+ {
+@@ -931,24 +933,57 @@ gint Cddb_Read_Line (gint socket_id, gch
+     return bytes_returned;
+ }
+ 
++
+ /*
++ * Read HTTP header data : from "HTTP/1.1 200 OK" to the blank line
++ */
++
+ gint Cddb_Read_Http_Header (gint socket_id, gchar *cddb_out)
+ {
+     gint bytes_returned = 0;
+     gint bytes_read;
+     
++    if ( (bytes_read=Cddb_Read_Line(socket_id,cddb_out)) < 0 )
++        return -1; // Error!
++    // First line must be "HTTP/1.1 200 OK"
++    if ( strncmp("HTTP",cddb_out,4)!=0 || strstr(cddb_out,"200 OK")==NULL )
++        return -1;
++    // Read until end of the http header
++    while ( (bytes_read=Cddb_Read_Line(socket_id,cddb_out)) > 0 && strlen(cddb_out) > 0 )
++        bytes_returned += bytes_read;
++
++    return bytes_returned;
++}
++
++
++/*
++ * Read CDDB header data when requesting a file (cmd=cddb+read+<album genre>+<discid>)
++ * Must be read after the HTTP header.
++ * Take one line like this : "210 rock 780dfe09 CD database entry follows (until terminating `.')"
++ */
++
++gint Cddb_Read_Cddb_Header (gint socket_id, gchar *cddb_out)
++{
++    gint bytes_read;
++    
++    if ( (bytes_read=Cddb_Read_Line(socket_id,cddb_out)) < 0 )
++        return -1; // Error!
++
++    // Some request receive some strange data at the beginning (2 or 3 characters)... so we read one line more...
++    if ( !cddb_out || strlen(cddb_out) < 10 )
+         if ( (bytes_read=Cddb_Read_Line(socket_id,cddb_out)) < 0 )
+             return -1; // Error!
+-        // First line must be "HTTP/1.1 200 OK"
+-        if ( strncmp("HTTP",cddb_out,4)!=0 )
+-            return bytes_returned;
+-        // Read until end of the http header
+-        while ( (bytes_read=Cddb_Read_Line(socket_id,cddb_out)) > 0 )
+-            bytes_returned += bytes_read;
++    
++    // Read the line
++    // 200 - exact match
++    // 210 - multiple exact matches
++    // 211 - inexact match
++    if ( cddb_out[0] != '2' )
++        return -1;
+ 
+-    return bytes_returned;
++    return bytes_read;
+ }
+-*/
++
+ 
+ 
+ /*
+@@ -1245,15 +1280,15 @@ gboolean Cddb_Search_Album_List_From_Str
+     while (gtk_events_pending()) gtk_main_iteration();
+     cddb_out = g_malloc0(CDDB_ANSWER_LINE_SIZE+1);
+     // Parse server answer : Check returned code in the first line
+-    bytes_read_total = bytes_read = Cddb_Read_Line(socket_id,cddb_out);
+-    if ( !cddb_out || bytes_read <= 0 || strncmp(cddb_out,"HTTP/1.1 200 OK",15) != 0 )
++    if ( !cddb_out || (bytes_read=Cddb_Read_Http_Header(socket_id,cddb_out)) <= 0 )
+     {
+-        msg = g_strdup(_("The server returned a wrong answer!"));
++        msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+         g_print("%s\n",msg);
+         g_free(msg);
+         return FALSE;
+     }
++    bytes_read_total = bytes_read;
+ 
+     // Read other lines,and get list of matching albums
+     // Composition of a line : 
+@@ -1353,9 +1388,8 @@ gboolean Cddb_Get_Album_Tracks_List (Gtk
+     gint   socket_id;
+     CddbAlbum *cddbalbum = NULL;
+     GList *TrackOffsetList = NULL;
+-    gchar *cddb_in;
+-    gchar *cddb_out;
+-    gint   bytes_written, bytes_read;
++    gchar *cddb_in, *cddb_out, *msg;
++    gint   bytes_written, bytes_read, bytes_read1, bytes_read_total;
+     gboolean read_track_offset = FALSE;
+ 
+ 
+@@ -1405,19 +1439,27 @@ gboolean Cddb_Get_Album_Tracks_List (Gtk
+     gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Receptionning data ..."));
+     while (gtk_events_pending()) gtk_main_iteration();
+     cddb_out = g_malloc0(CDDB_ANSWER_LINE_SIZE+1);
+-    // Parse server answer : Check returned code in the first line
+-    bytes_read = Cddb_Read_Line(socket_id,cddb_out);
+-    if ( !cddb_out || bytes_read <= 0 || strncmp(cddb_out,"HTTP/1.1 200 OK",15) != 0 )
++    // Parse server answer : Check HTTP Header and CDDB Header
++    if ( !cddb_out
++         || (bytes_read =Cddb_Read_Http_Header(socket_id,cddb_out)) <= 0
++         || (bytes_read1=Cddb_Read_Cddb_Header(socket_id,cddb_out)) <= 0 )
+     {
+-        gchar *msg = g_strdup(_("The server returned a wrong answer!"));
++        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+         g_print("%s\n",msg);
+         g_free(msg);
+         return FALSE;
+     }
++    bytes_read_total = bytes_read + bytes_read1;
+ 
+     while ( !CddbStopSearch && (bytes_read=Cddb_Read_Line(socket_id,cddb_out)) > 0 )
+     {
++        bytes_read_total += bytes_read;
++        msg = g_strdup_printf(_("Receptionning data (%s) ..."),Convert_Size_1(bytes_read_total));
++        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
++        while (gtk_events_pending()) gtk_main_iteration();
++        g_free(msg);
++
+         if (!cddb_out) continue; // Empty line?
+         //g_print("%s\n",cddb_out);
+ 
+@@ -1581,12 +1623,11 @@ gboolean Cddb_Set_Track_Infos_To_File_Li
+ 
+     for (clist_row=0;clist_row<GTK_CLIST(CddbTrackCList)->rows;clist_row++)
+     {
+-        ET_File *etfile;
+         CddbTrackAlbum *cddbtrackalbum = NULL;
+         cddbtrackalbum = gtk_clist_get_row_data(GTK_CLIST(CddbTrackCList),clist_row);
+-        etfile = (ET_File *)etfilelist->data;
+         if (cddbtrackalbum && etfilelist)
+         {
++            ET_File   *etfile   = (ET_File *)etfilelist->data;
+             File_Name *FileName = ET_File_Name_Item_New();
+             File_Tag  *FileTag  = ET_File_Tag_Item_New();
+             ET_Copy_File_Tag_Item(etfilelist->data,FileTag);
diff --git a/audio/easytag/patches/patch-ac b/audio/easytag/patches/patch-ac
new file mode 100644
index 00000000000..c75ed678f4f
--- /dev/null
+++ b/audio/easytag/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2002/12/17 19:40:08 wiz Exp $
+
+--- src/setting.c.orig	Sun Nov 10 15:34:57 2002
++++ src/setting.c
+@@ -46,7 +46,7 @@
+  ***************/
+ 
+ // Base directory created into home dir 
+-gchar *EASYTAG_DIR                                 = ".easytag/";
++gchar *EASYTAG_DIR                                 = ".easytag";
+ // File for configuration
+ gchar *CONFIG_FILE                                 = ".easytag/easytagrc";
+ // File of masks for tag scanner