<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/66401093b6b3dae052154191198bafc7b694e37d">https://github.com/macports/macports-ports/commit/66401093b6b3dae052154191198bafc7b694e37d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 66401093b6b3dae052154191198bafc7b694e37d
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Dec 7 12:35:44 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-lpSolveAPI: update to 5.5.2.0-17.11, unbreak Sonoma build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68848
</span>---
R/R-lpSolveAPI/Portfile | 16 +++++++++++-----
R/R-lpSolveAPI/files/patch-Makefile.diff | 8 ++++++++
R/R-lpSolveAPI/files/patch-lp_types.diff | 15 +++++++++++++++
3 files changed, 34 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-lpSolveAPI/Portfile b/R/R-lpSolveAPI/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59ae4e3de49..7c6310a19f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-lpSolveAPI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-lpSolveAPI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,16 +3,22 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran cran lpSolveAPI 5.5.2.0-17.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran FlorianSchwendinger lpSolveAPI 5.5.2.0-17.11
</span> revision 0
categories-append math
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> license LGPL-2
description R interface to lp_solve v. 5.5.2.0
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7db298dbe248e6253a56f96ea5f24927823f682e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4cb7ef25d32c1dace99455d5858bac0c57acca29e3a8e206b36e231e13da10b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 492682
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 97a4dfbf09de4e1054b84600484d7c782847d44b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b08d6cae4fc17575adf5df0113ea5f4f819bb2c7f87987e0d66c8eabfc933fa4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 492377
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix types defines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-lp_types.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/68848
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.diff
</span>
compilers.setup require_fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-lpSolveAPI/files/patch-Makefile.diff b/R/R-lpSolveAPI/files/patch-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0b58213730
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-lpSolveAPI/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lp_solve/Makefile 2023-11-28 23:09:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lp_solve/Makefile 2023-12-07 12:05:43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LP_SOLVE_CPPFLAGS=$(CPPFLAGS) -I../../inst/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LP_SOLVE_CPPFLAGS=-I../../inst/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(R_INCLUDE_DIR) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DYY_NO_INPUT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DR_EMBEDDED_LPSOLVE \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-lpSolveAPI/files/patch-lp_types.diff b/R/R-lpSolveAPI/files/patch-lp_types.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..517c780e5c6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-lpSolveAPI/files/patch-lp_types.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/include/lp_types.h 2023-11-28 22:11:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/include/lp_types.h 2023-12-07 12:33:22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CHAR_BIT 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef MYBOOL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #define MYBOOL unsigned char /* Conserve memory, could be unsigned int */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(__APPLE__) && defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MYBOOL unsigned int /* Darwin ppc 32-bit ABI */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MYBOOL unsigned char /* Conserve memory, could be unsigned int */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</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;'>+
</span></pre><pre style='margin:0'>
</pre>