From nobody Mon Jan 23 12:23:13 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0q4x64hcz3bRVW; Mon, 23 Jan 2023 12:23:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0q4x5PDCz4P8p; Mon, 23 Jan 2023 12:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674476593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/QpMybYi96ZxAcs9094YxORTiTl1RX/Fy8BHCFGCxM=; b=ItZAd3jNlFg/sawnC/GzYEawHhyCGAU3AhYN1p40/QAh8xe6Shc4x1ITwPXhzxlwVGCTvK l0n7kPzPiFD0C6+hE8pyw90CCMYkBdx8nHP3vl6vG9MBFeWNDZqa8BTU4MfUhcHdAszYp6 xVpC67+ozf+qlJTv3W5bwoKeyUAjw75WstuRacriY7uBReLWtoNu39hYBfsGete3PiplR4 vsMRf48oIf35roskL53C2PNmgHh9iWXoxAZxag+76dDr53L3k8cZjl/IqAFTD2l5jiOqkM sR9uvrAds/mcYWG3nyrGWRSivjIGeps/JMv5zepR7oO9FhBJ32OHxJoLQx6eqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674476593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/QpMybYi96ZxAcs9094YxORTiTl1RX/Fy8BHCFGCxM=; b=lq6BeChAJxQXii7Rv2MBdojux2Pq+SkY/1roBgRWoyfS6LJ4rbA0/R8mX7vb3DpveCe6/E LEKYSzPlCh+s+0OAeuAnFBhm2DEpOjSWAfvdPGZyFdls2Go9xqqXmyrqfil6pZ1Z55yvR/ Zf2o/onYuuiazI29UlF8I+IPPua4ZEo9RsexY5uKI1a8oEj9NgLLiusEKQtjGRtm4rxO3x AGxANwyAGp8+Goz0UuDiG+SnefFKu3QPwGRBaeCH+GEI+hrpleAzaQUX2WFRcwQ+jmBzJ3 UfgWAug4SN+vueuaU1aMMrGLw15B+OqWxXRNVKfk/4p9AAR03nd6FuWSUfbdsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674476593; a=rsa-sha256; cv=none; b=ARFONf0MwIEQMcDlIW/s+ko4o/NNvy7NcoNfr3EdJwgTKREmXmjwLoEQY7pG3l8rYg/GO4 ACyhq4TSDy7s7+Jl6klkgGB7Bo1huxoShkjIhBZkfu8/mU8Q4wQSdxzWnW4WJCjQLrIciJ B7wDRpLONUW5ES/MohcZ4sf3LrF+xWHNiHQVtek/zVxlQVILWkywZecN/10ghyfOAMpI8t MyUSvjciF3U7CyHxOZRNGhwZRUMXem0Q3aMbe/u4AWkbR8ipgd0ZomFNbD0pjIGir2UIBF 8Qt6NfsQ04ZkZtxTbFyOf0PlmL3PnfEJyXzI7RLEtFdifLttWcPjPvtwaKc2nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0q4x4RsFzTfN; Mon, 23 Jan 2023 12:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NCNDfs069626; Mon, 23 Jan 2023 12:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCNDCk069625; Mon, 23 Jan 2023 12:23:13 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:23:13 GMT Message-Id: <202301231223.30NCNDCk069625@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 02ac3683286f - main - sysutils/discus: update to 0.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02ac3683286f7a4bdb8581cd5bf4d4828f088a23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=02ac3683286f7a4bdb8581cd5bf4d4828f088a23 commit 02ac3683286f7a4bdb8581cd5bf4d4828f088a23 Author: Chris Moerz AuthorDate: 2023-01-21 16:42:20 +0000 Commit: Fernando Apesteguía CommitDate: 2023-01-23 12:18:56 +0000 sysutils/discus: update to 0.5 ChangeLog: https://github.com/ncarrier/discus/releases/tag/0.5.0 Empty and full storage locations didn't have the same width. PR: 269081 Reported by: freebsd@ny-central.org (maintainer) --- sysutils/discus/Makefile | 5 ++++- sysutils/discus/distinfo | 6 +++--- sysutils/discus/files/patch-README.md | 4 ++-- sysutils/discus/files/patch-discus.py | 27 +++++---------------------- sysutils/discus/files/patch-discusrc | 6 +++--- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/sysutils/discus/Makefile b/sysutils/discus/Makefile index ed8db5056ee6..c58678fd8de3 100644 --- a/sysutils/discus/Makefile +++ b/sysutils/discus/Makefile @@ -1,5 +1,5 @@ PORTNAME= discus -DISTVERSION= 0.4.0 +DISTVERSION= 0.5.0 CATEGORIES= sysutils MAINTAINER= freebsd@ny-central.org @@ -18,6 +18,9 @@ NO_BUILD= yes OPTIONS_DEFINE= DOCS +post-patch: + ${REINPLACE_CMD} -e "s@/etc/discusrc@${PREFIX}/discusrc@g" ${WRKSRC}/discus.py + do-install: ${MKDIR} ${STAGEDIR}/${ETCDIR}/ ${MKDIR} ${STAGEDIR}/${DOCSDIR} diff --git a/sysutils/discus/distinfo b/sysutils/discus/distinfo index e5db97b5fe4b..b6ecad8aa5ad 100644 --- a/sysutils/discus/distinfo +++ b/sysutils/discus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619608755 -SHA256 (ncarrier-discus-0.4.0_GH0.tar.gz) = bf9b9e94da6751a9b9f849b44d65cd7809e5d4814ac24f67353c70f09f743485 -SIZE (ncarrier-discus-0.4.0_GH0.tar.gz) = 16392 +TIMESTAMP = 1674303818 +SHA256 (ncarrier-discus-0.5.0_GH0.tar.gz) = 855a6bea4e8e5cfb2998ba9c1812ed0a467f86ff43b6494f1c61d39dc73433d7 +SIZE (ncarrier-discus-0.5.0_GH0.tar.gz) = 17704 diff --git a/sysutils/discus/files/patch-README.md b/sysutils/discus/files/patch-README.md index 9a2ff6a32508..3846c1102f0c 100644 --- a/sysutils/discus/files/patch-README.md +++ b/sysutils/discus/files/patch-README.md @@ -1,4 +1,4 @@ ---- README.md.orig 2021-04-26 14:05:27 UTC +--- README.md.orig 2023-01-15 08:07:06 UTC +++ README.md @@ -11,9 +11,9 @@ Features include color, bar graphs, and smart formatti gigabytes, or terabytes). Or choose your own size, along with specifying the @@ -33,4 +33,4 @@ +make install; make clean ``` - ## Test + ## Development diff --git a/sysutils/discus/files/patch-discus.py b/sysutils/discus/files/patch-discus.py index 9c9051e4efc6..81d613d89e0c 100644 --- a/sysutils/discus/files/patch-discus.py +++ b/sysutils/discus/files/patch-discus.py @@ -1,6 +1,6 @@ ---- discus.py.orig 2020-04-13 07:05:40 UTC +--- discus.py.orig 2023-01-21 12:38:18 UTC +++ discus.py -@@ -437,16 +437,8 @@ def read_mounts(mtab, skip_list): +@@ -350,16 +350,8 @@ def read_mounts(mtab, skip_list): """Read the mounts file.""" mounts = [] @@ -19,29 +19,12 @@ # Extract the mounted filesystems from the read file. for entry in mtab: -@@ -534,7 +526,7 @@ def get_layout(headers, reports): - def main(): +@@ -432,7 +424,7 @@ def main(): """Define main program.""" - parse_options() + options = parse_options() + interpret_options(options) - mounts = read_mounts(opts["mtab"], opts["skip_list"]) + mounts = read_mounts(None, opts["skip_list"]) headers = get_header(opts["graph"]) stats_factory = StatsFactory(opts["reserved"]) size_formatter = SizeFormatter(opts["smart"], opts["placing"], -@@ -559,13 +551,13 @@ def main(): - - if __name__ == "__main__": - # Before starting, we need to load the configuration files which -- # contain global objects. First the global /etc file, then the user's -+ # contain global objects. First the global /usr/local/etc file, then the user's - # file, if exists. - try: -- exec(compile(open("/etc/discusrc", "rb").read(), "/etc/discusrc", -+ exec(compile(open("/usr/local/etc/discus/discusrc", "rb").read(), "/usr/local/etc/discus/discusrc", - 'exec')) - except IOError: -- usage(EX_CONFIG, "/etc/discusrc must exist and be readable.") -+ usage(EX_CONFIG, "/usr/local/etc/discus/discusrc must exist and be readable.") - - try: - exec(compile(open(os.environ['HOME'] + "/.discusrc", "rb").read(), diff --git a/sysutils/discus/files/patch-discusrc b/sysutils/discus/files/patch-discusrc index 74647e6e275b..130a532aa37f 100644 --- a/sysutils/discus/files/patch-discusrc +++ b/sysutils/discus/files/patch-discusrc @@ -1,6 +1,6 @@ ---- discusrc.orig 2021-04-27 15:52:50 UTC +--- discusrc.orig 2023-01-15 08:07:06 UTC +++ discusrc -@@ -17,11 +17,6 @@ opts["graph"] = 1 +@@ -19,11 +19,6 @@ opts["graph"] = 1 opts["graph_char"] = "*" opts["graph_fill"] = "-" @@ -12,7 +12,7 @@ ## Number of decimal places to display, same as -p opts["places"] = 1 -@@ -30,10 +25,6 @@ opts["skip_list"] = ["/dev/pts", "/proc", "/dev", "/pr +@@ -32,10 +27,6 @@ opts["skip_list"] = ["/dev/pts", "/proc", "/dev", "/pr ## Use smart formatting of numbers. opts["smart"] = 1