diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-04-01 15:11:14 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-04-01 15:11:14 +0000 |
| commit | b85734e5a8a8069eb9cdd9e433d87a48ad56cd2e (patch) | |
| tree | cf36ee99baf262132ed098112ce81365db1c7f5b | |
| parent | d39ad836d1ab4367b3bc4d8e47ea54824d74bc1b (diff) | |
Notes
24 files changed, 316 insertions, 102 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 14a9f27abb58..82f88d28ae52 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.5.54 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.5 PKGNAMESUFFIX?= 55-server diff --git a/databases/mysql55-server/files/patch-client_mysql.cc b/databases/mysql55-server/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/mysql55-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/mysql55-server/files/patch-cmake_readline.cmake b/databases/mysql55-server/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/mysql55-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/mysql56-client/Makefile b/databases/mysql56-client/Makefile index 7da918eb3d9c..8071882371ee 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 3 +PORTREVISION?= 4 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) 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/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index a047fae6b78f..8614ec8c28a0 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -3,6 +3,7 @@ PORTNAME= mysqlwsrep PORTVERSION= 5.6.35 +PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://releases.galeracluster.com/source/ PKGNAMESUFFIX= 56-server diff --git a/databases/mysqlwsrep56-server/files/patch-client_mysql.cc b/databases/mysqlwsrep56-server/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/mysqlwsrep56-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/mysqlwsrep56-server/files/patch-cmake_readline.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/mysqlwsrep56-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/percona56-client/files/patch-client_mysql.cc b/databases/percona56-client/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/percona56-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/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/percona56-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/percona56-server/Makefile b/databases/percona56-server/Makefile index de961f613197..9fd4a23c83f0 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= percona DISTVERSION= 5.6.35-80.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server diff --git a/databases/percona56-server/files/patch-client_mysql.cc b/databases/percona56-server/files/patch-client_mysql.cc new file mode 100644 index 000000000000..5a03f22b249f --- /dev/null +++ b/databases/percona56-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/percona56-server/files/patch-cmake_readline.cmake b/databases/percona56-server/files/patch-cmake_readline.cmake new file mode 100644 index 000000000000..4c251b15fc56 --- /dev/null +++ b/databases/percona56-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/percona57-client/Makefile b/databases/percona57-client/Makefile index 96eb22a7c580..65b97d41c50b 100644 --- a/databases/percona57-client/Makefile +++ b/databases/percona57-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 2 +PORTREVISION?= 3 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/percona57-client/files/patch-client__mysql.cc b/databases/percona57-client/files/patch-client__mysql.cc index 26b9650400bf..d15700aa095f 100644 --- a/databases/percona57-client/files/patch-client__mysql.cc +++ b/databases/percona57-client/files/patch-client__mysql.cc @@ -1,4 +1,4 @@ ---- client/mysql.cc.orig 2016-11-27 19:44:54 UTC +--- client/mysql.cc.orig 2017-04-01 14:33:18 UTC +++ client/mysql.cc @@ -1903,11 +1903,11 @@ static void usage(int version) #endif @@ -14,3 +14,26 @@ MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); #endif +@@ -2865,9 +2865,11 @@ static void initialize_readline (char *name) + rl_add_defun("magic-space", (rl_command_func_t *)&fake_magic_space, -1); + #elif defined(USE_LIBEDIT_INTERFACE) + setlocale(LC_ALL,""); /* so as libedit use isprint */ +- 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; +@@ -2886,7 +2888,7 @@ static char **new_mysql_completion(const char *text, + 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/devel/libedit/Makefile b/devel/libedit/Makefile index ceab866e517a..cdac55a4c12a 100644 --- a/devel/libedit/Makefile +++ b/devel/libedit/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE USES= libtool ncurses pathfix EDITVERSION= 3.1 -EDITDATE= 20150325 +EDITDATE= 20170329 WRKSRC= ${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -26,4 +26,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS_INSTALL= editline-* +post-install: + ${MV} ${STAGEDIR}${PREFIX}/man/man3/history.3 ${STAGEDIR}${PREFIX}/man/man3/el_history.3 + .include <bsd.port.mk> diff --git a/devel/libedit/distinfo b/devel/libedit/distinfo index bc19d6fa8149..da3a4854fd76 100644 --- a/devel/libedit/distinfo +++ b/devel/libedit/distinfo @@ -1,2 +1,3 @@ -SHA256 (libedit-20150325-3.1.tar.gz) = c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5 -SIZE (libedit-20150325-3.1.tar.gz) = 502792 +TIMESTAMP = 1490994397 +SHA256 (libedit-20170329-3.1.tar.gz) = 91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be +SIZE (libedit-20170329-3.1.tar.gz) = 508504 diff --git a/devel/libedit/files/patch-netbsd-pr-50863 b/devel/libedit/files/patch-netbsd-pr-50863 deleted file mode 100644 index 72383f9c2b12..000000000000 --- a/devel/libedit/files/patch-netbsd-pr-50863 +++ /dev/null @@ -1,53 +0,0 @@ -http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=50863 - ---- src/tty.c.orig 2014-06-18 19:07:45 UTC -+++ src/tty.c -@@ -499,6 +499,9 @@ tty_setup(EditLine *el) - if (el->el_flags & EDIT_DISABLED) - return 0; - -+ if (el->el_tty.t_initialized) -+ return -1; -+ - if (!isatty(el->el_outfd)) { - #ifdef DEBUG_TTY - (void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__, -@@ -558,6 +561,7 @@ tty_setup(EditLine *el) - - tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]); - tty_bind_char(el, 1); -+ el->el_tty.t_initialized = 1; - return 0; - } - -@@ -567,6 +571,7 @@ tty_init(EditLine *el) - - el->el_tty.t_mode = EX_IO; - el->el_tty.t_vdisable = _POSIX_VDISABLE; -+ el->el_tty.t_initialized = 0; - (void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t)); - (void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t)); - return tty_setup(el); -@@ -580,6 +585,9 @@ protected void - /*ARGSUSED*/ - tty_end(EditLine *el) - { -+ if (!el->el_tty.t_initialized) -+ return; -+ - if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) { - #ifdef DEBUG_TTY - (void) fprintf(el->el_errfile, ---- src/tty.h.orig 2014-06-18 16:05:56 UTC -+++ src/tty.h -@@ -474,8 +474,9 @@ typedef struct { - int t_tabs; - int t_eight; - speed_t t_speed; -- int t_mode; -+ unsigned char t_mode; - unsigned char t_vdisable; -+ unsigned char t_initialized; - } el_tty_t; - - diff --git a/devel/libedit/files/patch-src__chartype.h b/devel/libedit/files/patch-src__chartype.h deleted file mode 100644 index bfc24ed65fab..000000000000 --- a/devel/libedit/files/patch-src__chartype.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/chartype.h.orig 2015-03-25 21:02:28.000000000 +0100 -+++ src/chartype.h 2015-03-28 11:37:42.072100000 +0100 -@@ -44,7 +44,7 @@ - * supports non-BMP code points without requiring UTF-16, but nothing - * seems to actually advertise this properly, despite Unicode 3.1 having - * been around since 2001... */ --#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) -+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #ifndef __STDC_ISO_10646__ - /* In many places it is assumed that the first 127 code points are ASCII - * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/devel/libedit/files/patch-src_eln.c b/devel/libedit/files/patch-src_eln.c deleted file mode 100644 index 3021c89d94a7..000000000000 --- a/devel/libedit/files/patch-src_eln.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/eln.c.orig 2015-03-25 21:02:28.000000000 +0100 -+++ src/eln.c 2015-03-28 11:42:29.913925000 +0100 -@@ -75,12 +75,17 @@ public const char * - el_gets(EditLine *el, int *nread) - { - const wchar_t *tmp; -+ int nwread; -+ -+ *nread = 0; - - if (!(el->el_flags & CHARSET_IS_UTF8)) - el->el_flags |= IGNORE_EXTCHARS; -- tmp = el_wgets(el, nread); -+ tmp = el_wgets(el, &nwread); - if (!(el->el_flags & CHARSET_IS_UTF8)) - el->el_flags &= ~IGNORE_EXTCHARS; -+ for (int i = 0; i < nwread; i++) -+ *nread += ct_enc_width(tmp[i]); - return ct_encode_string(tmp, &el->el_lgcyconv); - } - diff --git a/devel/libedit/pkg-plist b/devel/libedit/pkg-plist index 864459d6231c..294fa25a8e25 100644 --- a/devel/libedit/pkg-plist +++ b/devel/libedit/pkg-plist @@ -3,7 +3,7 @@ include/histedit.h lib/libedit.a lib/libedit.so lib/libedit.so.0 -lib/libedit.so.0.0.53 +lib/libedit.so.0.0.56 libdata/pkgconfig/libedit.pc man/man3/editline.3.gz man/man3/el_deletestr.3.gz @@ -11,10 +11,8 @@ man/man3/el_end.3.gz man/man3/el_get.3.gz man/man3/el_getc.3.gz man/man3/el_gets.3.gz -man/man3/el_history.3.gz -man/man3/el_history_end.3.gz -man/man3/el_history_init.3.gz man/man3/el_init.3.gz +man/man3/el_init_fd.3.gz man/man3/el_insertstr.3.gz man/man3/el_line.3.gz man/man3/el_parse.3.gz @@ -23,9 +21,30 @@ man/man3/el_reset.3.gz man/man3/el_resize.3.gz man/man3/el_set.3.gz man/man3/el_source.3.gz -man/man3/el_tok_end.3.gz -man/man3/el_tok_init.3.gz -man/man3/el_tok_line.3.gz -man/man3/el_tok_reset.3.gz -man/man3/el_tok_str.3.gz +man/man3/el_wdeletestr.3.gz +man/man3/el_wget.3.gz +man/man3/el_wgetc.3.gz +man/man3/el_wgets.3.gz +man/man3/el_winsertstr.3.gz +man/man3/el_wline.3.gz +man/man3/el_wparse.3.gz +man/man3/el_wpush.3.gz +man/man3/el_wset.3.gz +man/man3/el_history.3.gz +man/man3/history_end.3.gz +man/man3/history_init.3.gz +man/man3/history_w.3.gz +man/man3/history_wend.3.gz +man/man3/history_winit.3.gz +man/man3/tok_end.3.gz +man/man3/tok_init.3.gz +man/man3/tok_line.3.gz +man/man3/tok_reset.3.gz +man/man3/tok_str.3.gz +man/man3/tok_wend.3.gz +man/man3/tok_winit.3.gz +man/man3/tok_wline.3.gz +man/man3/tok_wreset.3.gz +man/man3/tok_wstr.3.gz man/man5/editrc.5.gz +man/man7/editline.7.gz |