<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/e0e242507597337d1b144d161d62b399e4cba5c7">https://github.com/macports/macports-ports/commit/e0e242507597337d1b144d161d62b399e4cba5c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e0e242507597337d1b144d161d62b399e4cba5c7
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 7 15:08:35 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> glpk: Remove mysql5 variant; fix mysql8 variant
</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/43431
</span>---
math/glpk/Portfile | 23 +++--------------------
math/glpk/files/patch-configure.diff | 8 ++++----
2 files changed, 7 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/glpk/Portfile b/math/glpk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa9d8d15d7a..bc1b40e2e7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/glpk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/glpk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,6 @@ version 5.0
</span> revision 0
license GPL-3+
categories math lang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description GNU Linear Programming Kit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +28,7 @@ checksums rmd160 bbf7d77de79d486bb6292f095f22713518399060 \
</span> depends_lib port:gmp
configure.args --with-gmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { [variant_isset odbc] || [variant_isset iodbc] || [variant_isset mysql5] || [variant_isset mysql56] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset odbc] || [variant_isset iodbc] || [variant_isset mysql56] || [variant_isset mysql8]} {
</span> depends_lib-append port:libtool
configure.args-append --enable-dl
patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,23 +85,7 @@ variant iodbc description {enable MathProg ODBC support using iODBC} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql requires mysql5 description {legacy variant, use +mysql5 instead} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 conflicts mysql56 mysql8 description {enable MathProg MySQL support using MySQL 5.1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__MYSQL__INCLUDE__|${prefix}/include/mysql5/mysql|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__MYSQL__LIB__|${prefix}/lib/mysql5/mysql|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql56 conflicts mysql5 mysql8 description {enable MathProg MySQL support using MySQL 5.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql56 conflicts mysql8 description {enable MathProg MySQL support using MySQL 5.6} {
</span> depends_lib-append port:mysql56
configure.args-append --enable-mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +99,7 @@ variant mysql56 conflicts mysql5 mysql8 description {enable MathProg MySQL suppo
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql8 conflicts mysql5 mysql56 description {enable MathProg MySQL support using MySQL 8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql8 conflicts mysql56 description {enable MathProg MySQL support using MySQL 8} {
</span> depends_lib-append port:mysql8
configure.args-append --enable-mysql
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/glpk/files/patch-configure.diff b/math/glpk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ca8a1590b64..ce577460a37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/glpk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/glpk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-11-08 00:00:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-11-15 06:54:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11410,9 +11410,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-12-16 03:00:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-05-07 15:05:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11424,9 +11424,9 @@
</span>
case $host_os in
darwin* | macosx*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span> ;;
*)
LIBIODBC="libiodbc.so"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11459,7 +11459,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11473,7 +11473,7 @@
</span> fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
</pre><pre style='margin:0'>
</pre>