Update to 0.26:

* Fixed filepointers leaks when ID3v2 tag is missing for files using ID3 tags
  (thanks to Martijn van Buul),
* NetBSD patches from Thomas Klausner,
* Some bugfixes in the CDDB search,
* Updated character conversion for CD-Rom filesystems,
* Fixed a crash when applying the CDDB result to a list with less files,
* Fixed a memory bug when using the menu entry 'Reload the directory',
* Added a man page (thanks to George Pauliuc),
* When sorting the files, they are sorted also by ascending filename by default,
* When tag entries have the focus, PageUp and PageDown keys select the previous
  or the next file,
* Polish translation updated (thanks to Maciej Kasprzyk),
* Italian translation updated (thanks to Lorenzo Cappelletti),
* Ukrainian translation updated (thanks to Cawko Xakep).

7 files changed, 9 insertions, 272 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 08eeb6185b2..b6cc59f4c1b 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2002/12/23 20:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/03 15:24:57 wiz Exp $
 #
 
-DISTNAME=	easytag-0.25
-PKGNAME=	easytag-0.25.0.2
-PKGREVISION=	1
+DISTNAME=	easytag-0.26
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 
@@ -15,12 +13,13 @@ BUILD_USES_MSGFMT=	yes				# xgettext, really
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_X11BASE=		yes
+USE_X11=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+#.include "../../audio/flac/buildlink2.mk"
 .include "../../audio/id3lib/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index cb0adda8b89..3f5e45a36bd 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2002/12/17 19:40:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/03 15:24:57 wiz Exp $
 bin/easytag
+man/man1/easytag.1
 share/easytag/EasyTAG_logo.xpm
 share/gnome/apps/Multimedia/easytag.desktop
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/easytag.mo
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 9fc47926674..51784afd0cb 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/12/23 20:54:41 wiz Exp $
+$NetBSD: distinfo,v 1.10 2003/01/03 15:24:58 wiz Exp $
 
-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
-SHA1 (patch-ad) = 29561441a4d417c0627be1d6cd7b87638733a540
+SHA1 (easytag-0.26.tar.gz) = 34c6e7803eb06bf2f291a7e513dddfa2e6220a91
+Size (easytag-0.26.tar.gz) = 1310948 bytes
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
deleted file mode 100644
index b612468b0be..00000000000
--- a/audio/easytag/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/12/17 19:40:08 wiz Exp $
-
---- configure.orig	Mon Nov 11 11:19:08 2002
-+++ configure
-@@ -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;
--    output=fopen("conftest.id3","w");
-+    output=fopen("/tmp/id3test.id3","w");
-     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);
-@@ -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
--  . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
-+  . /tmp/id3test.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
diff --git a/audio/easytag/patches/patch-ab b/audio/easytag/patches/patch-ab
deleted file mode 100644
index 76519618a38..00000000000
--- a/audio/easytag/patches/patch-ab
+++ /dev/null
@@ -1,193 +0,0 @@
-$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
deleted file mode 100644
index c75ed678f4f..00000000000
--- a/audio/easytag/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
diff --git a/audio/easytag/patches/patch-ad b/audio/easytag/patches/patch-ad
deleted file mode 100644
index c122b1e8ac2..00000000000
--- a/audio/easytag/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/12/23 20:54:43 wiz Exp $
-
---- src/id3_tag.c.orig	Sat Oct  5 23:32:43 2002
-+++ src/id3_tag.c
-@@ -807,12 +807,15 @@ gint Id3tag_Get_Id3v2_Version (gchar *fi
-     if ( filename!=NULL && (file=fopen(filename,"r"))!=NULL )
-     {
-         fseek(file,0,SEEK_SET);
--        if (fread(tmp,1,4, file) != 4)
-+        if (fread(tmp,1,4, file) != 4) {
-+	    fclose(file);
-             return -1;
-+	}
-+
-+	fclose(file);
- 
-         if (tmp[0] == 'I' && tmp[1] == 'D' && tmp[2] == '3' && tmp[3] < 0xFF)
-         {
--            fclose(file);
-             return (gint)tmp[3];
-         }else
-         {