From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 29 08:30:07 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2CB1A64F;
 Mon, 29 Jul 2013 08:30:07 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B6E226CF;
 Mon, 29 Jul 2013 08:30:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6T8U6ps005469;
 Mon, 29 Jul 2013 08:30:06 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6T8U6Wf005467;
 Mon, 29 Jul 2013 08:30:06 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201307290830.r6T8U6Wf005467@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 29 Jul 2013 08:30:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323874 - in head/sysutils/tmux: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jul 2013 08:30:07 -0000

Author: gahr
Date: Mon Jul 29 08:30:06 2013
New Revision: 323874
URL: http://svnweb.freebsd.org/changeset/ports/323874

Log:
  - Fix a bug that caused tmux to unexpectedly underline all
    characters when the status bar requests a bold color
  
  PR:		180787
  Submitted by:	Julio Merino <julio+host-mastodon-jmmv@meroh.net>

Added:
  head/sysutils/tmux/files/patch-tty.c   (contents, props changed)
Modified:
  head/sysutils/tmux/Makefile

Modified: head/sysutils/tmux/Makefile
==============================================================================
--- head/sysutils/tmux/Makefile	Mon Jul 29 08:13:51 2013	(r323873)
+++ head/sysutils/tmux/Makefile	Mon Jul 29 08:30:06 2013	(r323874)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tmux
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 

Added: head/sysutils/tmux/files/patch-tty.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/tmux/files/patch-tty.c	Mon Jul 29 08:30:06 2013	(r323874)
@@ -0,0 +1,25 @@
+$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));