From owner-svn-ports-all@freebsd.org Sat Apr 1 15:11:18 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30195D2937E; Sat, 1 Apr 2017 15:11:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0038189F; Sat, 1 Apr 2017 15:11:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v31FBHgO004319; Sat, 1 Apr 2017 15:11:17 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v31FBFnP004297; Sat, 1 Apr 2017 15:11:15 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201704011511.v31FBFnP004297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 1 Apr 2017 15:11:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437438 - in head: databases/mysql55-server databases/mysql55-server/files databases/mysql56-client databases/mysql56-client/files databases/mysql56-server/files databases/mysqlwsrep56-... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Apr 2017 15:11:18 -0000 Author: bapt Date: Sat Apr 1 15:11:14 2017 New Revision: 437438 URL: https://svnweb.freebsd.org/changeset/ports/437438 Log: Update libedit to 20170329 Added: head/databases/mysql55-server/files/patch-client_mysql.cc (contents, props changed) head/databases/mysql55-server/files/patch-cmake_readline.cmake (contents, props changed) head/databases/mysql56-client/files/patch-client_mysql.cc (contents, props changed) head/databases/mysql56-client/files/patch-cmake_readline.cmake (contents, props changed) head/databases/mysql56-server/files/patch-client_mysql.cc (contents, props changed) head/databases/mysql56-server/files/patch-cmake_readline.cmake (contents, props changed) head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc (contents, props changed) head/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake (contents, props changed) head/databases/percona56-client/files/patch-client_mysql.cc (contents, props changed) head/databases/percona56-client/files/patch-cmake_readline.cmake (contents, props changed) head/databases/percona56-server/files/patch-client_mysql.cc (contents, props changed) head/databases/percona56-server/files/patch-cmake_readline.cmake (contents, props changed) Deleted: head/devel/libedit/files/ Modified: head/databases/mysql55-server/Makefile head/databases/mysql56-client/Makefile head/databases/mysqlwsrep56-server/Makefile head/databases/percona56-server/Makefile head/databases/percona57-client/Makefile head/databases/percona57-client/files/patch-client__mysql.cc head/devel/libedit/Makefile head/devel/libedit/distinfo head/devel/libedit/pkg-plist Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Sat Apr 1 15:03:21 2017 (r437437) +++ head/databases/mysql55-server/Makefile Sat Apr 1 15:11:14 2017 (r437438) @@ -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 Added: head/databases/mysql55-server/files/patch-client_mysql.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql55-server/files/patch-client_mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Added: head/databases/mysql55-server/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql55-server/files/patch-cmake_readline.cmake Sat Apr 1 15:11:14 2017 (r437438) @@ -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 + 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) + Modified: head/databases/mysql56-client/Makefile ============================================================================== --- head/databases/mysql56-client/Makefile Sat Apr 1 15:03:21 2017 (r437437) +++ head/databases/mysql56-client/Makefile Sat Apr 1 15:11:14 2017 (r437438) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 3 +PORTREVISION?= 4 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) Added: head/databases/mysql56-client/files/patch-client_mysql.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-client/files/patch-client_mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Added: head/databases/mysql56-client/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-client/files/patch-cmake_readline.cmake Sat Apr 1 15:11:14 2017 (r437438) @@ -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 + 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) + Added: head/databases/mysql56-server/files/patch-client_mysql.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-server/files/patch-client_mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Added: head/databases/mysql56-server/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-server/files/patch-cmake_readline.cmake Sat Apr 1 15:11:14 2017 (r437438) @@ -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 + 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) + Modified: head/databases/mysqlwsrep56-server/Makefile ============================================================================== --- head/databases/mysqlwsrep56-server/Makefile Sat Apr 1 15:03:21 2017 (r437437) +++ head/databases/mysqlwsrep56-server/Makefile Sat Apr 1 15:11:14 2017 (r437438) @@ -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 Added: head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-client_mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Added: head/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake Sat Apr 1 15:11:14 2017 (r437438) @@ -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 + 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) + Added: head/databases/percona56-client/files/patch-client_mysql.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-client_mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Added: head/databases/percona56-client/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-cmake_readline.cmake Sat Apr 1 15:11:14 2017 (r437438) @@ -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 + 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) + Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Sat Apr 1 15:03:21 2017 (r437437) +++ head/databases/percona56-server/Makefile Sat Apr 1 15:11:14 2017 (r437438) @@ -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 Added: head/databases/percona56-server/files/patch-client_mysql.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-client_mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Added: head/databases/percona56-server/files/patch-cmake_readline.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-cmake_readline.cmake Sat Apr 1 15:11:14 2017 (r437438) @@ -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 + 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) + Modified: head/databases/percona57-client/Makefile ============================================================================== --- head/databases/percona57-client/Makefile Sat Apr 1 15:03:21 2017 (r437437) +++ head/databases/percona57-client/Makefile Sat Apr 1 15:11:14 2017 (r437438) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 2 +PORTREVISION?= 3 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/percona57-client/files/patch-client__mysql.cc ============================================================================== --- head/databases/percona57-client/files/patch-client__mysql.cc Sat Apr 1 15:03:21 2017 (r437437) +++ head/databases/percona57-client/files/patch-client__mysql.cc Sat Apr 1 15:11:14 2017 (r437438) @@ -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); Modified: head/devel/libedit/Makefile ============================================================================== --- head/devel/libedit/Makefile Sat Apr 1 15:03:21 2017 (r437437) +++ head/devel/libedit/Makefile Sat Apr 1 15:11:14 2017 (r437438) @@ -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 Modified: head/devel/libedit/distinfo ============================================================================== --- head/devel/libedit/distinfo Sat Apr 1 15:03:21 2017 (r437437) +++ head/devel/libedit/distinfo Sat Apr 1 15:11:14 2017 (r437438) @@ -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 Modified: head/devel/libedit/pkg-plist ============================================================================== --- head/devel/libedit/pkg-plist Sat Apr 1 15:03:21 2017 (r437437) +++ head/devel/libedit/pkg-plist Sat Apr 1 15:11:14 2017 (r437438) @@ -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