Index: databases/mysql56-client/files/patch-cmake_ssl.cmake =================================================================== --- databases/mysql56-client/files/patch-cmake_ssl.cmake (nonexistent) +++ databases/mysql56-client/files/patch-cmake_ssl.cmake (working copy) @@ -0,0 +1,11 @@ +--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC ++++ cmake/ssl.cmake +@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) + ELSE() Property changes on: databases/mysql56-client/files/patch-cmake_ssl.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: databases/mysql56-server/Makefile =================================================================== --- databases/mysql56-server/Makefile (revision 432077) +++ databases/mysql56-server/Makefile (working copy) @@ -54,6 +54,9 @@ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ + -DWITH_SSL=${OPENSSLBASE} \ + -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ + -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \ -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -129,12 +132,6 @@ .include -.if ${SSL_DEFAULT} == base -CMAKE_ARGS+= -DWITH_SSL=system -.else -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} -.endif - post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt Index: databases/mysql56-server/files/patch-cmake_ssl.cmake =================================================================== --- databases/mysql56-server/files/patch-cmake_ssl.cmake (nonexistent) +++ databases/mysql56-server/files/patch-cmake_ssl.cmake (working copy) @@ -0,0 +1,11 @@ +--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC ++++ cmake/ssl.cmake +@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) + ELSE() Property changes on: databases/mysql56-server/files/patch-cmake_ssl.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property