[132850] trunk/dports/databases/mysql56

[pixilla at macports.org]

Revision: 132850
          https://trac.macports.org/changeset/132850
Author:   pixilla at macports.org
Date:     2015-02-11 11:58:32 -0800 (Wed, 11 Feb 2015)
Log Message:
-----------
databases/mysql56:
- Fix OPENSSL_VERSION_NUMBER regex. Upstream ticket http://bugs.mysql.com/bug.php?id=75622. Closes #46766.

Modified Paths:
--------------
    trunk/dports/databases/mysql56/Portfile

Added Paths:
-----------
    trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2015-02-11 19:36:00 UTC (rev 132849)
+++ trunk/dports/databases/mysql56/Portfile	2015-02-11 19:58:32 UTC (rev 132850)
@@ -39,6 +39,10 @@
     patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff \
                         patch-scripts-mysql_secure_installation.pl.in.diff
 
+    # Patch cmake/ssl.cmake to be compatible with OpenSSL 1.0.2.
+    # http://bugs.mysql.com/bug.php?id=75622
+    patchfiles-append   patch-cmake-ssl.cmake.diff
+
     if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
         # Disallow clang versions older than the clang version which caused the problem
         #compiler.blacklist {clang < 425}

Added: trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff	                        (rev 0)
+++ trunk/dports/databases/mysql56/files/patch-cmake-ssl.cmake.diff	2015-02-11 19:58:32 UTC (rev 132850)
@@ -0,0 +1,11 @@
+--- a/cmake/ssl.cmake	2015-01-19 08:48:32.000000000 -0500
++++ b/cmake/ssl.cmake	2015-02-11 00:41:55.000000000 -0500
+@@ -166,7 +166,7 @@
+     # Encoded as MNNFFPPS: major minor fix patch status
+     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+       OPENSSL_VERSION_NUMBER
+-      REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
++      REGEX "^#[\t ]+define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+     )
+     STRING(REGEX REPLACE
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150211/915df2b2/attachment.html>