CVS commit: pkgsrc/sysutils/fastfetch

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/fastfetch
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Sun, 19 Jan 2025 11:59:52 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jan 19 11:59:51 UTC 2025

Modified Files:
        pkgsrc/sysutils/fastfetch: Makefile PLIST options.mk
Added Files:
        pkgsrc/sysutils/fastfetch/files: minimal.jsonc

Log Message:
sysutils/fastfetch: python required as tool

Python is needed at build time for minifying the embedded help dialog,
for generating the man page, and for built-in pciids (the latter is
still disabled by default). As a consequence, include python as tool in
Makefile, and only pull it as full dependency if the 'python' option is
enabled.

Other changes:

* Do not install the LICENSE file.
* Explicitely enable pciaccess support.
* Standardise link method.
* Replace hard-coded paths.
* Install custom minimal config.

Revision bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/fastfetch/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/fastfetch/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/fastfetch/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/fastfetch/files/minimal.jsonc

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.7 pkgsrc/sysutils/fastfetch/Makefile:1.8
--- pkgsrc/sysutils/fastfetch/Makefile:1.7      Fri Jan 17 16:28:09 2025
+++ pkgsrc/sysutils/fastfetch/Makefile  Sun Jan 19 11:59:51 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2025/01/17 16:28:09 vins Exp $
+# $NetBSD: Makefile,v 1.8 2025/01/19 11:59:51 vins Exp $
 
 DISTNAME=      fastfetch-2.34.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fastfetch-cli/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -19,25 +19,40 @@ DEPENDS+=   hwdata-[0-9]*:../../misc/hwdat
 
 .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"
+REPLACE_TOOL_PYTHON+=  scripts/gen-pciids.py scripts/gen-man.py
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Replacing hard-coded paths.
+SUBST_FILES.paths+=    src/detection/packages/packages_obsd.c
+SUBST_FILES.paths+=    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"
 
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release \
                        -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 \
+                       -DENABLE_PCIACCES=ON \
                        -DBUILD_FLASHFETCH=OFF \
-                       -DBUILD_TESTS=ON
+                       -DBUILD_TESTS=ON \
+                       -DINSTALL_LICENSE=OFF
 
 .include "options.mk"
 
-
+post-install:
+       ${INSTALL_DATA} ${FILESDIR}/minimal.jsonc       \
+               ${DESTDIR}${PREFIX}/share/fastfetch/presets
+
+# Whether Python is required strictly as a build tool or also at runtime is
+# determined in options.mk, and PYTHON_FOR_BUILD_ONLY is set there, if needed.
+.include "../../lang/python/tool.mk"
+.include "../../lang/python/application.mk"
+PYTHON_VERSIONS_INCOMPATIBLE=   27
 
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../devel/yyjson/buildlink3.mk"

Index: pkgsrc/sysutils/fastfetch/PLIST
diff -u pkgsrc/sysutils/fastfetch/PLIST:1.1 pkgsrc/sysutils/fastfetch/PLIST:1.2
--- pkgsrc/sysutils/fastfetch/PLIST:1.1 Mon Jan  6 19:34:59 2025
+++ pkgsrc/sysutils/fastfetch/PLIST     Sun Jan 19 11:59:51 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/01/06 19:34:59 vins Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/01/19 11:59:51 vins Exp $
 bin/fastfetch
 man/man1/fastfetch.1
 share/bash-completion/completions/fastfetch
@@ -28,9 +28,9 @@ share/fastfetch/presets/examples/6.jsonc
 share/fastfetch/presets/examples/7.jsonc
 share/fastfetch/presets/examples/8.jsonc
 share/fastfetch/presets/examples/9.jsonc
+share/fastfetch/presets/minimal.jsonc
 share/fastfetch/presets/neofetch.jsonc
 share/fastfetch/presets/paleofetch.jsonc
 share/fastfetch/presets/screenfetch.jsonc
 share/fish/vendor_completions.d/fastfetch.fish
-share/licenses/fastfetch/LICENSE
 share/zsh/site-functions/_fastfetch

Index: pkgsrc/sysutils/fastfetch/options.mk
diff -u pkgsrc/sysutils/fastfetch/options.mk:1.8 pkgsrc/sysutils/fastfetch/options.mk:1.9
--- pkgsrc/sysutils/fastfetch/options.mk:1.8    Fri Jan 17 16:28:09 2025
+++ pkgsrc/sysutils/fastfetch/options.mk        Sun Jan 19 11:59:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2025/01/17 16:28:09 vins Exp $
+# $NetBSD: options.mk,v 1.9 2025/01/19 11:59:51 vins Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fastfetch
 PKG_OPTIONS_OPTIONAL_GROUPS=   server sound
@@ -59,7 +59,7 @@ CMAKE_CONFIGURE_ARGS+=  -DENABLE_CHAFA=O
 ##
 ## libdrm
 ## Fallback if both wayland and x11 are not available
-## AMD GPU properties detection
+## (+ AMD GPU properties detection)
 ##
 .if !empty(PKG_OPTIONS:Mlibdrm)
 .  include "../../x11/libdrm/buildlink3.mk"
@@ -114,7 +114,7 @@ CMAKE_CONFIGURE_ARGS+=  -DENABLE_OSMESA=
 
 ##
 ## OpenCL
-## Build OpenCL module.
+## OpenCL framework support.
 ##
 .if !empty(PKG_OPTIONS:Mopencl)
 .  include "../../parallel/ocl-icd/buildlink3.mk"
@@ -125,6 +125,7 @@ CMAKE_CONFIGURE_ARGS+=  -DENABLE_OPENCL=
 ##
 ## OSS
 ## Provides sound device detection.
+## (through the Open Sound System Library)
 ##
 .if !empty(PKG_OPTIONS:Moss)
 .  include "../../mk/oss.buildlink3.mk"
@@ -133,6 +134,7 @@ CMAKE_CONFIGURE_ARGS+=  -DENABLE_OPENCL=
 ##
 ## Pulseaudio
 ## Provides sound device detection.
+## (through the PulseAudio sound server)
 ##
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .  include "../../audio/pulseaudio/buildlink3.mk"
@@ -142,11 +144,20 @@ CMAKE_CONFIGURE_ARGS+=  -DENABLE_PULSE=O
 
 ##
 ## Python
-## Needed for zsh and fish completions.
+## Needed for zsh and fish shell completions.
+## (+ man page generation and embedded pciids)
 ##
 .if !empty(PKG_OPTIONS:Mpython)
-.  include "../../lang/python/application.mk"
-PYTHON_VERSIONS_INCOMPATIBLE=   27
+.  include "../../lang/python/batteries-included.mk"
+PYTHON_FOR_BUILD_ONLY= no
+
+SUBST_CLASSES+=                python
+SUBST_STAGE.python=    pre-configure
+SUBST_MESSAGE.python=  Replacing python interpreter.
+SUBST_FILES.python+=   completions/fastfetch.fish completions/fastfetch.zsh
+SUBST_SED.python+=     -e "s:python3:${PYTHONBIN:Q}:g"
+.else
+PYTHON_FOR_BUILD_ONLY= tool
 .endif
 
 ##

Added files:

Index: pkgsrc/sysutils/fastfetch/files/minimal.jsonc
diff -u /dev/null pkgsrc/sysutils/fastfetch/files/minimal.jsonc:1.1
--- /dev/null   Sun Jan 19 11:59:51 2025
+++ pkgsrc/sysutils/fastfetch/files/minimal.jsonc       Sun Jan 19 11:59:51 2025
@@ -0,0 +1,49 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json";,
+  "logo": {
+    "type": "small"
+  },
+    "display": {
+        "separator": " ›  "
+    },
+    "modules": [
+       "break",
+        {
+            "type": "os",
+            "key": "OS  ",
+            "keyColor": "31",
+        },
+        {
+            "type": "memory",
+            "key": "MEM ",
+            "keyColor": "32",
+        },
+        {
+            "type": "cpu",
+            "key": "CPU ",
+            "keyColor": "33",
+        },
+        {
+            "type": "packages",
+            "format": "{} (pkgsrc)",
+            "key": "PKG ",
+            "keyColor": "34",  
+        },
+        {
+            "type": "shell",
+            "key": "SH  ",
+            "keyColor": "35", 
+        },
+        {
+            "type": "terminal",
+            "key": "TER ",
+            "keyColor": "36", 
+        },
+        {
+            "type": "wm",
+            "key": "WM  ",
+            "keyColor": "37", 
+        },
+        "break",
+    ]
+}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/lang
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/lang
Indexes:

Home | Main Index | Thread Index | Old Index