fix misuse of "bool", should fix build with some compilers, from

Pouya D. Tafti per pkgsrc-users

6 files changed, 106 insertions, 1 deletions

diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index eb1d3671134..ecae4bc6863 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.32 2011/04/04 08:51:34 wiz Exp $
+$NetBSD: distinfo,v 1.33 2011/04/14 17:55:43 drochner Exp $
 
 SHA1 (mpd-0.16.2.tar.bz2) = ce0b8cd473f8acb45c06d73f41c18fc4dabbe440
 RMD160 (mpd-0.16.2.tar.bz2) = 74e63fe4514eb8309bf2b2e4e4012566e14b6262
 Size (mpd-0.16.2.tar.bz2) = 478096 bytes
+SHA1 (patch-aa) = 4ac387b87c793014f2001e4cc2ba8242eaaa05e5
+SHA1 (patch-ab) = b0879896541d220300c105a0b2a94b53d62203cc
+SHA1 (patch-ac) = 08cb6ce7a7ca6e2c56d19d9d5487944dbba66c91
+SHA1 (patch-ad) = 0a836d2ca10143eb1472560d97769c367e42aea6
+SHA1 (patch-ae) = dfc4ca455ef606baf56cb2513e5471f6c16385dc
diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa
new file mode 100644
index 00000000000..5ad215c6601
--- /dev/null
+++ b/audio/musicpd/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.11 2011/04/14 17:55:43 drochner Exp $
+
+--- src/conf.c.orig	2011-03-19 00:41:52.000000000 +0000
++++ src/conf.c
+@@ -283,7 +283,7 @@ config_read_block(FILE *fp, int *count, 
+ 				g_set_error(error_r, config_quark(), 0,
+ 					    "line %i: Unknown tokens after '}'",
+ 					    *count);
+-				return false;
++				return NULL;
+ 			}
+ 
+ 			return ret;
+@@ -325,7 +325,7 @@ config_read_block(FILE *fp, int *count, 
+ 						 error_r);
+ 		if (!success) {
+ 			config_param_free(ret);
+-			return false;
++			return NULL;
+ 		}
+ 	}
+ }
diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab
new file mode 100644
index 00000000000..8307df91ce6
--- /dev/null
+++ b/audio/musicpd/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2011/04/14 17:55:43 drochner Exp $
+
+--- src/input_stream.c.orig	2011-03-19 00:41:53.000000000 +0000
++++ src/input_stream.c
+@@ -64,7 +64,7 @@ input_stream_open(const char *url, GErro
+ 	}
+ 
+ 	g_set_error(error_r, input_quark(), 0, "Unrecognized URI");
+-	return false;
++	return NULL;
+ }
+ 
+ bool
diff --git a/audio/musicpd/patches/patch-ac b/audio/musicpd/patches/patch-ac
new file mode 100644
index 00000000000..ae4c0d357d2
--- /dev/null
+++ b/audio/musicpd/patches/patch-ac
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.6 2011/04/14 17:55:43 drochner Exp $
+
+--- src/input/file_input_plugin.c.orig	2011-03-19 00:41:53.000000000 +0000
++++ src/input/file_input_plugin.c
+@@ -52,7 +52,7 @@ input_file_open(const char *filename, GE
+ 	struct file_input_stream *fis;
+ 
+ 	if (!g_path_is_absolute(filename))
+-		return false;
++		return NULL;
+ 
+ 	fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
+ 	if (fd < 0) {
+@@ -60,7 +60,7 @@ input_file_open(const char *filename, GE
+ 			g_set_error(error_r, file_quark(), errno,
+ 				    "Failed to open \"%s\": %s",
+ 				    filename, g_strerror(errno));
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	ret = fstat(fd, &st);
+@@ -69,14 +69,14 @@ input_file_open(const char *filename, GE
+ 			    "Failed to stat \"%s\": %s",
+ 			    filename, g_strerror(errno));
+ 		close(fd);
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	if (!S_ISREG(st.st_mode)) {
+ 		g_set_error(error_r, file_quark(), 0,
+ 			    "Not a regular file: %s", filename);
+ 		close(fd);
+-		return false;
++		return NULL;
+ 	}
+ 
+ #ifdef POSIX_FADV_SEQUENTIAL
diff --git a/audio/musicpd/patches/patch-ad b/audio/musicpd/patches/patch-ad
new file mode 100644
index 00000000000..ca5b109e92b
--- /dev/null
+++ b/audio/musicpd/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2011/04/14 17:55:43 drochner Exp $
+
+--- src/song_update.c.orig	2011-03-19 00:41:54.000000000 +0000
++++ src/song_update.c
+@@ -182,7 +182,7 @@ song_file_update_inarchive(struct song *
+ 	if (suffix == NULL)
+ 		return false;
+ 
+-	plugin = decoder_plugin_from_suffix(suffix, false);
++	plugin = decoder_plugin_from_suffix(suffix, NULL);
+ 	if (plugin == NULL)
+ 		return false;
+ 
diff --git a/audio/musicpd/patches/patch-ae b/audio/musicpd/patches/patch-ae
new file mode 100644
index 00000000000..186cfc49499
--- /dev/null
+++ b/audio/musicpd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2011/04/14 17:55:43 drochner Exp $
+
+--- src/update_walk.c.orig	2011-03-19 00:41:54.000000000 +0000
++++ src/update_walk.c
+@@ -590,7 +590,7 @@ update_regular_file(struct directory *di
+ 	if (suffix == NULL)
+ 		return;
+ 
+-	if ((plugin = decoder_plugin_from_suffix(suffix, false)) != NULL)
++	if ((plugin = decoder_plugin_from_suffix(suffix, NULL)) != NULL)
+ 	{
+ 		struct song* song = songvec_find(&directory->songs, name);
+