Update to 1.21:

* v1.21 Thu Jan  4 13:41:42 PST 2007

   * Use Module::Install
   * Prefer Encode::Detect::Detector over Encode::Detect if available.
   * Skip over Lyrics3 tags
   * Pull out iTunes iTunNORM gain info.
   * Handle Named genres separated by nulls & multiple genres
   * Skip over broken iTunes ID3v2.2 frames that are in a ID3v2.3/2.4 header.
   * Patch from Justin Fletcher <gerph (at) gerph.org> to fix ID3v2.4 header & footer parsing.

* v1.20, Saturday, January 7, 2006

   * New maintainer & Sponsor:

	Dan Sully - daniel | at | electricrain.com
	Slim Devices, Inc - dan | at | slimdevices.com

   * Read ReplayGain Information in:

	- RVA, RVAD and RVA2 tags.
	- COMM tags via J.River Media Center
	- PRIV tags via Windows Media Player

   * Unicode / Encode optimizations to only guess if the string isn't ascii.

   * Proper numeric genre decoding, now in tune with the ID3 spec.

   * Parse and return PIC & APIC data.

   * Handle multiple COMM and TCON tags.

   * Parse APE tags that are in the ID3v1 header space.

   * Parse USLT - Lyrics tags, used by iTunes.

* v1.13, Wednesday, March 10, 2005

   Fix for UTF-16 handling.  (Wes Barris)

* v1.12, Wednesday, March 9, 2005

   Add OFFSET to info.  (Dan Sully)

* v1.11, Friday, January 14, 2005

   Fix for ID3v2 tags that happen to be UTF-16LE.  (Dan Sully)

* v1.10, Thursday, December 30, 2004

   Make utf8 enabled by default (if available).

   perl 5.6 is now required.

   Remove dependency on Symbol.pm.

   Use three-arg open.  (Alex Marandon)

   Make reading of genres a bit more nimble.  (Brian S. Stephan)

   Fix frame counting.  (Ben Winslow, Anthony DiSante)

   Fix syncsafe byte reading.  (Pierre-Yves Thoulon, et al)

   Some Unicode fixes.  (Ilya Konstantinov)

   More changes for Unicode.  Unicode::String no longer used; Encode is used
   instead.  Encode::Guess used as last resort.  (Dan Sully)

   Optimizations and other fixes.  (michael, Dan Sully)

   Support for reading ID3v2 tags from WAV and AIFF files.  Not fully
   supported.  (Dan Sully)

* v1.02, Sunday, March 2, 2003

   Fix broken argument parsing for use_mp3_utf8.  (Ben Gertzfield)

   Document that UTF8 can be access in ":all" export tag.  (Ben Gertzfield)

   Better document for new() method.

   Add can() method.  (Ken Williams)

   Stick failure warnings in $@.  (Jeffrey Friedl)

   Added support for reasonable data from ID3v2 tags with RAW_V2 == 2.
   (brian d foy and others)

   Deal with broken iTunes comment frames in ID3v2.3.0/2.4.0.  (Many users)

   remove_mp3tag() was reporting 128 bytes removed even if no bytes were
   removed.  (scfc_de)

   Allow calling methods on objects where tag does not exist (e.g., don't fail
   if there is no comment but you call $mp3->comment).

   Various bugfixes.

3 files changed, 8 insertions, 87 deletions

diff --git a/audio/p5-MP3-Info/Makefile b/audio/p5-MP3-Info/Makefile
index 80d720b24ce..f1680dfc464 100644
--- a/audio/p5-MP3-Info/Makefile
+++ b/audio/p5-MP3-Info/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/27 09:21:26 wiz Exp $
 
-DISTNAME=	MP3-Info-1.01
+DISTNAME=	MP3-Info-1.21
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MP3/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/search?module=MP3::Info
-COMMENT=	Manipulate / fetch info from MP3 audio files
+HOMEPAGE=	http://search.cpan.org/dist/MP3-Info/
+COMMENT=	Manipulate/fetch info from MP3 audio files
 
 PERL5_PACKLIST=		auto/MP3/Info/.packlist
 
diff --git a/audio/p5-MP3-Info/distinfo b/audio/p5-MP3-Info/distinfo
index 701598fe521..60a78450394 100644
--- a/audio/p5-MP3-Info/distinfo
+++ b/audio/p5-MP3-Info/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:50 agc Exp $
+$NetBSD: distinfo,v 1.5 2007/02/27 09:21:26 wiz Exp $
 
-SHA1 (MP3-Info-1.01.tar.gz) = 78434f1487343e549c5cfe5465b266288b66d810
-RMD160 (MP3-Info-1.01.tar.gz) = 7616b3cee8c5615dac4a4d99c4d63924cb1818e9
-Size (MP3-Info-1.01.tar.gz) = 51394 bytes
-SHA1 (patch-aa) = 8b4ca0d0d1766c180dd8b88369e77a7b462f7d50
+SHA1 (MP3-Info-1.21.tar.gz) = a9fc2682cce1dae25eb16bcf324106f3d636f07b
+RMD160 (MP3-Info-1.21.tar.gz) = d8a0f5e871bcb355c21613369df8f399a18c44f6
+Size (MP3-Info-1.21.tar.gz) = 124581 bytes
diff --git a/audio/p5-MP3-Info/patches/patch-aa b/audio/p5-MP3-Info/patches/patch-aa
deleted file mode 100644
index 450eb16e742..00000000000
--- a/audio/p5-MP3-Info/patches/patch-aa
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/12/30 23:12:41 kim Exp $
-
---- Info.pm.orig	Tue Feb 26 18:03:29 2002
-+++ Info.pm	Mon Dec 30 15:18:03 2002
-@@ -8,7 +8,7 @@
- 	@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION $REVISION
- 	@mp3_genres %mp3_genres @winamp_genres %winamp_genres $try_harder
- 	@t_bitrate @t_sampling_freq @frequency_tbl %v1_tag_fields
--	@v1_tag_names %v2_tag_names %v2_to_v1_names $AUTOLOAD
-+	@v1_tag_names %v2_tag_names %v2_to_symbol $AUTOLOAD
- );
- 
- @ISA = 'Exporter';
-@@ -471,10 +471,10 @@
- 			%info = %$v2;
- 			$info{TAGVERSION} = $v2h->{version};
- 		} else {
--			for (keys %v2_to_v1_names) {
-+			for (keys %v2_to_symbol) {
- 				if (exists $v2->{$_}) {
- 					if ($_ =~ /^TCON?$/ && $v2->{$_} =~ /^.?\((\d+)\)/) {
--						$info{$v2_to_v1_names{$_}} = $mp3_genres[$1];
-+						$info{$v2_to_symbol{$_}} = $mp3_genres[$1];
- 					} else {
- 						my $data = $v2->{$_};
- 
-@@ -510,7 +510,8 @@
- 								$data = $u->utf8;
- 							}
- 						}
--						$info{$v2_to_v1_names{$_}} = $data;
-+						$info{$v2_to_symbol{$_}} = $data;
-+						$info{$_} = $data;
- 					}
- 				}
- 			}
-@@ -1077,23 +1078,39 @@
- 
- 	@v1_tag_names = qw(TITLE ARTIST ALBUM YEAR COMMENT TRACKNUM GENRE);
- 
--	%v2_to_v1_names = (
-+	%v2_to_symbol = (
- 		# v2.2 tags
-+		'TT1' => 'CONTENTGROUP',
- 		'TT2' => 'TITLE',
-+		'TT3' => 'SUBTITLE',
- 		'TP1' => 'ARTIST',
-+		'TP2' => 'BAND',
-+		'TP3' => 'CONDUCTOR',
-+		'TP4' => 'MIXARTIST',
-+		'TCM' => 'COMPOSER',
-+		'TXT' => 'LYRICIST',
- 		'TAL' => 'ALBUM',
- 		'TYE' => 'YEAR',
- 		'COM' => 'COMMENT',
- 		'TRK' => 'TRACKNUM',
- 		'TCO' => 'GENRE', # not clean mapping, but ...
-+		'TBP' => 'BPM',
- 		# v2.3 tags
-+		'TIT1' => 'CONTENTGROUP',
- 		'TIT2' => 'TITLE',
-+		'TIT3' => 'SUBTITLE',
- 		'TPE1' => 'ARTIST',
-+		'TPE2' => 'BAND',
-+		'TPE3' => 'CONDUCTOR',
-+		'TPE4' => 'MIXARTIST',
-+		'TCOM' => 'COMPOSER',
-+		'TEXT' => 'LYRICIST',
- 		'TALB' => 'ALBUM',
- 		'TYER' => 'YEAR',
- 		'COMM' => 'COMMENT',
- 		'TRCK' => 'TRACKNUM',
- 		'TCON' => 'GENRE',
-+		'TBPM' => 'BPM',
- 	);
- 
- 	%v2_tag_names = (