Attachment #179253 for bug #216311

Lines 2-8 Link Here

(-)databases/mysql56-client/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTREVISION?= 0	5	PORTREVISION?= 1
6	PKGNAMESUFFIX= 56-client	6	PKGNAMESUFFIX= 56-client
7		7
8	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)

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()

Lines 3-9 Link Here

(-)databases/mysql56-server/Makefile (-7 / +4 lines)
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 5.6.35	5	PORTVERSION= 5.6.35
6	PORTREVISION?= 2	6	PORTREVISION?= 3
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.6	8	MASTER_SITES= MYSQL/MySQL-5.6
9	PKGNAMESUFFIX?= 56-server	9	PKGNAMESUFFIX?= 56-server
Lines 54-59 Link Here
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

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