From nobody Sun May 15 22:16:19 2022 X-Original-To: dev-commits-ports-all@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 CBC831AC867E; Sun, 15 May 2022 22:16:19 +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 4L1cD35Mf2z3DkD; Sun, 15 May 2022 22:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652652979; 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=jr0oRAPChz5f3P/Frwqd0dOSfVy8HbCq+B88f+Fo/Yg=; b=hNUn/A8ea4fWmmGv+dgeGyxAxVOLOQcnaq7qTedXl1P0I49L5wjYrp9pceRLgekVXkbn68 I4EJb+2GtWR0q/aY6Q2ash0gkzuRZU53DWoix8XFeidJIJBxdOrQgZ+15M5YKKsv0cIR83 7S1saxKGzLN/62QwL5GtEDUsJiLfFpWxBfhL62K2HN8zw4lJ+TswrWbZpMJj2SD/haQ10R 96yJB94EcLroZ0JZIayUkz5C67Jy06I0W8/ptD9dNuTtx5JWtNBUTCfKqnj9yhFNezXGVs YMlFJ+ZalQA0D4N5waHR4Q/gjavHK2xS18/K8iuaIxcJW7MkBijXbePoVF/G7w== 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 948B61448C; Sun, 15 May 2022 22:16:19 +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 24FMGJ4c005677; Sun, 15 May 2022 22:16:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24FMGJr6005676; Sun, 15 May 2022 22:16:19 GMT (envelope-from git) Date: Sun, 15 May 2022 22:16:19 GMT Message-Id: <202205152216.24FMGJr6005676@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jason Helfman Subject: git: a0b376611181 - main - sysutils/screenfetch: update to 3.9.1.57 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jgh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0b376611181b0ed88b7edef8c96834937724253 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652652979; 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=jr0oRAPChz5f3P/Frwqd0dOSfVy8HbCq+B88f+Fo/Yg=; b=R62BUa8QAsS/rgQ81ZNDIHEQzDe2BiRIrHhczJ06PtAGNn40v+PruZKHoXkfk039bqDQvR QG9HieakUxmSrXhlHdfEfMupSKGefLbbOWrIHoSUOO4MlY0XnJf4IrNlwF8zZlHL2Xw09k 6+54DF5117aO9anOqUF5ZjtkQoU9Be+EyZurW3JeS9ICqGxxQg29zW0N8BfXyc7mzlbzQz Uu4NhrOH7PSLjs80GGe3wCjYWdiUdWX6ik8n4AXFpmGM8u9cXS7ci96prCKp7zwuziJBjG OtEfgzXhA1XdMIXuh3GRPN+3vm77AASMZaBuQQmfUsh5KijWl0/c1UsFRPbgcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652652979; a=rsa-sha256; cv=none; b=c8F5I3vHchG5NuBGlREboLKWNkv9q8RYDmXaTtywAXX8+TCzrtDqJVfeIiDPjc1igEVl6k +C/UNeFz4+6jXGK0i/6aneTad0ArCYAaxZvr8w/9echQZIMopDpUI6avtDtJ3g/YJQ9WkM mtFvpczNpgwLmGPaD63AJk41kv5F8r0fTyuHIZuUTJrAfGImYL0wMqEKMCYJAp/IwDGxmx qTAN8VYlg9w1DlPm+Gcx66kpyFyQzyCTPIitio17wHe/o4ruJgdzSWScTdcmNv9LjYoyG+ PX7xlkgsCg7ZDWi2fEfZYYQwNLRiSBT7pQmAG4R+/LAE9Hmyy3FIi70dV4Ju1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jgh: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0b376611181b0ed88b7edef8c96834937724253 commit a0b376611181b0ed88b7edef8c96834937724253 Author: Jason Helfman AuthorDate: 2022-05-15 22:13:29 +0000 Commit: Jason Helfman CommitDate: 2022-05-15 22:15:27 +0000 sysutils/screenfetch: update to 3.9.1.57 - add patch for FreeBSD-related fixes (upstream pr pending) Changes: https://github.com/KittyKatt/screenFetch/compare/v3.9.1...master --- sysutils/screenfetch/Makefile | 4 +-- sysutils/screenfetch/distinfo | 6 ++-- sysutils/screenfetch/files/patch-screenfetch-dev | 42 ++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index ce6a203674dd..3f174f728383 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -2,8 +2,8 @@ PORTNAME= screenFetch DISTVERSIONPREFIX= v -DISTVERSION= 3.9.1-56 -DISTVERSIONSUFFIX= -gc3a4789 +DISTVERSION= 3.9.1-57 +DISTVERSIONSUFFIX= -g9f6a62a CATEGORIES= sysutils MAINTAINER= jgh@FreeBSD.org diff --git a/sysutils/screenfetch/distinfo b/sysutils/screenfetch/distinfo index 3c99753ced56..7c7d31a60352 100644 --- a/sysutils/screenfetch/distinfo +++ b/sysutils/screenfetch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623283806 -SHA256 (KittyKatt-screenFetch-v3.9.1-56-gc3a4789_GH0.tar.gz) = 88a2b1ab3a65cdd4785a9fd40aa144c1b741e69fa69c6189b3f6f091e815ee2d -SIZE (KittyKatt-screenFetch-v3.9.1-56-gc3a4789_GH0.tar.gz) = 78771 +TIMESTAMP = 1652575337 +SHA256 (KittyKatt-screenFetch-v3.9.1-57-g9f6a62a_GH0.tar.gz) = 340480d479febfd6826f399c4564ae1ed0348e496a6e77998c7e5c0bf7dab84d +SIZE (KittyKatt-screenFetch-v3.9.1-57-g9f6a62a_GH0.tar.gz) = 78770 diff --git a/sysutils/screenfetch/files/patch-screenfetch-dev b/sysutils/screenfetch/files/patch-screenfetch-dev new file mode 100644 index 000000000000..49f79ced8def --- /dev/null +++ b/sysutils/screenfetch/files/patch-screenfetch-dev @@ -0,0 +1,42 @@ +--- screenfetch-dev.orig 2021-09-27 01:52:17 UTC ++++ screenfetch-dev +@@ -1315,6 +1315,8 @@ detectkernel () { + detectkernel () { + if [[ "$distro" == "OpenBSD" ]]; then + kernel=$(uname -a | cut -f 3- -d ' ') ++ elif [[ "$distro" == "FreeBSD" ]]; then ++ kernel=$(freebsd-version -r) + else + # compatibility for older versions of OS X: + kernel=$(uname -m && uname -sr) +@@ -1458,7 +1460,7 @@ detectpkgs () { + pkgs=$(pkg_info | grep -c .) + ;; + 'FreeBSD') +- pkgs=$(pkg info | grep -c .) ++ pkgs=$(/usr/sbin/pkg info | grep -c .) + ;; + 'Cygwin') + offset=2 +@@ -1522,7 +1524,7 @@ detectcpu () { + cpu="Unknown" + fi + elif [ "$distro" == "FreeBSD" ]; then +- cpu=$(dmesg | awk -F': ' '/^CPU/ {gsub(/ +/," "); gsub(/\([^\(\)]*\)|CPU /,"", $2); print $2; exit}') ++ cpu=$(sysctl -n hw.model |sed -e 's/ \{2,\}/ /g') + elif [ "$distro" == "DragonFlyBSD" ]; then + cpu=$(sysctl -n hw.model) + elif [ "$distro" == "OpenBSD" ]; then +@@ -6379,7 +6381,11 @@ infoDisplay () { + ((display_index++)) + fi + if [[ "${display[@]}" =~ "kernel" ]]; then +- mykernel=$(echo -e "$labelcolor Kernel:$textcolor $kernel") ++ if [[ "$distro" == "FreeBSD" ]]; then ++ mykernel=$(echo -e "$labelcolor Running Kernel:$textcolor $kernel") ++ else ++ mykernel=$(echo -e "$labelcolor Kernel:$textcolor $kernel") ++ fi + out_array=( "${out_array[@]}" "$mykernel" ) + ((display_index++)) + fi