CVS commit: pkgsrc/sysutils/fastfetch

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Feb 14 13:26:54 UTC 2025

Modified Files:
        pkgsrc/sysutils/fastfetch: Makefile distinfo
Added Files:
        pkgsrc/sysutils/fastfetch/patches:
            patch-src_detection_packages_packages__apple.c
            patch-src_detection_packages_packages__linux.c

Log Message:
sysutils/fastfetch: enable pkgsrc package count on Linux/macOS

Tested on Slackware 15.0. Not tested on macOS.
SunOS already builds pkgsrc support by default (tested: OmniOS).

Also fix bug (ours) whereby setting TARGET_DIR_ETC to PKG_SYSCONFDIR
prevents fastfetch from opening /etc/os-release and/or /etc/lsb-release
on Linux.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/fastfetch/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/fastfetch/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__apple.c \
    pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__linux.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/fastfetch/Makefile
diff -u pkgsrc/sysutils/fastfetch/Makefile:1.17 pkgsrc/sysutils/fastfetch/Makefile:1.18
--- pkgsrc/sysutils/fastfetch/Makefile:1.17     Fri Feb 14 10:39:17 2025
+++ pkgsrc/sysutils/fastfetch/Makefile  Fri Feb 14 13:26:54 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2025/02/14 10:39:17 vins Exp $
+# $NetBSD: Makefile,v 1.18 2025/02/14 13:26:54 vins Exp $
 
 DISTNAME=      fastfetch-2.36.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fastfetch-cli/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -27,6 +27,8 @@ SUBST_STAGE.paths=    pre-configure
 SUBST_MESSAGE.paths=   Replacing hard-coded paths.
 SUBST_FILES.paths+=    src/detection/packages/packages_obsd.c  \
                        src/detection/packages/packages_sunos.c \
+                       src/detection/packages/packages_linux.c \
+                       src/detection/packages/packages_apple.c \
                        doc/fastfetch.1.in scripts/gen-man.py
 SUBST_SED.paths+=      -e "s:/usr/pkg/pkgdb:${PKG_DBDIR}:g"
 SUBST_SED.paths+=      -e "s:/usr/share:${PREFIX}/share:g"
@@ -35,7 +37,6 @@ CMAKE_CONFIGURE_ARGS+=        -DCMAKE_BUILD_TYP
                        -DCMAKE_INSTALL_PREFIX='${PREFIX}' \
                        -DBINARY_LINK_TYPE=dlopen \
                        -DTARGET_DIR_USR='${PREFIX}' \
-                       -DTARGET_DIR_ETC='${PKG_SYSCONFDIR}' \
                        -DCUSTOM_PCI_IDS_PATH=${PREFIX}/share/hwdata/pci.ids \
                        -DCUSTOM_AMDGPU_IDS_PATH=${BUILDLINK_PREFIX.libdrm}/share/libdrm/amdgpu.ids \
                        -DENABLE_SYSTEM_YYJSON=ON \

Index: pkgsrc/sysutils/fastfetch/distinfo
diff -u pkgsrc/sysutils/fastfetch/distinfo:1.12 pkgsrc/sysutils/fastfetch/distinfo:1.13
--- pkgsrc/sysutils/fastfetch/distinfo:1.12     Fri Feb 14 10:39:17 2025
+++ pkgsrc/sysutils/fastfetch/distinfo  Fri Feb 14 13:26:54 2025
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.12 2025/02/14 10:39:17 vins Exp $
+$NetBSD: distinfo,v 1.13 2025/02/14 13:26:54 vins Exp $
 
 BLAKE2s (fastfetch-2.36.1.tar.gz) = 02d2a72f53a6cd0020971823e91b70780e3b20b783053d39c3a38958990e6829
 SHA512 (fastfetch-2.36.1.tar.gz) = 2906b8e6912185a3acdd2b615ff869fa8f44ce0e547ed5529068eb2570ef5c013ed84691e62d613e52f2433595aa4e67859cf89b4116588ba4cb7c7bb7d8bb01
 Size (fastfetch-2.36.1.tar.gz) = 1176932 bytes
 SHA1 (patch-src_common_color.h) = a452dcb56469578f0e51c46b1f7af079303e7da1
 SHA1 (patch-src_common_option.c) = e7563a636bda0aa909c2fd2ef852bbed3c952949
+SHA1 (patch-src_detection_packages_packages__apple.c) = 3678300a59d8ef989d1848b3685485db3c638038
+SHA1 (patch-src_detection_packages_packages__linux.c) = 85d415a590a4126170f4f20f3b45b816b6dd3654
 SHA1 (patch-src_logo_ascii_netbsd2.txt) = bf145d947cac62b88b999396ea0a0e9ad8e8a5ad
 SHA1 (patch-src_logo_builtin.c) = cf31f3769f1aae4c26cbdf5e68fd802436b0faa7

Added files:

Index: pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__apple.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__apple.c:1.1
--- /dev/null   Fri Feb 14 13:26:54 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__apple.c    Fri Feb 14 13:26:54 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_detection_packages_packages__apple.c,v 1.1 2025/02/14 13:26:54 vins Exp $
+
+Enable pkgsrc support on macOS.
+
+--- src/detection/packages/packages_apple.c.orig       2025-02-14 11:53:56.694737100 +0000
++++ src/detection/packages/packages_apple.c
+@@ -83,6 +83,8 @@ void ffDetectPackagesImpl(FFPackagesResu
+ {
+     if (!(options->disabled & FF_PACKAGES_FLAG_BREW_BIT)) getBrewPackages(result);
+     if (!(options->disabled & FF_PACKAGES_FLAG_MACPORTS_BIT)) result->macports = getMacPortsPackages();
++    if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT))
++        result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", DT_DIR);
+     if (!(options->disabled & FF_PACKAGES_FLAG_NIX_BIT))
+     {
+         FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateS(FASTFETCH_TARGET_DIR_ROOT);
Index: pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__linux.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__linux.c:1.1
--- /dev/null   Fri Feb 14 13:26:54 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_detection_packages_packages__linux.c    Fri Feb 14 13:26:54 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_detection_packages_packages__linux.c,v 1.1 2025/02/14 13:26:54 vins Exp $
+
+Enable pkgsrc support on Linux.
+
+--- src/detection/packages/packages_linux.c.orig       2025-02-11 02:40:51.000000000 +0000
++++ src/detection/packages/packages_linux.c
+@@ -680,4 +680,7 @@ void ffDetectPackagesImpl(FFPackagesResu
+ 
+     if (!(options->disabled & FF_PACKAGES_FLAG_AM_BIT))
+         result->amUser = getAMUser();
++
++    if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT))
++        result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", DT_DIR);
+ }