diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-06-10 23:12:51 +0800 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-06-10 23:12:51 +0800 |
| commit | 4ddabf9b1382caaf5a49a1053555c2ad8b47388e (patch) | |
| tree | 63c3d56052a269c4e946d3e083eba4bc201517f6 /databases | |
| parent | 87e9e9eee0c5ac9bc0e8af59379a2f48ee4e35ec (diff) | |
| download | freebsd-ports-gnome-4ddabf9b1382caaf5a49a1053555c2ad8b47388e.tar.gz freebsd-ports-gnome-4ddabf9b1382caaf5a49a1053555c2ad8b47388e.tar.zst freebsd-ports-gnome-4ddabf9b1382caaf5a49a1053555c2ad8b47388e.zip | |
Update to 5.6.12 release.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql56-client/files/patch-cmake_readline.cmake | 11 | ||||
| -rw-r--r-- | databases/mysql56-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql56-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql56-server/files/patch-client_CMakeLists.txt | 16 |
4 files changed, 12 insertions, 23 deletions
diff --git a/databases/mysql56-client/files/patch-cmake_readline.cmake b/databases/mysql56-client/files/patch-cmake_readline.cmake deleted file mode 100644 index 589c0fcaac22..000000000000 --- a/databases/mysql56-client/files/patch-cmake_readline.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/readline.cmake.orig 2013-02-13 11:49:33.000000000 +0100 -+++ cmake/readline.cmake 2013-02-13 11:49:56.000000000 +0100 -@@ -192,7 +192,7 @@ - IF(WITH_LIBEDIT) - MYSQL_USE_BUNDLED_LIBEDIT() - ELSE() -- FIND_SYSTEM_LIBEDIT(edit) -+ FIND_SYSTEM_LIBEDIT(readline) - IF(NOT_LIBEDIT_FOUND) - MESSAGE(FATAL_ERROR "Cannot find system libedit libraries.Use WITH_LIBEDIT") - ENDIF() diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 589e4d01f14e..a1d631739a64 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.11 +PORTVERSION= 5.6.12 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -31,7 +31,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DWITH_LIBEDIT=0 \ + -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=1 .ifdef USE_MYSQL diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo index 72c2c0067f49..64e1410acae4 100644 --- a/databases/mysql56-server/distinfo +++ b/databases/mysql56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.11.tar.gz) = ea4a494ea926a20ada56b1c139afdc65f5a68827068a509cd0801640d8dd079e -SIZE (mysql-5.6.11.tar.gz) = 35458544 +SHA256 (mysql-5.6.12.tar.gz) = 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 +SIZE (mysql-5.6.12.tar.gz) = 35876046 diff --git a/databases/mysql56-server/files/patch-client_CMakeLists.txt b/databases/mysql56-server/files/patch-client_CMakeLists.txt index 166a94fb3998..3acc651e0544 100644 --- a/databases/mysql56-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql56-server/files/patch-client_CMakeLists.txt @@ -1,14 +1,14 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 14:47:51.000000000 +0100 -@@ -33,17 +33,20 @@ +--- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200 ++++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200 +@@ -31,17 +31,20 @@ + COPY_OPENSSL_DLLS(copy_openssl_client) - ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -52,17 +55,21 @@ +@@ -50,17 +53,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -43,7 +43,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -75,6 +82,7 @@ +@@ -73,6 +80,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -51,7 +51,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -84,11 +92,6 @@ +@@ -82,11 +90,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade |