From owner-svn-ports-head@freebsd.org Fri Dec 13 00:09:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5C671DDD1D; Fri, 13 Dec 2019 00:09:03 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Yrcb4hSjz4HLx; Fri, 13 Dec 2019 00:09:03 +0000 (UTC) (envelope-from meta@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 978FD3CAB; Fri, 13 Dec 2019 00:09:03 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBD093Ug070295; Fri, 13 Dec 2019 00:09:03 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBD0936V070294; Fri, 13 Dec 2019 00:09:03 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201912130009.xBD0936V070294@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Fri, 13 Dec 2019 00:09:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519957 - in head/sysutils/hatop: . files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/sysutils/hatop: . files X-SVN-Commit-Revision: 519957 X-SVN-Commit-Repository: ports 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.29 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: Fri, 13 Dec 2019 00:09:03 -0000 Author: meta Date: Fri Dec 13 00:09:02 2019 New Revision: 519957 URL: https://svnweb.freebsd.org/changeset/ports/519957 Log: sysutils/hatop: actually works with Python 2.7 Also, fix for terminals larger than 80x25 on Python 3. PR: 242590 Submitted by: meta (myself), maintainer Reviewed by: maintainer Modified: head/sysutils/hatop/Makefile head/sysutils/hatop/files/patch-bin_hatop Modified: head/sysutils/hatop/Makefile ============================================================================== --- head/sysutils/hatop/Makefile Thu Dec 12 23:41:16 2019 (r519956) +++ head/sysutils/hatop/Makefile Fri Dec 13 00:09:02 2019 (r519957) @@ -3,7 +3,7 @@ PORTNAME= hatop PORTVERSION= 0.7.7 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX= v CATEGORIES= sysutils net @@ -14,7 +14,7 @@ LICENSE= GPLv3+ RUN_DEPENDS= ${LOCALBASE}/sbin/haproxy:net/haproxy -USES= python:3.6+ shebangfix +USES= python:2.7+ shebangfix SHEBANG_FILES= bin/hatop NO_BUILD= yes NO_ARCH= yes Modified: head/sysutils/hatop/files/patch-bin_hatop ============================================================================== --- head/sysutils/hatop/files/patch-bin_hatop Thu Dec 12 23:41:16 2019 (r519956) +++ head/sysutils/hatop/files/patch-bin_hatop Fri Dec 13 00:09:02 2019 (r519957) @@ -153,6 +153,15 @@ def get_width(width, xmax, ncols, idx): # distribute excess space evenly from left to right +@@ -1709,7 +1709,7 @@ def get_width(width, xmax, ncols, idx): + if idx < (xdiff - (xdiff / ncols) * ncols): + width += 1 # compensate rounding + width = width + xdiff / ncols +- return width ++ return int(width) + + def get_cell(width, align, value): + s = str(value) @@ -1732,7 +1732,7 @@ def get_head(mode): def get_screenlines(stat): screenlines = []