ports/187210: [patch] update sysutils/tmux to 1.9

[Adam Weinberger]

>Number:         187210
>Category:       ports
>Synopsis:       [patch] update sysutils/tmux to 1.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 02 23:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Adam Weinberger
>Release:        FreeBSD 10.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #0: Fri Feb 28 10:32:45 EST 2014 root at apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386


	
>Description:

The attached patch updates to tmux 1.9, and uses the OPTIONS
helpers to shorten the Makefile quite a bit. It also unmutes
install commands.

I *think* the files/patch-tty.c is no longer necessary. I can't
reproduce the underline problem in OSX's Terminal.app.

>How-To-Repeat:
>Fix:

--- tmux.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 346828)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tmux
-PORTVERSION=	1.8
-PORTREVISION=	1
+PORTVERSION=	1.9
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -33,55 +32,40 @@
 
 CFLAGS+=	-Wno-pointer-sign
 
+BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
+LIBEVENT2_CONFIGURE_ENV=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
+							LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
+LIBEVENT2_CONFIGURE_ENV_OFF=LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
+							LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
+LIBEVENT2_LIB_DEPENDS=		libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIBEVENT2_LIB_DEPENDS_OFF=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+
 .include <bsd.port.options.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
+		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
+	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
+
+.if ${PORT_OPTIONS:MLIBEVENT_STATIC}
 .if ${PORT_OPTIONS:MLIBEVENT2}
-CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat" \
-		LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
-. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
 LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
-. else
-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
-. endif
 .else
-CONFIGURE_ENV+=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
-		LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
-. if ${PORT_OPTIONS:MLIBEVENT_STATIC}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
 LESTATIC=	${LOCALBASE}/lib/libevent.a
-. else
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
-. endif
 .endif
-
-.if ${PORT_OPTIONS:MBACKSPACE}
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' \
-		${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h ${WRKSRC}/CHANGES
-	@${REINPLACE_CMD} -e '/LIBS=/s/-lrt//' ${WRKSRC}/${CONFIGURE_SCRIPT}
-
 post-configure:
-.if defined(WITH_LIBEVENT_STATIC)
 	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
 		${WRKSRC}/${MAKEFILE}
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/tmux ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/tmux.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
-	@${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_DATA} ${WRKSRC}/examples/bash_completion_tmux.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 346828)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (tmux-1.8.tar.gz) = f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44
-SIZE (tmux-1.8.tar.gz) = 417537
+SHA256 (tmux-1.9.tar.gz) = 3ee6ca093513aca816e9d3cc62f9f2ab89b1d2a5a237ed967957ebedd99a1e27
+SIZE (tmux-1.9.tar.gz) = 447027
Index: files/patch-tty.c
===================================================================
--- files/patch-tty.c	(revision 346828)
+++ files/patch-tty.c	(working copy)
@@ -1,25 +0,0 @@
-$FreeBSD$
-
-Apply upstream commit cbee283c26968304b473e2191d2bb5f52208b58d to prevent
-OS X's Terminal.app turning on underlining when the status bar contains
-bold characters.
-
---- tty.c
-+++ tty.c
-@@ -220,7 +220,7 @@ tty_start_tty(struct tty *tty)
- 		tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
- 
- 	if (tty_term_has(tty->term, TTYC_XT))
--		tty_puts(tty, "\033[c\033[>4;1m\033[?1004h");
-+		tty_puts(tty, "\033[c\033[>4;1m\033[?1004h\033[m");
- 
- 	tty->cx = UINT_MAX;
- 	tty->cy = UINT_MAX;
-@@ -283,7 +283,7 @@ tty_stop_tty(struct tty *tty)
- 		tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
- 
- 	if (tty_term_has(tty->term, TTYC_XT))
--		tty_raw(tty, "\033[>4m\033[?1004l");
-+		tty_raw(tty, "\033[>4m\033[?1004l\033[m");
- 
- 	tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
--- tmux.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: