Date: Sun, 14 Oct 2012 15:42:29 GMT From: Oleg Sidorkin <osidorkin@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172696: [new port][patch] databases/mysq56 Message-ID: <201210141542.q9EFgT5q060845@red.freebsd.org> Resent-Message-ID: <201210141550.q9EFo1Z3097127@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172696 >Category: ports >Synopsis: [new port][patch] databases/mysq56 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 14 15:50:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Oleg Sidorkin >Release: RELENG_9 >Organization: >Environment: FreeBSD window.trtk.ru 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r241044: Sat Sep 29 12:29:43 MSK 2012 root@window.trtk.ru:/usr/obj/usr/src/sys/QUADKERNEL amd64 >Description: mysql-5.6 is now in the RC state. It will be useful to have it in ports. >How-To-Repeat: >Fix: 1) unpack the archive attrached 2) add MYSQL56_LIBVER = 18 to bsd.database.mk The given port is the copy of mysql55 port with patches and pkg-plist corrected Patch attached with submission follows: # 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/Makefile # mysql56-client/pkg-plist # mysql56-client/files # mysql56-client/files/patch-extra_CMakeLists.txt # mysql56-client/files/patch-include_CMakeLists.txt # mysql56-client/files/patch-include_my_compare.h # mysql56-client/files/patch-scripts_CMakeLists.txt # mysql56-client/files/patch-client_CMakeLists.txt # mysql56-client/files/patch-CMakeLists.txt # mysql56-client/files/patch-man_CMakeLists.txt # mysql56-client/files/patch-include_myisam.h # mysql56-client/files/patch-support-files_CMakeLists.txt # mysql56-server # mysql56-server/pkg-plist # mysql56-server/pkg-message # mysql56-server/pkg-descr # mysql56-server/Makefile # mysql56-server/files # mysql56-server/files/patch-man_CMakeLists.txt # mysql56-server/files/patch-include_CMakeLists.txt # mysql56-server/files/patch-extra_CMakeLists.txt # mysql56-server/files/patch-include_myisam.h # mysql56-server/files/patch-sql_CMakeLists.txt # mysql56-server/files/patch-cmake_plugin.cmake # mysql56-server/files/patch-scripts_mysqld_safe.sh # mysql56-server/files/patch-libservices_CMakeLists.txt # mysql56-server/files/patch-include_my_compare.h # mysql56-server/files/patch-client_CMakeLists.txt # mysql56-server/files/patch-support-files_CMakeLists.txt # mysql56-server/files/patch-scripts_CMakeLists.txt # mysql56-server/files/patch-CMakeLists.txt # mysql56-server/files/mysql-server.in # mysql56-server/files/patch-libmysql_CMakeLists.txt # mysql56-server/files/patch-sql_mysqld.cc # mysql56-server/distinfo # echo c - mysql56-client mkdir -p mysql56-client > /dev/null 2>&1 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: ports/databases/mysql55-client/Makefile,v 1.110 2011/10/07 09:46:50 ale Exp $ X# X XPORTNAME= mysql XPKGNAMESUFFIX= -client X XCOMMENT= Multithreaded SQL database (client) X XMASTERDIR= ${.CURDIR}/../mysql56-server X XPKGMESSAGE= mustnotexist XPATCHDIR= ${.CURDIR}/files XPLIST= ${.CURDIR}/pkg-plist X XLATEST_LINK= mysql56-client X XCONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-57-9].* X XCMAKE_ARGS+= -DWITHOUT_SERVER=1 X XUSE_LDCONFIG= ${PREFIX}/lib/mysql X XMAN1= 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= yes X X.include "${MASTERDIR}/Makefile" 04de9f1f0ab9646f9ecfbdfefc006a5b echo x - mysql56-client/pkg-plist sed 's/^X//' >mysql56-client/pkg-plist << '4b2dbd1eae38e192f4407c43f95aff2c' Xbin/msql2mysql Xbin/mysql Xbin/mysql_config Xbin/mysql_config_editor Xbin/mysql_find_rows Xbin/mysql_waitpid Xbin/mysqlaccess Xbin/mysqlaccess.conf 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 Xshare/aclocal/mysql.m4 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-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 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-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 X- mysql/plugin.h X- mysql/plugin_audit.h X- mysql/plugin_ftparser.h X- mysql/plugin_validate_password.h X ) X X SET(HEADERS a672f421ef8d6a144344724cd2a2f8e3 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 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 X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) 1a5934d7cf6a9a70992a414c49bc1456 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 2010-12-03 18:58:26.000000000 +0100 X+++ scripts/CMakeLists.txt 2011-01-11 20:18:07.000000000 +0100 X@@ -71,6 +71,7 @@ X ) X ENDIF() X X+IF(FALSE) X INSTALL(FILES X ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql X ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql X@@ -79,6 +80,7 @@ X ${FIX_PRIVILEGES_SQL} X DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server X ) X+ENDIF() X X # TCMalloc hacks X IF(MALLOC_LIB) X@@ -138,6 +140,7 @@ X SET(HOSTNAME "hostname") X SET(MYSQLD_USER "mysql") X X+IF(FALSE) X # Required for mysqlbug until autotools are deprecated, once done remove these X # and expand default cmake variables X SET(CC ${CMAKE_C_COMPILER}) X@@ -174,6 +177,7 @@ X DESTINATION ${INSTALL_BINDIR} X COMPONENT Server X ) X+ENDIF() X X ENDIF(UNIX) X X@@ -198,6 +202,7 @@ X SET(localstatedir ${MYSQL_DATADIR}) X ENDIF() X X+IF() X IF(UNIX) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh X ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) X@@ -215,6 +220,7 @@ X DESTINATION ${DEST} X COMPONENT Server X ) X+ENDIF() X X X SET(prefix "${CMAKE_INSTALL_PREFIX}") X@@ -266,6 +272,8 @@ X GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) X STRING(REGEX REPLACE "^lib" "" lib "${lib}") X SET(${var} "${${var}}-l${lib} " ) X+ ELSEIF(lib STREQUAL "-pthread") X+ SET(${var} "${${var}}-pthread " ) X ELSE() X SET(${var} "${${var}}-l${lib} " ) X ENDIF() X@@ -318,18 +326,9 @@ X SET(BIN_SCRIPTS X msql2mysql X mysql_config X- mysql_fix_extensions X- mysql_setpermission X- mysql_secure_installation 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 ) X FOREACH(file ${BIN_SCRIPTS}) X IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) ff3d6f07a65a90b443fb2c40c77f380d 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 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 X 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 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 X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) X@@ -73,8 +79,6 @@ X ENDIF(WIN32) X X SET_TARGET_PROPERTIES ( X- mysql_plugin X- mysql_upgrade X mysqlcheck X mysqldump X mysqlimport bdbd743706cc464c0485ad44114dbeec echo x - mysql56-client/files/patch-CMakeLists.txt sed 's/^X//' >mysql56-client/files/patch-CMakeLists.txt << 'af20e5a4e9e4539f2613786b10d24bfc' X--- CMakeLists.txt.orig 2012-09-18 23:06:30.000000000 +0000 X+++ CMakeLists.txt 2012-10-11 10:15:04.374100269 +0000 X@@ -378,30 +378,12 @@ X ENDIF() X 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) 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-ENDIF() X+ADD_SUBDIRECTORY(client) X+ADD_SUBDIRECTORY(libservices) X+ADD_SUBDIRECTORY(support-files) X+ADD_SUBDIRECTORY(scripts) X+ADD_SUBDIRECTORY(man) X+ X X INCLUDE(cmake/abi_check.cmake) X INCLUDE(cmake/tags.cmake) X@@ -445,11 +427,11 @@ X X INCLUDE(CPack) X IF(UNIX) X- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) X ENDIF() 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 X DESTINATION ${INSTALL_DOCREADMEDIR} X@@ -475,3 +457,4 @@ X PATTERN "sp-imp-spec.txt" EXCLUDE X ) X ENDIF() X+ENDIF() af20e5a4e9e4539f2613786b10d24bfc 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 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-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 X #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) 5894bde17a61be2bca0b5d6083eda34b 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 2012-03-29 08:18:29.000000000 +0000 X+++ support-files/CMakeLists.txt 2012-04-19 18:18:45.915533040 +0000 X@@ -40,15 +40,18 @@ X SET(inst_location ${INSTALL_SUPPORTFILESDIR}) X ENDIF() X X+IF(FALSE) X FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) X CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh X ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) X INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} X DESTINATION ${inst_location} COMPONENT IniFiles) X ENDFOREACH() X+ENDIF() X 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 X ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) X@@ -65,8 +68,10 @@ X IF(INSTALL_SUPPORTFILESDIR) X INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) X ENDIF() X+ENDIF() X X INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) X+IF(FALSE) 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) X@@ -84,3 +89,4 @@ X PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ X GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) X ENDIF() X+ENDIF() 46b57d9782d81102df340e6e37fcbd99 echo c - mysql56-server mkdir -p mysql56-server > /dev/null 2>&1 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%%/my-innodb-heavy-4G.cnf X%%DATADIR%%/my-huge.cnf X%%DATADIR%%/my-large.cnf X%%DATADIR%%/my-medium.cnf X%%DATADIR%%/my-small.cnf 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@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=<dbdir> flag) Xthe first time you start the MySQL server after an upgrade from an Xearlier version. X X************************************************************************ 9e30749e75329bceccd1ee9ccd84da1d 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/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: ports/databases/mysql55-server/Makefile,v 1.286 2012/03/26 09:03:12 ale Exp $ X# X XPORTNAME?= mysql XPORTVERSION= 5.6.7 XDISTVERSIONSUFFIX= -rc XPORTREVISION?= 0 XCATEGORIES= databases ipv6 XMASTER_SITES= ${MASTER_SITE_MYSQL} XMASTER_SITE_SUBDIR= MySQL-5.6 XPKGNAMESUFFIX?= -server X XMAINTAINER= ale@FreeBSD.org XCOMMENT?= Multithreaded SQL database (server) X XSLAVEDIRS= databases/mysql56-client XUSE_CMAKE= yes XMAKE_JOBS_SAFE= yes XNO_OPTIONS_SORT=yes X XOPTIONS_DEFINE= SSL FASTMTX XOPTIONS_DEFAULT=SSL X XFASTMTX_DESC= Replace mutexes with spinlocks X XCMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ X -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ X -DINSTALL_INCLUDEDIR="include/mysql" \ X -DINSTALL_INFODIR="info" \ X -DINSTALL_LIBDIR="lib/mysql" \ X -DINSTALL_MANDIR="man" \ X -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ X -DINSTALL_MYSQLSHAREDIR="share/mysql" \ X -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ X -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ X -DINSTALL_SBINDIR="libexec" \ X -DINSTALL_SCRIPTDIR="bin" \ X -DINSTALL_SHAREDIR="share" \ X -DINSTALL_SQLBENCHDIR="share/mysql" \ X -DINSTALL_SUPPORTFILESDIR="share/mysql" \ X -DWITH_LIBEDIT=0 \ X -DWITH_LIBWRAP=1 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+= -DWITH_SSL=bundled X.endif X.if ${PORT_OPTIONS:MFASTMTX} XCMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 X.endif X X# MySQL-Server part X.if !defined(CLIENT_ONLY) XUSE_MYSQL= yes XWANT_MYSQL_VER= 56 X XLATEST_LINK= mysql56-server X XCONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-57-9].* X XUSE_RC_SUBR= mysql-server X XUSERS= mysql XGROUPS= mysql X XINFO= mysql X XMAN1= 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= mysqld.8 X XCMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="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} == "arm" XBROKEN= Does not compile on arm X.endif X X.include <bsd.port.post.mk> 7129544cef1bdb098d7c505843998df8 echo c - mysql56-server/files mkdir -p mysql56-server/files > /dev/null 2>&1 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 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_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 X+IF(FALSE) X INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) X INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development X PATTERN "*.h" X PATTERN "psi_abi*" EXCLUDE X ) X- X+ENDIF() X 2645744ee667d307f5db1a59324d41a8 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_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 X #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) 26c8020e3cf55455db7e7c5707d19671 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 X IF(INSTALL_LAYOUT STREQUAL "STANDALONE") X X+IF(FALSE) X # We need to create empty directories (data/test) the installation. X # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 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 X ADD_CUSTOM_TARGET(show-dist-name X COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" 5bf60065a6ab96bbaedf0dfbd83f4ecc 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}") 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-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 X if test -z "$MYSQL_HOME" X then 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 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=$DATADIR X else X MYSQL_HOME=$MY_BASEDIR_VERSION b0e8250b1ac160609cc2fa5c2de292ae 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 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-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 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 X #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) 2bccb6f3f616a5906938df609ad7800e 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 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 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 X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) X TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) X X@@ -47,17 +50,21 @@ X X MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) X TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) X TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) X ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) X TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) X+ENDIF() X X MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) X TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) X X+IF(FALSE) X MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) X TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) X X@@ -70,6 +77,7 @@ X X MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) X TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) X+ENDIF() X 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 X mysql_upgrade X- mysqlcheck X- mysqldump X- mysqlimport X- mysqlshow X- mysqlslap X PROPERTIES HAS_CXX TRUE) X X ADD_DEFINITIONS(-DHAVE_DLOPEN) 460183d6ff20b686f5e71b14ea25da1b 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 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/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} " ) X+ ELSEIF(lib STREQUAL "-pthread") X+ SET(${var} "${${var}}-pthread " ) X ELSE() X SET(${var} "${${var}}-l${lib} " ) 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_secure_installation 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 +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-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 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) 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@@ -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 X DESTINATION ${INSTALL_DOCREADMEDIR} X@@ -367,3 +363,4 @@ X PATTERN "sp-imp-spec.txt" EXCLUDE X ) X ENDIF() X+ENDIF() e0ed8afcd6c23a83aaafb5ceccdb4828 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="mysql" Xrcvar=mysql_enable X Xload_rc_config $name X X: ${mysql_enable="NO"} X: ${mysql_limits="NO"} X: ${mysql_dbdir="/var/db/mysql"} X Xmysql_user="mysql" Xmysql_limits_args="-e -U ${mysql_user}" Xpidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} Xcommand="/usr/sbin/daemon" Xcommand_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" Xprocname="%%PREFIX%%/libexec/mysqld" Xstart_precmd="${name}_prestart" Xstart_postcmd="${name}_poststart" Xmysql_install_db="%%PREFIX%%/bin/mysql_install_db" Xmysql_install_db_args="--basedir=%%PREFIX%% --datadir=${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=15 X while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do X timeout=$(( timeout - 1 )) X sleep 1 X done X return 0 X} X Xrun_rc_command "$1" 74b76550ca6146bb3922117ab93cbf43 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 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 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 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 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-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/distinfo sed 's/^X//' >mysql56-server/distinfo << 'fb47e66a54ef4cb2a42f34737b601d8b' XSHA256 (mysql-5.6.7-rc.tar.gz) = cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 XSIZE (mysql-5.6.7-rc.tar.gz) = 34316534 fb47e66a54ef4cb2a42f34737b601d8b exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210141542.q9EFgT5q060845>