<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/2c912b4e531b54190304aaf767a6a788bd484c67">https://github.com/macports/macports-ports/commit/2c912b4e531b54190304aaf767a6a788bd484c67</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 2c912b4e531 mysql8, p5-dbd-mysql: Fix my_openssl / mysqlclient.dylib link errors
</span>2c912b4e531 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2c912b4e531b54190304aaf767a6a788bd484c67
</span>Author: jhoyt4 <john.hoyt@gmail.com>
AuthorDate: Fri Jun 21 13:38:41 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> mysql8, p5-dbd-mysql: Fix my_openssl / mysqlclient.dylib link errors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> mysql8:
</span><span style='display:block; white-space:pre;color:#404040;'> In more recent mysql8 releases, some of the cmake files have are
</span><span style='display:block; white-space:pre;color:#404040;'> hard coded to the homebrew install locations. This commit resolves
</span><span style='display:block; white-space:pre;color:#404040;'> the issues when using the macports openssl / libcrypto packages.
</span><span style='display:block; white-space:pre;color:#404040;'> This commit also resolved issues where mysql_config produced the
</span><span style='display:block; white-space:pre;color:#404040;'> incorrect path for the installed mysql support libraries.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> p5-dbd-mysql:
</span><span style='display:block; white-space:pre;color:#404040;'> This commit additionally updates p5-dbd-mysql to 5.006
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70001
</span>---
databases/mysql8/Portfile | 8 +-
.../files/patch-cmake-install_layout.cmake.diff | 4 +-
.../files/patch-copy_openssl_binary.cmake.diff | 55 ++++++++
databases/mysql8/files/patch-ssl.cmake.diff | 153 +++++++++++++++++++++
perl/p5-dbd-mysql/Portfile | 10 +-
5 files changed, 220 insertions(+), 10 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 02a678837f8..63063231fee 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 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 3
</span>
set name_mysql ${name}
set version_branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +142,9 @@ if {$subport eq $name} {
</span> patch.pre_args-replace -p0 -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-readline.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-scripts-cmakelists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scripts-cmakelists.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ssl.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-copy_openssl_binary.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 a3538e4004c..5d409330a0c 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@/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(INSTALL_PRIV_LIBDIR_MACPORTS "lib/@NAME@/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(INSTALL_LIBDIR_MACPORTS "lib/@NAME@/mysql")
</span><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;color:#808080;'>diff --git a/databases/mysql8/files/patch-copy_openssl_binary.cmake.diff b/databases/mysql8/files/patch-copy_openssl_binary.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3d57ef1dbe4
</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-copy_openssl_binary.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/copy_openssl_binary.cmake 2024-06-21 09:47:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/copy_openssl_binary.cmake 2024-06-21 09:49:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +68,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(LINUX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND which port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RESULT_VARIABLE DETECT_MACPORTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND brew --prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RESULT_VARIABLE DETECT_HOMEBREW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(DETECT_MACPORTS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(MYSQL_LIB_DIR "../mysql")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSEIF(DETECT_HOMEBREW EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(MYSQL_LIB_DIR "../lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "CRYPTO_VERSION is ${CRYPTO_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "OPENSSL_VERSION is ${OPENSSL_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,11 +109,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(BUILD_IS_SINGLE_CONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install_name_tool -change old new file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${LIBSSL_MATCH}" "@loader_path/../lib/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${LIBSSL_MATCH}" "@loader_path/${MYSQL_LIB_DIR}/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "./${executable_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${LIBCRYPTO_MATCH}" "@loader_path/../lib/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${LIBCRYPTO_MATCH}" "@loader_path/${MYSQL_LIB_DIR}/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "./${executable_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,12 +123,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install_name_tool -change old new file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${LIBSSL_MATCH}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "@loader_path/../../lib/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@loader_path/../../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "./${CMAKE_CFG_INTDIR}/${executable_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${LIBCRYPTO_MATCH}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "@loader_path/../../lib/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@loader_path/../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "./${CMAKE_CFG_INTDIR}/${executable_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-ssl.cmake.diff b/databases/mysql8/files/patch-ssl.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4359b244b0f
</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-ssl.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,153 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/ssl.cmake 2024-06-21 09:47:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/ssl.cmake 2024-06-21 09:49:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,19 +46,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://brew.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://formulae.brew.sh/formula/openssl@1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://formulae.brew.sh/formula/openssl@3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# we give a hint ${HOMEBREW_HOME}/openssl to find_package(OpenSSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# we give a hint ${HOMEBREW_HOME}/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On Windows, we treat this "system" library as if cmake had been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # invoked with -DWITH_SSL=</path/to/custom/openssl>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On macOS we treat it as a system library, which means that the generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# binaries end up having dependencies on Homebrew libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# binaries end up having dependencies on Homebrew or MacPorts libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that 'cmake -DWITH_SSL=<some path>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is NOT handled in the same way as 'cmake -DWITH_SSL=system'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which means that for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'cmake -DWITH_SSL=/usr/local/opt/openssl'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # or, on Apple silicon:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'cmake -DWITH_SSL=/opt/homebrew/opt/openssl'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# or, on MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 'cmake -DWITH_SSL=/opt/local/libexec/openssl3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we will treat the libraries as external, and copy them into our build tree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On el7:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,9 +352,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For all non-windows platforms, use the standard FIND_PACKAGE utility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to locate OpenSSL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FUNCTION(FIND_SYSTEM_OPENSSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # For APPLE we set the hint ${HOMEBREW_HOME}/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(APPLE AND NOT OPENSSL_ROOT_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(OPENSSL_ROOT_DIR "${HOMEBREW_HOME}/openssl")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # MacPorts or Homebrew?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND which port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RESULT_VARIABLE DETECT_MACPORTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND brew --prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RESULT_VARIABLE DETECT_HOMEBREW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(DETECT_MACPORTS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(OPENSSL_ROOT_DIR "${PKGMGR_PREFIX}/libexec/openssl3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(OPENSSL_ALT_ROOT_DIR "${PKGMGR_PREFIX}/openssl11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(MYSQL_LIB_DIR "${PKGMGR_PREFIX}/libexec/mysql8/mysql")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSEIF(DETECT_HOMEBREW EQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(OPENSSL_ROOT_DIR "${PKGMGR_PREFIX}/openssl")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(OPENSSL_ALT_ROOT_DIR "${PKGMGR_PREFIX}/openssl@1.1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(MYSQL_LIB_DIR "../lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Will set OPENSSL_FOUND, OPENSSL_INCLUDE_DIR and others.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,8 +379,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Re-try, in case the symlink is not found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT OPENSSL_FOUND AND APPLE AND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPENSSL_ROOT_DIR STREQUAL "${HOMEBREW_HOME}/openssl")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(OPENSSL_ROOT_DIR "${HOMEBREW_HOME}/openssl@1.1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OPENSSL_ROOT_DIR STREQUAL "${OPENSSL_ROOT_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(OPENSSL_ROOT_DIR "${OPENSSL_ALT_ROOT_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(OpenSSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_OPENSSL_VERSION()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Homebrew "system" OpenSSL needs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Homebrew/Macports "system" OpenSSL needs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT OPENSSL_INCLUDE_DIR STREQUAL "/usr/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_DIRECTORIES(BEFORE SYSTEM ${OPENSSL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -632,8 +651,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APPLE_WITH_CUSTOM_SSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # on Homebrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CRYPTO_LIBRARY is .../lib/libcrypto.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # CRYPTO_VERSION is .../lib/libcrypto.1.0.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # CRYPTO_VERSION is .../lib/libcrypto.3.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # on Macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # CRYPTO_LIBRARY is ${MACPORTS_PREFIX}/lib/libcrypto.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # CRYPTO_VERSION is ${MACPORTS_PREFIX}/lib/libcrypto.3.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND readlink "${CRYPTO_LIBRARY}" OUTPUT_VARIABLE CRYPTO_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -641,7 +665,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND readlink "${OPENSSL_LIBRARY}" OUTPUT_VARIABLE OPENSSL_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Replace dependency "/Volumes/.../lib/libcrypto.1.0.0.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Replace dependency "*/libcrypto.3.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND otool -L "${OPENSSL_LIBRARY}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_VARIABLE OTOOL_OPENSSL_DEPS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -702,9 +726,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create symlinks for plugins, see MYSQL_ADD_PLUGIN/install_name_tool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_TARGET(link_openssl_dlls ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../lib/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${MYSQL_LIB_DIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../lib/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${MYSQL_LIB_DIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BYPRODUCTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -715,9 +739,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT BUILD_IS_SINGLE_CONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_TARGET(link_openssl_dlls_cmake_cfg_intdir ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../../lib/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../../lib/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMAKE_BINARY_DIR}/plugin_output_directory/${CMAKE_CFG_INTDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,13 +752,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Directory layout after 'make install' is different.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Create some symlinks from lib/plugin/*.dylib to ../../lib/*.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Create some symlinks from mysql/plugin/*.dylib to ../../mysql/*.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_TARGET(link_openssl_dlls_for_install ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../../lib/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "../${MYSQL_LIB_DIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../../lib/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "../${MYSQL_LIB_DIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See INSTALL_DEBUG_TARGET used for installing debug versions of plugins.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -742,9 +766,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_TARGET(link_openssl_dlls_for_install_debug ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../../../lib/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "../../${MYSQL_LIB_DIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "../../../lib/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "../../${MYSQL_LIB_DIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-dbd-mysql/Portfile b/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17ac68db1e8..d58b059e2dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +23,10 @@ platforms darwin
</span> # }
###############################################################################
array set version_current {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 750b4a31d358a7c5ae5a3f9905df80357dbc1f3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21554443d60e294cc0ac00adaef53ccb7de55d4fae66a38372a5adf0a0f1edda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 154242
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.006
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 983a5431e91b9c87bd2dfa14ed2ed60c471d675b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4ca6c6415552a8acd3d8e01a96d0ac5a4a936e845c4c0e6a7ac6a10ad3798db7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 155023
</span> }
array set version_4 {
version 4.052
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ checksums rmd160 [lindex [array get $install_version rmd160]
</span> size [lindex [array get $install_version size] 1]
# version gets set to the "current version" values to prevenet constant upgraing by port upgrade
version [perl5_convert_version [lindex [array get version_current version] 1]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
if {${perl5.major} != ""} {
depends_build-append \
</pre><pre style='margin:0'>
</pre>