From b6f614009f7d08853ef175f7f6d11eedf7b8de66 Mon Sep 17 00:00:00 2001 From: gahr Date: Wed, 30 Jul 2014 07:12:58 +0000 Subject: - Unconditionally apply the backspace patch, remove the BACKSPACE OPTION Suggested by: bapt --- sysutils/tmux/Makefile | 5 +---- sysutils/tmux/files/extra-patch-tty-keys.c | 11 ----------- sysutils/tmux/files/patch-tty-keys.c | 11 +++++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 sysutils/tmux/files/extra-patch-tty-keys.c create mode 100644 sysutils/tmux/files/patch-tty-keys.c (limited to 'sysutils') diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile index caead8908b28..a9552aee4cb8 100644 --- a/sysutils/tmux/Makefile +++ b/sysutils/tmux/Makefile @@ -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 diff --git a/sysutils/tmux/files/extra-patch-tty-keys.c b/sysutils/tmux/files/extra-patch-tty-keys.c deleted file mode 100644 index df926d8fb9ca..000000000000 --- a/sysutils/tmux/files/extra-patch-tty-keys.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; - diff --git a/sysutils/tmux/files/patch-tty-keys.c b/sysutils/tmux/files/patch-tty-keys.c new file mode 100644 index 000000000000..df926d8fb9ca --- /dev/null +++ b/sysutils/tmux/files/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; + -- cgit