<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ddfc2c14d19d6b84fe6004ef959dd5f5c2292dea">https://github.com/macports/macports-ports/commit/ddfc2c14d19d6b84fe6004ef959dd5f5c2292dea</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ddfc2c14d19 libmcs: Fix configure script to check for cpp
</span>ddfc2c14d19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ddfc2c14d19d6b84fe6004ef959dd5f5c2292dea
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 26 08:14:50 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> libmcs: Fix configure script to check for cpp
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66594
</span>---
devel/libmcs/Portfile | 11 +++++++----
devel/libmcs/files/check-for-cpp.patch | 14 ++++++++++++++
2 files changed, 21 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmcs/Portfile b/devel/libmcs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28ea495e9f6..ff34f3ff539 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libmcs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmcs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,8 @@ checksums rmd160 6bd840b24e7825d8315b99c51f9a9bcbc5b8c184 \
</span> sha256 09691556056cb20140d0f5ba284475445f2245891f3f0448e6cb629ff2b5783b \
size 70417
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-m4-buildsys.m4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles check-for-cpp.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-m4-buildsys.m4.diff
</span>
post-patch {
# remove terminal color sequences so the log is readable.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +31,10 @@ post-patch {
</span>
# see autogen.sh
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "aclocal -I m4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} autoheader
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${prefix}/bin/aclocal -I m4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} ${prefix}/bin/autoheader
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# We are patching configure.ac and m4 files.
</span> use_autoconf yes
configure.args --disable-gconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +43,8 @@ configure.args --disable-gconf \
</span> configure.universal_args-delete \
--disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:libmowgli
variant gconf description {Build with gconf support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmcs/files/check-for-cpp.patch b/devel/libmcs/files/check-for-cpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..179370f7aaa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmcs/files/check-for-cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Check for cpp at configure time. This causes @CPP@ to be replaced with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cpp that was found, fixing the error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/bin/sh: CPP@: command not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2010-07-13 22:15:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-01-26 08:13:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Checks for programs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PROG_CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_LN_S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_INSTALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_MAKE_SET
</span></pre><pre style='margin:0'>
</pre>