Attachment 170391 Details for Bug 209458 – Patch merges Kim's fix to correctly choose SSL Ports for 9.X

[patch] Patch merges Kim's fix to correctly choose SSL Ports for 9.X

patch-databases_mysql57-fix_ssl_base.diff (text/plain), 1.23 KB, created by Mahdi Mokhtari on 2016-05-17 08:17:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2016-05-17 08:17:29 UTC

Size: 1.23 KB

patch

obsolete

>Index: databases/mysql57-server/Makefile
>===================================================================
>--- databases/mysql57-server/Makefile	(revision 415316)
>+++ databases/mysql57-server/Makefile	(working copy)
>@@ -21,14 +21,12 @@
> USE_OPENSSL=	yes
> USE_PERL5=	run
> 
>-WITH_OPENSSL_PORT=	yes
>-
> MY_DBDIR=	/var/db/mysql
> MY_SECDIR=	/var/db/mysql_secure
> MY_TMPDIR=	/var/db/mysql_tmpdir
> 
>-LIB_DEPENDS+=	libevent.so:devel/libevent2 \
>-		liblz4.so:archivers/liblz4
>+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
>+		liblz4.so:${PORTSDIR}/archivers/liblz4
> 
> CMAKE_BUILD_TYPE=	Release
> 
>@@ -57,9 +55,7 @@
> 		-DWITH_EDITLINE=system \
> 		-DWITH_LIBEVENT=system \
> 		-DWITH_LZ4=system \
>-		-DWITH_ZLIB=system \
>-		-DWITH_SSL=${OPENSSLBASE} \
>-		-DWITH_PIC=1
>+		-DWITH_ZLIB=system
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
>@@ -139,7 +135,16 @@
> .if !defined(CLIENT_ONLY)
> EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
> .endif
>+WITH_OPENSSL_PORT=	yes
>+
>+### FreeBSD Version > 9.X ###
>+.else
>+.if defined(WITH_OPENSSL_BASE)
>+CMAKE_ARGS+=		-DWITH_SSL=system
>+.else
>+CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
> .endif
>+.endif
> 
> post-extract:
> 	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 209458: 170235 | 170365 | 170380 | 170391 | 170411