diff --git a/misc/hwdata/Makefile b/misc/hwdata/Makefile index 1daf4dafa9c8..0246acc456b8 100644 --- a/misc/hwdata/Makefile +++ b/misc/hwdata/Makefile @@ -1,27 +1,27 @@ PORTNAME= hwdata DISTVERSIONPREFIX= v -DISTVERSION= 0.362 +DISTVERSION= 0.364 PORTEPOCH= 1 CATEGORIES= misc MAINTAINER= desktop@FreeBSD.org COMMENT= Database of IDs used in PCI, PNP and USB devices WWW= https://github.com/vcrhonek/hwdata LICENSE= GPLv2+ MIT LICENSE_COMB= dual BUILD_DEPENDS= ginstall:sysutils/coreutils USES= gmake USE_GITHUB= yes GH_ACCOUNT= vcrhonek HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir=${DATADIR} BINARY_ALIAS= install=ginstall NO_ARCH= yes .include diff --git a/misc/hwdata/distinfo b/misc/hwdata/distinfo index cbc5cb3190e2..be0e31735d49 100644 --- a/misc/hwdata/distinfo +++ b/misc/hwdata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662621307 -SHA256 (vcrhonek-hwdata-v0.362_GH0.tar.gz) = 9e4e5ee09aa10eae88d096d2012f85a7c47b2b19adc1aeb70f97e5b60b6628a6 -SIZE (vcrhonek-hwdata-v0.362_GH0.tar.gz) = 2277092 +TIMESTAMP = 1667655927 +SHA256 (vcrhonek-hwdata-v0.364_GH0.tar.gz) = e79ee7e0251c94273ac8ffa7f68892152d3cfc243a471bc61771d8ab53da3331 +SIZE (vcrhonek-hwdata-v0.364_GH0.tar.gz) = 2290206 diff --git a/misc/hwdata/files/patch-Makefile b/misc/hwdata/files/patch-Makefile index 3bfb69f6c27d..a636ccb4c5a4 100644 --- a/misc/hwdata/files/patch-Makefile +++ b/misc/hwdata/files/patch-Makefile @@ -1,20 +1,22 @@ ---- Makefile.orig 2022-09-07 07:07:17 UTC +--- Makefile.orig 2022-11-01 08:35:59 UTC +++ Makefile -@@ -48,10 +48,8 @@ install: Makefile.inc hwdata.pc +@@ -48,12 +48,8 @@ install: Makefile.inc hwdata.pc for foo in $(IDFILES) ; do \ install -m 644 $$foo $(DESTDIR)$(datadir)/$(NAME) ;\ done -- mkdir -p -m 755 $(DESTDIR)$(libdir)/modprobe.d -- install -m 644 -T blacklist.conf $(DESTDIR)$(libdir)/modprobe.d/dist-blacklist.conf +- @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)$(prefix)/libdata/pkgconfig + install -m 644 hwdata.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/ commit: git commit -vas ||: -@@ -159,4 +157,3 @@ pnp.ids: pnp.ids.orig pnp.ids.patch +@@ -161,4 +157,3 @@ pnp.ids: pnp.ids.orig pnp.ids.patch else \ cat $?; \ fi | sed 's/\s\+$$//' >$@ -