From owner-svn-ports-head@FreeBSD.ORG  Tue Dec  9 12:45:33 2014
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 71DD6CFF;
 Tue,  9 Dec 2014 12:45:33 +0000 (UTC)
Received: from mailrelay007.isp.belgacom.be (mailrelay007.isp.belgacom.be
 [195.238.6.173]) by mx1.freebsd.org (Postfix) with ESMTP id 96F3AE95;
 Tue,  9 Dec 2014 12:45:32 +0000 (UTC)
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: Ao8GAOnthlRbsIuB/2dsb2JhbABZgwZSTQvGHoYJAoEqFwEBAQEBfYQDAQEEOhwjEAsOBgQJJQ8SGB4GEx6IBgMVAQjQbA2FZQEBAQEBAQEDAQEBAQEBARuOD4F6MweENgWRZoN0gUeLc4V4g28+MIJDAQEB
Received: from 129.139-176-91.adsl-dyn.isp.belgacom.be (HELO
 kalimero.tijl.coosemans.org) ([91.176.139.129])
 by relay.skynet.be with ESMTP; 09 Dec 2014 13:44:22 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org
 [127.0.0.1])
 by kalimero.tijl.coosemans.org (8.14.9/8.14.9) with ESMTP id sB9CiK3o002463;
 Tue, 9 Dec 2014 13:44:21 +0100 (CET) (envelope-from tijl@FreeBSD.org)
Date: Tue, 9 Dec 2014 13:44:20 +0100
From: Tijl Coosemans <tijl@FreeBSD.org>
To: Kurt Jaeger <pi@FreeBSD.org>
Subject: Re: svn commit: r374372 - in head/misc/mc: . files
Message-ID: <20141209134420.22b42d62@kalimero.tijl.coosemans.org>
In-Reply-To: <201412091203.sB9C3E6t019510@svn.freebsd.org>
References: <201412091203.sB9C3E6t019510@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Tue, 09 Dec 2014 12:45:33 -0000

On Tue, 9 Dec 2014 12:03:14 +0000 (UTC) Kurt Jaeger <pi@FreeBSD.org> wrote:
> Author: pi
> Date: Tue Dec  9 12:03:13 2014
> New Revision: 374372
> URL: https://svnweb.freebsd.org/changeset/ports/374372
> QAT: https://qat.redports.org/buildarchive/r374372/
> 
> Log:
>   misc/mc: re-add small patch that was deleted in r369133
>   
>   Change:
>   save/restore the sub-shell's screen on Ctrl+O and/or command execution
>   
>   PR:	194627
>   Submitted by:	andriys@gmail.com
> 
> Modified:
>   head/misc/mc/Makefile
>   head/misc/mc/files/patch-lib__tty__win.c
> 
> Modified: head/misc/mc/Makefile
> ==============================================================================
> --- head/misc/mc/Makefile	Tue Dec  9 11:42:34 2014	(r374371)
> +++ head/misc/mc/Makefile	Tue Dec  9 12:03:13 2014	(r374372)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	mc
>  PORTVERSION=	4.8.13
> -PORTREVISION=	1
> +PORTREVISION=	2
>  CATEGORIES=	misc shells
>  MASTER_SITES=	http://ftp.midnight-commander.org/ \
>  		http://ftp.osuosl.org/pub/midnightcommander/ \
> 
> Modified: head/misc/mc/files/patch-lib__tty__win.c
> ==============================================================================
> --- head/misc/mc/files/patch-lib__tty__win.c	Tue Dec  9 11:42:34 2014	(r374371)
> +++ head/misc/mc/files/patch-lib__tty__win.c	Tue Dec  9 12:03:13 2014	(r374372)
> @@ -1,5 +1,14 @@
>  --- lib/tty/win.c.orig	2014-09-02 09:23:58 UTC
>  +++ lib/tty/win.c
> ++@@ -95,7 +95,7 @@
> ++ void
> ++ do_enter_ca_mode (void)
> ++ {
> ++-    if (mc_global.tty.xterm_flag && smcup != NULL)
> +++    if (mc_global.tty.xterm_flag)
> ++     {
> ++         fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
> ++         fflush (stdout);

There's one column of pluses too many here.  The patch won't apply like
this.