Attachment #166802 for bug #206998

View | Details | Raw Unified | Return to bug 206998 | Differences between

and this patch




# $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $

PORTNAME=	mysql
PORTVERSION=	5.7.11
#PORTREVISION?=	0
CATEGORIES=	databases ipv6
MASTER_SITES=	MYSQL/MySQL-5.7
PKGNAMESUFFIX?=	57-server
DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	mokhi64@gmail.com
COMMENT=	Multithreaded SQL database (server)

BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
WITHOUT_SSL_DESC=	No SSL/TLS support

CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
		-DINSTALL_DOCDIR="share/doc/mysql" \
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
		-DINSTALL_INCLUDEDIR="include/mysql" \
		-DINSTALL_INFODIR="info" \

		-DINSTALL_SCRIPTDIR="bin" \
		-DINSTALL_SHAREDIR="share" \
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DWITH_INNODB_EXTRA_DEBUG=0 \
		-DWITH_BOOST=${WRKSRC}/boost \
		-DWITH_LIBEVENT=system \
		-DWITH_ZLIB=system

SHEBANG_FILES=	scripts/*.pl* scripts/*.sh


PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"

.else
USES+=		libedit
CMAKE_ARGS+=	-DWITH_EDITLINE=system
.endif

.include <bsd.port.pre.mk>

Lines 1-4 Link Here

(-)mysql57-server.work/distinfo (-4 / +2 lines)
1	SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74	1	SHA256 (mysql-boost-5.7.11.tar.gz) = ab21347ba004a5aa349b911d829a14e79b1e36e4bcd007d39d75212071414e28
2	SIZE (mysql-5.7.10.tar.gz) = 48919371	2	SIZE (mysql-boost-5.7.11.tar.gz) = 59225677
3	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
4	SIZE (boost_1_59_0.tar.gz) = 83709983




--- CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ CMakeLists.txt
@@ -587,12 +587,10 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)

   ENDIF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
@@ -601,8 +599,6 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

   ADD_SUBDIRECTORY(support-files)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
@@ -661,6 +657,7 @@ ENDIF()
 #
 # RPM installs documentation directly from the source tree
 #

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()




--- client/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ client/CMakeLists.txt
@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
 
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)

 
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 ADD_DEFINITIONS(${SSL_DEFINES})
+IF(FALSE)

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
 

 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
 
@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
   mysqlbinlog.cc
@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
 
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)

 
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
 ENDIF()
 

 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
@@ -123,11 +129,6 @@ ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (
   mysql_plugin

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-cmake_plugin.cmake (-1 / +1 lines)
1	--- cmake/plugin.cmake.orig 2015-11-29 19:16:24 UTC	1	--- cmake/plugin.cmake.orig 2016-02-01 23:31:58 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)	3	@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)
4	MYSQL_INSTALL_TARGETS(${target}	4	MYSQL_INSTALL_TARGETS(${target}

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-cmd-line-utils_libedit_chartype.h (-1 / +1 lines)
1	--- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/chartype.h.orig 2016-02-01 23:31:58 UTC
2	+++ cmd-line-utils/libedit/chartype.h	2	+++ cmd-line-utils/libedit/chartype.h
3	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */	4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-cmd-line-utils_libedit_vi.c (-1 / +1 lines)
1	--- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/vi.c.orig 2016-02-01 23:31:58 UTC
2	+++ cmd-line-utils/libedit/vi.c	2	+++ cmd-line-utils/libedit/vi.c
3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att	3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
4	* NB: posix implies that we should enter insert mode, however	4	* NB: posix implies that we should enter insert mode, however




--- include/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ include/CMakeLists.txt
@@ -69,6 +69,7 @@ SET(HEADERS 
   ${HEADERS_GEN_CONFIGURE}
 )
 
+IF(FALSE) 
 INSTALL(FILES
   ../libbinlogevents/export/binary_log_types.h
   DESTINATION ${INSTALL_INCLUDEDIR}
@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
  PATTERN "*.h"
  PATTERN "psi_abi*" EXCLUDE
 )

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-include_my__compare.h (-1 / +1 lines)
1	--- include/my_compare.h.orig 2015-11-29 19:16:24 UTC	1	--- include/my_compare.h.orig 2016-02-01 23:31:58 UTC
2	+++ include/my_compare.h	2	+++ include/my_compare.h
3	@@ -40,7 +40,7 @@ extern "C" {	3	@@ -40,7 +40,7 @@ extern "C" {
4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-include_my__thread__os__id.h (-1 / +1 lines)
1	--- include/my_thread_os_id.h.orig 2015-11-29 19:16:24 UTC	1	--- include/my_thread_os_id.h.orig 2016-02-01 23:31:58 UTC
2	+++ include/my_thread_os_id.h	2	+++ include/my_thread_os_id.h
3	@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa	3	@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
4	return pthread_getthreadid_np();	4	return pthread_getthreadid_np();

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-include_myisam.h (-1 / +1 lines)
1	--- include/myisam.h.orig 2015-11-29 19:16:24 UTC	1	--- include/myisam.h.orig 2016-02-01 23:31:58 UTC
2	+++ include/myisam.h	2	+++ include/myisam.h
3	@@ -45,7 +45,7 @@ extern "C" {	3	@@ -45,7 +45,7 @@ extern "C" {
4	The following defines can be increased if necessary.	4	The following defines can be increased if necessary.

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-libmysql_CMakeLists.txt (-1 / +1 lines)
1	--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- libmysql/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -215,7 +215,7 @@ IF(WIN32)	3	@@ -215,7 +215,7 @@ IF(WIN32)
4	ENDIF()	4	ENDIF()

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-libservices_CMakeLists.txt (-1 / +1 lines)
1	--- libservices/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- libservices/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ libservices/CMakeLists.txt	2	+++ libservices/CMakeLists.txt
3	@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES	3	@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
4	security_context_service.c)	4	security_context_service.c)




--- man/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
+++ man/CMakeLists.txt
@@ -14,9 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 # Copy man pages
-FILE(GLOB MAN1_FILES *.1)
-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
-FILE(GLOB MAN1_NDB ndb*.1)
+FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1  mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1  mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1  mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1  mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1  mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
 FILE(GLOB MAN8_FILES *.8)
 FILE(GLOB MAN8_NDB ndb*.8)
 IF(MAN1_FILES)

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-mysys__ssl_my__default.cc (-1 / +1 lines)
1	--- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC	1	--- mysys_ssl/my_default.cc.orig 2016-02-01 23:31:58 UTC
2	+++ mysys_ssl/my_default.cc	2	+++ mysys_ssl/my_default.cc
3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;	3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
4		4

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-plugin_password__validation_validate__password.cc (-1 / +1 lines)
1	--- plugin/password_validation/validate_password.cc.orig 2015-11-29 19:16:24 UTC	1	--- plugin/password_validation/validate_password.cc.orig 2016-02-01 23:31:58 UTC
2	+++ plugin/password_validation/validate_password.cc	2	+++ plugin/password_validation/validate_password.cc
3	@@ -18,6 +18,8 @@	3	@@ -18,6 +18,8 @@
4	#include <mysql/plugin_validate_password.h>	4	#include <mysql/plugin_validate_password.h>

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-scripts_CMakeLists.txt (-1 / +1 lines)
1	--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- scripts/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-sql_CMakeLists.txt (-1 / +1 lines)
1	--- sql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- sql/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ sql/CMakeLists.txt	2	+++ sql/CMakeLists.txt
3	@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(	3	@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
4	${ZLIB_INCLUDE_DIR}	4	${ZLIB_INCLUDE_DIR}

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-sql_conn__handler_socket__connection.cc (-1 / +1 lines)
1	--- sql/conn_handler/socket_connection.cc.orig 2015-11-29 19:16:24 UTC	1	--- sql/conn_handler/socket_connection.cc.orig 2016-02-01 23:31:58 UTC
2	+++ sql/conn_handler/socket_connection.cc	2	+++ sql/conn_handler/socket_connection.cc
3	@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li	3	@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
4	signal(SIGCHLD, SIG_DFL);	4	signal(SIGCHLD, SIG_DFL);

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-sql_sql__view.cc (-1 / +1 lines)
1	--- sql/sql_view.cc.orig 2015-11-29 19:16:24 UTC	1	--- sql/sql_view.cc.orig 2016-02-01 23:31:58 UTC
2	+++ sql/sql_view.cc	2	+++ sql/sql_view.cc
3	@@ -768,46 +768,46 @@ static const int required_view_parameter	3	@@ -768,46 +768,46 @@ static const int required_view_parameter
4	*/	4	*/




--- sql/sys_vars.cc.orig	2016-02-01 23:31:58 UTC
+++ sql/sys_vars.cc
@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
        "connection before closing it",

 
 static Sys_var_ulong Sys_join_buffer_size(
        "join_buffer_size",
@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_read_timeou
        "Number of seconds to wait for more data from a connection before "
        "aborting the read",
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),

        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_read_timeout));
 
@@ -2584,7 +2584,7 @@ static Sys_var_ulong Sys_net_write_timeo
        "Number of seconds to wait for a block to be written to a connection "
        "before aborting the write",
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),

        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_write_timeout));
 
@@ -4034,7 +4034,7 @@ static Sys_var_ulong Sys_net_wait_timeou
        "The number of seconds the server waits for activity on a "
        "connection before closing it",
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-storage_innobase_include_srv0mon.h (-1 / +1 lines)
1	--- storage/innobase/include/srv0mon.h.orig 2015-11-29 19:16:24 UTC	1	--- storage/innobase/include/srv0mon.h.orig 2016-02-01 23:31:58 UTC
2	+++ storage/innobase/include/srv0mon.h	2	+++ storage/innobase/include/srv0mon.h
3	@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang	3	@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang
4	/* Required for FreeBSD so that INT64_MAX is defined. */	4	/* Required for FreeBSD so that INT64_MAX is defined. */

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-storage_myisam_mi__dynrec.c (-1 / +1 lines)
1	--- storage/myisam/mi_dynrec.c.orig 2015-11-29 19:16:24 UTC	1	--- storage/myisam/mi_dynrec.c.orig 2016-02-01 23:31:58 UTC
2	+++ storage/myisam/mi_dynrec.c	2	+++ storage/myisam/mi_dynrec.c
3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my	3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
4	DBUG_RETURN(1);	4	DBUG_RETURN(1);

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-support-files_CMakeLists.txt (-1 / +1 lines)
1	--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- support-files/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -69,7 +69,9 @@ IF(UNIX)	3	@@ -69,7 +69,9 @@ IF(UNIX)
4	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	4	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)

Lines 25-30 Link Here

(-)mysql57-server.work/pkg-plist (+1 lines)
25	lib/mysql/plugin/auth_test_plugin.so	25	lib/mysql/plugin/auth_test_plugin.so
26	lib/mysql/plugin/daemon_example.ini	26	lib/mysql/plugin/daemon_example.ini
27	%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so	27	%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
		28	lib/mysql/plugin/keyring_file.so
28	lib/mysql/plugin/libdaemon_example.so	29	lib/mysql/plugin/libdaemon_example.so
29	lib/mysql/plugin/libtest_framework.so	30	lib/mysql/plugin/libtest_framework.so
30	lib/mysql/plugin/libtest_services.so	31	lib/mysql/plugin/libtest_services.so

Return to bug 206998

Lines 2-13 Link Here

(-)mysql57-server.work/Makefile (-9 / +13 lines)
2	# $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $	2	# $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTVERSION= 5.7.10	5	PORTVERSION= 5.7.11
6	PORTREVISION?= 3	6	#PORTREVISION?= 0
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost	8	MASTER_SITES= MYSQL/MySQL-5.7
9	PKGNAMESUFFIX?= 57-server	9	PKGNAMESUFFIX?= 57-server
10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost	10	DISTNAME= ${PORTNAME}-boost-${PORTVERSION}
		11	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
11		12
12	MAINTAINER= mokhi64@gmail.com	13	MAINTAINER= mokhi64@gmail.com
13	COMMENT= Multithreaded SQL database (server)	14	COMMENT= Multithreaded SQL database (server)
Lines 25-31 Link Here
25	BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL	26	BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL
26	WITHOUT_SSL_DESC= No SSL/TLS support	27	WITHOUT_SSL_DESC= No SSL/TLS support
27		28
28	CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \	29	CMAKE_ARGS+= -DINSTALL_LAYOUT=STANDALONE \
		30	-DINSTALL_DOCDIR="share/doc/mysql" \
29	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \	31	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
30	-DINSTALL_INCLUDEDIR="include/mysql" \	32	-DINSTALL_INCLUDEDIR="include/mysql" \
31	-DINSTALL_INFODIR="info" \	33	-DINSTALL_INFODIR="info" \
Lines 40-48 Link Here
40	-DINSTALL_SCRIPTDIR="bin" \	42	-DINSTALL_SCRIPTDIR="bin" \
41	-DINSTALL_SHAREDIR="share" \	43	-DINSTALL_SHAREDIR="share" \
42	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	44	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
43	-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \	45	-DWITH_INNODB_EXTRA_DEBUG=0 \
44	-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \	46	-DWITH_BOOST=${WRKSRC}/boost \
45	-DWITH_INNODB_EXTRA_DEBUG=0	47	-DWITH_LIBEVENT=system \
		48	-DWITH_ZLIB=system
46		49
47	SHEBANG_FILES= scripts/.pl scripts/*.sh	50	SHEBANG_FILES= scripts/.pl scripts/*.sh
48		51
Lines 112-118 Link Here
112	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"	115	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
113		116
114	.else	117	.else
115	USES+= readline	118	USES+= libedit
		119	CMAKE_ARGS+= -DWITH_EDITLINE=system
116	.endif	120	.endif
117		121
118	.include <bsd.port.pre.mk>	122	.include <bsd.port.pre.mk>

Lines 1-6 Link Here

(-)mysql57-server.work/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -577,12 +577,10 @@ IF(UNIX)	3	@@ -587,12 +587,10 @@ IF(UNIX)
4	ENDIF()	4	ENDIF()
5		5
6	IF(NOT WITHOUT_SERVER)	6	IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13	ENDIF(WITH_EMBEDDED_SERVER)	13	ENDIF(WITH_EMBEDDED_SERVER)
14	ENDIF()	14	ENDIF()
15		15
16	@@ -591,8 +589,6 @@ ENDIF()	16	@@ -601,8 +599,6 @@ ENDIF()
17	ADD_SUBDIRECTORY(scripts)	17	ADD_SUBDIRECTORY(scripts)
18		18
19	IF(NOT WITHOUT_SERVER)	19	IF(NOT WITHOUT_SERVER)
Lines 22-28 Link Here
22	ADD_SUBDIRECTORY(support-files)	22	ADD_SUBDIRECTORY(support-files)
23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24	ADD_SUBDIRECTORY(internal)	24	ADD_SUBDIRECTORY(internal)
25	@@ -647,6 +643,7 @@ ENDIF()	25	@@ -661,6 +657,7 @@ ENDIF()
26	#	26	#
27	# RPM installs documentation directly from the source tree	27	# RPM installs documentation directly from the source tree
28	#	28	#
Lines 30-36 Link Here
30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31	INSTALL(FILES COPYING LICENSE.mysql	31	INSTALL(FILES COPYING LICENSE.mysql
32	DESTINATION ${INSTALL_DOCREADMEDIR}	32	DESTINATION ${INSTALL_DOCREADMEDIR}
33	@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	33	@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34	PATTERN "sp-imp-spec.txt" EXCLUDE	34	PATTERN "sp-imp-spec.txt" EXCLUDE
35	)	35	)
36	ENDIF()	36	ENDIF()

Lines 1-6 Link Here

(-)mysql57-server.work/files/patch-client_CMakeLists.txt (-9 / +9 lines)
1	--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- client/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -38,8 +38,6 @@ ADD_DEFINITIONS(	3	@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
4		4
5	## Subdirectory with common client code.	5	## Subdirectory with common client code.
6	ADD_SUBDIRECTORY(base)	6	ADD_SUBDIRECTORY(base)
Lines 9-16 Link Here
9		9
10	## We will need libeay32.dll and ssleay32.dll when running client executables.	10	## We will need libeay32.dll and ssleay32.dll when running client executables.
11	COPY_OPENSSL_DLLS(copy_openssl_client)	11	COPY_OPENSSL_DLLS(copy_openssl_client)
12	@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F	12	@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
13	ENDIF()	13	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
14		14
15	ADD_DEFINITIONS(${SSL_DEFINES})	15	ADD_DEFINITIONS(${SSL_DEFINES})
16	+IF(FALSE)	16	+IF(FALSE)
Lines 23-29 Link Here
23		23
24	IF(NOT WITHOUT_SERVER)	24	IF(NOT WITHOUT_SERVER)
25	MYSQL_ADD_EXECUTABLE(mysql_upgrade	25	MYSQL_ADD_EXECUTABLE(mysql_upgrade
26	@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli	26	@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
29		29
Lines 31-37 Link Here
31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)	31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)	32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
33		33
34	@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	34	@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
35		35
36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Lines 44-50 Link Here
44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
45	ADD_COMPILE_FLAGS(	45	ADD_COMPILE_FLAGS(
46	mysqlbinlog.cc	46	mysqlbinlog.cc
47	@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	47	@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
48		48
49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 52-58 Link Here
52		52
53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)	53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)	54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
55	@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)	55	@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)	56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
57	ENDIF()	57	ENDIF()
58		58
Lines 64-70 Link Here
64		64
65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".	65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
66	IF(WIN32)	66	IF(WIN32)
67	@@ -197,11 +203,6 @@ ENDIF(WIN32)	67	@@ -123,11 +129,6 @@ ENDIF(WIN32)
68		68
69	SET_TARGET_PROPERTIES (	69	SET_TARGET_PROPERTIES (
70	mysql_plugin	70	mysql_plugin

Lines 1-12 Link Here

(-)mysql57-server.work/files/patch-include_CMakeLists.txt (-6 / +8 lines)
1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- include/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -69,10 +69,12 @@ SET(HEADERS	3	@@ -69,6 +69,7 @@ SET(HEADERS
		4	${HEADERS_GEN_CONFIGURE}
4	)	5	)
5		6
6	+IF(FALSE)	7	+IF(FALSE)
7	INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})	8	INSTALL(FILES
8	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)	9	../libbinlogevents/export/binary_log_types.h
9	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development	10	DESTINATION ${INSTALL_INCLUDEDIR}
		11	@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
10	PATTERN "*.h"	12	PATTERN "*.h"
11	PATTERN "psi_abi*" EXCLUDE	13	PATTERN "psi_abi*" EXCLUDE
12	)	14	)

Lines 1-11 Link Here

(-)mysql57-server.work/files/patch-man_CMakeLists.txt (-3 / +5 lines)
1	--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- man/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -15,8 +15,6 @@	3	@@ -14,9 +14,7 @@
		4	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4		5
5	# Copy man pages	6	# Copy man pages
6	FILE(GLOB MAN1_FILES *.1)	7	-FILE(GLOB MAN1_FILES *.1)
7	-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)	8	-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
8	-FILE(GLOB MAN1_NDB ndb*.1)	9	-FILE(GLOB MAN1_NDB ndb*.1)
		10	+FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
9	FILE(GLOB MAN8_FILES *.8)	11	FILE(GLOB MAN8_FILES *.8)
10	FILE(GLOB MAN8_NDB ndb*.8)	12	FILE(GLOB MAN8_NDB ndb*.8)
11	IF(MAN1_FILES)	13	IF(MAN1_FILES)

Lines 1-4 Link Here

(-)mysql57-server.work/files/patch-sql_sys__vars.cc (-4 / +4 lines)
1	--- sql/sys_vars.cc.orig 2015-11-29 19:16:24 UTC	1	--- sql/sys_vars.cc.orig 2016-02-01 23:31:58 UTC
2	+++ sql/sys_vars.cc	2	+++ sql/sys_vars.cc
3	@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim	3	@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
4	"connection before closing it",	4	"connection before closing it",
Lines 9-15 Link Here
9		9
10	static Sys_var_ulong Sys_join_buffer_size(	10	static Sys_var_ulong Sys_join_buffer_size(
11	"join_buffer_size",	11	"join_buffer_size",
12	@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou	12	@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_read_timeou
13	"Number of seconds to wait for more data from a connection before "	13	"Number of seconds to wait for more data from a connection before "
14	"aborting the read",	14	"aborting the read",
15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),	15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
Lines 18-24 Link Here
18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
19	ON_UPDATE(fix_net_read_timeout));	19	ON_UPDATE(fix_net_read_timeout));
20		20
21	@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo	21	@@ -2584,7 +2584,7 @@ static Sys_var_ulong Sys_net_write_timeo
22	"Number of seconds to wait for a block to be written to a connection "	22	"Number of seconds to wait for a block to be written to a connection "
23	"before aborting the write",	23	"before aborting the write",
24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),	24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
Lines 27-33 Link Here
27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
28	ON_UPDATE(fix_net_write_timeout));	28	ON_UPDATE(fix_net_write_timeout));
29		29
30	@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou	30	@@ -4034,7 +4034,7 @@ static Sys_var_ulong Sys_net_wait_timeou
31	"The number of seconds the server waits for activity on a "	31	"The number of seconds the server waits for activity on a "
32	"connection before closing it",	32	"connection before closing it",
33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),	33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),