Fri May 13 23:50:46 2022 UTC ()
pciutils: fix PLIST issue on Linux


(tnn)
diff -r1.40 -r1.41 pkgsrc/sysutils/pciutils/distinfo
diff -r1.5 -r1.6 pkgsrc/sysutils/pciutils/patches/patch-ab

cvs diff -r1.40 -r1.41 pkgsrc/sysutils/pciutils/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/pciutils/distinfo 2022/05/13 11:41:56 1.40
+++ pkgsrc/sysutils/pciutils/distinfo 2022/05/13 23:50:46 1.41
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.40 2022/05/13 11:41:56 wiz Exp $ 1$NetBSD: distinfo,v 1.41 2022/05/13 23:50:46 tnn Exp $
2 2
3BLAKE2s (pciutils-3.8.0.tar.gz) = ed9638a759d045122ae4b466582fa4a763d930ed8de71e59519e1f7370249d51 3BLAKE2s (pciutils-3.8.0.tar.gz) = ed9638a759d045122ae4b466582fa4a763d930ed8de71e59519e1f7370249d51
4SHA512 (pciutils-3.8.0.tar.gz) = 49b8ccc87cc82326744de7f0306c0245a5bb87740d3e96b18378cc07477ca176bd3ffaf699bfe9954d61381c57f65aa703c07fa6406fe2be289917dc1715600d 4SHA512 (pciutils-3.8.0.tar.gz) = 49b8ccc87cc82326744de7f0306c0245a5bb87740d3e96b18378cc07477ca176bd3ffaf699bfe9954d61381c57f65aa703c07fa6406fe2be289917dc1715600d
5Size (pciutils-3.8.0.tar.gz) = 564686 bytes 5Size (pciutils-3.8.0.tar.gz) = 564686 bytes
6SHA1 (patch-aa) = 9d852153dbad858a68b1f3503a98578d48cbcf4d 6SHA1 (patch-aa) = 9d852153dbad858a68b1f3503a98578d48cbcf4d
7SHA1 (patch-ab) = 14786e702cceaea9146f34a5a301650d2092d689 7SHA1 (patch-ab) = 01ed933aa91fd71b37e73899be816894ef4e3d8f
8SHA1 (patch-ac) = 83fd2d79a7a4a05593ccd69b9d1f38e6ec4763c8 8SHA1 (patch-ac) = 83fd2d79a7a4a05593ccd69b9d1f38e6ec4763c8
9SHA1 (patch-lib_filter.c) = 60ab18c9cd4f9850f500f11fe837006bef93ed3a 9SHA1 (patch-lib_filter.c) = 60ab18c9cd4f9850f500f11fe837006bef93ed3a
10SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24 10SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24
11SHA1 (patch-lib_internal.h) = e608669ead99bb63e3c245046412b8cde5abc31a 11SHA1 (patch-lib_internal.h) = e608669ead99bb63e3c245046412b8cde5abc31a

cvs diff -r1.5 -r1.6 pkgsrc/sysutils/pciutils/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/pciutils/patches/patch-ab 2020/01/23 04:26:41 1.5
+++ pkgsrc/sysutils/pciutils/patches/patch-ab 2022/05/13 23:50:46 1.6
@@ -1,13 +1,24 @@ @@ -1,13 +1,24 @@
1$NetBSD: patch-ab,v 1.5 2020/01/23 04:26:41 msaitoh Exp $ 1$NetBSD: patch-ab,v 1.6 2022/05/13 23:50:46 tnn Exp $
2 2
3--- lib/configure.orig 2018-03-21 05:36:30.000000000 +0900 3lspci on Linux is unprivileged and wants to go in bin, not sbin.
4+++ lib/configure 2019-01-25 13:38:50.273095384 +0900 4But that breaks our PLIST so let's not bother with that.
5@@ -266,7 +267,7 @@ else 5
 6--- lib/configure.orig 2022-04-15 21:57:59.000000000 +0000
 7+++ lib/configure
 8@@ -80,7 +80,6 @@ case $sys in
 9 ;;
 10 esac
 11 echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
 12- LSPCIDIR=BINDIR
 13 ;;
 14 sunos)
 15 case $cpu in
 16@@ -301,7 +300,7 @@ else
6 echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)' 17 echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)'
7 fi 18 fi
8 fi 19 fi
9-echo >>$m 'PCILIBPC=$(LIBNAME).pc' 20-echo >>$m 'PCILIBPC=$(LIBNAME).pc'
10+echo >>$m 'PCILIBPC=libpci.pc' 21+echo >>$m 'PCILIBPC=libpci.pc'
11  22
12 echo >>$c "#define PCILIB_VERSION \"$VERSION\"" 23 echo >>$c "#define PCILIB_VERSION \"$VERSION\""
13 sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m 24 sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m