<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/13a668e5771d4b3490e7eb71716082bed4d872c6">https://github.com/macports/macports-ports/commit/13a668e5771d4b3490e7eb71716082bed4d872c6</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 13a668e mysql8: update to 8.0.19
</span>13a668e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 13a668e5771d4b3490e7eb71716082bed4d872c6
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Tue Jan 14 11:28:25 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql8: update to 8.0.19
</span>---
databases/mysql8/Portfile | 14 +++++------
.../files/patch-cmake-install_layout.cmake.diff | 27 +++++++++++-----------
.../files/patch-cmake-install_macros.cmake.diff | 6 ++---
3 files changed, 23 insertions(+), 24 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 0607af9..353f2cb 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,7 +3,7 @@
</span> PortSystem 1.0
name mysql8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.0.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.0.19
</span> set boost_version 1.70.0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +44,9 @@ if {$subport eq $name} {
</span> ${boost_distname}${extract.suffix}:boost
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cc43f36cf917ad60361a47eef7ee86a2791710aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4cb39a315298eb243c25c53c184b3682b49c2a907a1d8432ba0620534806ade8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 197457483 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 95e609d2180269815796a91abe41b8a22ab41846 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a62786d67b5e267eef928003967b4ccfe362d604b80f4523578e0688f5b9f834 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 266717983 \
</span> ${boost_distname}${extract.suffix} \
rmd160 1c39413060dca46a02ea2143788d6ee061b79d03 \
sha256 882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,10 +131,10 @@ if {$subport eq $name} {
</span> # -DROUTER_INSTALL_PLUGINDIR="lib/${name_mysql}/mysqlrouter"
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-cmake-install_layout.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sql-local-boost.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cmake-install_macros.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-install_layout.cmake.diff \
</span> patch-mysql8-workaround-no-SC_PHYS_PAGES.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-install_macros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sql-local-boost.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 a0d8da5..0ac6952 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,28 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_layout.cmake 2019-10-24 09:35:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_layout.cmake 2019-10-24 09:40:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/install_layout.cmake 2020-01-14 10:35:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/install_layout.cmake 2020-01-14 10:37:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span> ENDIF()
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), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+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;'>+- CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4"
</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, 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")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +98,7 @@
</span> CACHE PATH "install prefix" FORCE)
ENDIF()
SET(VALID_INSTALL_LAYOUTS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "STANDALONE" "MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "RPM" "DEB" "SVR4" "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;'>-@@ -306,6 +306,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_MYSQLKEYRINGDIR_RPM "/var/lib/mysql-keyring")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,6 +225,36 @@
</span> SET(INSTALL_SECURE_FILE_PRIVDIR_RPM ${secure_file_priv_path})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</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;'>@@ -52,7 +51,7 @@
</span> +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;'>- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span> # DEB layout
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_BINDIR_DEB "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><span style='display:block; white-space:pre;color:#808080;'>index 645a33b..f4b8639 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-cmake-install_macros.cmake.diff
</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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_macros.cmake 2019-12-10 15:50:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_macros.cmake 2019-12-10 16:43:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,11 +324,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/install_macros.cmake 2020-01-14 10:39:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/install_macros.cmake 2020-01-14 10:39:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -345,11 +345,11 @@
</span> ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD
COMMAND install_name_tool -change
"@rpath/$<TARGET_FILE_NAME:libprotobuf-lite>"
</pre><pre style='margin:0'>
</pre>