git: a0b376611181 - main - sysutils/screenfetch: update to 3.9.1.57

From: Jason Helfman <jgh_at_FreeBSD.org>
Date: Sun, 15 May 2022 22:16:19 UTC
The branch main has been updated by jgh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a0b376611181b0ed88b7edef8c96834937724253

commit a0b376611181b0ed88b7edef8c96834937724253
Author:     Jason Helfman <jgh@FreeBSD.org>
AuthorDate: 2022-05-15 22:13:29 +0000
Commit:     Jason Helfman <jgh@FreeBSD.org>
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