ports/187176: commit references a PR

[dfilter service]

The following reply was made to PR ports/187176; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/187176: commit references a PR
Date: Sat,  1 Mar 2014 14:28:16 +0000 (UTC)

 Author: antoine
 Date: Sat Mar  1 14:28:08 2014
 New Revision: 346628
 URL: http://svnweb.freebsd.org/changeset/ports/346628
 QAT: https://qat.redports.org/buildarchive/r346628/
 
 Log:
   - Fix build with readline 6.3 from ports
     the patch was obtained from upstream (issue #20374)
   - Add missing USES=readline
   
   PR:		ports/187176
   Reported by:	O. Hartmann
   Reviewed by:	koobs
   Obtained from:	python
 
 Added:
   head/lang/python33/files/patch-issue20374   (contents, props changed)
 Modified:
   head/lang/python33/Makefile
 
 Modified: head/lang/python33/Makefile
 ==============================================================================
 --- head/lang/python33/Makefile	Sat Mar  1 14:22:52 2014	(r346627)
 +++ head/lang/python33/Makefile	Sat Mar  1 14:28:08 2014	(r346628)
 @@ -21,7 +21,7 @@ MAKE_ENV=		VPATH="${PYTHON_WRKSRC}"
  
  INSTALL_TARGET=		altinstall
  
 -USES=		gmake
 +USES=		gmake readline
  USE_LDCONFIG=	yes
  USE_PYTHON=	yes
  USE_XZ=		yes
 
 Added: head/lang/python33/files/patch-issue20374
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/lang/python33/files/patch-issue20374	Sat Mar  1 14:28:08 2014	(r346628)
 @@ -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/187176
 +
 +--- ./Modules/readline.c.orig	2013-11-17 07:23:01.000000000 +0000
 ++++ ./Modules/readline.c	2014-03-01 13:05:47.000000000 +0000
 +@@ -774,14 +774,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);
 + }
 +@@ -877,7 +885,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';
 +@@ -936,12 +944,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 =
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"