Update id3 to 0.15.

While here, fixes patch-aa and original DESTDIR ready back.

ChangeLog:
d3 (0.15-1) unstable; urgency=low
   * Fix infinite loop when setting genre to Fusion (the official ID3v1 genre
     list has Fusion as both #30 and #84). Thanks to Matthew Garman for
     reporting this bug.

 -- Robert Woodcock <rcw@debian.org>  Mon, 31 Jul 2006 21:42:52 -0700

id3 (0.14-2) unstable; urgency=low
   * Rebuild to remove /usr/doc/id3 symlink, closes: #322808
   * Fixed spelling of Psychedelic, closes: #275155
   * Fixed version number, closes: #198439
   * Updated manual page

 -- Robert Woodcock <rcw@debian.org>  Fri, 12 Aug 2005 16:23:24 -0700

id3 (0.14-1) unstable; urgency=low
   * Added Hwei Sheng Teoh's patches to a new release
   * Added directory sanity checking

 -- Robert Woodcock <rcw@debian.org>  Sun, 24 Nov 2002 11:35:06 -0800
id3 (0.13-3.1) unstable; urgency=low
   * Non-maintainer upload
   * Clean up id3 tag structure after done processing with a file.
     (Closes: #66962)
   * Verified that #71795 has already been fixed. (Closes: #71795)

 -- Hwei Sheng Teoh <hsteoh@debian.org>  Sat, 23 Nov 2002 10:36:03 -0500
id3 (0.13-3) unstable; urgency=low
   * Added Build-Depends line

 -- Robert Woodcock <rcw@debian.org>  Fri, 24 May 2002 10:27:09 -0700

id3 (0.13-2) unstable; urgency=low
   * Accidentally built 0.13-1 as a debian-native package. Recompiled.

 -- Robert Woodcock <rcw@debian.org>  Sat, 23 Sep 2000 14:04:03 -0700
id3 (0.13-1) unstable; urgency=low
   * -R outputs genre numbers correctly, thanks to Ma.Fr@t-online.de,
     closes: bug #71795

 -- Robert Woodcock <rcw@debian.org>  Fri, 22 Sep 2000 20:08:27 -0700

3 files changed, 22 insertions, 20 deletions

diff --git a/audio/id3/Makefile b/audio/id3/Makefile
index 59ee7068691..1c3f5e1ebe3 100644
--- a/audio/id3/Makefile
+++ b/audio/id3/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2006/10/14 13:12:44 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2008/11/24 12:04:15 obache Exp $
 
-DISTNAME=	id3_0.12.orig
-PKGNAME=	id3-0.12
+DISTNAME=	id3_0.15.orig
+PKGNAME=	id3-0.15
 CATEGORIES=	audio
-MASTER_SITES=	http://frantica.lly.org/~rcw/id3/
+MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/id3/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://frantica.lly.org/~rcw/abcde/page/
+#HOMEPAGE=	http://packages.qa.debian.org/i/id3.html
 COMMENT=	ID3 v1.1 tag editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/id3/distinfo b/audio/id3/distinfo
index 6c1329bc9ff..230b9779e19 100644
--- a/audio/id3/distinfo
+++ b/audio/id3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:46 agc Exp $
+$NetBSD: distinfo,v 1.4 2008/11/24 12:04:15 obache Exp $
 
-SHA1 (id3_0.12.orig.tar.gz) = 6e74313f56214a73ef8b54edabd698444e07080f
-RMD160 (id3_0.12.orig.tar.gz) = 04bbb9077e606d4768e93a13b8f92cb9202a8f5c
-Size (id3_0.12.orig.tar.gz) = 12492 bytes
-SHA1 (patch-aa) = 94a50bdb147f9cc1df48409882ccdd4a76a43c69
+SHA1 (id3_0.15.orig.tar.gz) = 5095c2e8963071776adf10df92d94b3fa8934dd8
+RMD160 (id3_0.15.orig.tar.gz) = 85a84f94012971bd79828dee179ffe171fe2eb07
+Size (id3_0.15.orig.tar.gz) = 12871 bytes
+SHA1 (patch-aa) = 2c3b4f97300489ba7c2ff3d47cbb6654b00abb70
 SHA1 (patch-ab) = e9343a34088e6ca9bbb0315399e9c8e604546c54
diff --git a/audio/id3/patches/patch-aa b/audio/id3/patches/patch-aa
index 3e012fc1e89..750f2a70aa5 100644
--- a/audio/id3/patches/patch-aa
+++ b/audio/id3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/12/23 18:11:19 sketch Exp $
+$NetBSD: patch-aa,v 1.3 2008/11/24 12:04:15 obache Exp $
 
---- Makefile	2001/10/12 08:59:21	1.1
-+++ Makefile	2001/10/12 09:11:16
-@@ -3,17 +3,17 @@
+--- Makefile.orig	2000-09-23 03:08:39.000000000 +0000
++++ Makefile
+@@ -3,17 +3,17 @@ VERSION = 0.13
  
  SHELL = /bin/sh
  
@@ -14,19 +14,18 @@ $NetBSD: patch-aa,v 1.2 2003/12/23 18:11:19 sketch Exp $
 +#LDFLAGS = 
  LIBS = 
  DEFS =  
--INSTALL = /usr/bin/install -c
-+#INSTALL = /usr/bin/install
+ INSTALL = /usr/bin/install -c
  
  # Installation directories
 -prefix = ${DESTDIR}/usr
-+prefix = ${PREFIX}
++prefix = ${DESTDIR}${PREFIX}
  exec_prefix = ${prefix}
 -mandir = ${prefix}/share/man/man1
-+mandir = ${prefix}/man/man1
++mandir = ${prefix}/${PKGMANDIR}/man1
  bindir = ${exec_prefix}/bin
  
  INCL = 
-@@ -34,7 +34,5 @@
+@@ -34,7 +34,7 @@ clean:
  	rm -f *~ *.o core $(PRODUCT)
  
  install: $(PRODUCT)
@@ -34,5 +33,7 @@ $NetBSD: patch-aa,v 1.2 2003/12/23 18:11:19 sketch Exp $
 -	$(INSTALL) -s -m 755 -o 0 $(PRODUCT) $(bindir)
 -	$(INSTALL) -d -m 755 $(mandir)
 -	$(INSTALL) -m 644 -o 0 $(PRODUCT).1 $(mandir)
++	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
 +	$(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir)
++	$(BSD_INSTALL_MAN_DIR) $(mandir)
 +	$(BSD_INSTALL_MAN) $(PRODUCT).1 $(mandir)