From owner-svn-ports-all@freebsd.org Mon Dec 18 10:47:46 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB918E83293; Mon, 18 Dec 2017 10:47:46 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E325742B6; Mon, 18 Dec 2017 10:47:46 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBIAljmT041179; Mon, 18 Dec 2017 10:47:45 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIAljHL041177; Mon, 18 Dec 2017 10:47:45 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201712181047.vBIAljHL041177@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Mon, 18 Dec 2017 10:47:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r456605 - in branches/2017Q4/misc/mc: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in branches/2017Q4/misc/mc: . files X-SVN-Commit-Revision: 456605 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 10:47:46 -0000 Author: woodsb02 Date: Mon Dec 18 10:47:45 2017 New Revision: 456605 URL: https://svnweb.freebsd.org/changeset/ports/456605 Log: MFH: r456522 misc/mc: Fix SUBSHELL blank terminal upon opening in xterm with Slang Note: Unfortunately this does not fix this issue on the FreeBSD console. PR: 217758 Submitted by: Alexander Moisseev Reported by: Dron Reported by: danfe Approved by: ports-secteam (delphij) Added: branches/2017Q4/misc/mc/files/patch-lib_tty_tty-slang.c - copied unchanged from r456522, head/misc/mc/files/patch-lib_tty_tty-slang.c Modified: branches/2017Q4/misc/mc/Makefile Directory Properties: branches/2017Q4/ (props changed) Modified: branches/2017Q4/misc/mc/Makefile ============================================================================== --- branches/2017Q4/misc/mc/Makefile Mon Dec 18 09:04:34 2017 (r456604) +++ branches/2017Q4/misc/mc/Makefile Mon Dec 18 10:47:45 2017 (r456605) @@ -4,6 +4,7 @@ PORTNAME= mc PORTVERSION= 4.8.19 PORTREVISION= 3 +PORTREVISION= 1 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ http://ftp.osuosl.org/pub/midnightcommander/ Copied: branches/2017Q4/misc/mc/files/patch-lib_tty_tty-slang.c (from r456522, head/misc/mc/files/patch-lib_tty_tty-slang.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q4/misc/mc/files/patch-lib_tty_tty-slang.c Mon Dec 18 10:47:45 2017 (r456605, copy of r456522, head/misc/mc/files/patch-lib_tty_tty-slang.c) @@ -0,0 +1,28 @@ +--- lib/tty/tty-slang.c.orig 2017-03-04 17:51:38 UTC ++++ lib/tty/tty-slang.c +@@ -373,7 +373,11 @@ tty_shutdown (void) + void + tty_enter_ca_mode (void) + { +- /* S-Lang handles alternate screen switching and cursor position saving */ ++ if (mc_global.tty.xterm_flag) ++ { ++ fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h"); ++ fflush (stdout); ++ } + } + + /* --------------------------------------------------------------------------------------------- */ +@@ -381,7 +385,11 @@ tty_enter_ca_mode (void) + void + tty_exit_ca_mode (void) + { +- /* S-Lang handles alternate screen switching and cursor position restoring */ ++ if (mc_global.tty.xterm_flag) ++ { ++ fprintf (stdout, ESC_STR "[?47l" ESC_STR "8" ESC_STR "[m"); ++ fflush (stdout); ++ } + } + + /* --------------------------------------------------------------------------------------------- */