diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/percona56-client/files/patch-cmake_readline.cmake | 22 | ||||
| -rw-r--r-- | databases/percona56-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/percona56-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/percona56-server/files/patch-client_CMakeLists.txt | 16 | ||||
| -rw-r--r-- | databases/percona56-server/pkg-plist | 2 |
5 files changed, 26 insertions, 24 deletions
diff --git a/databases/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake index 589c0fcaac22..65d14549da47 100644 --- a/databases/percona56-client/files/patch-cmake_readline.cmake +++ b/databases/percona56-client/files/patch-cmake_readline.cmake @@ -1,11 +1,11 @@ ---- 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() +--- cmake/readline.cmake.orig 2013-06-28 21:04:29.807976388 +0200 ++++ cmake/readline.cmake 2013-06-28 21:04:49.685326016 +0200 +@@ -147,7 +147,7 @@ + + FIND_LIBRARY(EDITLINE_LIBRARY + NAMES +- edit ++ readline + ) + MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY) + diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 7d86f0af0f2c..701711a7c6b9 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.11-rc60.3 +DISTVERSION= 5.6.12-rc60.4 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/ PKGNAMESUFFIX?= -server -DISTNAME= Percona-Server-5.6.11-rc60.3 +DISTNAME= Percona-Server-5.6.12-rc60.4 MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -38,7 +38,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 \ -DHAVE_PAM=0 diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo index 6d3de4ee7584..b2de4f6210cc 100644 --- a/databases/percona56-server/distinfo +++ b/databases/percona56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (Percona-Server-5.6.11-rc60.3.tar.gz) = 8f8626811087eb177561c16870d290a41a0950edd9ac02f9bbab73ff01786921 -SIZE (Percona-Server-5.6.11-rc60.3.tar.gz) = 33327340 +SHA256 (Percona-Server-5.6.12-rc60.4.tar.gz) = 546d23e0f70c233ff737ace34370b8651dae33f1fb2062540a083c8773886cb7 +SIZE (Percona-Server-5.6.12-rc60.4.tar.gz) = 33285170 diff --git a/databases/percona56-server/files/patch-client_CMakeLists.txt b/databases/percona56-server/files/patch-client_CMakeLists.txt index d09ad8ef6bdd..fa8a864a1745 100644 --- a/databases/percona56-server/files/patch-client_CMakeLists.txt +++ b/databases/percona56-server/files/patch-client_CMakeLists.txt @@ -1,14 +1,14 @@ ---- client/CMakeLists.txt.orig 2013-06-03 00:02:34.000000000 +0200 -+++ client/CMakeLists.txt 2013-06-06 00:49:27.110952603 +0200 -@@ -33,17 +33,20 @@ +--- client/CMakeLists.txt.orig 2013-06-26 22:38:20.000000000 +0200 ++++ client/CMakeLists.txt 2013-06-28 18:54:21.482641124 +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 sql_string.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 diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist index 436978b38b79..9c5de10c5ef8 100644 --- a/databases/percona56-server/pkg-plist +++ b/databases/percona56-server/pkg-plist @@ -130,3 +130,5 @@ libexec/mysqld @dirrm %%DATADIR%%/swedish @dirrm %%DATADIR%%/ukrainian @dirrm %%DATADIR%% +@cwd /var +@dirrmtry db/mysql |