CVS commit: pkgsrc/sysutils/hw-probe

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Aug 25 14:49:58 UTC 2023

Modified Files:
        pkgsrc/sysutils/hw-probe: DESCR Makefile PLIST distinfo

Log Message:
sysutils/hw-probe: package revision.

# Changes

* Fix versioning.
  The script available on the BSD hardware database site tracks the master
  branch, so it's difficult to provide reliable distfiles without breaking
  checksums. Switching MASTER_SITES to the official github repo.
  This also allows to have consistent versioning.
* Let package to be installed also on Linux (supported).
* Simplify DESCR.
* Install documentation.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/hw-probe/DESCR \
    pkgsrc/sysutils/hw-probe/PLIST pkgsrc/sysutils/hw-probe/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/hw-probe/Makefile

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/DESCR
diff -u pkgsrc/sysutils/hw-probe/DESCR:1.1 pkgsrc/sysutils/hw-probe/DESCR:1.2
--- pkgsrc/sysutils/hw-probe/DESCR:1.1  Sat Jul  8 22:15:42 2023
+++ pkgsrc/sysutils/hw-probe/DESCR      Fri Aug 25 14:49:58 2023
@@ -1,16 +1,3 @@
-A tool to probe for hardware, check operability and find drivers
-with the help of BSD hardware database.
-
-Probe is a snapshot of your computer hardware state and system
-logs.  The tool checks operability of devices by analysis of logs
-and returns a permanent URL to view the probe of the computer.
-
-The tool is intended to simplify collecting of logs necessary for
-investigating hardware related problems.  Just run one simple
-command (requires superuser privileges) in the console to check
-your hardware and collect all the system logs at once:
-
-    # hw-probe -all -upload
-
-By creating probes you also contribute to the HDD/SSD reliability
-test study (https://github.com/bsdhw/SMART).
+Hardware probe is a tool to check operability of hardware devices,
+collect system logs and contribute to the hardware database and user
+statistics.
Index: pkgsrc/sysutils/hw-probe/PLIST
diff -u pkgsrc/sysutils/hw-probe/PLIST:1.1 pkgsrc/sysutils/hw-probe/PLIST:1.2
--- pkgsrc/sysutils/hw-probe/PLIST:1.1  Sat Jul  8 22:15:42 2023
+++ pkgsrc/sysutils/hw-probe/PLIST      Fri Aug 25 14:49:58 2023
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2023/07/08 22:15:42 vins Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/08/25 14:49:58 vins Exp $
 bin/hw-probe
+share/doc/hw-probe/README
Index: pkgsrc/sysutils/hw-probe/distinfo
diff -u pkgsrc/sysutils/hw-probe/distinfo:1.1 pkgsrc/sysutils/hw-probe/distinfo:1.2
--- pkgsrc/sysutils/hw-probe/distinfo:1.1       Sat Jul  8 22:15:42 2023
+++ pkgsrc/sysutils/hw-probe/distinfo   Fri Aug 25 14:49:58 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2023/07/08 22:15:42 vins Exp $
+$NetBSD: distinfo,v 1.2 2023/08/25 14:49:58 vins Exp $
 
-BLAKE2s (hw-probe-1.6/hw-probe) = 635ebfd03db6d806aa8c54396a07ec6c3ec83b0ee9ca04197f0623249226a331
-SHA512 (hw-probe-1.6/hw-probe) = f811d34297f1cca048cd02929d2c962a36f593c8f15385578082671dd0d2e1cc0aef7de991559adfeca98abf1cad88b97be0dd0e6094194103323fdd8d35b177
-Size (hw-probe-1.6/hw-probe) = 551369 bytes
+BLAKE2s (hw-probe-1.6.5_20230812-b895b77b7e03f4b1b0a5fb177118373ee0328a25.tar.gz) = 86592282efc6fca24eeb4efb3c46e5e1772364fde2dd7b8fcb1b8abb94bd245c
+SHA512 (hw-probe-1.6.5_20230812-b895b77b7e03f4b1b0a5fb177118373ee0328a25.tar.gz) = 
633cda1e1d6a3104587b6ebf4faad98526e0d6daec5e9a26b319a4b5b76baeac063277eca9e81e7903b28cdebbb3db095f7526d1f46511f885e37b31e1032b7d
+Size (hw-probe-1.6.5_20230812-b895b77b7e03f4b1b0a5fb177118373ee0328a25.tar.gz) = 166015 bytes

Index: pkgsrc/sysutils/hw-probe/Makefile
diff -u pkgsrc/sysutils/hw-probe/Makefile:1.2 pkgsrc/sysutils/hw-probe/Makefile:1.3
--- pkgsrc/sysutils/hw-probe/Makefile:1.2       Mon Jul 10 10:35:20 2023
+++ pkgsrc/sysutils/hw-probe/Makefile   Fri Aug 25 14:49:58 2023
@@ -1,34 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2023/07/10 10:35:20 vins Exp $
+# $NetBSD: Makefile,v 1.3 2023/08/25 14:49:58 vins Exp $
 
-DISTNAME=      hw-probe
-PKGNAME=       hw-probe-1.6
+PKGVER=                1.6.5_20230812
+DISTNAME=      hw-probe-${PKGVER}
 CATEGORIES=    sysutils perl5
-MASTER_SITES=  http://bsd-hardware.info/
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-EXTRACT_SUFX=  # empty
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=linuxhw/}
+GITHUB_TAG=    b895b77b7e03f4b1b0a5fb177118373ee0328a25
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://bsd-hardware.info/
+#HOMEPAGE+=    https://linux-hardware.org/
 COMMENT=       Check operability of computer hardware and find drivers
 LICENSE=       gnu-lgpl-v2.1 OR original-bsd
 
-ONLY_FOR_PLATFORM+=    FreeBSD-*-* OpenBSD-*-* NetBSD-*-* DragonFly-*-*
+ONLY_FOR_PLATFORM+=    FreeBSD-*-* OpenBSD-*-* NetBSD-*-*
+ONLY_FOR_PLATFORM+=    DragonFly-*-* Linux-*-*
+
+USE_TOOLS+=    perl:run
 
 DEPENDS+=      curl-[0-9]*:../../www/curl
 DEPENDS+=      usbutil-[0-9]*:../../sysutils/usbutil
 DEPENDS+=      mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 DEPENDS+=      smartmontools-[0-9]*:../../sysutils/smartmontools
 
-USE_TOOLS+=    perl:run
-
-REPLACE_PERL+= hw-probe
-
-INSTALLATION_DIRS+=    bin
-
-NO_BUILD=      yes
-
-WRKSRC=        ${WRKDIR}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "aarch64")
@@ -36,15 +29,28 @@ DEPENDS+=   dmidecode-[0-9]*:../../sysutil
 .endif
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
-.  if ${OPSYS} == "NetBSD"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
 DEPENDS+=      cpuid-[0-9]*:../../sysutils/cpuid
 .  else
 DEPENDS+=      lscpu-[0-9]*:../../sysutils/lscpu
 .  endif
 .endif
 
+DOCDIR=                share/doc/${PKGBASE}
+MESSAGE_SUBST+=        DOCDIR=${DOCDIR:Q}
+
+REPLACE_PERL+= hw-probe.pl
+
+NO_BUILD=      yes
+
+INSTALLATION_DIRS+=    bin ${DOCDIR}
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/hw-probe ${DESTDIR}${PREFIX}/bin/hw-probe
+       ${INSTALL_SCRIPT} ${WRKSRC}/hw-probe.pl         \
+               ${DESTDIR}${PREFIX}/bin/hw-probe
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/README.md             \
+               ${DESTDIR}${PREFIX}/${DOCDIR}/README
 
 .include "../../mk/bsd.pkg.mk"