[145955] trunk/dports/databases/mysql56

[pixilla at macports.org]

Revision: 145955
          https://trac.macports.org/changeset/145955
Author:   pixilla at macports.org
Date:     2016-02-22 17:12:15 -0800 (Mon, 22 Feb 2016)
Log Message:
-----------
databases/mysql56: Refactor yassl patch to fix building with openssl variant. Closes #50699

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

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

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2016-02-23 00:41:53 UTC (rev 145954)
+++ trunk/dports/databases/mysql56/Portfile	2016-02-23 01:12:15 UTC (rev 145955)
@@ -8,7 +8,7 @@
 version             5.6.29
 # Set revision_client and revision_server to 0 on
 # version bump.
-set revision_client 3
+set revision_client 4
 set revision_server 0
 set version_branch  [join [lrange [split ${version} .] 0 1] .]
 categories          databases
@@ -38,6 +38,9 @@
     patch.pre_args      -p1
     patchfiles          patch-cmake-install_layout.cmake.diff
 
+    # Add yasll includes and libs before prefix
+    patchfiles-append   patch-cmake-install_layout.cmake-yassl.diff
+
     # Fix detection of htonll/ntohll.
     patchfiles-append   patch-configure.cmake.diff \
                         patch-innodb_memcached-daemon_memcached-include-memcached-util.h.diff
@@ -83,6 +86,10 @@
             ${worksrcpath}/scripts/mysql_secure_installation.pl.in
     }
 
+    post-configure {
+        ui_error "Debugging cmake"
+    }
+
     configure.args-delete \
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
     configure.args-append \
@@ -157,11 +164,12 @@
         }
     }
 
-    variant openssl description {Enable OpenSSL support} {
+    variant openssl description {Instead of the bundled yaSSL use OpenSSL} {
         configure.args-delete   -DWITH_SSL:STRING=bundled
         configure.args-append   -DWITH_SSL:STRING=${prefix}
         depends_lib-append      path:lib/libssl.dylib:openssl
         archcheck.files-append  lib/libssl.dylib
+        patchfiles-delete       patch-cmake-install_layout.cmake-yassl.diff
     }
 
     notes "

Added: trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake-yassl.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake-yassl.diff	                        (rev 0)
+++ trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake-yassl.diff	2016-02-23 01:12:15 UTC (rev 145955)
@@ -0,0 +1,11 @@
+--- a/cmake/install_layout.cmake	2016-02-22 12:55:26.000000000 -0800
++++ b/cmake/install_layout.cmake	2016-02-22 12:56:57.000000000 -0800
+@@ -225,6 +225,8 @@
+ #
+ # MACPORTS layout
+ #
++INCLUDE_DIRECTORIES(@WORKSRCPATH@/extra/yassl/include)
++LINK_DIRECTORIES(@WORKSRCPATH@/extra/yassl/lib)
+ SET(INSTALL_BINDIR_MACPORTS             "lib/@NAME@/bin")
+ SET(INSTALL_SBINDIR_MACPORTS            "lib/@NAME@/bin")
+ SET(INSTALL_SCRIPTDIR_MACPORTS          "lib/@NAME@/bin")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160222/3cb5a599/attachment.html>