svn commit: r346724 - in head/devel/gdb: . files

[Bryan Drewery]

Author: bdrewery
Date: Sat Mar  1 22:54:47 2014
New Revision: 346724
URL: http://svnweb.freebsd.org/changeset/ports/346724
QAT: https://qat.redports.org/buildarchive/r346724/

Log:
  - Fix build with devel/readline 6.3 update
  
  Submitted by:	antoine
  With hat:	portmgr

Added:
  head/devel/gdb/files/extrapatch-gdb-tui-tui-io.c   (contents, props changed)
Modified:
  head/devel/gdb/Makefile

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Sat Mar  1 22:41:57 2014	(r346723)
+++ head/devel/gdb/Makefile	Sat Mar  1 22:54:47 2014	(r346724)
@@ -57,6 +57,7 @@ EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDI
 PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
 PYTHON_CONFIGURE_OFF=	--without-python
 PORT_READLINE_USES=	readline:port
+PORT_READLINE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-gdb-tui-tui-io.c
 TUI_CONFIGURE_ENABLE=	tui
 
 .include <bsd.port.options.mk>
@@ -70,7 +71,7 @@ USE_PYTHON=	2
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-gdb-configure.tgt \
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-gdb-configure.tgt \
 		${FILESDIR}/extrapatch-gdb-Makefile.in
 .endif
 

Added: head/devel/gdb/files/extrapatch-gdb-tui-tui-io.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gdb/files/extrapatch-gdb-tui-tui-io.c	Sat Mar  1 22:54:47 2014	(r346724)
@@ -0,0 +1,17 @@
+--- ./gdb/tui/tui-io.c.orig     2013-12-08 04:33:14.000000000 +0000
++++ ./gdb/tui/tui-io.c  2014-03-01 22:20:33.000000000 +0000
+@@ -128,10 +128,10 @@
+ struct ui_out *tui_old_uiout;
+ 
+ /* Readline previous hooks.  */
+-static Function *tui_old_rl_getc_function;
+-static VFunction *tui_old_rl_redisplay_function;
+-static VFunction *tui_old_rl_prep_terminal;
+-static VFunction *tui_old_rl_deprep_terminal;
++static rl_getc_func_t *tui_old_rl_getc_function;
++static rl_voidfunc_t *tui_old_rl_redisplay_function;
++static rl_voidfunc_t *tui_old_rl_prep_terminal;
++static rl_voidfunc_t *tui_old_rl_deprep_terminal;
+ static int tui_old_rl_echoing_p;
+ 
+ /* Readline output stream.