[pkgsrc/trunk]: pkgsrc/sysutils/xentools411 xentools411: adapt for pciutils 3.8

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/89d98d5889a1
branches:  trunk
changeset: 379257:89d98d5889a1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 13 15:53:08 2022 +0000

description:
xentools411: adapt for pciutils 3.8

Untested because of

In file included from include/ipxe/uaccess.h:27,
                 from core/acpi.c:28:
./config/ioapi.h:17:10: fatal error: config/local/ioapi.h: No such file or directory
   17 | #include <config/local/ioapi.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~

on -current/amd64.

diffstat:

 sysutils/xentools411/Makefile                                                   |   5 +-
 sysutils/xentools411/distinfo                                                   |   4 +-
 sysutils/xentools411/patches/patch-tools_qemu-xen-traditional_hw_pass-through.h |  18 ----------
 sysutils/xentools411/patches/patch-tools_qemu-xen-traditional_hw_piix4acpi.c    |  17 ---------
 4 files changed, 4 insertions(+), 40 deletions(-)

diffs (82 lines):

diff -r 0e7ba6c623f5 -r 89d98d5889a1 sysutils/xentools411/Makefile
--- a/sysutils/xentools411/Makefile     Fri May 13 15:46:09 2022 +0000
+++ b/sysutils/xentools411/Makefile     Fri May 13 15:53:08 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2022/05/05 08:27:13 nia Exp $
+# $NetBSD: Makefile,v 1.33 2022/05/13 15:53:08 wiz Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
-PKGREVISION=   7
+PKGREVISION=   8
 .include       "version.mk"
 
 DIST_IPXE=     ipxe-git-${VERSION_IPXE}.tar.gz
@@ -238,6 +238,7 @@
 #.include "../../devel/SDL/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pciutils+=       pciutils>=3.8
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
diff -r 0e7ba6c623f5 -r 89d98d5889a1 sysutils/xentools411/distinfo
--- a/sysutils/xentools411/distinfo     Fri May 13 15:46:09 2022 +0000
+++ b/sysutils/xentools411/distinfo     Fri May 13 15:53:08 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:20:25 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/05/13 15:53:08 wiz Exp $
 
 BLAKE2s (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 4a7456f18df85a639d003b3e8c926414f421cd77e032da9813fdc9beaf871795
 SHA512 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 
bbcce5e55040e7e29adebd4a5253a046016a6e2e7ff34cf801a42d147e1ec1af57e0297318249bfa9c5bbeac969fe4b37c18cbf845a80b2136d65387a4fc31da
@@ -72,8 +72,6 @@
 SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea
 SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e
 SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1
-SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.h) = 6edb7a9a03d99b84801bf595c4d68acbc361bb4b
-SHA1 (patch-tools_qemu-xen-traditional_hw_piix4acpi.c) = 280265db035e239b173efd9d63b629201d2c0cfa
 SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a
 SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738
 SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.h) = 787447cc24518fe5ae16942d72d3038db612419d
diff -r 0e7ba6c623f5 -r 89d98d5889a1 sysutils/xentools411/patches/patch-tools_qemu-xen-traditional_hw_pass-through.h
--- a/sysutils/xentools411/patches/patch-tools_qemu-xen-traditional_hw_pass-through.h   Fri May 13 15:46:09 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_qemu-xen-traditional_hw_pass-through.h,v 1.1 2018/07/24 13:40:11 bouyer Exp $
-
---- tools/qemu-xen-traditional/hw/pass-through.h.orig  2014-10-06 17:50:24.000000000 +0200
-+++ tools/qemu-xen-traditional/hw/pass-through.h       2015-01-19 13:16:38.000000000 +0100
-@@ -20,8 +20,13 @@
- 
- #include "hw.h"
- #include "pci.h"
-+#ifdef __NetBSD__
-+#include "pciutils/header.h"
-+#include "pciutils/pci.h"
-+#else
- #include "pci/header.h"
- #include "pci/pci.h"
-+#endif
- #include "exec-all.h"
- #include "sys-queue.h"
- #include "qemu-timer.h"
diff -r 0e7ba6c623f5 -r 89d98d5889a1 sysutils/xentools411/patches/patch-tools_qemu-xen-traditional_hw_piix4acpi.c
--- a/sysutils/xentools411/patches/patch-tools_qemu-xen-traditional_hw_piix4acpi.c      Fri May 13 15:46:09 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-tools_qemu-xen-traditional_hw_piix4acpi.c,v 1.1 2018/07/24 13:40:11 bouyer Exp $
-
---- tools/qemu-xen-traditional/hw/piix4acpi.c.orig     2014-10-06 17:50:24.000000000 +0200
-+++ tools/qemu-xen-traditional/hw/piix4acpi.c  2015-01-19 13:16:38.000000000 +0100
-@@ -41,8 +41,12 @@
- #define PIIX4ACPI_LOG(level, fmt, ...) do { if (level <= PIIX4ACPI_LOGLEVEL) qemu_log(fmt, ## __VA_ARGS__); } while (0)
- 
- #ifdef CONFIG_PASSTHROUGH
-+#ifdef __NetBSD__
-+#include <pciutils/header.h>
-+#else
- #include <pci/header.h>
- #endif
-+#endif
- 
- /* PM1a_CNT bits, as defined in the ACPI specification. */
- #define SCI_EN            (1 <<  0)