<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/eeeb795e625ad50f416e8f69ff9dc520f7021c80">https://github.com/macports/macports-ports/commit/eeeb795e625ad50f416e8f69ff9dc520f7021c80</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 eeeb795e625 mysql8: fix paths for libs & MacPorts select
</span>eeeb795e625 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eeeb795e625ad50f416e8f69ff9dc520f7021c80
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed May 15 19:59:17 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> mysql8: fix paths for libs & MacPorts select
</span>---
databases/mysql8/Portfile | 7 +-
databases/mysql8/files/mysql8 | 18 +++---
.../files/patch-cmake-install_layout.cmake.diff | 4 +-
...h-cmake-install_macros-protobuf-path.cmake.diff | 75 ----------------------
4 files changed, 14 insertions(+), 90 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/Portfile b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20725c6acae..fef19bf9e96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,8 @@ maintainers {gmail.com:herby.gillot @herbygillot} \
</span> openmaintainer
# Set revision_client and revision_server to 0 on version bump.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 1
</span>
set name_mysql ${name}
set version_branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,8 +139,7 @@ if {$subport eq $name} {
</span> -DWITH_ROUTER:BOOL=OFF
patch.pre_args-replace -p0 -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-cmake-install_macros-protobuf-path.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-install_layout.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cmake-install_layout.cmake.diff \
</span> patch-readline.cmake.diff \
patch-scripts-cmakelists.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/mysql8 b/databases/mysql8/files/mysql8
</span><span style='display:block; white-space:pre;color:#808080;'>index 23ca092dcbc..634595dfa74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/mysql8
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/mysql8
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> -
lib/mysql8/bin/ibd2sdi
lib/mysql8/bin/innochecksum
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lib/mysql8/bin/lz4_decompress
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -
-
lib/mysql8/bin/my_print_defaults
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ lib/mysql8/bin/mysql_config_editor
</span> -
lib/mysql8/bin/mysql_secure_installation
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lib/mysql8/bin/mysql_ssl_rsa_setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> lib/mysql8/bin/mysql_tzinfo_to_sql
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lib/mysql8/bin/mysql_upgrade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -
-
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ lib/mysql8/bin/mysqldumpslow
</span> -
lib/mysql8/bin/mysqlimport
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lib/mysql8/bin/mysqlpump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> lib/mysql8/bin/mysqlshow
lib/mysql8/bin/mysqlslap
lib/mysql8/bin/mysqltest
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@ lib/mysql8/bin/perror
</span> -
share/man/mysql8/man1/comp_err.1.gz
share/man/mysql8/man1/innochecksum.1.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/mysql8/man1/lz4_decompress.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -
share/man/mysql8/man1/my_print_defaults.1.gz
share/man/mysql8/man1/myisam_ftdump.1.gz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,9 +113,9 @@ share/man/mysql8/man1/mysql_config_editor.1.gz
</span> -
share/man/mysql8/man1/mysql_secure_installation.1.gz
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/mysql8/man1/mysql_ssl_rsa_setup.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> share/man/mysql8/man1/mysql_tzinfo_to_sql.1.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/mysql8/man1/mysql_upgrade.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -
-
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +130,7 @@ share/man/mysql8/man1/mysqldumpslow.1.gz
</span> -
share/man/mysql8/man1/mysqlimport.1.gz
share/man/mysql8/man1/mysqlman.1.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/mysql8/man1/mysqlpump.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> share/man/mysql8/man1/mysqlshow.1.gz
share/man/mysql8/man1/mysqlslap.1.gz
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,7 +161,7 @@ share/man/mysql8/man1/perror.1.gz
</span> -
-
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/mysql8/man1/zlib_decompress.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> share/man/mysql8/man8/mysqld.8.gz
-
-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-cmake-install_layout.cmake.diff b/databases/mysql8/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d409330a0c..a3538e4004c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@
</span> +SET(INSTALL_SBINDIR_MACPORTS "lib/@NAME@/bin")
+SET(INSTALL_SCRIPTDIR_MACPORTS "lib/@NAME@/bin")
+#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(INSTALL_LIBDIR_MACPORTS "lib/@NAME@/mysql")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(INSTALL_PRIV_LIBDIR_MACPORTS "lib/@NAME@/mysql")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_LIBDIR_MACPORTS "lib/@NAME@/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_PRIV_LIBDIR_MACPORTS "lib/@NAME@/lib")
</span> +SET(INSTALL_PLUGINDIR_MACPORTS "lib/@NAME@/plugin")
+#
+SET(INSTALL_INCLUDEDIR_MACPORTS "include/@NAME@/mysql")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-cmake-install_macros-protobuf-path.cmake.diff b/databases/mysql8/files/patch-cmake-install_macros-protobuf-path.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e173de1fc90..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-cmake-install_macros-protobuf-path.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_macros.cmake.orig 2020-10-21 05:11:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_macros.cmake 2020-10-21 05:13:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -342,9 +342,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_protobuf_dlls_bin ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../lib/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../mysql/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../lib/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../mysql/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/runtime_output_directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Creating libprotobuf symlinks in runtime_output_directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,9 +356,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEPENDENCIES(symlink_protobuf_dlls link_protobuf_dlls_bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_protobuf_dlls_plugin ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../lib/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../mysql/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../lib/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../mysql/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Creating libprotobuf symlinks in plugin_output_directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -379,9 +379,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_protobuf_dlls_plugin_install ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../mysql/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../mysql/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(FILES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,9 +393,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_protobuf_dlls_plugin_install_debug ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../../lib/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../../mysql/$<TARGET_FILE_NAME:libprotobuf>" "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../../lib/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../../mysql/$<TARGET_FILE_NAME:libprotobuf-lite>" "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEPENDENCIES(symlink_protobuf_dlls link_protobuf_dlls_plugin_install_debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -408,20 +408,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT BUILD_IS_SINGLE_CONFIG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_protobuf_dlls_plugin_xcode ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../mysql/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../mysql/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/${CMAKE_CFG_INTDIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEPENDENCIES(symlink_protobuf_dlls link_protobuf_dlls_plugin_xcode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_protobuf_dlls_bin_xcode ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../mysql/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../mysql/${CMAKE_CFG_INTDIR}/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/runtime_output_directory/${CMAKE_CFG_INTDIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span></pre><pre style='margin:0'>
</pre>