Attachment #179246 for bug #216311

Line 0 Link Here

(-)databases/mysql56-client/files/patch-cmake_ssl.cmake (+11 lines)
	1	--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC
	2	+++ cmake/ssl.cmake
	3	@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL)
	4	IF(OPENSSL_INCLUDE_DIR AND
	5	OPENSSL_LIBRARY AND
	6	CRYPTO_LIBRARY AND
	7	- OPENSSL_MAJOR_VERSION STREQUAL "1"
	8	+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
	9	)
	10	SET(OPENSSL_FOUND TRUE)
	11	ELSE()




		-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


.include <bsd.port.pre.mk>

.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


Line 0 Link Here

(-)databases/mysql56-server/files/patch-cmake_ssl.cmake (+11 lines)
	1	--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC
	2	+++ cmake/ssl.cmake
	3	@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL)
	4	IF(OPENSSL_INCLUDE_DIR AND
	5	OPENSSL_LIBRARY AND
	6	CRYPTO_LIBRARY AND
	7	- OPENSSL_MAJOR_VERSION STREQUAL "1"
	8	+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
	9	)
	10	SET(OPENSSL_FOUND TRUE)
	11	ELSE()

Return to bug 216311

Lines 54-59 Link Here

(-)databases/mysql56-server/Makefile (-6 / +3 lines)
54	-DWITH_LIBEVENT=system \	54	-DWITH_LIBEVENT=system \
55	-DWITH_LZ4=system \	55	-DWITH_LZ4=system \
56	-DWITH_ZLIB=system \	56	-DWITH_ZLIB=system \
		57	-DWITH_SSL=${OPENSSLBASE} \
		58	-DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
		59	-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
57	-DINSTALL_MYSQLTESTDIR=0	60	-DINSTALL_MYSQLTESTDIR=0
58		61
59	SHEBANG_FILES= scripts/.pl scripts/*.sh	62	SHEBANG_FILES= scripts/.pl scripts/*.sh
Lines 129-140 Link Here
129		132
130	.include <bsd.port.pre.mk>	133	.include <bsd.port.pre.mk>
131		134
132	.if ${SSL_DEFAULT} == base
133	CMAKE_ARGS+= -DWITH_SSL=system
134	.else
135	CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
136	.endif
137
138	post-patch:	135	post-patch:
139	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt	136	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
140		137