Two functions had missing arguments. Patch from stoned@

Fixes problems in amarok (and probably other dependencies).

Bump PKGREVISION.

5 files changed, 24 insertions, 11 deletions

diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index b98c4440e6d..fd800cb54f9 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2006/09/13 12:06:28 ben Exp $
+# $NetBSD: Makefile,v 1.26 2006/09/23 13:26:24 wiz Exp $
 #
 
 DISTNAME=	id3lib-3.8.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
diff --git a/audio/id3lib/distinfo b/audio/id3lib/distinfo
index 9d391461b56..6294e9fbee1 100644
--- a/audio/id3lib/distinfo
+++ b/audio/id3lib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2006/09/13 12:06:28 ben Exp $
+$NetBSD: distinfo,v 1.13 2006/09/23 13:26:24 wiz Exp $
 
 SHA1 (id3lib-3.8.3.tar.gz) = c92c880da41d1ec0b242745a901702ae87970838
 RMD160 (id3lib-3.8.3.tar.gz) = bfa2499ec649ed40815ad0a370c78eb1517952c4
 Size (id3lib-3.8.3.tar.gz) = 950726 bytes
-SHA1 (patch-aa) = 75b19258eeaeb65aa2fa43cd44769aa1d6e575c3
+SHA1 (patch-aa) = 35e7df9577fd7fdd8657dca32207e34b580a0b57
 SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
 SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
 SHA1 (patch-ah) = 42a04014cc839565063daa395884b757214eb911
diff --git a/audio/id3lib/patches/patch-aa b/audio/id3lib/patches/patch-aa
index 4f2585b397f..fc6e9eb403f 100644
--- a/audio/id3lib/patches/patch-aa
+++ b/audio/id3lib/patches/patch-aa
@@ -1,7 +1,20 @@
-$NetBSD: patch-aa,v 1.3 2004/11/17 17:42:05 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2006/09/23 13:26:24 wiz Exp $
 
---- include/id3/id3lib_strings.h.orig	2003-03-01 18:23:00.000000000 -0600
+--- include/id3/id3lib_strings.h.orig	2003-03-02 00:23:00.000000000 +0000
 +++ include/id3/id3lib_strings.h
+@@ -100,10 +100,10 @@ namespace std
+ 
+       static char_type
+       to_char_type(const int_type& __c)
+-      { return char_type(); }
++      { return char_type(__c); }
+ 
+       static int_type
+-      to_int_type(const char_type& __c) { return int_type(); }
++      to_int_type(const char_type& __c) { return int_type(__c); }
+ 
+       static bool
+       eq_int_type(const int_type& __c1, const int_type& __c2)
 @@ -117,7 +117,8 @@ namespace std
        { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
      };
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index f2fe84c1982..b256453f511 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/05/04 16:37:29 tv Exp $
+# $NetBSD: Makefile,v 1.13 2006/09/23 13:26:24 wiz Exp $
 #
 
 DISTNAME=	taglib-1.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ktown.kde.org/~wheeler/files/src/
 
diff --git a/audio/taglib/files/id3lib_strings.h b/audio/taglib/files/id3lib_strings.h
index 7eb4f64e670..b16eb256132 100644
--- a/audio/taglib/files/id3lib_strings.h
+++ b/audio/taglib/files/id3lib_strings.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: id3lib_strings.h,v 1.3 2006/01/11 16:41:45 joerg Exp $
+// $Id: id3lib_strings.h,v 1.4 2006/09/23 13:26:24 wiz Exp $
 
 // id3lib: a software library for creating and manipulating id3v1/v2 tags
 // Copyright 1999, 2000  Scott Thomas Haug
@@ -100,10 +100,10 @@ namespace std
 
       static char_type
       to_char_type(const int_type& __c)
-      { return char_type(); }
+      { return char_type(__c); }
 
       static int_type
-      to_int_type(const char_type& __c) { return int_type(); }
+      to_int_type(const char_type& __c) { return int_type(__c); }
 
       static bool
       eq_int_type(const int_type& __c1, const int_type& __c2)