diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index 8bf52def095f..f456f7e61e7b 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -1,49 +1,49 @@ PORTNAME= screenFetch DISTVERSIONPREFIX= v -DISTVERSION= 3.9.1-59 -DISTVERSIONSUFFIX= -gd2b0f2b +DISTVERSION= 3.9.1-64 +DISTVERSIONSUFFIX= -gb1f0893 CATEGORIES= sysutils MAINTAINER= jgh@FreeBSD.org COMMENT= Bash Screenshot Information Tool WWW= https://github.com/KittyKatt/screenFetch LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash default_RUN_DEPENDS= xdpyinfo:x11/xdpyinfo FLAVORS= default nox11 FLAVOR?= ${FLAVORS:[1]} nox11_PKGNAMESUFFIX= -nox11 CONFLICTS_INSTALL= screenFetch-nox11* OPTIONS_DEFINE= DOCS NO_BUILD= yes NO_ARCH= yes USE_GITHUB= yes GH_ACCOUNT= KittyKatt PLIST_FILES= bin/screenFetch \ bin/screenfetch \ man/man1/screenfetch.1.gz PORTDOCS= CHANGELOG README.mkdn TODO do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME:tl}-dev ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${LN} -fs ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/screenfetch ${INSTALL_MAN} ${WRKSRC}/screenfetch.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor do-test: cd ${WRKSRC} && ./${PORTNAME:tl}-dev .include diff --git a/sysutils/screenfetch/distinfo b/sysutils/screenfetch/distinfo index 90cfc42f02ad..83f433bc6cbd 100644 --- a/sysutils/screenfetch/distinfo +++ b/sysutils/screenfetch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675965448 -SHA256 (KittyKatt-screenFetch-v3.9.1-59-gd2b0f2b_GH0.tar.gz) = 05a571057ab3f3c8a51edf19f0874c684ec4f8895c82b95e0fd4350277bb2312 -SIZE (KittyKatt-screenFetch-v3.9.1-59-gd2b0f2b_GH0.tar.gz) = 78772 +TIMESTAMP = 1701133097 +SHA256 (KittyKatt-screenFetch-v3.9.1-64-gb1f0893_GH0.tar.gz) = 50dc7aaea0c01605f895b4a4e8f2f4a8383cb56931237b6e93498f290149bfbd +SIZE (KittyKatt-screenFetch-v3.9.1-64-gb1f0893_GH0.tar.gz) = 79351 diff --git a/sysutils/screenfetch/files/patch-screenfetch-dev b/sysutils/screenfetch/files/patch-screenfetch-dev index 49f79ced8def..696f2ecd3266 100644 --- a/sysutils/screenfetch/files/patch-screenfetch-dev +++ b/sysutils/screenfetch/files/patch-screenfetch-dev @@ -1,42 +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') +- cpu=$(dmesg | "${AWK}" -F': ' '/^CPU/ {gsub(/ +/," "); gsub(/\([^\(\)]*\)|CPU /,"", $2); print $2; exit}') ++ cpu=$(sysctl -n hw.model) 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