Update to 0.23. Lots of changes since 0.15, too many to mention.

6 files changed, 37 insertions, 98 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 37575a0b341..68384bc169a 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2001/08/24 12:47:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/31 02:14:38 wiz Exp $
 #
 
-DISTNAME=	easytag-0.15
+DISTNAME=	easytag-0.23
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 
@@ -9,14 +9,16 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://easytag.sourceforge.net/
 COMMENT=	Tool to view, edit and write ID3 v1&2 TAGs with a GTK+ interface
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 BUILD_USES_MSGFMT=	yes				# xgettext, really
 USE_X11BASE=	yes
-USE_CONFIG_WRAPPER=	yes				# $GTK_CONFIG
+USE_BUILDLINK2=	yes
 
-.include "../../audio/id3lib/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
+.include "../../audio/id3lib/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
 
 MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index 68fba82b74d..ea42f2d0b00 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:28 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/31 02:14:38 wiz Exp $
 bin/easytag
 share/easytag/EasyTAG_logo.xpm
 share/gnome/apps/Multimedia/easytag.desktop
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/easytag.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/es/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
@@ -10,6 +12,7 @@ ${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
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/easytag.mo
 share/pixmaps/EasyTAG.xpm
 @unexec ${RMDIR} -p %D/share/pixmaps 2>/dev/null || true
 @unexec ${RMDIR} -p %D/share/gnome/apps/Multimedia 2>/dev/null || true
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 1a0eee24318..7c65f07f266 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2001/08/03 17:07:24 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/08/31 02:14:38 wiz Exp $
 
-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
+SHA1 (easytag-0.23.tar.gz) = 979cf450b15e7c6f4c12d19020804f77c12a6184
+Size (easytag-0.23.tar.gz) = 1085023 bytes
+SHA1 (patch-aa) = c964640b93e8dfa0890932e3d68b3773ab9dbdde
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
index a8409229fd3..dec754c1e0b 100644
--- a/audio/easytag/patches/patch-aa
+++ b/audio/easytag/patches/patch-aa
@@ -1,43 +1,22 @@
-$NetBSD: patch-aa,v 1.6 2001/08/03 17:07:25 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/31 02:14:39 wiz Exp $
 
---- Makefile.orig	Tue Jul 17 18:56:02 2001
-+++ Makefile
-@@ -14,16 +14,14 @@
- 
- 
- # Installation prefix dirctory:
--PREFIX	= /usr
- BINDIR	= $(PREFIX)/bin
- 
- 
--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
-+LOCALEDIR = $(PREFIX)/${PKGLOCALEDIR}/locale
- 
- # The directory where are located pixmaps, logo
- DATA_DIR = -DPACKAGE_DATA_DIR=\"${PACKAGE_DATA_DIR}\"
-@@ -39,10 +37,12 @@
- install:
- 	$(MAKE) install -C src
- 	[ -z "$(NLS)" ] || $(MAKE) install -C po
--	cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/
--	cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm
--	mkdir -p $(PREFIX)/share/easytag
--	cp -f pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/
-+	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/gnome/apps/Multimedia
-+	${BSD_INSTALL_DATA} easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/
-+	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/pixmaps
-+	${BSD_INSTALL_DATA} pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm
-+	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/easytag
-+	${BSD_INSTALL_DATA} pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/
- 	@echo "------"
- 	@echo "EasyTAG is installed, to uninstall it, type 'make uninstall'!"
- 	@echo "------"
+--- configure.orig	Sat Aug 31 03:46:09 2002
++++ configure
+@@ -8016,7 +8016,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);
+@@ -8034,7 +8034,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 71d31ad59e3..00000000000
--- a/audio/easytag/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 99a19b45101..00000000000
--- a/audio/easytag/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
- }