Update to 0.15. Lots of changes, most important of which is partial ID3v2

support via id3lib.

6 files changed, 69 insertions, 22 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index a10af1dd147..f1958e29481 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/06/16 19:51:51 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/03 17:07:24 wiz Exp $
 #
 
-DISTNAME=	easytag-0.11
+DISTNAME=	easytag-0.15
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 
@@ -9,12 +9,11 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	Tool to view, edit and write ID3 v1 TAGs with a GTK+ interface
 
-DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
-
 USE_GMAKE=	yes
 #USE_LIBINTL=	yes
 USE_X11BASE=	yes
 
+.include "../../audio/id3lib/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 048ad31f0c1..1a0eee24318 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/06/16 19:51:51 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/03 17:07:24 wiz Exp $
 
-SHA1 (easytag-0.11.tar.gz) = b111566c7642ce692217c0f80a1ccea91944a632
-Size (easytag-0.11.tar.gz) = 284140 bytes
-SHA1 (patch-aa) = ef834386a8b0c5201b673d0c78b2073de0e7815c
+SHA1 (easytag-0.15.tar.gz) = 37d76233b1969356a017af5b15b12c01fa3a61fb
+Size (easytag-0.15.tar.gz) = 372263 bytes
+SHA1 (patch-aa) = 9d56354744c14ee691c8313f9f50eebd49c5f7c0
+SHA1 (patch-ab) = f6e547a2f6d972bc2eb905496f8fe290c6a08e9f
+SHA1 (patch-ac) = 0bf5eefca8deee1a1e037a8b7dfb423f816550ce
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
index 5bbca2dcd01..a8409229fd3 100644
--- a/audio/easytag/patches/patch-aa
+++ b/audio/easytag/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/06/16 19:51:51 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/03 17:07:25 wiz Exp $
 
---- Makefile.orig	Thu Oct 26 15:18:35 2000
-+++ Makefile	Fri Jun 15 02:04:42 2001
-@@ -11,17 +11,14 @@
+--- Makefile.orig	Tue Jul 17 18:56:02 2001
++++ Makefile
+@@ -14,16 +14,14 @@
  
  
  # Installation prefix dirctory:
@@ -10,21 +10,21 @@ $NetBSD: patch-aa,v 1.5 2001/06/16 19:51:51 jlam Exp $
  BINDIR	= $(PREFIX)/bin
  
  
--CC	= gcc
--GLIBS	= `gtk-config --libs`
--GFLAGS	= `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
--OPT	= -g -Wall -O2
+-CC        = gcc
+-GLIBS     = `gtk-config --libs`
+-GFLAGS    = `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
+-OPT       = -g -Wall -O2 #-mpentium #-pedantic
+-MAKE      = make
+-LOCALEDIR = $(PREFIX)/share/locale
 +GLIBS = ${LDFLAGS} `${GTK_CONFIG} --libs` -lintl
 +GFLAGS	= ${CFLAGS} `${GTK_CONFIG} --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
 +OPT   = -Wall
- #ID3_LIB = -lid3
--MAKE	= make
--LOCALEDIR = $(PREFIX)/share/locale
++#ID3_LIB = -lid3
 +LOCALEDIR = $(PREFIX)/${PKGLOCALEDIR}/locale
  
- # The dir where are located pixmaps, logo
+ # The directory where are located pixmaps, logo
  DATA_DIR = -DPACKAGE_DATA_DIR=\"${PACKAGE_DATA_DIR}\"
-@@ -37,10 +34,12 @@
+@@ -39,10 +37,12 @@
  install:
  	$(MAKE) install -C src
  	[ -z "$(NLS)" ] || $(MAKE) install -C po
diff --git a/audio/easytag/patches/patch-ab b/audio/easytag/patches/patch-ab
new file mode 100644
index 00000000000..71d31ad59e3
--- /dev/null
+++ b/audio/easytag/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2001/08/03 17:07:25 wiz Exp $
+
+--- src/Makefile.orig	Tue Mar 13 21:57:31 2001
++++ src/Makefile
+@@ -23,7 +23,7 @@
+ 	$(CC) $(GFLAGS) $(OPT) -c $<
+ 
+ $(BINARY): $(OBJS)
+-	$(CC) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY)
++	$(CC) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -lz -lstdc++ -o $(BINARY)
+ 
+ 
+ 
diff --git a/audio/easytag/patches/patch-ac b/audio/easytag/patches/patch-ac
new file mode 100644
index 00000000000..99a19b45101
--- /dev/null
+++ b/audio/easytag/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 2001/08/03 17:07:26 wiz Exp $
+
+--- src/id3tag.c.orig	Mon Jul 16 22:17:08 2001
++++ src/id3tag.c
+@@ -1033,25 +1033,5 @@
+  */
+ ID3_C_EXPORT size_t my_ID3Field_GetASCII(const ID3Field *field, char *buffer, size_t maxChars, index_t itemNum)
+ {
+-#    if (ID3LIB_MAJOR_VERSION >= 3)
+-#        if (ID3LIB_MINOR_VERSION <= 7)
+-//#            if (ID3LIB_PATCH_VERSION <= 12)
+-                 // (<= to 3.7.12)
+-                 return ID3Field_GetASCII(field,buffer,MAX_STRING_LEN,itemNum);
+-//                 return ID3Field_GetASCII(field,buffer,MAX_STRING_LEN,1);
+-//#            else
+-                 // (>= to 3.7.13)
+-//                 return ID3Field_GetASCII(field,buffer,MAX_STRING_LEN,0);
+-//#            endif
+-#        elif (ID3LIB_MINOR_VERSION >= 8)
+-             // (>= to 3.8.x)
+              return ID3Field_GetASCII(field,buffer,MAX_STRING_LEN);
+-//#        else
+-             // Not tested (< 3.7.x)
+-//             return ID3Field_GetASCII(field,buffer,MAX_STRING_LEN,1);
+-#        endif
+-#    else
+-         // Not tested (< 3.x.x)
+-         return ID3Field_GetASCII(field,buffer,MAX_STRING_LEN,itemNum);
+-#    endif
+ }
diff --git a/audio/easytag/pkg/PLIST b/audio/easytag/pkg/PLIST
index 5d1196d8d2b..2b3de375898 100644
--- a/audio/easytag/pkg/PLIST
+++ b/audio/easytag/pkg/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2001/06/16 14:52:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/08/03 17:07:26 wiz Exp $
 bin/easytag
 share/easytag/EasyTAG_logo.xpm
 share/gnome/apps/Multimedia/easytag.desktop
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/easytag.mo