aboutsummaryrefslogtreecommitdiff
path: root/sysutils/tmux
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/tmux')
-rw-r--r--sysutils/tmux/Makefile14
-rw-r--r--sysutils/tmux/distinfo4
-rw-r--r--sysutils/tmux/files/extra-patch-tty-keys.c20
3 files changed, 18 insertions, 20 deletions
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index 2c268527b643..e2e79befc53d 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tmux
-PORTVERSION= 1.7
-PORTREVISION= 1
+PORTVERSION= 1.8
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -21,7 +20,7 @@ PLIST_FILES= bin/tmux \
etc/bash_completion.d/tmux
PLIST_DIRSTRY= etc/bash_completion.d
-PORTDOCS= CHANGES FAQ NOTES
+PORTDOCS= CHANGES FAQ README TODO
PORTEXAMPLES= *
OPTIONS_DEFINE= LIBEVENT2 LIBEVENT_STATIC BACKSPACE
@@ -39,7 +38,7 @@ CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
BUILD_DEPENDS+= ${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
LESTATIC= ${LOCALBASE}/lib/event2/libevent.a
. else
-LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS= event-2:${PORTSDIR}/devel/libevent2
. endif
.else
CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
@@ -48,7 +47,7 @@ CONFIGURE_ENV+= LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
BUILD_DEPENDS+= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
LESTATIC= ${LOCALBASE}/lib/libevent.a
. else
-LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
+LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent
. endif
.endif
@@ -74,14 +73,13 @@ do-install:
post-install:
${MKDIR} ${PREFIX}/etc/bash_completion.d
@${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${PREFIX}/etc/bash_completion.d/tmux
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
-
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
index 21fd1ade51dd..12076f32841f 100644
--- a/sysutils/tmux/distinfo
+++ b/sysutils/tmux/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tmux-1.7.tar.gz) = 68346bda11cf7d86591e663b94b98576332ac88c2890df26acb080f4440f9e7b
-SIZE (tmux-1.7.tar.gz) = 407164
+SHA256 (tmux-1.8.tar.gz) = f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44
+SIZE (tmux-1.8.tar.gz) = 417537
diff --git a/sysutils/tmux/files/extra-patch-tty-keys.c b/sysutils/tmux/files/extra-patch-tty-keys.c
index 6a8bf625c9cc..df926d8fb9ca 100644
--- a/sysutils/tmux/files/extra-patch-tty-keys.c
+++ b/sysutils/tmux/files/extra-patch-tty-keys.c
@@ -1,11 +1,11 @@
---- tty-keys.c.orig 2010-06-04 08:45:52.000000000 +0800
-+++ tty-keys.c 2010-06-04 08:46:45.000000000 +0800
-@@ -456,8 +456,6 @@
- * used. termios should have a better idea.
- */
- bspace = tty->tio.c_cc[VERASE];
-- if (bspace != _POSIX_VDISABLE && key == bspace)
-- key = KEYC_BSPACE;
- goto handle_key;
- }
+--- 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;