From owner-svn-ports-all@FreeBSD.ORG Sat Mar 1 14:10:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D054FE1B; Sat, 1 Mar 2014 14:10:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A39141ABB; Sat, 1 Mar 2014 14:10:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s21EAEvx094043; Sat, 1 Mar 2014 14:10:14 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s21EAEO9094041; Sat, 1 Mar 2014 14:10:14 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201403011410.s21EAEO9094041@svn.freebsd.org> From: Antoine Brodin Date: Sat, 1 Mar 2014 14:10:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346625 - in head/lang/python27: . files 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.17 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 Mar 2014 14:10:14 -0000 Author: antoine Date: Sat Mar 1 14:10:13 2014 New Revision: 346625 URL: http://svnweb.freebsd.org/changeset/ports/346625 QAT: https://qat.redports.org/buildarchive/r346625/ Log: - Fix build with readline 6.3 from ports the patch was obtained from upstream (issue #20374) - Add missing USES=readline PR: ports/187174 Reported by: O. Hartmann Reviewed by: koobs Obtained from: python Added: head/lang/python27/files/patch-issue20374 (contents, props changed) Modified: head/lang/python27/Makefile Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Sat Mar 1 14:08:41 2014 (r346624) +++ head/lang/python27/Makefile Sat Mar 1 14:10:13 2014 (r346625) @@ -22,6 +22,7 @@ MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall +USES= readline USE_LDCONFIG= yes USE_PYTHON= yes USE_XZ= yes Added: head/lang/python27/files/patch-issue20374 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python27/files/patch-issue20374 Sat Mar 1 14:10:13 2014 (r346625) @@ -0,0 +1,55 @@ +# Description: fix readline.so build with readline 6.3 +# Patch obtained from upstream, issue #20374 +# http://bugs.python.org/issue20374 +# PR: ports/187174 + +--- ./Modules/readline.c.orig 2013-11-10 07:36:41.000000000 +0000 ++++ ./Modules/readline.c 2014-03-01 12:40:44.000000000 +0000 +@@ -750,14 +750,22 @@ + } + + static int ++#if defined(_RL_FUNCTION_TYPEDEF) + on_startup_hook(void) ++#else ++on_startup_hook() ++#endif + { + return on_hook(startup_hook); + } + + #ifdef HAVE_RL_PRE_INPUT_HOOK + static int ++#if defined(_RL_FUNCTION_TYPEDEF) + on_pre_input_hook(void) ++#else ++on_pre_input_hook() ++#endif + { + return on_hook(pre_input_hook); + } +@@ -852,7 +860,7 @@ + * before calling the normal completer */ + + static char ** +-flex_complete(char *text, int start, int end) ++flex_complete(const char *text, int start, int end) + { + #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + rl_completion_append_character ='\0'; +@@ -911,12 +919,12 @@ + rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); + rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); + /* Set our hook functions */ +- rl_startup_hook = (Function *)on_startup_hook; ++ rl_startup_hook = on_startup_hook; + #ifdef HAVE_RL_PRE_INPUT_HOOK +- rl_pre_input_hook = (Function *)on_pre_input_hook; ++ rl_pre_input_hook = on_pre_input_hook; + #endif + /* Set our completion function */ +- rl_attempted_completion_function = (CPPFunction *)flex_complete; ++ rl_attempted_completion_function = flex_complete; + /* Set Python word break characters */ + completer_word_break_characters = + rl_completer_word_break_characters =