Update kid3 to 0.8.1

* Release 0.8.1

* Fixed:
  + A new Custom genre was added on termination.

* Release 0.8

* New:
  + Import from freedb2.org, Discogs and MusicBrainz release database.
  + Support for ID3v2.4 and MPC using TagLib.
  + Context specific help in dialogs.
  + Support build with Qt4.

* Improved:
  + Show tag formats.
  + Remove non-letter characters before matching by title in
    import dialog.
  + Buttons to save dialog specific settings.

* Fixed:
  + Allow building with tunepimp 0.5.x.
  + Place kid3.desktop in /usr/share/applications/kde/.
  + Fix inadvertent changes of ID3v2.3 genre strings.
  + Remove trailing zeroes in unicode strings.

4 files changed, 25 insertions, 31 deletions

diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index f18df0fee4b..d2552457d52 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/01/17 23:47:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/26 03:53:56 markd Exp $
 #
 
-DISTNAME=		kid3-0.7
-PKGREVISION=		2
+DISTNAME=		kid3-0.8.1
 CATEGORIES=		kde audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kid3/}
 
@@ -10,20 +9,20 @@ MAINTAINER=		shattered@users.sourceforge.net
 HOMEPAGE=		http://kid3.sourceforge.net/
 COMMENT=		KDE ID3 tagger
 
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++
 
-# Note: put app specific data files into kde dir
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/kde
+CHECK_PORTABILITY_SKIP+=	make_qtonly.sh
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/id3lib/buildlink3.mk"
-.include "../../audio/libtunepimp0.4/buildlink3.mk"
+.include "../../audio/libtunepimp/buildlink3.mk"
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/audio/kid3/PLIST b/audio/kid3/PLIST
index 86f83e9b14d..e1561948374 100644
--- a/audio/kid3/PLIST
+++ b/audio/kid3/PLIST
@@ -1,20 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/03 21:16:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/26 03:53:56 markd Exp $
 bin/kid3
+share/applications/kde/kid3.desktop
 share/doc/kde/HTML/de/kid3/common
 share/doc/kde/HTML/de/kid3/index.cache.bz2
 share/doc/kde/HTML/de/kid3/index.docbook
 share/doc/kde/HTML/en/kid3/common
 share/doc/kde/HTML/en/kid3/index.cache.bz2
 share/doc/kde/HTML/en/kid3/index.docbook
-share/kde/applnk/Multimedia/kid3.desktop
+share/icons/hicolor/16x16/apps/kid3.png
+share/icons/hicolor/32x32/apps/kid3.png
+share/icons/hicolor/48x48/apps/kid3.png
+share/icons/hicolor/scalable/apps/kid3.svgz
 share/kde/apps/kid3/kid3ui.rc
-share/kde/icons/hicolor/16x16/apps/kid3.png
-share/kde/icons/hicolor/32x32/apps/kid3.png
-share/kde/icons/hicolor/48x48/apps/kid3.png
 share/locale/de/LC_MESSAGES/kid3.mo
 share/locale/es/LC_MESSAGES/kid3.mo
 share/locale/ru/LC_MESSAGES/kid3.mo
 @dirrm share/kde/apps/kid3
-@dirrm share/kde/applnk/Multimedia
+@comment in kde: @dirrm share/kde/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/doc/kde/HTML/en/kid3
+@comment in kde: @dirrm share/doc/kde/HTML/en
 @dirrm share/doc/kde/HTML/de/kid3
+@comment in kde: @dirrm share/doc/kde/HTML/de
+@comment in kde: @dirrm share/applications/kde
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index f946975d396..f88b631f22e 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/08/22 14:32:11 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/01/26 03:53:56 markd Exp $
 
-SHA1 (kid3-0.7.tar.gz) = 21eacdf9511d119a6a2824c0f4bdb4fb8dd3ccfb
-RMD160 (kid3-0.7.tar.gz) = 9f7f4a17b5e048bfb4336b1cfe86afcf4c2f20cf
-Size (kid3-0.7.tar.gz) = 897741 bytes
-SHA1 (patch-aa) = 74a7b7bab91edc5101bb43eeabbf5a6c95bf389e
+SHA1 (kid3-0.8.1.tar.gz) = 17d89087c3a21a2963fdd39600d5dac50922bb80
+RMD160 (kid3-0.8.1.tar.gz) = 6054aa27b2df3aba7c4f5302c1954241710aaa2b
+Size (kid3-0.8.1.tar.gz) = 871390 bytes
 SHA1 (patch-ab) = 75955211d667793420a481cfa269dec29bd49221
diff --git a/audio/kid3/patches/patch-aa b/audio/kid3/patches/patch-aa
deleted file mode 100644
index 6b646c6aab9..00000000000
--- a/audio/kid3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/03 21:16:17 wiz Exp $
-
---- kid3/oggfile.cpp.orig	2005-10-13 15:54:34.000000000 +0000
-+++ kid3/oggfile.cpp
-@@ -143,7 +143,7 @@ bool OggFile::writeTags(bool force, bool
- 			bool setUtime = false;
- 			struct utimbuf times;
- 			if (preserve) {
--				int fd = ::fileno(fpIn);
-+				int fd = fileno(fpIn);
- 				if (fd >= 0) {
- 					struct stat fileStat;
- 					if (::fstat(fd, &fileStat) == 0) {