CVS commit: pkgsrc/sysutils/hw-probe

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/hw-probe
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Mon, 8 Dec 2025 10:19:23 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Dec  8 10:19:23 UTC 2025

Modified Files:
        pkgsrc/sysutils/hw-probe: Makefile PLIST distinfo
        pkgsrc/sysutils/hw-probe/patches: patch-hw-probe.pl
Added Files:
        pkgsrc/sysutils/hw-probe/files: README.pkgsrc
Removed Files:
        pkgsrc/sysutils/hw-probe: MESSAGE

Log Message:
hw-probe: package revision

* Replace MESSAGE with pkgsrc README.
* Replace sndstat with audioctl in logs for NetBSD.
* Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/hw-probe/MESSAGE
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/hw-probe/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/hw-probe/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/hw-probe/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/hw-probe/files/README.pkgsrc
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/hw-probe/patches/patch-hw-probe.pl

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

Modified files:

Index: pkgsrc/sysutils/hw-probe/Makefile
diff -u pkgsrc/sysutils/hw-probe/Makefile:1.15 pkgsrc/sysutils/hw-probe/Makefile:1.16
--- pkgsrc/sysutils/hw-probe/Makefile:1.15      Sun Oct  5 19:26:19 2025
+++ pkgsrc/sysutils/hw-probe/Makefile   Mon Dec  8 10:19:23 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2025/10/05 19:26:19 js Exp $
+# $NetBSD: Makefile,v 1.16 2025/12/08 10:19:23 vins Exp $
 
 DISTNAME=      hw-probe-1.6.6
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    sysutils perl5
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=linuxhw/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -42,18 +42,7 @@ DEPENDS+=    cpuid-[0-9]*:../../sysutils/cp
 .  endif
 .endif
 
-.if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
-SUBST_CLASSES+=                fetch
-SUBST_STAGE.fetch=     pre-configure
-SUBST_MESSAGE.fetch=   Using bsdfetch on *BSD.
-SUBST_FILES.fetch=     hw-probe.pl
-SUBST_SED.fetch+=      -e 's|neofetch|bsdfetch|g'
-
-DEPENDS+=      bsdfetch-[0-9]*:../../sysutils/bsdfetch
-.endif
-
 DOCDIR=                share/doc/${PKGBASE}
-MESSAGE_SUBST+=        DOCDIR=${DOCDIR:Q}
 
 REPLACE_PERL+= hw-probe.pl
 
@@ -68,6 +57,8 @@ do-install:
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md             \
                ${DESTDIR}${PREFIX}/${DOCDIR}/README
+       ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc       \
+               ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/sysutils/hw-probe/PLIST
diff -u pkgsrc/sysutils/hw-probe/PLIST:1.2 pkgsrc/sysutils/hw-probe/PLIST:1.3
--- pkgsrc/sysutils/hw-probe/PLIST:1.2  Fri Aug 25 14:49:58 2023
+++ pkgsrc/sysutils/hw-probe/PLIST      Mon Dec  8 10:19:23 2025
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/08/25 14:49:58 vins Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/12/08 10:19:23 vins Exp $
 bin/hw-probe
 share/doc/hw-probe/README
+share/doc/hw-probe/README.pkgsrc

Index: pkgsrc/sysutils/hw-probe/distinfo
diff -u pkgsrc/sysutils/hw-probe/distinfo:1.3 pkgsrc/sysutils/hw-probe/distinfo:1.4
--- pkgsrc/sysutils/hw-probe/distinfo:1.3       Mon Jan 13 19:20:35 2025
+++ pkgsrc/sysutils/hw-probe/distinfo   Mon Dec  8 10:19:23 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2025/01/13 19:20:35 vins Exp $
+$NetBSD: distinfo,v 1.4 2025/12/08 10:19:23 vins Exp $
 
 BLAKE2s (hw-probe-1.6.6.tar.gz) = 822c43f6f2aeb9d733949ba6d9114bfcb921866966454b1d2119dad054d27133
 SHA512 (hw-probe-1.6.6.tar.gz) = ca645549d0b8f8a8c1c8f69498dd8591b55a2a007850b508fe1d6a48cd7c6e3ee25102ed348cb9578989014b7f069c4b9453ed7e516ce57dcbded1166c6ad017
 Size (hw-probe-1.6.6.tar.gz) = 170004 bytes
-SHA1 (patch-hw-probe.pl) = d88c244b7e60bb7be98b7a57fdceecdfe385fb26
+SHA1 (patch-hw-probe.pl) = 5f1abee69f2dcb3fd4c3a03c4b475b782bfc9bcb

Index: pkgsrc/sysutils/hw-probe/patches/patch-hw-probe.pl
diff -u pkgsrc/sysutils/hw-probe/patches/patch-hw-probe.pl:1.1 pkgsrc/sysutils/hw-probe/patches/patch-hw-probe.pl:1.2
--- pkgsrc/sysutils/hw-probe/patches/patch-hw-probe.pl:1.1      Mon Jan 13 19:22:23 2025
+++ pkgsrc/sysutils/hw-probe/patches/patch-hw-probe.pl  Mon Dec  8 10:19:23 2025
@@ -1,8 +1,9 @@
-$NetBSD: patch-hw-probe.pl,v 1.1 2025/01/13 19:22:23 vins Exp $
+$NetBSD: patch-hw-probe.pl,v 1.2 2025/12/08 10:19:23 vins Exp $
 
-No need for cpuid; our lscpu package supports NetBSD.
+* No need for cpuid; our lscpu package supports NetBSD.
+* Use audioctl in place of sndstat on NetBSD/OpenBSD.
 
---- hw-probe.pl.orig   2025-01-13 18:54:37.940812334 +0000
+--- hw-probe.pl.orig   2025-01-11 17:52:38.000000000 +0000
 +++ hw-probe.pl
 @@ -3994,7 +3994,7 @@ sub probeHW()
              }
@@ -13,3 +14,53 @@ No need for cpuid; our lscpu package sup
                  
                  if($Sys{"Arch"}!~/i386|amd64|aarch64/) {
                      @NeedProgs = grep {$_!~/dmidecode/} @NeedProgs;
+@@ -4359,7 +4359,26 @@ sub probeHW()
+             writeLog($LOG_DIR."/sndstat", $Sndstat);
+         }
+     }
+-    
++
++    my $Audioctl = "";
++
++    if($Opt{"FixProbe"}) {
++        $Audioctl = readFile($FixProbe_Logs."/audioctl");
++    }
++    elsif(enabledLog("audioctl") and checkCmd("audioctl"))
++    {
++        listProbe("logs", "audioctl");
++        if(isOpenBSD()) {
++        $Audioctl = runCmd("audioctl 2>/dev/null");
++        }
++        elsif(isNetBSD()) {
++      $Audioctl = runCmd("audioctl -a | head -5 2>/dev/null");
++        }
++        if($Opt{"HWLogs"}) {
++            writeLog($LOG_DIR."/audioctl", $Audioctl);
++        }
++    }
++
+     my $Neofetch = "";
+     
+     if($Opt{"FixProbe"}) {
+@@ -17758,6 +17777,7 @@ my %EnabledLog_BSD = (
+         "apm",
+         "arcconf",
+         "atactl",
++        "audioctl",
+         "biosdecode",
+         "curl",
+         "dev",
+@@ -18887,11 +18907,11 @@ sub scenario()
+         my @Exclude = ();
+         
+         if($^O=~/openbsd|dragonfly/ or isNetBSD($^O))  {
+-            push(@Exclude, "loader", "gpart", "gpart_list", "diskinfo", "camcontrol");
++            push(@Exclude, "loader", "gpart", "gpart_list", "diskinfo", "camcontrol", "sndstat");
+         }
+         
+         if($^O=~/freebsd|dragonfly/) {
+-            push(@Exclude, "disklabel");
++            push(@Exclude, "disklabel", "audioctl");
+         }
+         
+         if(@Exclude)

Added files:

Index: pkgsrc/sysutils/hw-probe/files/README.pkgsrc
diff -u /dev/null pkgsrc/sysutils/hw-probe/files/README.pkgsrc:1.1
--- /dev/null   Mon Dec  8 10:19:23 2025
+++ pkgsrc/sysutils/hw-probe/files/README.pkgsrc        Mon Dec  8 10:19:23 2025
@@ -0,0 +1,17 @@
+| hw-probe: hints and caveats
++-----------------------------------------------------------------------
+
+Hardware probe requires root privileges. To run the program as root
+while preserving the standard user environment, you can use
+security/sudo or security/opendoas.
+
+For example, to probe your computer and upload the results to the
+hardware database, you may alternatively run:
+
+       $ sudo -E hw-probe -all -upload
+       $ doas hw-probe -all -upload    # use 'keepenv' option in doas.conf
+
+Please be aware that running hw-probe with parameter "-upload" will
+upload a lot of information about your current OS and hardware
+configuration informationto the online database. This might include
+identifiable information like UIDs and hardware serial numbers.

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

Home | Main Index | Thread Index | Old Index