From owner-svn-ports-head@freebsd.org Wed May 11 11:44:41 2016 Return-Path: Delivered-To: svn-ports-head@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 9D3B4B3573F; Wed, 11 May 2016 11:44:41 +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 74DA21355; Wed, 11 May 2016 11:44:41 +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 u4BBielQ039204; Wed, 11 May 2016 11:44:40 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BBieu6039200; Wed, 11 May 2016 11:44:40 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201605111144.u4BBieu6039200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Wed, 11 May 2016 11:44:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414983 - in head/misc/mc: . 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.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2016 11:44:41 -0000 Author: woodsb02 Date: Wed May 11 11:44:40 2016 New Revision: 414983 URL: https://svnweb.freebsd.org/changeset/ports/414983 Log: misc/mc: Update to 4.8.17 - Remove patches for upstream tickets 2742, 3611, 3617 (resolved) - Move patch of lib/tty/win.c to lib/tty/tty-ncurses.c (upstream change) - Add patch of src/cons.handler.c to fix build, reported upstream [1] Changes this release: https://www.midnight-commander.org/wiki/NEWS-4.8.17 [1] https://www.midnight-commander.org/ticket/3643 Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D6321 Added: head/misc/mc/files/patch-lib_tty_tty-ncurses.c - copied, changed from r414982, head/misc/mc/files/patch-lib__tty__win.c head/misc/mc/files/patch-src_cons.handler.c (contents, props changed) Deleted: head/misc/mc/files/patch-lib__tty__win.c head/misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch head/misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch head/misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch Modified: head/misc/mc/Makefile head/misc/mc/distinfo Modified: head/misc/mc/Makefile ============================================================================== --- head/misc/mc/Makefile Wed May 11 11:01:57 2016 (r414982) +++ head/misc/mc/Makefile Wed May 11 11:44:40 2016 (r414983) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mc -PORTVERSION= 4.8.16 -PORTREVISION= 1 +PORTVERSION= 4.8.17 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ http://ftp.osuosl.org/pub/midnightcommander/ \ Modified: head/misc/mc/distinfo ============================================================================== --- head/misc/mc/distinfo Wed May 11 11:01:57 2016 (r414982) +++ head/misc/mc/distinfo Wed May 11 11:44:40 2016 (r414983) @@ -1,4 +1,4 @@ -SHA256 (mc-4.8.16.tar.xz) = bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 -SIZE (mc-4.8.16.tar.xz) = 2387724 +SHA256 (mc-4.8.17.tar.xz) = 0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d +SIZE (mc-4.8.17.tar.xz) = 2457156 SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe SIZE (mc.png) = 6466 Copied and modified: head/misc/mc/files/patch-lib_tty_tty-ncurses.c (from r414982, head/misc/mc/files/patch-lib__tty__win.c) ============================================================================== --- head/misc/mc/files/patch-lib__tty__win.c Wed May 11 11:01:57 2016 (r414982, copy source) +++ head/misc/mc/files/patch-lib_tty_tty-ncurses.c Wed May 11 11:44:40 2016 (r414983) @@ -1,17 +1,17 @@ ---- lib/tty/win.c.orig 2014-09-02 09:23:58 UTC -+++ lib/tty/win.c -@@ -95,7 +95,7 @@ +--- lib/tty/tty-ncurses.c.orig 2016-05-07 15:42:52 UTC ++++ lib/tty/tty-ncurses.c +@@ -233,7 +233,7 @@ tty_shutdown (void) void - do_enter_ca_mode (void) + tty_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); -@@ -107,7 +107,7 @@ +@@ -245,7 +245,7 @@ tty_enter_ca_mode (void) void - do_exit_ca_mode (void) + tty_exit_ca_mode (void) { - if (mc_global.tty.xterm_flag && rmcup != NULL) + if (mc_global.tty.xterm_flag) Added: head/misc/mc/files/patch-src_cons.handler.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/mc/files/patch-src_cons.handler.c Wed May 11 11:44:40 2016 (r414983) @@ -0,0 +1,14 @@ +Created by: Ben Woods (FreeBSD port maintainer) +Logged upstream: https://www.midnight-commander.org/ticket/3643 + +--- src/cons.handler.c.orig 2016-05-11 09:47:32 UTC ++++ src/cons.handler.c +@@ -408,7 +408,7 @@ show_console_contents_freebsd (int start + for (line = begin_line; line <= end_line; line++) + { + tty_gotoyx (starty + line - begin_line, 0); +- for (col = 0; col < min (COLS, screen_info.mv_csz); col++) ++ for (col = 0; col < MIN (COLS, screen_info.mv_csz); col++) + { + c = screen_shot.buf[line * screen_info.mv_csz + col] & 0xFF; + tty_print_char (c);