Make cddb-bundle compile with stdbool.h under C99. Bump PKGREVISION

4 files changed, 65 insertions, 3 deletions

diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 5936fdd686b..af1ca3e3f6e 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2012/09/11 23:59:28 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/22 21:37:02 rh Exp $
 #
 
 DISTNAME=	cddb.bundle-0.2
 PKGNAME=	${DISTNAME:S/./-/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
diff --git a/audio/cddb-bundle/distinfo b/audio/cddb-bundle/distinfo
index 0b90a2d2e25..f18ad59e590 100644
--- a/audio/cddb-bundle/distinfo
+++ b/audio/cddb-bundle/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $
+$NetBSD: distinfo,v 1.2 2012/10/22 21:37:02 rh Exp $
 
 SHA1 (cddb.bundle-0.2.tar.gz) = d1401dd70587ff0cdebe88098dd38eb3bd218e29
 RMD160 (cddb.bundle-0.2.tar.gz) = 2de6c627b64dd644ba7612159b86fae83a79e6df
 Size (cddb.bundle-0.2.tar.gz) = 16936 bytes
+SHA1 (patch-aa) = 10174afe64d9a5211af1947ddf569b9135d7fb24
+SHA1 (patch-ab) = 8f58dd914544650096eb4ed3be45b961c3d39e85
diff --git a/audio/cddb-bundle/patches/patch-aa b/audio/cddb-bundle/patches/patch-aa
new file mode 100644
index 00000000000..6dadfb317c3
--- /dev/null
+++ b/audio/cddb-bundle/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2012/10/22 21:37:02 rh Exp $
+
+Substitute 'bool' to make this compile under C99.
+
+--- Cddb/Cddb.h.orig	2002-10-15 14:32:13.000000000 +0000
++++ Cddb/Cddb.h
+@@ -55,7 +55,7 @@
+  * The keys of NSDictionary are "length" and "offset".
+  */
+ - (NSString *) discidWithCDTracks: (NSArray *) tracks
+-                          locally: (BOOL) bool;
++                          locally: (BOOL) yesno;
+ 
+ /* Return the query using a NSArray of NSDictionary.
+  * The number of object in NSArray are the number of tracks.
+@@ -77,7 +77,7 @@
+  */
+ - (NSDictionary *) readWithCategory: (NSString *) category
+                              discid: (NSString *) discid
+-                        postProcess: (BOOL) bool;
++                        postProcess: (BOOL) yesno;
+ 
+ /* Low-level methods */
+ /* Input format:
diff --git a/audio/cddb-bundle/patches/patch-ab b/audio/cddb-bundle/patches/patch-ab
new file mode 100644
index 00000000000..ae00d0ebdec
--- /dev/null
+++ b/audio/cddb-bundle/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2012/10/22 21:37:02 rh Exp $
+
+Substitute 'bool' to make this compile under C99.
+
+--- Cddb/Cddb.m.orig	2002-10-17 13:17:01.000000000 +0000
++++ Cddb/Cddb.m
+@@ -44,7 +44,7 @@ int cddb_sum (int n)
+ 
+ 
+ - (NSString *) discidWithCDTracks: (NSArray *) tracks 
+-                          locally: (BOOL) bool
++                          locally: (BOOL) locally
+ {
+   NSMutableString *string = [NSMutableString new];
+   int i = 0, numtracks = 0;
+@@ -72,7 +72,7 @@ int cddb_sum (int n)
+ 
+   [string appendFormat: @" %d", totaltime];
+ 
+-  if (bool == YES) // Calculate locally
++  if (locally == YES) // Calculate locally
+     {
+       RELEASE(string);
+       RELEASE(tracks);
+@@ -123,9 +123,9 @@ int cddb_sum (int n)
+ 
+ - (NSDictionary *) readWithCategory: (NSString *) category
+                              discid: (NSString *) discid
+-                        postProcess: (BOOL) bool
++                        postProcess: (BOOL) postproc
+ {
+-  if (bool == NO)
++  if (postproc == NO)
+     return [self read: [NSString stringWithFormat: @"%@ %@", category, discid]];
+   else
+     {