<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/caebc24d901543dc03fb69fb576ffb3ee89cfee0">https://github.com/macports/macports-ports/commit/caebc24d901543dc03fb69fb576ffb3ee89cfee0</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 caebc24d mysql8: update to 8.0.18
</span>caebc24d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit caebc24d901543dc03fb69fb576ffb3ee89cfee0
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sat Oct 26 10:13:58 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql8: update to 8.0.18
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch to fix library path for protobuf
</span><span style='display:block; white-space:pre;color:#404040;'> - add zstd dependency
</span>---
databases/mysql8/Portfile | 29 +++++++-------
.../files/patch-cmake-install_layout.cmake.diff | 44 +++++++++++-----------
.../files/patch-cmake-install_macros.cmake.diff | 16 ++++++++
databases/mysql8/files/patch-sql-local-boost.diff | 13 +++----
4 files changed, 59 insertions(+), 43 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 4e2c390..32db51f 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name mysql8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.0.17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set boost_version 1.69.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.0.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set boost_version 1.70.0
</span> categories databases
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ maintainers {gmail.com:herby.gillot @herbygillot} openmaintainer
</span> homepage https://www.mysql.com/
# Set revision_client and revision_server to 0 on version bump.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span> set revision_server 0
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,18 +44,19 @@ if {$subport eq $name} {
</span> ${boost_distname}${extract.suffix}:boost
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 aa6f5fe3a890e8e4a7fef8a6c3a30701d925a79f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c6e3f38199a77bfd8a4925ca00b252d3b6159b90e4980c7232f1c58d6ca759d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 190203398 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cc43f36cf917ad60361a47eef7ee86a2791710aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4cb39a315298eb243c25c53c184b3682b49c2a907a1d8432ba0620534806ade8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 197457483 \
</span> ${boost_distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ad6cd576a5229a11601986908ff03261582c9f81 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a2c2819310839ea373f42d69e733c339b4e9a19deab6bfec448281554aa4dbb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 111710205
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1c39413060dca46a02ea2143788d6ee061b79d03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 116000903
</span>
depends_lib-append path:lib/libssl.dylib:openssl \
port:cyrus-sasl2 \
port:icu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd
</span>
depends_run-append port:mysql_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,9 +118,11 @@ if {$subport eq $name} {
</span> -DWITH_BOOST:PATH="${worksrcpath}/../${boost_distname}" \
-DWITH_ICU:PATH="${prefix}" \
-DWITH_INNODB_MEMCACHED=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PROTOBUF=bundled \
</span> -DWITH_SASL:PATH="${prefix}" \
-DWITH_SSL:PATH="${prefix}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_ZLIB:PATH="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ZLIB:PATH="${prefix}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ZSTD=system
</span>
# FIXME: Disable building MySQL Router until we resolve link issues
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,9 +132,9 @@ if {$subport eq $name} {
</span>
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-router-cmake-set_rpath.diff \
</span> patch-sql-local-boost.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mysql8-workaround-no-SC_PHYS_PAGES.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mysql8-workaround-no-SC_PHYS_PAGES.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-install_macros.cmake.diff
</span>
post-extract {
file mkdir ${cmake.build_dir}/macports
<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 0b8f8f6..a0d8da5 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;'>@@ -1,27 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_layout.cmake.orig 2016-02-08 20:35:02.000000000 -0430
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_layout.cmake 2016-02-08 20:53:31.000000000 -0430
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/install_layout.cmake 2019-10-24 09:35:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/install_layout.cmake 2019-10-24 09:40:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span> ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, SLES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, MACPORTS, SLES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> IF(UNIX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(INSTALL_LAYOUT MATCHES "RPM" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,7 +101,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_INSTALL_PREFIX ${default_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(INSTALL_LAYOUT MATCHES "RPM")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,7 @@
</span> CACHE PATH "install prefix" FORCE)
ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "MACPORTS" "TARGZ" "SLES" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(VALID_INSTALL_LAYOUTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "STANDALONE" "MACPORTS")
</span> LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,6 +291,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_OSX ${secure_file_priv_embedded_path})
</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:#e0ffe0;'>+@@ -306,6 +306,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_MYSQLKEYRINGDIR_RPM "/var/lib/mysql-keyring")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_SECURE_FILE_PRIVDIR_RPM ${secure_file_priv_path})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +# MACPORTS layout
+#
+SET(INSTALL_BINDIR_MACPORTS "lib/@NAME@/bin")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +30,7 @@
</span> +SET(INSTALL_SCRIPTDIR_MACPORTS "lib/@NAME@/bin")
+#
+SET(INSTALL_LIBDIR_MACPORTS "lib/@NAME@/mysql")
<span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_PRIV_LIBDIR_MACPORTS "lib/@NAME@/mysql")
</span> +SET(INSTALL_PLUGINDIR_MACPORTS "lib/@NAME@/plugin")
+#
+SET(INSTALL_INCLUDEDIR_MACPORTS "include/@NAME@/mysql")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,12 +51,8 @@
</span> +SET(INSTALL_SECURE_FILE_PRIVDIR_MACPORTS "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@-files")
+SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_MACPORTS "${CMAKE_INSTALL_PREFIX}/var/db/@NAME@-files")
+SET(INSTALL_PLUGINTESTDIR_MACPORTS ${plugin_tests})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TARGZ layout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEB layout
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_BINDIR_TARGZ "bin")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-cmake-install_macros.cmake.diff b/databases/mysql8/files/patch-cmake-install_macros.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..645a33b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-cmake-install_macros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/install_macros.cmake 2019-12-10 15:50:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/install_macros.cmake 2019-12-10 16:43:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,11 +324,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "@rpath/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "@loader_path/../lib/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@loader_path/../mysql/$<TARGET_FILE_NAME:libprotobuf-lite>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<TARGET_FILE:${TARGET}>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "@rpath/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "@loader_path/../lib/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@loader_path/../mysql/$<TARGET_FILE_NAME:libprotobuf>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$<TARGET_FILE:${TARGET}>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSEIF(UNIX)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-sql-local-boost.diff b/databases/mysql8/files/patch-sql-local-boost.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f0c8464..eecbf0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-sql-local-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-sql-local-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sql/CMakeLists.txt.orig 2019-04-13 07:46:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sql/CMakeLists.txt 2019-06-09 04:02:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_SOURCE_DIR}/libbinlogevents/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sql/CMakeLists.txt 2019-10-24 09:46:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sql/CMakeLists.txt 2019-10-24 09:46:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # along with this program; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +# Prevent Boost from including external precompiled Boost libraries
+IF(USING_LOCAL_BOOST)
+ ADD_DEFINITIONS(
</pre><pre style='margin:0'>
</pre>