svn commit: r363450 - in head/sysutils/tmux: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Jul 30 07:12:58 2014
New Revision: 363450
URL: http://svnweb.freebsd.org/changeset/ports/363450
QAT: https://qat.redports.org/buildarchive/r363450/

Log:
  - Unconditionally apply the backspace patch, remove the BACKSPACE OPTION
  
  Suggested by:	bapt

Added:
  head/sysutils/tmux/files/patch-tty-keys.c
     - copied unchanged from r363161, head/sysutils/tmux/files/extra-patch-tty-keys.c
Deleted:
  head/sysutils/tmux/files/extra-patch-tty-keys.c
Modified:
  head/sysutils/tmux/Makefile

Modified: head/sysutils/tmux/Makefile
==============================================================================
--- head/sysutils/tmux/Makefile	Wed Jul 30 07:11:05 2014	(r363449)
+++ head/sysutils/tmux/Makefile	Wed Jul 30 07:12:58 2014	(r363450)
@@ -26,15 +26,12 @@ PLIST_DIRSTRY=	etc/bash_completion.d
 PORTDOCS=	CHANGES FAQ README TODO
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE
+OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC
 
 LIBEVENT_STATIC_DESC=	Build with static libevent
-BACKSPACE_DESC=	Build with tty/keys patch
 
 CFLAGS+=	-Wno-pointer-sign
 
-BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
-
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:${PORTSDIR}/devel/libevent2
 LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 

Copied: head/sysutils/tmux/files/patch-tty-keys.c (from r363161, head/sysutils/tmux/files/extra-patch-tty-keys.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/tmux/files/patch-tty-keys.c	Wed Jul 30 07:12:58 2014	(r363450, copy of r363161, head/sysutils/tmux/files/extra-patch-tty-keys.c)
@@ -0,0 +1,11 @@
+--- tty-keys.c.orig	2013-03-27 14:37:25.000000000 +0100
++++ tty-keys.c	2013-03-27 14:37:44.000000000 +0100
+@@ -529,8 +529,6 @@
+ 	 * used. termios should have a better idea.
+ 	 */
+ 	bspace = tty->tio.c_cc[VERASE];
+-	if (bspace != _POSIX_VDISABLE && key == bspace)
+-		key = KEYC_BSPACE;
+ 
+ 	goto complete_key;
+