Date: Tue, 19 Apr 2016 15:45:07 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413653 - in head/databases: mysql56-client/files mysql56-server Message-ID: <201604191545.u3JFj76S051613@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Tue Apr 19 15:45:07 2016 New Revision: 413653 URL: https://svnweb.freebsd.org/changeset/ports/413653 Log: Update to 5.6.30 release. Modified: head/databases/mysql56-client/files/patch-CMakeLists.txt head/databases/mysql56-client/files/patch-client_CMakeLists.txt head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake head/databases/mysql56-client/files/patch-extra_CMakeLists.txt head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo Modified: head/databases/mysql56-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql56-client/files/patch-CMakeLists.txt Tue Apr 19 15:33:46 2016 (r413652) +++ head/databases/mysql56-client/files/patch-CMakeLists.txt Tue Apr 19 15:45:07 2016 (r413653) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 13:56:19.445692503 +0000 -@@ -492,8 +492,8 @@ +--- CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ CMakeLists.txt 2016-04-19 17:30:13.343558770 +0200 +@@ -475,8 +475,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,7 +10,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -560,18 +560,17 @@ +@@ -546,18 +546,17 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -30,10 +30,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +596,6 @@ +@@ -579,6 +578,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: head/databases/mysql56-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql56-client/files/patch-client_CMakeLists.txt Tue Apr 19 15:33:46 2016 (r413652) +++ head/databases/mysql56-client/files/patch-client_CMakeLists.txt Tue Apr 19 15:45:07 2016 (r413653) @@ -1,7 +1,7 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ client/CMakeLists.txt 2016-04-19 17:30:13.344558659 +0200 +@@ -37,9 +37,11 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) @@ -12,8 +12,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -32,7 +32,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ +@@ -81,8 +87,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( Modified: head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake ============================================================================== --- head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Tue Apr 19 15:33:46 2016 (r413652) +++ head/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Tue Apr 19 15:45:07 2016 (r413653) @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2014-12-05 10:49:17.394216277 +0000 -+++ cmake/build_configurations/compiler_options.cmake 2014-12-05 10:50:58.144209859 +0000 -@@ -25,7 +25,7 @@ +--- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 ++++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 +@@ -25,7 +25,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,7 +9,7 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ IF(UNIX) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) Modified: head/databases/mysql56-client/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mysql56-client/files/patch-extra_CMakeLists.txt Tue Apr 19 15:33:46 2016 (r413652) +++ head/databases/mysql56-client/files/patch-extra_CMakeLists.txt Tue Apr 19 15:45:07 2016 (r413653) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 -@@ -60,6 +60,7 @@ +--- extra/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ extra/CMakeLists.txt 2016-04-19 17:37:34.634528313 +0200 +@@ -60,6 +60,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY ENDIF() @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -96,11 +97,14 @@ +@@ -96,10 +97,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) ENDIF() @@ -16,9 +16,8 @@ IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Tue Apr 19 15:33:46 2016 (r413652) +++ head/databases/mysql56-server/Makefile Tue Apr 19 15:45:07 2016 (r413653) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.27 +PORTVERSION= 5.6.30 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Tue Apr 19 15:33:46 2016 (r413652) +++ head/databases/mysql56-server/distinfo Tue Apr 19 15:45:07 2016 (r413653) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.27.tar.gz) = 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d -SIZE (mysql-5.6.27.tar.gz) = 33327156 +SHA256 (mysql-5.6.30.tar.gz) = 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb +SIZE (mysql-5.6.30.tar.gz) = 32223818
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604191545.u3JFj76S051613>