Index: branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt =================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt (revision 414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt (revision 414912) @@ -1,39 +1,40 @@ ---- 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) -ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -560,18 +560,17 @@ +@@ -546,18 +546,17 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) -ADD_SUBDIRECTORY(packaging/solaris) # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) 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) + Index: branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt =================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt (revision 414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt (revision 414912) @@ -1,43 +1,43 @@ ---- 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) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) +ENDIF() 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) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +ENDIF() 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 ( - mysql_plugin - mysql_upgrade mysqlcheck mysqldump mysqlimport Index: branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake =================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake (revision 414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake (revision 414912) @@ -1,20 +1,20 @@ ---- 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) - SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") # 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) - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") Index: branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt =================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt (revision 414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt (revision 414912) @@ -1,25 +1,24 @@ ---- 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() +IF(FALSE) 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() +ENDIF() 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) TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) Index: branches/2016Q2/databases/mysql56-server/Makefile =================================================================== --- branches/2016Q2/databases/mysql56-server/Makefile (revision 414911) +++ branches/2016Q2/databases/mysql56-server/Makefile (revision 414912) @@ -1,79 +1,79 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.27 +PORTVERSION= 5.6.30 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql56-client USES= cmake shebangfix CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 56 USES+= perl5 USE_PERL5= run CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ mariadb*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql MMAN1= 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 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" .else USES+= libedit .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "armv6" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: branches/2016Q2/databases/mysql56-server/distinfo =================================================================== --- branches/2016Q2/databases/mysql56-server/distinfo (revision 414911) +++ branches/2016Q2/databases/mysql56-server/distinfo (revision 414912) @@ -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 Index: branches/2016Q2 =================================================================== --- branches/2016Q2 (revision 414911) +++ branches/2016Q2 (revision 414912) Property changes on: branches/2016Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r413653