Date: Fri, 4 Jan 2013 10:00:01 GMT From: Espen Tagestad <espen@tagestad.no> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172696: [new port][patch] databases/mysq56 Message-ID: <201301041000.r04A01ED020150@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172696; it has been noted by GNATS. From: Espen Tagestad <espen@tagestad.no> To: bug-followup@FreeBSD.org, osidorkin@gmail.com Cc: Subject: Re: ports/172696: [new port][patch] databases/mysq56 Date: Fri, 4 Jan 2013 10:52:51 +0100 --Apple-Mail=_1EFC42E1-26DA-40A8-9715-5A12E1C740DB Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Here is an update which adds support for the latest mysql 5.6.9-rc: --Apple-Mail=_1EFC42E1-26DA-40A8-9715-5A12E1C740DB Content-Disposition: attachment; filename=patch.txt Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: quoted-printable # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # mysql56-client # mysql56-client/pkg-plist # mysql56-client/files # mysql56-client/files/patch-client_CMakeLists.txt # mysql56-client/files/patch-include_my_compare.h # mysql56-client/files/patch-include_CMakeLists.txt # mysql56-client/files/patch-CMakeLists.txt # mysql56-client/files/patch-support-files_CMakeLists.txt # mysql56-client/files/patch-include_myisam.h # mysql56-client/files/patch-extra_CMakeLists.txt # mysql56-client/files/patch-man_CMakeLists.txt # mysql56-client/files/patch-scripts_CMakeLists.txt # mysql56-client/files/patch-include_my_global.h # mysql56-client/Makefile # mysql56-server # mysql56-server/pkg-descr # mysql56-server/distinfo # mysql56-server/files # mysql56-server/files/patch-sql_mysqld.cc # mysql56-server/files/patch-include_my_compare.h # mysql56-server/files/patch-scripts_CMakeLists.txt # mysql56-server/files/patch-scripts_mysqld_safe.sh # mysql56-server/files/patch-libmysql_CMakeLists.txt # mysql56-server/files/patch-libservices_CMakeLists.txt # mysql56-server/files/patch-extra_CMakeLists.txt # mysql56-server/files/patch-include_CMakeLists.txt # mysql56-server/files/patch-sql_sys_vars.cc # mysql56-server/files/patch-CMakeLists.txt # mysql56-server/files/patch-client_CMakeLists.txt # mysql56-server/files/patch-cmake_plugin.cmake # mysql56-server/files/patch-sql_CMakeLists.txt # mysql56-server/files/mysql-server.in # mysql56-server/files/patch-man_CMakeLists.txt # mysql56-server/files/patch-include_my_global.h # mysql56-server/files/patch-include_myisam.h # mysql56-server/files/patch-support-files_CMakeLists.txt # mysql56-server/Makefile # mysql56-server/pkg-plist # mysql56-server/pkg-message # echo c - mysql56-client mkdir -p mysql56-client > /dev/null 2>&1 echo x - mysql56-client/pkg-plist sed 's/^X//' >mysql56-client/pkg-plist << = '4b2dbd1eae38e192f4407c43f95aff2c' Xbin/mysql Xbin/mysql_config_editor Xbin/mysql_waitpid Xbin/mysqladmin Xbin/mysqlbinlog Xbin/mysqlcheck Xbin/mysqldump Xbin/mysqlimport Xbin/mysqlshow Xbin/mysqlslap Xinclude/mysql/big_endian.h Xinclude/mysql/byte_order_generic.h Xinclude/mysql/byte_order_generic_x86.h Xinclude/mysql/byte_order_generic_x86_64.h Xinclude/mysql/decimal.h Xinclude/mysql/errmsg.h Xinclude/mysql/keycache.h Xinclude/mysql/little_endian.h Xinclude/mysql/m_ctype.h Xinclude/mysql/m_string.h Xinclude/mysql/my_alloc.h Xinclude/mysql/my_attribute.h Xinclude/mysql/my_byteorder.h Xinclude/mysql/my_compiler.h Xinclude/mysql/my_config.h Xinclude/mysql/my_dbug.h Xinclude/mysql/my_dir.h Xinclude/mysql/my_getopt.h Xinclude/mysql/my_global.h Xinclude/mysql/my_list.h Xinclude/mysql/my_net.h Xinclude/mysql/my_pthread.h Xinclude/mysql/my_sys.h Xinclude/mysql/my_xml.h Xinclude/mysql/mysql/client_authentication.h Xinclude/mysql/mysql/client_plugin.h Xinclude/mysql/mysql/client_plugin.h.pp Xinclude/mysql/mysql/get_password.h Xinclude/mysql/mysql/innodb_priv.h Xinclude/mysql/mysql/plugin.h Xinclude/mysql/mysql/plugin_audit.h Xinclude/mysql/mysql/plugin_audit.h.pp Xinclude/mysql/mysql/plugin_auth.h Xinclude/mysql/mysql/plugin_auth.h.pp Xinclude/mysql/mysql/plugin_auth_common.h Xinclude/mysql/mysql/plugin_ftparser.h Xinclude/mysql/mysql/plugin_ftparser.h.pp Xinclude/mysql/mysql/plugin_validate_password.h Xinclude/mysql/mysql/service_mysql_string.h Xinclude/mysql/mysql/psi/mysql_file.h Xinclude/mysql/mysql/psi/mysql_idle.h Xinclude/mysql/mysql/psi/mysql_socket.h Xinclude/mysql/mysql/psi/mysql_stage.h Xinclude/mysql/mysql/psi/mysql_statement.h Xinclude/mysql/mysql/psi/mysql_table.h Xinclude/mysql/mysql/psi/mysql_thread.h Xinclude/mysql/mysql/psi/psi.h Xinclude/mysql/mysql/service_my_plugin_log.h Xinclude/mysql/mysql/service_my_snprintf.h Xinclude/mysql/mysql/service_thd_alloc.h Xinclude/mysql/mysql/service_thd_wait.h Xinclude/mysql/mysql/service_thread_scheduler.h Xinclude/mysql/mysql/services.h Xinclude/mysql/mysql/thread_pool_priv.h Xinclude/mysql/mysql.h Xinclude/mysql/mysql_com.h Xinclude/mysql/mysql_com_server.h Xinclude/mysql/mysql_embed.h Xinclude/mysql/mysql_time.h Xinclude/mysql/mysql_version.h Xinclude/mysql/mysqld_ername.h Xinclude/mysql/mysqld_error.h Xinclude/mysql/sql_common.h Xinclude/mysql/sql_state.h Xinclude/mysql/sslopt-case.h Xinclude/mysql/sslopt-longopts.h Xinclude/mysql/sslopt-vars.h Xinclude/mysql/typelib.h Xlib/mysql/libmysqlclient.a Xlib/mysql/libmysqlclient.so Xlib/mysql/libmysqlclient.so.18 Xlib/mysql/libmysqlclient_r.a Xlib/mysql/libmysqlclient_r.so Xlib/mysql/libmysqlclient_r.so.18 Xlib/mysql/libmysqlservices.a X@dirrm include/mysql/mysql/psi X@dirrm include/mysql/mysql X@dirrm include/mysql X@dirrmtry lib/mysql 4b2dbd1eae38e192f4407c43f95aff2c echo c - mysql56-client/files mkdir -p mysql56-client/files > /dev/null 2>&1 echo x - mysql56-client/files/patch-client_CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-client_CMakeLists.txt << = 'bdbd743706cc464c0485ad44114dbeec' X--- client/CMakeLists.txt.orig 2012-03-29 08:18:30.000000000 +0000 X+++ client/CMakeLists.txt 2012-04-19 18:00:48.141539119 +0000 X@@ -33,9 +33,11 @@ X TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) X ENDIF(UNIX) X=20 X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS = "-DTHREADS") X TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) X+ENDIF() X=20 X=20 X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) X@@ -47,15 +49,19 @@ X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) X=20 X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) X+ENDIF() X=20 X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) X=20 X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) X+ENDIF() X=20 X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) X@@ -73,8 +79,6 @@ X ENDIF(WIN32) X=20 X SET_TARGET_PROPERTIES ( X- mysql_plugin=20 X- mysql_upgrade X mysqlcheck X mysqldump X mysqlimport bdbd743706cc464c0485ad44114dbeec echo x - mysql56-client/files/patch-include_my_compare.h sed 's/^X//' >mysql56-client/files/patch-include_my_compare.h << = '1a5934d7cf6a9a70992a414c49bc1456' X--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 X+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 X@@ -39,7 +39,7 @@ X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and = HA_MAX_KEY_LENGTH. X */ X=20 X-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes = */ X+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes = */ X #define HA_MAX_KEY_SEG 16 /* Max segments for = key */ X=20 X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) 1a5934d7cf6a9a70992a414c49bc1456 echo x - mysql56-client/files/patch-include_CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-include_CMakeLists.txt << = 'a672f421ef8d6a144344724cd2a2f8e3' X--- include/CMakeLists.txt.orig 2012-07-17 15:55:06.000000000 = +0000 X+++ include/CMakeLists.txt 2012-08-14 16:03:17.708781121 +0000 X@@ -27,10 +27,6 @@ X my_list.h X my_alloc.h X typelib.h=20 X- mysql/plugin.h X- mysql/plugin_audit.h X- mysql/plugin_ftparser.h X- mysql/plugin_validate_password.h X ) X=20 X SET(HEADERS=20 a672f421ef8d6a144344724cd2a2f8e3 echo x - mysql56-client/files/patch-CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-CMakeLists.txt << = 'af20e5a4e9e4539f2613786b10d24bfc' X--- CMakeLists.txt.orig 2013-01-03 13:26:13.247396204 +0000 X+++ CMakeLists.txt 2013-01-03 13:28:09.246403522 +0000 X@@ -379,31 +379,11 @@ X ENDIF() X=20 X ADD_SUBDIRECTORY(extra) X-IF(NOT WITHOUT_SERVER) X- ADD_SUBDIRECTORY(tests) X- ADD_SUBDIRECTORY(client) X- ADD_SUBDIRECTORY(sql) X- ADD_SUBDIRECTORY(sql/share) X- ADD_SUBDIRECTORY(libservices) X- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" = OFF) X- IF(WITH_EMBEDDED_SERVER)=20 X- ADD_SUBDIRECTORY(libmysqld) X- ADD_SUBDIRECTORY(libmysqld/examples) X- ENDIF(WITH_EMBEDDED_SERVER) X- X- ADD_SUBDIRECTORY(mysql-test) X- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) X- ADD_SUBDIRECTORY(support-files) X- ADD_SUBDIRECTORY(scripts) X- ADD_SUBDIRECTORY(sql-bench) X- IF(UNIX) X- ADD_SUBDIRECTORY(man) X- ENDIF() X- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) X- ADD_SUBDIRECTORY(internal) X- ENDIF() X- ADD_SUBDIRECTORY(packaging/rpm-uln) X-ENDIF() X+ADD_SUBDIRECTORY(client) X+ADD_SUBDIRECTORY(libservices) X+ADD_SUBDIRECTORY(support-files) X+ADD_SUBDIRECTORY(scripts) X+ADD_SUBDIRECTORY(man) X=20 X INCLUDE(cmake/abi_check.cmake) X INCLUDE(cmake/tags.cmake) X@@ -453,6 +433,7 @@ X # X # RPM installs documentation directly from the source tree X # X+IF(FALSE) X IF(NOT INSTALL_LAYOUT MATCHES "RPM") X INSTALL(FILES COPYING LICENSE.mysql=20 X DESTINATION ${INSTALL_DOCREADMEDIR}=20 X@@ -461,9 +442,6 @@ X ) X INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT = Readme) X INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC = ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) X- IF(UNIX) X- INSTALL(FILES Docs/INSTALL-BINARY DESTINATION = ${INSTALL_DOCREADMEDIR} COMPONENT Readme) X- ENDIF() X # MYSQL_DOCS_LOCATON is used in "make dist", points to the = documentation directory X SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where = documentation is copied") X MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION) X@@ -478,3 +456,4 @@ X PATTERN "sp-imp-spec.txt" EXCLUDE X ) X ENDIF() X+ENDIF() af20e5a4e9e4539f2613786b10d24bfc echo x - mysql56-client/files/patch-support-files_CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-support-files_CMakeLists.txt << = '46b57d9782d81102df340e6e37fcbd99' X--- support-files/CMakeLists.txt.orig 2013-01-03 13:38:16.784386439 = +0000 X+++ support-files/CMakeLists.txt 2013-01-03 13:40:39.333386772 = +0000 X@@ -52,6 +52,7 @@ X=20 X IF(UNIX) X SET(prefix ${CMAKE_INSTALL_PREFIX}) X+ IF(FALSE) X FOREACH(script mysqld_multi.server mysql-log-rotate = binary-configure) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh=20 X ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) X@@ -93,4 +94,5 @@ X DESTINATION ${inst_location} COMPONENT SupportFiles X PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ=20 X GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) X+ ENDIF() X ENDIF() 46b57d9782d81102df340e6e37fcbd99 echo x - mysql56-client/files/patch-include_myisam.h sed 's/^X//' >mysql56-client/files/patch-include_myisam.h << = '5894bde17a61be2bca0b5d6083eda34b' X--- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 X+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 X@@ -48,7 +48,7 @@ X The following defines can be increased if necessary. X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and = MI_MAX_KEY_LENGTH. X */ X-#define MI_MAX_KEY_LENGTH 1000 /* Max length in = bytes */ X+#define MI_MAX_KEY_LENGTH 4000 /* Max length in = bytes */ X #define MI_MAX_KEY_SEG 16 /* Max segments = for key */ X=20 X #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) 5894bde17a61be2bca0b5d6083eda34b echo x - mysql56-client/files/patch-extra_CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-extra_CMakeLists.txt << = 'ae934bd901cb592e51ea545e911357dd' X--- extra/CMakeLists.txt.orig 2012-03-29 08:18:29.000000000 +0000 X+++ extra/CMakeLists.txt 2012-04-19 18:07:09.211525232 +0000 X@@ -50,6 +50,7 @@ X ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys=20= X ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) X TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) X SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE = CXX) X@@ -87,11 +88,14 @@ X MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc = ${INNOBASE_SOURCES}) X TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) X ENDIF() X+ENDIF() X X IF(UNIX) X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) X SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE = CXX) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) X TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) ae934bd901cb592e51ea545e911357dd echo x - mysql56-client/files/patch-man_CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-man_CMakeLists.txt << = 'c6dd6c923f9d7cda408bd9324eb27475' X--- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200 X+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200 X@@ -15,10 +15,6 @@ X=20 X # Copy man pages X FILE(GLOB MAN1_FILES *.1) X-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) X-FILE(GLOB MAN1_NDB ndb*.1) X-FILE(GLOB MAN8_FILES *.8) X-FILE(GLOB MAN8_NDB ndb*.8) X IF(MAN1_FILES) X IF(MAN1_EXCLUDE) X LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) c6dd6c923f9d7cda408bd9324eb27475 echo x - mysql56-client/files/patch-scripts_CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-scripts_CMakeLists.txt << = 'ff3d6f07a65a90b443fb2c40c77f380d' X--- scripts/CMakeLists.txt.orig 2013-01-03 14:50:52.642386584 = +0000 X+++ scripts/CMakeLists.txt 2013-01-03 14:51:55.176395796 +0000 X@@ -264,6 +264,8 @@ X GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) X STRING(REGEX REPLACE "^lib" "" lib "${lib}") X SET(${var} "${${var}}-l${lib} " )=20 X+ ELSEIF(lib STREQUAL "-pthread") X+ SET(${var} "${${var}}-pthread " ) X ELSE() X SET(${var} "${${var}}-l${lib} " )=20 X ENDIF() X@@ -314,15 +316,11 @@ X # On Unix, most of the files end up in the bin directory X SET(mysql_config_COMPONENT COMPONENT Development) X SET(BIN_SCRIPTS X- msql2mysql X mysql_config X mysql_fix_extensions X mysql_setpermission X mysql_zap X- mysqlaccess X- mysqlaccess.conf X mysql_convert_table_format X- mysql_find_rows X mysqlhotcopy X mysqldumpslow X mysqld_multi X@@ -334,7 +332,7 @@ X ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) X ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} X- ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) X+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) X ELSE() X MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file} in " X "${CMAKE_CURRENT_SOURCE_DIR}" ) ff3d6f07a65a90b443fb2c40c77f380d echo x - mysql56-client/files/patch-include_my_global.h sed 's/^X//' >mysql56-client/files/patch-include_my_global.h << = 'a9a0efe94ddae2c727a6b3433833375a' X--- include/my_global.h.orig 2013-01-04 08:34:33.134386823 +0000 X+++ include/my_global.h 2013-01-04 08:36:10.296386950 +0000 X@@ -337,9 +337,6 @@ X #ifdef HAVE_FCNTL_H X #include <fcntl.h> X #endif X-#ifdef HAVE_SYS_TIMEB_H X-#include <sys/timeb.h> /* Avoid = warnings on SCO */ X-#endif X #if TIME_WITH_SYS_TIME X # include <sys/time.h> X # include <time.h> a9a0efe94ddae2c727a6b3433833375a echo x - mysql56-client/Makefile sed 's/^X//' >mysql56-client/Makefile << = '04de9f1f0ab9646f9ecfbdfefc006a5b' X# New ports collection makefile for: MySQL-client X# Date created: 28 Jan 2006 X# Whom: Alex Dupre = <ale@FreeBSD.org> X# X# $FreeBSD$ X# X XPORTNAME=3D mysql XPKGNAMESUFFIX=3D -client X XCOMMENT=3D Multithreaded SQL database (client) X XMASTERDIR=3D ${.CURDIR}/../mysql56-server X XPKGMESSAGE=3D mustnotexist XPATCHDIR=3D ${.CURDIR}/files XPLIST=3D ${.CURDIR}/pkg-plist X XLATEST_LINK=3D mysql56-client X XCONFLICTS_INSTALL=3D mysql-client-[34].* mysql-client-5.[0-57-9].* X XCMAKE_ARGS+=3D -DWITHOUT_SERVER=3D1 X XUSE_LDCONFIG=3D ${PREFIX}/lib/mysql X XMAN1=3D comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 = mysql_find_rows.1 \ X mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 = \ X mysqlcheck.1 mysql_config_editor.1 mysqldump.1 = mysqlimport.1 mysqlshow.1 mysqlslap.1 X XCLIENT_ONLY=3D yes X X.include "${MASTERDIR}/Makefile" 04de9f1f0ab9646f9ecfbdfefc006a5b echo c - mysql56-server mkdir -p mysql56-server > /dev/null 2>&1 echo x - mysql56-server/pkg-descr sed 's/^X//' >mysql56-server/pkg-descr << = '52603aa6c9890f9f85f69bdd28b9923e' XMySQL is a very fast, multi-threaded, multi-user and robust SQL X(Structured Query Language) database server. X XWWW: http://www.mysql.com/ 52603aa6c9890f9f85f69bdd28b9923e echo x - mysql56-server/distinfo sed 's/^X//' >mysql56-server/distinfo << = 'fb47e66a54ef4cb2a42f34737b601d8b' XSHA256 (mysql-5.6.9-rc.tar.gz) =3D = f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff XSIZE (mysql-5.6.9-rc.tar.gz) =3D 35444739 fb47e66a54ef4cb2a42f34737b601d8b echo c - mysql56-server/files mkdir -p mysql56-server/files > /dev/null 2>&1 echo x - mysql56-server/files/patch-sql_mysqld.cc sed 's/^X//' >mysql56-server/files/patch-sql_mysqld.cc << = 'afb58967c306cd159bcd22c4edb8ed23' X--- sql/mysqld.cc.orig 2012-03-29 08:18:30.000000000 +0000 X+++ sql/mysqld.cc 2012-04-21 14:22:34.920526418 +0000 X@@ -5848,7 +5848,7 @@ X The connection was refused by TCP wrappers. X There are no details (by client IP) available to update = the host_cache. X */ X- statistic_increment(connection_tcpwrap_errors, = &LOCK_status); X+ statistic_increment(connection_errors_tcpwrap, = &LOCK_status); X continue; X } X } afb58967c306cd159bcd22c4edb8ed23 echo x - mysql56-server/files/patch-include_my_compare.h sed 's/^X//' >mysql56-server/files/patch-include_my_compare.h << = '2bccb6f3f616a5906938df609ad7800e' X--- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 X+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 X@@ -39,7 +39,7 @@ X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and = HA_MAX_KEY_LENGTH. X */ X=20 X-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes = */ X+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes = */ X #define HA_MAX_KEY_SEG 16 /* Max segments for = key */ X=20 X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) 2bccb6f3f616a5906938df609ad7800e echo x - mysql56-server/files/patch-scripts_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-scripts_CMakeLists.txt << = '8f0ae5203ff5ade590e688a449c053b4' X--- scripts/CMakeLists.txt.orig 2011-07-13 21:09:03.000000000 = +0200 X+++ scripts/CMakeLists.txt 2011-09-01 09:48:22.000000000 +0200 X@@ -266,6 +266,8 @@ X GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) X STRING(REGEX REPLACE "^lib" "" lib "${lib}") X SET(${var} "${${var}}-l${lib} " )=20 X+ ELSEIF(lib STREQUAL "-pthread") X+ SET(${var} "${${var}}-pthread " )=20 X ELSE() X SET(${var} "${${var}}-l${lib} " )=20 X ENDIF() X@@ -316,16 +318,11 @@ X # On Unix, most of the files end up in the bin directory X SET(mysql_config_COMPONENT COMPONENT Development) X SET(BIN_SCRIPTS X- msql2mysql X- mysql_config X mysql_fix_extensions X mysql_setpermission X mysql_zap X- mysqlaccess X- mysqlaccess.conf X mysql_convert_table_format X- mysql_find_rows X mysqlhotcopy X mysqldumpslow X mysqld_multi X mysqld_safe X@@ -334,7 +331,7 @@ X FOREACH(file ${BIN_SCRIPTS}) X IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh X- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) X+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) X ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} X ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) 8f0ae5203ff5ade590e688a449c053b4 echo x - mysql56-server/files/patch-scripts_mysqld_safe.sh sed 's/^X//' >mysql56-server/files/patch-scripts_mysqld_safe.sh << = 'b0e8250b1ac160609cc2fa5c2de292ae' X--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 = +0200 X+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 X@@ -242,10 +242,10 @@ X=20 X if test -z "$MYSQL_HOME" X then=20 X- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" X+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r = "$DATADIR/my.cnf" X then X log_error "WARNING: Found two instances of my.cnf - X-$MY_BASEDIR_VERSION/my.cnf and X+$MY_BASEDIR_VERSION/etc/my.cnf and X $DATADIR/my.cnf X IGNORING $DATADIR/my.cnf" X=20 X@@ -254,7 +254,7 @@ X then X log_error "WARNING: Found $DATADIR/my.cnf X The data directory is a deprecated location for my.cnf, please move it = to X-$MY_BASEDIR_VERSION/my.cnf" X+$MY_BASEDIR_VERSION/etc/my.cnf" X MYSQL_HOME=3D$DATADIR X else X MYSQL_HOME=3D$MY_BASEDIR_VERSION b0e8250b1ac160609cc2fa5c2de292ae echo x - mysql56-server/files/patch-libmysql_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-libmysql_CMakeLists.txt << = '7cbcfb2c54a8f645bcfe01417c241f91' X--- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 = +0100 X+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 X@@ -153,13 +153,14 @@ X=20 X # Merge several convenience libraries into one big mysqlclient X # and link them together into shared library. X-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) X+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development = NOINSTALL) X=20 X # Visual Studio users need debug static library for debug projects X IF(MSVC) X INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) X ENDIF() X=20 X+IF(FALSE) X IF(UNIX) X MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) X SET(DOT_VERSION ".${VERSION}") X@@ -174,9 +175,11 @@ X ENDMACRO() X INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a = mysqlclient ${INSTALL_LIBDIR} Development) X ENDIF() X+ENDIF() X=20 X IF(NOT DISABLE_SHARED) X- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS = ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) X+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS = ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) X+IF(FALSE) X IF(UNIX) X # libtool compatability X IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) X@@ -223,3 +226,4 @@ X ENDFOREACH() X ENDIF() X ENDIF() X+ENDIF() 7cbcfb2c54a8f645bcfe01417c241f91 echo x - mysql56-server/files/patch-libservices_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-libservices_CMakeLists.txt << = '2497c7d1697e5c17014c83057fcd21a6' X--- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 = +0100 X+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100 X@@ -22,4 +22,6 @@ X my_thread_scheduler_service.c) X=20 X ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) X+IF(FALSE) X INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT = Development) X+ENDIF() 2497c7d1697e5c17014c83057fcd21a6 echo x - mysql56-server/files/patch-extra_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-extra_CMakeLists.txt << = 'c46aecc639c05a4acd37e90b06f4efb5' X--- extra/CMakeLists.txt.orig 2010-12-23 17:38:06.000000000 +0100 X+++ extra/CMakeLists.txt 2010-12-23 17:38:51.000000000 +0100 X@@ -93,8 +93,10 @@ X TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) X SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE = CXX) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) X TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) X SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX) X ENDIF() X+ENDIF() X c46aecc639c05a4acd37e90b06f4efb5 echo x - mysql56-server/files/patch-include_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-include_CMakeLists.txt << = '2645744ee667d307f5db1a59324d41a8' X--- include/CMakeLists.txt.orig 2012-03-29 08:18:29.000000000 = +0000 X+++ include/CMakeLists.txt 2012-04-21 13:57:52.191531140 +0000 X@@ -64,10 +64,11 @@ X ${HEADERS_GEN_CONFIGURE} X ) X=20 X+IF(FALSE) X INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT = Development) X INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql = COMPONENT Development=20 X PATTERN "*.h" X PATTERN "psi_abi*" EXCLUDE X ) X- X+ENDIF() X=20 2645744ee667d307f5db1a59324d41a8 echo x - mysql56-server/files/patch-sql_sys_vars.cc sed 's/^X//' >mysql56-server/files/patch-sql_sys_vars.cc << = 'f0089a7fea842041049c6725422b216d' X--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 X+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 X@@ -900,7 +900,7 @@ X "connection before closing it", X SESSION_VAR(net_interactive_timeout), X CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), = BLOCK_SIZE(1)); X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), = BLOCK_SIZE(1)); X=20 X static Sys_var_ulong Sys_join_buffer_size( X "join_buffer_size", X@@ -1401,7 +1401,7 @@ X "Number of seconds to wait for more data from a connection = before " X "aborting the read", X SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), = BLOCK_SIZE(1), X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), = BLOCK_SIZE(1), X NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), X ON_UPDATE(fix_net_read_timeout)); X=20 X@@ -1416,7 +1416,7 @@ X "Number of seconds to wait for a block to be written to a = connection " X "before aborting the write", X SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), = BLOCK_SIZE(1), X+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), = BLOCK_SIZE(1), X NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), X ON_UPDATE(fix_net_write_timeout)); X=20 X@@ -2257,7 +2257,7 @@ X "The number of seconds the server waits for activity on a " X "connection before closing it", X SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), X- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), X+ VALID_RANGE(1, INT_MAX32/1000), X DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); X=20 X /** propagates changes to the relevant flag of @@optimizer_switch */ f0089a7fea842041049c6725422b216d echo x - mysql56-server/files/patch-CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-CMakeLists.txt << = 'e0ed8afcd6c23a83aaafb5ceccdb4828' X--- CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 X+++ CMakeLists.txt 2010-12-23 18:02:02.000000000 +0100 X@@ -293,7 +293,6 @@ X=20 X ADD_SUBDIRECTORY(extra) X IF(NOT WITHOUT_SERVER) X- ADD_SUBDIRECTORY(tests) X ADD_SUBDIRECTORY(client) X ADD_SUBDIRECTORY(sql) X ADD_SUBDIRECTORY(sql/share) X@@ -301,14 +300,10 @@ X OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" = OFF) X IF(WITH_EMBEDDED_SERVER)=20 X ADD_SUBDIRECTORY(libmysqld) X- ADD_SUBDIRECTORY(libmysqld/examples) X ENDIF(WITH_EMBEDDED_SERVER) X=20 X- ADD_SUBDIRECTORY(mysql-test) X- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) X ADD_SUBDIRECTORY(support-files) X ADD_SUBDIRECTORY(scripts) X- ADD_SUBDIRECTORY(sql-bench) X IF(UNIX) X ADD_SUBDIRECTORY(man) X ENDIF() X@@ -343,6 +338,7 @@ X # X # RPM installs documentation directly from the source tree X # X+IF(FALSE) X IF(NOT INSTALL_LAYOUT MATCHES "RPM") X INSTALL(FILES COPYING LICENSE.mysql=20 X DESTINATION ${INSTALL_DOCREADMEDIR}=20 X@@ -367,3 +363,4 @@ X PATTERN "sp-imp-spec.txt" EXCLUDE X ) X ENDIF() X+ENDIF() e0ed8afcd6c23a83aaafb5ceccdb4828 echo x - mysql56-server/files/patch-client_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-client_CMakeLists.txt << = '460183d6ff20b686f5e71b14ea25da1b' X--- client/CMakeLists.txt.orig 2012-09-18 23:06:30.000000000 +0000 X+++ client/CMakeLists.txt 2012-10-12 08:16:08.998508827 +0000 X@@ -28,17 +28,20 @@ X=20 X ADD_DEFINITIONS(${READLINE_DEFINES}) X ADD_DEFINITIONS(${SSL_DEFINES}) X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc = sql_string.cc) X TARGET_LINK_LIBRARIES(mysql mysqlclient) X IF(UNIX) X TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) X ENDIF(UNIX) X+ENDIF() X=20 X MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) X SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS = "-DTHREADS") X TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) X=20 X=20 X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) X=20 X@@ -47,17 +50,21 @@ X=20 X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) X+ENDIF() X=20 X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) X=20 X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) X+ENDIF() X=20 X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) X=20 X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) X=20 X@@ -70,6 +77,7 @@ X=20 X MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) X TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) X+ENDIF() X=20 X # "WIN32" also covers 64 bit. "echo" is used in some files below = "mysql-test/". X IF(WIN32) X@@ -79,11 +87,6 @@ X SET_TARGET_PROPERTIES ( X mysql_plugin=20 X mysql_upgrade X- mysqlcheck X- mysqldump X- mysqlimport X- mysqlshow X- mysqlslap X PROPERTIES HAS_CXX TRUE) X=20 X ADD_DEFINITIONS(-DHAVE_DLOPEN) 460183d6ff20b686f5e71b14ea25da1b echo x - mysql56-server/files/patch-cmake_plugin.cmake sed 's/^X//' >mysql56-server/files/patch-cmake_plugin.cmake << = '49e774fee82b2b33835083de774f7b79' X--- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200 X+++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200 X@@ -195,7 +195,6 @@ X OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") =20 X # Install dynamic library X MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} = COMPONENT Server) X- INSTALL_DEBUG_TARGET(${target} DESTINATION = ${INSTALL_PLUGINDIR}/debug) X # Add installed files to list for RPMs X FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files X "%attr(755, root, root) = %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" 49e774fee82b2b33835083de774f7b79 echo x - mysql56-server/files/patch-sql_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-sql_CMakeLists.txt << = '5bf60065a6ab96bbaedf0dfbd83f4ecc' X--- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100 X+++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100 X@@ -245,6 +245,7 @@ X=20 X IF(INSTALL_LAYOUT STREQUAL "STANDALONE") X=20 X+IF(FALSE) X # We need to create empty directories (data/test) the installation. =20= X # This does not work with current CPack due to = http://www.cmake.org/Bug/view.php?id=3D8767 X # Avoid completely empty directories and install dummy file instead. X@@ -286,6 +287,7 @@ X INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT = DataFiles) X ENDIF() X ENDIF() X+ENDIF() X=20 X ADD_CUSTOM_TARGET(show-dist-name X COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" 5bf60065a6ab96bbaedf0dfbd83f4ecc echo x - mysql56-server/files/mysql-server.in sed 's/^X//' >mysql56-server/files/mysql-server.in << = '74b76550ca6146bb3922117ab93cbf43' X#!/bin/sh X# X# $FreeBSD: ports/databases/mysql56-server/files/mysql-server.in,v 1.1 = 2012/08/05 23:19:36 dougb Exp $ X# X X# PROVIDE: mysql X# REQUIRE: LOGIN X# KEYWORD: shutdown X X# X# Add the following line to /etc/rc.conf to enable mysql: X# mysql_enable (bool): Set to "NO" by default. X# Set it to "YES" to enable MySQL. X# mysql_limits (bool): Set to "NO" by default. X# Set it to yes to run `limits -e -U mysql` X# just before mysql starts. X# mysql_dbdir (str): Default to "/var/db/mysql" X# Base database directory. X# mysql_pidfile (str): Custum PID file path and name. X# Default to "${mysql_dbdir}/${hostname}.pid". X# mysql_args (str): Custom additional arguments to be passed X# to mysqld_safe (default empty). X# X X. /etc/rc.subr X Xname=3D"mysql" Xrcvar=3Dmysql_enable X Xload_rc_config $name X X: ${mysql_enable=3D"NO"} X: ${mysql_limits=3D"NO"} X: ${mysql_dbdir=3D"/var/db/mysql"} X Xmysql_user=3D"mysql" Xmysql_limits_args=3D"-e -U ${mysql_user}" Xpidfile=3D${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} Xcommand=3D"/usr/sbin/daemon" Xcommand_args=3D"-c -f %%PREFIX%%/bin/mysqld_safe = --defaults-extra-file=3D${mysql_dbdir}/my.cnf --user=3D${mysql_user} = --datadir=3D${mysql_dbdir} --pid-file=3D${pidfile} ${mysql_args}" Xprocname=3D"%%PREFIX%%/libexec/mysqld" Xstart_precmd=3D"${name}_prestart" Xstart_postcmd=3D"${name}_poststart" Xmysql_install_db=3D"%%PREFIX%%/bin/mysql_install_db" Xmysql_install_db_args=3D"--basedir=3D%%PREFIX%% = --datadir=3D${mysql_dbdir} --force" X Xmysql_create_auth_tables() X{ X eval $mysql_install_db $mysql_install_db_args >/dev/null = 2>/dev/null X [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} = ${mysql_dbdir} X} X Xmysql_prestart() X{ X if [ ! -d "${mysql_dbdir}/mysql/." ]; then X mysql_create_auth_tables || return 1 X fi X if checkyesno mysql_limits; then X eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null X else X return 0 X fi X} X Xmysql_poststart() X{ X local timeout=3D15 X while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do X timeout=3D$(( timeout - 1 )) X sleep 1 X done X return 0 X} X Xrun_rc_command "$1" 74b76550ca6146bb3922117ab93cbf43 echo x - mysql56-server/files/patch-man_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-man_CMakeLists.txt << = '8cbf6833eb207d8d527f1c889ec07529' X--- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200 X+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200 X@@ -15,8 +15,6 @@ X=20 X # Copy man pages X FILE(GLOB MAN1_FILES *.1) X-FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) X-FILE(GLOB MAN1_NDB ndb*.1) X FILE(GLOB MAN8_FILES *.8) X FILE(GLOB MAN8_NDB ndb*.8) X IF(MAN1_FILES) 8cbf6833eb207d8d527f1c889ec07529 echo x - mysql56-server/files/patch-include_my_global.h sed 's/^X//' >mysql56-server/files/patch-include_my_global.h << = 'bab875d29c6f6d5f22ae0237cd2fe06c' X--- include/my_global.h.orig 2013-01-04 08:34:33.134386823 +0000 X+++ include/my_global.h 2013-01-04 08:36:10.296386950 +0000 X@@ -337,9 +337,6 @@ X #ifdef HAVE_FCNTL_H X #include <fcntl.h> X #endif X-#ifdef HAVE_SYS_TIMEB_H X-#include <sys/timeb.h> /* Avoid = warnings on SCO */ X-#endif X #if TIME_WITH_SYS_TIME X # include <sys/time.h> X # include <time.h> bab875d29c6f6d5f22ae0237cd2fe06c echo x - mysql56-server/files/patch-include_myisam.h sed 's/^X//' >mysql56-server/files/patch-include_myisam.h << = '26c8020e3cf55455db7e7c5707d19671' X--- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 X+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 X@@ -48,7 +48,7 @@ X The following defines can be increased if necessary. X But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and = MI_MAX_KEY_LENGTH. X */ X-#define MI_MAX_KEY_LENGTH 1000 /* Max length in = bytes */ X+#define MI_MAX_KEY_LENGTH 4000 /* Max length in = bytes */ X #define MI_MAX_KEY_SEG 16 /* Max segments = for key */ X=20 X #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) 26c8020e3cf55455db7e7c5707d19671 echo x - mysql56-server/files/patch-support-files_CMakeLists.txt sed 's/^X//' >mysql56-server/files/patch-support-files_CMakeLists.txt << = '6d11c09f6bb7cc9ab4a958f49558c43b' X--- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 = +0100 X+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 = +0100 X@@ -74,7 +74,9 @@ X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT = SupportFiles) X ENDIF() X=20 X+IF(FALSE) X INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal = COMPONENT Development) X+ENDIF() X CONFIGURE_FILE(MySQL-shared-compat.spec.sh = ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) X CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec = @ONLY) X CONFIGURE_FILE(mysql.spec.sh = ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) 6d11c09f6bb7cc9ab4a958f49558c43b echo x - mysql56-server/Makefile sed 's/^X//' >mysql56-server/Makefile << = '7129544cef1bdb098d7c505843998df8' X# New ports collection makefile for: MySQL-server X# Date created: 28 Jan 2006 X# Whom: Alex Dupre = <ale@FreeBSD.org> X# X# $FreeBSD$ X# X XPORTNAME?=3D mysql XPORTVERSION=3D 5.6.9 XDISTVERSIONSUFFIX=3D -rc XCATEGORIES=3D databases ipv6 XMASTER_SITES=3D ${MASTER_SITE_MYSQL} XMASTER_SITE_SUBDIR=3D MySQL-5.6 XPKGNAMESUFFIX?=3D -server X XMAINTAINER=3D ale@FreeBSD.org XCOMMENT?=3D Multithreaded SQL database (server) X XSLAVEDIRS=3D databases/mysql56-client XUSE_CMAKE=3D yes XMAKE_JOBS_SAFE=3D yes XNO_OPTIONS_SORT=3Dyes X XOPTIONS_DEFINE=3D SSL FASTMTX XOPTIONS_DEFAULT=3DSSL X XFASTMTX_DESC=3D Replace mutexes with spinlocks X XCMAKE_ARGS+=3D -DINSTALL_DOCDIR=3D"share/doc/mysql" \ X -DINSTALL_DOCREADMEDIR=3D"share/doc/mysql" \ X -DINSTALL_INCLUDEDIR=3D"include/mysql" \ X -DINSTALL_INFODIR=3D"info" \ X -DINSTALL_LIBDIR=3D"lib/mysql" \ X -DINSTALL_MANDIR=3D"man" \ X -DINSTALL_MYSQLDATADIR=3D"/var/db/mysql" \ X -DINSTALL_MYSQLSHAREDIR=3D"share/mysql" \ X -DINSTALL_MYSQLTESTDIR=3D"share/mysql/tests" \ X -DINSTALL_PLUGINDIR=3D"lib/mysql/plugin" \ X -DINSTALL_SBINDIR=3D"libexec" \ X -DINSTALL_SCRIPTDIR=3D"bin" \ X -DINSTALL_SHAREDIR=3D"share" \ X -DINSTALL_SQLBENCHDIR=3D"share/mysql" \ X -DINSTALL_SUPPORTFILESDIR=3D"share/mysql" \ X -DWITH_LIBEDIT=3D0 \ X -DWITH_LIBWRAP=3D1 X X.ifdef USE_MYSQL X.error You have `USE_MYSQL' variable defined either in environment or = in make(1) arguments. Please undefine and try again. X.endif X X.include <bsd.port.options.mk> X X.if ${PORT_OPTIONS:MSSL} XCMAKE_ARGS+=3D -DWITH_SSL=3Dbundled X.endif X.if ${PORT_OPTIONS:MFASTMTX} XCMAKE_ARGS+=3D -DWITH_FAST_MUTEXES=3D1 X.endif X X# MySQL-Server part X.if !defined(CLIENT_ONLY) XUSE_MYSQL=3D yes XWANT_MYSQL_VER=3D 56 X XLATEST_LINK=3D mysql56-server X XCONFLICTS_INSTALL=3D mysql-server-[34].* mysql-server-5.[0-57-9].* X XUSE_RC_SUBR=3D mysql-server X XUSERS=3D mysql XGROUPS=3D mysql X XINFO=3D mysql X XMAN1=3D my_print_defaults.1 myisam_ftdump.1 myisamchk.1 = myisamlog.1 myisampack.1 \ X mysql.server.1 mysql_convert_table_format.1 = mysql_fix_extensions.1 \ X mysql_install_db.1 mysql_plugin.1 = mysql_secure_installation.1 mysql_setpermission.1 \ X mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 = mysqlbug.1 \ X mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 = mysqlhotcopy.1 mysqlman.1 \ X mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 = resolveip.1 X XMAN8=3D mysqld.8 X XCMAKE_ARGS+=3D -DWITH_EMBEDDED_SERVER=3D"ON" X Xpost-install: X.if !defined(PACKAGE_BUILDING) X @${CAT} ${PKGMESSAGE} X.endif X.endif X Xpost-patch: X @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt X X.include <bsd.port.pre.mk> X X.if ${ARCH} =3D=3D "arm" XBROKEN=3D Does not compile on arm X.endif X X.include <bsd.port.post.mk> 7129544cef1bdb098d7c505843998df8 echo x - mysql56-server/pkg-plist sed 's/^X//' >mysql56-server/pkg-plist << = '3348309b4dbbce72f616bd3ad5823b5d' X@stopdaemon mysql-server Xbin/innochecksum Xbin/my_print_defaults Xbin/myisam_ftdump Xbin/myisamchk Xbin/myisamlog Xbin/myisampack Xbin/mysql_convert_table_format Xbin/mysql_fix_extensions Xbin/mysql_install_db Xbin/mysql_plugin Xbin/mysql_secure_installation Xbin/mysql_setpermission Xbin/mysql_tzinfo_to_sql Xbin/mysql_upgrade Xbin/mysql_zap Xbin/mysqlbug Xbin/mysqld_multi Xbin/mysqld_safe Xbin/mysqldumpslow Xbin/mysqlhotcopy Xbin/mysqltest Xbin/perror Xbin/replace Xbin/resolve_stack_dump Xbin/resolveip Xlib/mysql/libmysqld.a Xlib/mysql/plugin/adt_null.so Xlib/mysql/plugin/auth.so Xlib/mysql/plugin/auth_test_plugin.so Xlib/mysql/plugin/daemon_example.ini Xlib/mysql/plugin/validate_password.so Xlib/mysql/plugin/libdaemon_example.so Xlib/mysql/plugin/mypluglib.so Xlib/mysql/plugin/qa_auth_client.so Xlib/mysql/plugin/qa_auth_interface.so Xlib/mysql/plugin/qa_auth_server.so Xlib/mysql/plugin/semisync_master.so Xlib/mysql/plugin/semisync_slave.so Xlibexec/mysqld X%%DATADIR%%/binary-configure X%%DATADIR%%/charsets/Index.xml X%%DATADIR%%/charsets/README X%%DATADIR%%/charsets/armscii8.xml X%%DATADIR%%/charsets/ascii.xml X%%DATADIR%%/charsets/cp1250.xml X%%DATADIR%%/charsets/cp1251.xml X%%DATADIR%%/charsets/cp1256.xml X%%DATADIR%%/charsets/cp1257.xml X%%DATADIR%%/charsets/cp850.xml X%%DATADIR%%/charsets/cp852.xml X%%DATADIR%%/charsets/cp866.xml X%%DATADIR%%/charsets/dec8.xml X%%DATADIR%%/charsets/geostd8.xml X%%DATADIR%%/charsets/greek.xml X%%DATADIR%%/charsets/hebrew.xml X%%DATADIR%%/charsets/hp8.xml X%%DATADIR%%/charsets/keybcs2.xml X%%DATADIR%%/charsets/koi8r.xml X%%DATADIR%%/charsets/koi8u.xml X%%DATADIR%%/charsets/latin1.xml X%%DATADIR%%/charsets/latin2.xml X%%DATADIR%%/charsets/latin5.xml X%%DATADIR%%/charsets/latin7.xml X%%DATADIR%%/charsets/macce.xml X%%DATADIR%%/charsets/macroman.xml X%%DATADIR%%/charsets/swe7.xml X%%DATADIR%%/dictionary.txt X%%DATADIR%%/bulgarian/errmsg.sys X%%DATADIR%%/czech/errmsg.sys X%%DATADIR%%/danish/errmsg.sys X%%DATADIR%%/dutch/errmsg.sys X%%DATADIR%%/english/errmsg.sys X%%DATADIR%%/errmsg-utf8.txt X%%DATADIR%%/estonian/errmsg.sys X%%DATADIR%%/fill_help_tables.sql X%%DATADIR%%/french/errmsg.sys X%%DATADIR%%/german/errmsg.sys X%%DATADIR%%/greek/errmsg.sys X%%DATADIR%%/hungarian/errmsg.sys X%%DATADIR%%/italian/errmsg.sys X%%DATADIR%%/innodb_memcached_config.sql X%%DATADIR%%/japanese/errmsg.sys X%%DATADIR%%/korean/errmsg.sys X%%DATADIR%%/magic X%%DATADIR%%/mysql-log-rotate X%%DATADIR%%/mysql.server X%%DATADIR%%/mysql_system_tables.sql X%%DATADIR%%/mysql_system_tables_data.sql X%%DATADIR%%/mysql_test_data_timezone.sql X%%DATADIR%%/mysqld_multi.server X%%DATADIR%%/norwegian-ny/errmsg.sys X%%DATADIR%%/norwegian/errmsg.sys X%%DATADIR%%/polish/errmsg.sys X%%DATADIR%%/portuguese/errmsg.sys X%%DATADIR%%/romanian/errmsg.sys X%%DATADIR%%/russian/errmsg.sys X%%DATADIR%%/serbian/errmsg.sys X%%DATADIR%%/slovak/errmsg.sys X%%DATADIR%%/spanish/errmsg.sys X%%DATADIR%%/swedish/errmsg.sys X%%DATADIR%%/ukrainian/errmsg.sys X%%DATADIR%%/my-default.cnf X%%DATADIR%%/solaris/postinstall-solaris X%%DATADIR%%/mysql_security_commands.sql X@dirrm %%DATADIR%%/solaris X@dirrm lib/mysql/plugin X@dirrmtry lib/mysql X@dirrm %%DATADIR%%/charsets X@dirrm %%DATADIR%%/bulgarian X@dirrm %%DATADIR%%/czech X@dirrm %%DATADIR%%/danish X@dirrm %%DATADIR%%/dutch X@dirrm %%DATADIR%%/english X@dirrm %%DATADIR%%/estonian X@dirrm %%DATADIR%%/french X@dirrm %%DATADIR%%/german X@dirrm %%DATADIR%%/greek X@dirrm %%DATADIR%%/hungarian X@dirrm %%DATADIR%%/italian X@dirrm %%DATADIR%%/japanese X@dirrm %%DATADIR%%/korean X@dirrm %%DATADIR%%/norwegian X@dirrm %%DATADIR%%/norwegian-ny X@dirrm %%DATADIR%%/polish X@dirrm %%DATADIR%%/portuguese X@dirrm %%DATADIR%%/romanian X@dirrm %%DATADIR%%/russian X@dirrm %%DATADIR%%/serbian X@dirrm %%DATADIR%%/slovak X@dirrm %%DATADIR%%/spanish X@dirrm %%DATADIR%%/swedish X@dirrm %%DATADIR%%/ukrainian X@dirrm %%DATADIR%% 3348309b4dbbce72f616bd3ad5823b5d echo x - mysql56-server/pkg-message sed 's/^X//' >mysql56-server/pkg-message << = '9e30749e75329bceccd1ee9ccd84da1d' = X************************************************************************ X XRemember to run mysql_upgrade (with the optional --datadir=3D<dbdir> = flag) Xthe first time you start the MySQL server after an upgrade from an Xearlier version. X = X************************************************************************ 9e30749e75329bceccd1ee9ccd84da1d exit --Apple-Mail=_1EFC42E1-26DA-40A8-9715-5A12E1C740DB Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Br, Espen Tagestad --Apple-Mail=_1EFC42E1-26DA-40A8-9715-5A12E1C740DB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301041000.r04A01ED020150>