<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/41ac4929947e38053215d57474bb6085a52f3b2b">https://github.com/macports/macports-ports/commit/41ac4929947e38053215d57474bb6085a52f3b2b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 41ac4929947e38053215d57474bb6085a52f3b2b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 23 04:34:32 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> rbmake: Use stdbool.h rather than defining our own
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65886
</span>---
textproc/rbmake/Portfile | 5 +++++
textproc/rbmake/files/stdbool.patch | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/rbmake/Portfile b/textproc/rbmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf351b28509..8286baafcb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/rbmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/rbmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,7 @@ depends_lib port:libxml2 \
</span> port:zlib
patchfiles implicit.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ stdbool.patch \
</span> xml2-config-dynamic.patch \
libpng-1.5.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,3 +46,7 @@ configure.args --mandir=${prefix}/share/man \
</span> # the build system already inserts the correct flags on its own later.
configure.cppflags-delete -I${prefix}/include
configure.ldflags-delete -L${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For stdbool.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c99
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/rbmake/files/stdbool.patch b/textproc/rbmake/files/stdbool.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..61d49184e2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/rbmake/files/stdbool.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use C99's <stdbool.h> rather than defining our own bool, true, and false.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/rbmake/rbfile.h.orig 2006-04-22 17:08:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/rbmake/rbfile.h 2022-09-23 04:31:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _RBFILE_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdbool.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RB_FILE_VERSION 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,13 +72,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef int int32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(true) && !defined(RB_OMIT_true_AND_false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define true 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define false 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef char bool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -------------------- Opaque objects -------------------- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct RbFile RbFile;
</span></pre><pre style='margin:0'>
</pre>