Attachment 166996 Details for Bug 206998 – patch sets libs to system, adds radio option for zlib, bumps PORTREVISION to 5

[patch] patch sets libs to system, adds radio option for zlib, bumps PORTREVISION to 5

mysql57-update-libs.diff (text/plain), 2.08 KB, created by Markus Kohlmeyer on 2016-02-14 21:28:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-02-14 21:28:10 UTC

Size: 2.08 KB

patch

obsolete

>diff -Naur mysql57-client/Makefile mysql57-client/Makefile
>--- mysql57-client/Makefile	2016-02-14 21:33:22.901630000 +0100
>+++ mysql57-client/Makefile	2016-02-14 22:03:03.951495000 +0100
>@@ -2,7 +2,6 @@
> # $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $
> 
> PORTNAME=	mysql
>-PORTREVISION?=	4
> PKGNAMESUFFIX=	57-client
> 
> COMMENT=	Multithreaded SQL database (client)
>diff -Naur mysql57-server/Makefile mysql57-server/Makefile
>--- mysql57-server/Makefile	2016-02-14 21:33:22.903452000 +0100
>+++ mysql57-server/Makefile	2016-02-14 22:16:27.037793000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mysql
> PORTVERSION=	5.7.10
>-PORTREVISION?=	3
>+PORTREVISION?=	5
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
> PKGNAMESUFFIX?=	57-server
>@@ -17,13 +17,17 @@
> SLAVEDIRS=	databases/mysql57-client
> USES=		cmake:outsource shebangfix
> 
>-OPTIONS_RADIO=		SSL
>+OPTIONS_RADIO=		SSL ZLIB
> OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
>-OPTIONS_DEFAULT+=	OPENSSL
>+OPTIONS_DEFAULT+=	OPENSSL BUNDLED_ZLIB
>+OPTIONS_RADIO_ZLIB=	BUNDLED_ZLIB SYSTEM_ZLIB
>+
> NO_OPTIONS_SORT=	yes
> 
> BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
> WITHOUT_SSL_DESC=	No SSL/TLS support
>+BUNDLED_ZLIB_DESC=	Use bundled zlib
>+SYSTEM_ZLIB_DESC=	Use system zlib
> 
> CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
>@@ -42,7 +46,8 @@
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
> 		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
> 		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
>-		-DWITH_INNODB_EXTRA_DEBUG=0
>+		-DWITH_INNODB_EXTRA_DEBUG=0 \
>+		-DWITH_LIBEVENT=system
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
>@@ -54,6 +59,9 @@
> OPENSSL_USE=		OPENSSL=yes
> WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
> 
>+BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
>+SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
>+
> # MySQL-Server part
> .if !defined(CLIENT_ONLY)
> USE_MYSQL=	yes
>@@ -112,7 +120,8 @@
> PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
> 
> .else
>-USES+=		readline
>+USES+=		libedit
>+CMAKE_ARGS+=	-DWITH_EDITLINE=system
> .endif
> 
> .include <bsd.port.pre.mk>

Actions: View | Diff

Attachments on bug 206998: 166699 | 166705 | 166778 | 166801 | 166802 | 166853 | 166996 | 166997 | 167010 | 167027 | 168565 | 168566 | 168567 | 168568 | 168570 | 168572 | 169320 | 169321 | 169324 | 169325 | 169343 | 169433 | 169437 | 169592 | 169598 | 169982 | 169994 | 170041