diff options
Diffstat (limited to 'databases')
7 files changed, 99 insertions, 5 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 1d6799fafa7b..1066f637cb11 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= evolution-data-server -PORTVERSION= 3.24.2 -PORTREVISION= 3 +PORTVERSION= 3.24.4 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 7bfe05b38ffb..d7cd213da536 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496410963 -SHA256 (gnome3/evolution-data-server-3.24.2.tar.xz) = a9bbb98308f935bac8550838b3b5a2b54b38a3d1dd5b0ad91cfb089b46f298fb -SIZE (gnome3/evolution-data-server-3.24.2.tar.xz) = 4306528 +TIMESTAMP = 1501011384 +SHA256 (gnome3/evolution-data-server-3.24.4.tar.xz) = c8527da0ffe8e81ad4192411ea4a9b99f8870e70565e187136426252c103a9d0 +SIZE (gnome3/evolution-data-server-3.24.4.tar.xz) = 4253548 diff --git a/databases/mysql56-client/files/patch-client_mysql.cc b/databases/mysql56-client/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/mysql56-client/files/patch-client_mysql.cc @@ -0,0 +1,25 @@ +--- client/mysql.cc.orig 2016-09-30 11:41:40 UTC ++++ client/mysql.cc +@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n + #ifdef HAVE_LOCALE_H + setlocale(LC_ALL,""); /* so as libedit use isprint */ + #endif +- rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; +- rl_completion_entry_function= &no_completion; ++ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; ++ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; ++ /* + rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); ++ */ + #else + rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; + rl_completion_entry_function= &no_completion; +@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const + int end MY_ATTRIBUTE((unused))) + { + if (!status.batch && !quick) +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) + return rl_completion_matches(text, new_command_generator); + #else + return completion_matches((char *)text, (CPFunction *)new_command_generator); diff --git a/databases/mysql56-client/files/patch-cmake_readline.cmake b/databases/mysql56-client/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/mysql56-client/files/patch-cmake_readline.cmake @@ -0,0 +1,17 @@ +--- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC ++++ cmake/readline.cmake +@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE) + #include <readline.h> + int main(int argc, char **argv) + { +- typedef int MYFunction(const char*, int); ++ typedef char *MYFunction(const char*, int); + MYFunction* myf= rl_completion_entry_function; +- int res= (myf)(NULL, 0); ++ char *res= (myf)(NULL, 0); + completion_matches(0,0); +- return res; ++ return (res != NULL); + }" + EDITLINE_HAVE_COMPLETION) + diff --git a/databases/mysql56-server/files/patch-client_mysql.cc b/databases/mysql56-server/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/mysql56-server/files/patch-client_mysql.cc @@ -0,0 +1,25 @@ +--- client/mysql.cc.orig 2016-09-30 11:41:40 UTC ++++ client/mysql.cc +@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n + #ifdef HAVE_LOCALE_H + setlocale(LC_ALL,""); /* so as libedit use isprint */ + #endif +- rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; +- rl_completion_entry_function= &no_completion; ++ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; ++ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; ++ /* + rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); ++ */ + #else + rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; + rl_completion_entry_function= &no_completion; +@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const + int end MY_ATTRIBUTE((unused))) + { + if (!status.batch && !quick) +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) + return rl_completion_matches(text, new_command_generator); + #else + return completion_matches((char *)text, (CPFunction *)new_command_generator); diff --git a/databases/mysql56-server/files/patch-cmake_readline.cmake b/databases/mysql56-server/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/mysql56-server/files/patch-cmake_readline.cmake @@ -0,0 +1,17 @@ +--- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC ++++ cmake/readline.cmake +@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE) + #include <readline.h> + int main(int argc, char **argv) + { +- typedef int MYFunction(const char*, int); ++ typedef char *MYFunction(const char*, int); + MYFunction* myf= rl_completion_entry_function; +- int res= (myf)(NULL, 0); ++ char *res= (myf)(NULL, 0); + completion_matches(0,0); +- return res; ++ return (res != NULL); + }" + EDITLINE_HAVE_COMPLETION) + diff --git a/databases/rubygem-redis-actionpack4/files/patch-gemspec b/databases/rubygem-redis-actionpack4/files/patch-gemspec new file mode 100644 index 000000000000..9e08063f9a32 --- /dev/null +++ b/databases/rubygem-redis-actionpack4/files/patch-gemspec @@ -0,0 +1,11 @@ +--- redis-actionpack.gemspec.orig 2017-03-15 08:52:49 UTC ++++ redis-actionpack.gemspec +@@ -23,7 +23,7 @@ Gem::Specification.new do |s| + s.specification_version = 4 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q<redis-store>.freeze, ["~> 1.1.0"]) ++ s.add_runtime_dependency(%q<redis-store>.freeze, [">= 1.1.0"]) + s.add_runtime_dependency(%q<redis-rack>.freeze, ["~> 1.5.0"]) + s.add_runtime_dependency(%q<actionpack>.freeze, ["~> 4"]) + s.add_development_dependency(%q<rake>.freeze, ["~> 10"]) |