<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa42f315e6bbfd5847f426bd752cd9bcaa16af51">https://github.com/macports/macports-ports/commit/aa42f315e6bbfd5847f426bd752cd9bcaa16af51</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa42f315e6bbfd5847f426bd752cd9bcaa16af51
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Sep 21 08:16:04 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> percona: update version 8.0.15-6-> 8.0.16-7
</span>---
databases/percona/Portfile | 24 ++++++++++------------
.../files/patch-cmake-install_layout.cmake.diff | 6 +++---
.../percona/files/patch-cmake-lzma.cmake.diff | 11 ----------
databases/percona/files/patch-doc_dir.diff | 2 +-
.../files/patch-libmysql-CMakeLists.txt.diff | 2 +-
.../percona/files/patch-local_boost_first.diff | 4 ++--
databases/percona/files/patch-protobuf.diff | 4 ++--
7 files changed, 20 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/Portfile b/databases/percona/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc05390..f0709f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,12 @@ PortSystem 1.0
</span> name percona
set name_mysql ${name}
set name_package ${name}-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set version_mysql 8.0.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set release 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set version_mysql 8.0.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release 7
</span> # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set boost_version 1.68.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set boost_version 1.69.0
</span> version ${version_mysql}-${release}
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,6 @@ if {$subport eq $name} {
</span> compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.* {macports-clang-[4-6].0}
patchfiles patch-cmake-install_layout.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-lzma.cmake.diff \
</span> patch-protobuf.diff \
patch-local_boost_first.diff \
patch-doc_dir.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,13 +54,13 @@ if {$subport eq $name} {
</span> patch-libmysql-CMakeLists.txt.diff
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 904197ca867504d947eeaa7a5b1a896aa26e6471 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25d946763aabc51bd18a547fba6be109ad083700318844e80675ae567057358b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 160116772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e3f9f1d6b4e4b8c171119b9c9b70499450467c0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f8f685c23917054f47b7b3a0f0acb6eb9157e59f46463caf112d1704495e798 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 188873588 \
</span> ${boost_distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2995fce4cb6d2741f47e3566626f965b7047934e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 108771741
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ad6cd576a5229a11601986908ff03261582c9f81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a2c2819310839ea373f42d69e733c339b4e9a19deab6bfec448281554aa4dbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 111710205
</span>
depends_lib-append port:cyrus-sasl2 \
port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +123,6 @@ if {$subport eq $name} {
</span> -DWITH_ICU:STRING=system \
-DWITH_LIBEVENT:STRING=system \
-DWITH_LZ4:STRING=system \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_LZMA:STRING=system \
</span> -DWITH_PROTOBUF:STRING=system \
-DWITH_RE2:STRING=system \
-DWITH_SASL:STRING=system \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-cmake-install_layout.cmake.diff b/databases/percona/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 06d861a..94e96ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- cmake/install_layout.cmake 2013-06-23 08:41:38.000000000 -0700
+++ cmake/install_layout.cmake 2013-06-23 08:44:25.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +88,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@
</span> ENDIF()
SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
IF(UNIX)
IF(INSTALL_LAYOUT MATCHES "RPM" OR
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +108,7 @@
</span> SET(CMAKE_INSTALL_PREFIX ${default_prefix}
CACHE PATH "install prefix" FORCE)
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</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;'>-@@ -427,6 +427,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,6 +428,35 @@
</span> SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
SET(INSTALL_SECURE_FILE_PRIVDIR_SVR4 ${secure_file_priv_path})
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-cmake-lzma.cmake.diff b/databases/percona/files/patch-cmake-lzma.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e38a92c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-cmake-lzma.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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/lzma.cmake.orig 2019-06-22 00:17:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/lzma.cmake 2019-06-22 00:18:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bundled is the default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACRO (FIND_SYSTEM_LZMA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIND_PATH(PATH_TO_LZMA NAMES lzma/lzma.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FIND_PATH(PATH_TO_LZMA NAMES lzma/lzma.h lzma.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_LIBRARY(LZMA_SYSTEM_LIBRARY NAMES lzma)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF (PATH_TO_LZMA AND LZMA_SYSTEM_LIBRARY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(SYSTEM_LZMA_FOUND 1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-doc_dir.diff b/databases/percona/files/patch-doc_dir.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d96cbe..0dd9474 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-doc_dir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-doc_dir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> avoid mtree violation
--- router/CMakeLists.txt.orig 2019-05-03 04:55:18.000000000 -0700
+++ router/CMakeLists.txt 2019-09-18 12:39:48.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span> SET(ROUTER_LICENSE_FILE "${CMAKE_SOURCE_DIR}/router/LICENSE.router")
SET(ROUTER_README_FILE "${CMAKE_SOURCE_DIR}/router/README.router")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-libmysql-CMakeLists.txt.diff b/databases/percona/files/patch-libmysql-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f2d988..48460bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-libmysql-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-libmysql-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- libmysql/CMakeLists.txt.orig 2019-06-22 00:40:07.000000000 +0800
+++ libmysql/CMakeLists.txt 2019-06-22 00:40:12.000000000 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,9 +372,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -380,9 +380,3 @@
</span> ELSE()
TARGET_LINK_LIBRARIES(libmysql_api_test libmysql)
ENDIF()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-local_boost_first.diff b/databases/percona/files/patch-local_boost_first.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ba00192..b12b77b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-local_boost_first.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-local_boost_first.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ If installed, MacPorts Boost headers are found
</span> abstract_chain_element.cc
--- mysys_ssl/CMakeLists.txt.orig 2019-08-14 07:25:47.000000000 -0700
+++ mysys_ssl/CMakeLists.txt 2019-09-17 20:05:34.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span> SET(MYSYS_AES_IMPLEMENTATION my_aes_openssl.cc)
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ If installed, MacPorts Boost headers are found
</span> -INCLUDE_DIRECTORIES(SYSTEM ${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${BOOST_PATCHES_DIR} ${BOOST_INCLUDE_DIR})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIRECTORIES(SYSTEM ${ICU_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MY_INCLUDE_SYSTEM_DIRECTORIES(ICU)
</span>
--- unittest/gunit/CMakeLists.txt.orig 2019-08-14 07:25:47.000000000 -0700
+++ unittest/gunit/CMakeLists.txt 2019-09-17 20:08:07.000000000 -0700
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/percona/files/patch-protobuf.diff b/databases/percona/files/patch-protobuf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 245f625..e408e2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/percona/files/patch-protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/percona/files/patch-protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> Removed header files no longer include in recent versions of protobuf.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig 2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugin/x/ngs/include/ngs_common/protocol_protobuf.h 2019-09-17 20:10:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h.orig 2019-08-14 07:25:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugin/x/ngs/include/ngs/protocol/protocol_protobuf.h 2019-09-17 20:10:21.000000000 -0700
</span> @@ -38,7 +38,6 @@
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/text_format.h>
</pre><pre style='margin:0'>
</pre>