CVS commit: pkgsrc/sysutils/fastfetch

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Jan 17 16:28:09 UTC 2025

Modified Files:
        pkgsrc/sysutils/fastfetch: Makefile distinfo options.mk
Added Files:
        pkgsrc/sysutils/fastfetch/patches: patch-src_detection_disk_disk__bsd.c

Log Message:
sysutils/fastfetch: few changes

* Set pkgsrc database dir at build time depending on PKG_DBDIR setting.
  Covers non-standard locations.
* Fix compiler warning.
* Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/fastfetch/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/fastfetch/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/fastfetch/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/fastfetch/patches/patch-src_detection_disk_disk__bsd.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.6 pkgsrc/sysutils/fastfetch/Makefile:1.7
--- pkgsrc/sysutils/fastfetch/Makefile:1.6      Mon Jan 13 20:46:08 2025
+++ pkgsrc/sysutils/fastfetch/Makefile  Fri Jan 17 16:28:09 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2025/01/13 20:46:08 vins Exp $
+# $NetBSD: Makefile,v 1.7 2025/01/17 16:28:09 vins Exp $
 
 DISTNAME=      fastfetch-2.34.1
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fastfetch-cli/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -16,6 +17,14 @@ USE_LANGUAGES=       c c++
 
 DEPENDS+=      hwdata-[0-9]*:../../misc/hwdata
 
+.include "../../mk/bsd.prefs.mk"
+
+SUBST_CLASSES+=                db
+SUBST_STAGE.db=                pre-configure
+SUBST_MESSAGE.db=      Setting pkgsrc database dir.
+SUBST_FILES.ds+=       src/detection/packages/packages_obsd.c
+SUBST_SED.db+=         -e "s:/usr/pkg/pkgdb:${PKG_DBDIR}:g"
+
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release \
                        -DCMAKE_INSTALL_PREFIX='${PREFIX}' \
                        -DTARGET_DIR_USR='${PREFIX}' \
@@ -28,6 +37,8 @@ CMAKE_CONFIGURE_ARGS+=        -DCMAKE_BUILD_TYP
 
 .include "options.mk"
 
+
+
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../devel/yyjson/buildlink3.mk"
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/sysutils/fastfetch/distinfo
diff -u pkgsrc/sysutils/fastfetch/distinfo:1.5 pkgsrc/sysutils/fastfetch/distinfo:1.6
--- pkgsrc/sysutils/fastfetch/distinfo:1.5      Fri Jan 17 15:32:01 2025
+++ pkgsrc/sysutils/fastfetch/distinfo  Fri Jan 17 16:28:09 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2025/01/17 15:32:01 vins Exp $
+$NetBSD: distinfo,v 1.6 2025/01/17 16:28:09 vins Exp $
 
 BLAKE2s (fastfetch-2.34.1.tar.gz) = a5e6fc60ee3376e5f054e12ce209bc3e4f4b7d2118b76d5ede064873e85620d7
 SHA512 (fastfetch-2.34.1.tar.gz) = 026b71c8d6ad5d5683ededf173d4cb2e936b3e934c7f27227fa7c5f665b9628717e90413626a4fab25fa5f5fde50cae6cdeb75621d6a2cac1ca6368c943293de
 Size (fastfetch-2.34.1.tar.gz) = 1168310 bytes
+SHA1 (patch-src_detection_disk_disk__bsd.c) = 807794a5c46963813e82dbb0af11668ad468bc0c

Index: pkgsrc/sysutils/fastfetch/options.mk
diff -u pkgsrc/sysutils/fastfetch/options.mk:1.7 pkgsrc/sysutils/fastfetch/options.mk:1.8
--- pkgsrc/sysutils/fastfetch/options.mk:1.7    Fri Jan 17 15:32:01 2025
+++ pkgsrc/sysutils/fastfetch/options.mk        Fri Jan 17 16:28:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2025/01/17 15:32:01 vins Exp $
+# $NetBSD: options.mk,v 1.8 2025/01/17 16:28:09 vins Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fastfetch
 PKG_OPTIONS_OPTIONAL_GROUPS=   server sound
@@ -17,8 +17,6 @@ CHECK_BUILTIN.pthread:= no
 PKG_SUGGESTED_OPTIONS+=        threads
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-
 .if  ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        dbus pulseaudio sqlite3
 .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"

Added files:

Index: pkgsrc/sysutils/fastfetch/patches/patch-src_detection_disk_disk__bsd.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_detection_disk_disk__bsd.c:1.1
--- /dev/null   Fri Jan 17 16:28:09 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_detection_disk_disk__bsd.c      Fri Jan 17 16:28:09 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_detection_disk_disk__bsd.c,v 1.1 2025/01/17 16:28:09 vins Exp $
+
+Silence sign conversion warning.
+
+--- src/detection/disk/disk_bsd.c.orig 2025-01-17 16:06:46.666195362 +0000
++++ src/detection/disk/disk_bsd.c
+@@ -131,7 +131,7 @@ const char* ffDetectDisksImpl(FFDiskOpti
+         return "getfsstat(NULL, 0, MNT_WAIT) failed";
+ 
+     FF_AUTO_FREE struct statfs* buf = malloc(sizeof(*buf) * (unsigned) size);
+-    if(getfsstat(buf, (int) (sizeof(*buf) * (unsigned) size), MNT_NOWAIT) <= 0)
++    if(getfsstat(buf, (uint) (sizeof(*buf) * (unsigned) size), MNT_NOWAIT) <= 0)
+         return "getfsstat(buf, size, MNT_NOWAIT) failed";
+ 
+     for(struct statfs* fs = buf; fs < buf + size; ++fs)