pciutils: build libpci.so as a dynamic library. needed by firefox.

bump pkgrevision, hopefully doesn't break too many things...

6 files changed, 26 insertions, 22 deletions

diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index ad079813f35..f585628a3f5 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2021/04/23 22:24:04 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2021/12/17 20:07:24 maya Exp $
 
 DISTNAME=	pciutils-3.7.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES+=	https://www.kernel.org/pub/software/utils/pciutils/
 
@@ -17,6 +17,7 @@ ONLY_FOR_PLATFORM+=	DragonFly-*-* OpenBSD-*-* SunOS-5.11-* Haiku-*-*
 CFLAGS+=		-fPIC
 MAKE_FLAGS+=		CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=		SHARED=yes
 
 INSTALL_TARGET=		install install-lib
 USE_TOOLS+=		gmake pkg-config
@@ -24,9 +25,7 @@ REPLACE_SH=		*.sh
 
 PKGCONFIG_OVERRIDE=	lib/libpci.pc.in
 
-OPSYSVARS+=			PCIUTILS_LIBNAME
-PCIUTILS_LIBNAME.NetBSD=	pciutils
-PCIUTILS_LIBNAME.*=		pci
+.include "../../sysutils/pciutils/libname.mk"
 
 PLIST_SUBST+=		PCIUTILS_LIBNAME=${PCIUTILS_LIBNAME}
 
diff --git a/sysutils/pciutils/PLIST b/sysutils/pciutils/PLIST
index 3db0fae17c8..3c405476365 100644
--- a/sysutils/pciutils/PLIST
+++ b/sysutils/pciutils/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2020/01/23 04:26:40 msaitoh Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/12/17 20:07:24 maya Exp $
 include/pciutils/config.h
 include/pciutils/header.h
 include/pciutils/pci.h
 include/pciutils/types.h
-lib/lib${PCIUTILS_LIBNAME}.a
+lib/lib${PCIUTILS_LIBNAME}.so
+lib/lib${PCIUTILS_LIBNAME}.so.3
+lib/lib${PCIUTILS_LIBNAME}.so.${PKGVERSION}
 lib/pkgconfig/libpci.pc
 man/man5/pci.ids.5
 man/man7/pcilib.7
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
index 4b9f686f655..675f889d627 100644
--- a/sysutils/pciutils/distinfo
+++ b/sysutils/pciutils/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2021/10/26 11:20:00 nia Exp $
+$NetBSD: distinfo,v 1.38 2021/12/17 20:07:24 maya Exp $
 
 BLAKE2s (pciutils-3.7.0.tar.gz) = da0286d390bcb46d3cba1665e33edc163a895af428af2b2f1910450839431ac3
 SHA512 (pciutils-3.7.0.tar.gz) = 37c01619264d299ac1e367a022637d60ab2bf6e5533fe9d37b2d37fdc5070563b78bfedc200b6bcb9192ce43fdec09ff350080c3e3ba504b90766d004398efc5
 Size (pciutils-3.7.0.tar.gz) = 507777 bytes
-SHA1 (patch-aa) = f609713b035dd20dcdc1f8cdc15f9b280598e89a
+SHA1 (patch-aa) = 4c5c8950868627c7175a3544dccb6f645fd9c52d
 SHA1 (patch-ab) = 14786e702cceaea9146f34a5a301650d2092d689
 SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29
-SHA1 (patch-lib_i386-io-sunos.h) = afb666796a6b220d868a41e4fb9fd9e42152faed
+SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24
diff --git a/sysutils/pciutils/libname.mk b/sysutils/pciutils/libname.mk
new file mode 100644
index 00000000000..973107a3668
--- /dev/null
+++ b/sysutils/pciutils/libname.mk
@@ -0,0 +1,5 @@
+# $NetBSD: libname.mk,v 1.1 2021/12/17 20:07:24 maya Exp $
+
+OPSYSVARS+=			PCIUTILS_LIBNAME
+PCIUTILS_LIBNAME.NetBSD=	pciutils
+PCIUTILS_LIBNAME.*=		pci
diff --git a/sysutils/pciutils/patches/patch-aa b/sysutils/pciutils/patches/patch-aa
index ca8bce092c9..d128578a579 100644
--- a/sysutils/pciutils/patches/patch-aa
+++ b/sysutils/pciutils/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.26 2020/06/01 15:47:53 msaitoh Exp $
+$NetBSD: patch-aa,v 1.27 2021/12/17 20:07:24 maya Exp $
 
 Adapt the Makefile to make it compliant with pkgsrc.
 
---- Makefile.orig	2020-05-31 07:17:26.000000000 +0900
-+++ Makefile	2020-06-01 17:39:19.929850506 +0900
+--- Makefile.orig	2020-05-30 22:17:26.000000000 +0000
++++ Makefile
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
  # (c) 1998--2020 Martin Mares <mj@ucw.cz>
@@ -23,12 +23,8 @@ Adapt the Makefile to make it compliant with pkgsrc.
  
  # Support for resolving ID's by DNS (yes/no, default: detect)
  DNS=
-@@ -29,23 +28,23 @@ HWDB=
- 
- # ABI version suffix in the name of the shared library
- # (as we use proper symbol versioning, this seldom needs changing)
--ABI_VERSION=.3
-+ABI_VERSION=-version-info 3:0
+@@ -32,20 +31,20 @@ HWDB=
+ ABI_VERSION=.3
  
  # Installation directories
 -PREFIX=/usr/local
diff --git a/sysutils/pciutils/patches/patch-lib_i386-io-sunos.h b/sysutils/pciutils/patches/patch-lib_i386-io-sunos.h
index d628de5ccd8..a9f2f16edab 100644
--- a/sysutils/pciutils/patches/patch-lib_i386-io-sunos.h
+++ b/sysutils/pciutils/patches/patch-lib_i386-io-sunos.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_i386-io-sunos.h,v 1.1 2018/01/31 13:21:55 jperkin Exp $
+$NetBSD: patch-lib_i386-io-sunos.h,v 1.2 2021/12/17 20:07:24 maya Exp $
 
 Fix assembly syntax to work with clang.
 
---- lib/i386-io-sunos.h.orig	2011-01-07 21:04:28.000000000 +0000
+--- lib/i386-io-sunos.h.orig	2019-02-13 10:05:03.000000000 +0000
 +++ lib/i386-io-sunos.h
 @@ -27,7 +27,7 @@ static inline u8
  inb (u16 port)
@@ -22,7 +22,7 @@ Fix assembly syntax to work with clang.
    return v;
  }
  
-@@ -43,24 +43,24 @@ static inline u32
+@@ -43,26 +43,26 @@ static inline u32
  inl (u16 port)
  {
    u32 v;
@@ -51,3 +51,5 @@ Fix assembly syntax to work with clang.
 -  __asm__ __volatile__ ("outl (%w1)": :"a" (value), "Nd" (port));
 +  __asm__ __volatile__ ("outl %w1": :"a" (value), "Nd" (port));
  }
+ 
+ static inline void intel_io_lock(void)