CVS commit: pkgsrc/sysutils/hwdata

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Jan 29 17:25:01 UTC 2025

Modified Files:
        pkgsrc/sysutils/hwdata: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/sysutils/hwdata/patches: patch-Makefile

Log Message:
sysutils/hwadata: update to 0.391

# pkgsrc changes

* Merge PKGCONFIG_DIR location patch from misc/hwdata
* Specify BUILDLINLK_FILES to make the *.ids databases discoverable, as
  suggested in tech-pkg.
* Add sed to used tools.

# upstream changes (since 0.390)

* Updated USB and vendor ids.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/hwdata/Makefile \
    pkgsrc/sysutils/hwdata/PLIST pkgsrc/sysutils/hwdata/buildlink3.mk \
    pkgsrc/sysutils/hwdata/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/hwdata/patches/patch-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/hwdata/Makefile
diff -u pkgsrc/sysutils/hwdata/Makefile:1.1 pkgsrc/sysutils/hwdata/Makefile:1.2
--- pkgsrc/sysutils/hwdata/Makefile:1.1 Thu Dec 26 18:33:23 2024
+++ pkgsrc/sysutils/hwdata/Makefile     Wed Jan 29 17:25:01 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2024/12/26 18:33:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2025/01/29 17:25:01 vins Exp $
 
-DISTNAME=      hwdata-0.390
+DISTNAME=      hwdata-0.391
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vcrhonek/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,7 +11,7 @@ COMMENT=      Hardware identification and con
 LICENSE=       gnu-gpl-v2 OR x11
 
 HAS_CONFIGURE= yes
-USE_TOOLS+=    gmake
+USE_TOOLS+=    gmake sed
 USE_LANGUAGES= # none
 
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
@@ -20,4 +20,6 @@ CONFIGURE_ARGS+=      --disable-blacklist
 
 PKGCONFIG_OVERRIDE+=   hwdata.pc.in
 
+MAKE_FLAGS+=   PKGCONFIG_DIR=${PREFIX}/lib/pkgconfig
+
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/hwdata/PLIST
diff -u pkgsrc/sysutils/hwdata/PLIST:1.1 pkgsrc/sysutils/hwdata/PLIST:1.2
--- pkgsrc/sysutils/hwdata/PLIST:1.1    Thu Dec 26 18:33:23 2024
+++ pkgsrc/sysutils/hwdata/PLIST        Wed Jan 29 17:25:01 2025
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2024/12/26 18:33:23 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/01/29 17:25:01 vins Exp $
+lib/pkgconfig/hwdata.pc
 share/hwdata/iab.txt
 share/hwdata/oui.txt
 share/hwdata/pci.ids
 share/hwdata/pnp.ids
 share/hwdata/usb.ids
-share/pkgconfig/hwdata.pc
Index: pkgsrc/sysutils/hwdata/buildlink3.mk
diff -u pkgsrc/sysutils/hwdata/buildlink3.mk:1.1 pkgsrc/sysutils/hwdata/buildlink3.mk:1.2
--- pkgsrc/sysutils/hwdata/buildlink3.mk:1.1    Thu Dec 26 18:33:23 2024
+++ pkgsrc/sysutils/hwdata/buildlink3.mk        Wed Jan 29 17:25:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2024/12/26 18:33:23 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2025/01/29 17:25:01 vins Exp $
 
 BUILDLINK_TREE+=       hwdata
 
@@ -8,7 +8,9 @@ HWDATA_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.hwdata?=   build
 
 BUILDLINK_API_DEPENDS.hwdata+= hwdata>=0.390
+BUILDLINK_ABI_DEPENDS.hwdata+= hwdata>=0.391
 BUILDLINK_PKGSRCDIR.hwdata?=   ../../sysutils/hwdata
+BUILDLINK_FILES.hwdata+=       share/*
 .endif # HWDATA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hwdata
Index: pkgsrc/sysutils/hwdata/distinfo
diff -u pkgsrc/sysutils/hwdata/distinfo:1.1 pkgsrc/sysutils/hwdata/distinfo:1.2
--- pkgsrc/sysutils/hwdata/distinfo:1.1 Thu Dec 26 18:33:23 2024
+++ pkgsrc/sysutils/hwdata/distinfo     Wed Jan 29 17:25:01 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2024/12/26 18:33:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2025/01/29 17:25:01 vins Exp $
 
-BLAKE2s (hwdata-0.390.tar.gz) = b19ecb6815a195190e63f1bc78562afeddb085cda06c2e6285169f7a8785cc7a
-SHA512 (hwdata-0.390.tar.gz) = c9cbe0e41001a0d61b164d6544e57d66be7b4230434d2c395d182f41f96e6c3831e443c933f5a29bd0a2fefabbfc232a9efa772d04b89972da5d4d2eb7882443
-Size (hwdata-0.390.tar.gz) = 2473831 bytes
-SHA1 (patch-Makefile) = e778e08ad9fc467219f594d8b9c3a678362f6afe
+BLAKE2s (hwdata-0.391.tar.gz) = 5575f37ce09c40dd2a684da627c0fc01f3a977c88a8cd829aa2039b8bf7e0c1d
+SHA512 (hwdata-0.391.tar.gz) = 9b831a7546ac6ca457b92bf438ba84d6487980b15a304af78ba8738cc456e02a62b1d19a849573ed596c85a3fbbc88ca305e5e4c665f27e8d75454be41d708f0
+Size (hwdata-0.391.tar.gz) = 2479872 bytes
+SHA1 (patch-Makefile) = b8d6fb8d4f8db0c634eba59085ef49db399f7c92

Index: pkgsrc/sysutils/hwdata/patches/patch-Makefile
diff -u pkgsrc/sysutils/hwdata/patches/patch-Makefile:1.1 pkgsrc/sysutils/hwdata/patches/patch-Makefile:1.2
--- pkgsrc/sysutils/hwdata/patches/patch-Makefile:1.1   Thu Dec 26 18:33:23 2024
+++ pkgsrc/sysutils/hwdata/patches/patch-Makefile       Wed Jan 29 17:25:01 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile,v 1.1 2024/12/26 18:33:23 bsiegert Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/01/29 17:25:01 vins Exp $
 
-Avoid syntax error in Makefile.
+* Avoid syntax error in Makefile.
+* Allow pkgsrc to define its PKGCONFIG_DIR.
 
---- Makefile.orig      2024-12-03 10:47:33.000000000 +0000
+--- Makefile.orig      2025-01-03 09:15:23.000000000 +0000
 +++ Makefile
-@@ -45,9 +45,7 @@ hwdata.pc: hwdata.pc.in
+@@ -45,15 +45,13 @@ hwdata.pc: hwdata.pc.in
  
  install: Makefile.inc hwdata.pc
        mkdir -p -m 755 $(DESTDIR)$(datadir)/$(NAME)
@@ -15,3 +16,11 @@ Avoid syntax error in Makefile.
        @if [ "$(blacklist)" = true ]; then \
                mkdir -p -m 755 $(DESTDIR)$(libdir)/modprobe.d ;\
                install -m 644 -T blacklist.conf $(DESTDIR)$(libdir)/modprobe.d/dist-blacklist.conf ;\
+       fi;
+-      mkdir -p -m 755 $(DESTDIR)$(datadir)/pkgconfig
+-      install -m 644 hwdata.pc $(DESTDIR)$(datadir)/pkgconfig/
++      mkdir -p -m 755 $(DESTDIR)$(PKGCONFIG_DIR)
++      install -m 644 hwdata.pc $(DESTDIR)$(PKGCONFIG_DIR)
+ 
+ commit:
+       git commit -vas ||: