From d67b7555c703526c8ea9bcfaa3f53577dac48873 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer@pkgsrc.org>
Date: Tue, 5 Jul 2022 15:56:33 +0000
Subject: Update xentools415 and xenstoretools to 4.15.3. pkgsrc changes: drop
 egg.mk from xentools415 (it's not suitable for this package and causes
 duplicate targets); and instead mark as incompatible with python2.7 and
 TOOL_DEPEND on py-setuptool. See
 http://mail-index.netbsd.org/tech-pkg/2022/07/04/msg026500.html and followups
 for details

Upstream changes are mostly bugfixes
---
 sysutils/xenstoretools/Makefile | 3 +--
 sysutils/xentools415/Makefile   | 9 ++++++---
 sysutils/xentools415/distinfo   | 8 ++++----
 sysutils/xentools415/version.mk | 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/sysutils/xenstoretools/Makefile b/sysutils/xenstoretools/Makefile
index 2389c0915c8..00f53bee3b3 100644
--- a/sysutils/xenstoretools/Makefile
+++ b/sysutils/xenstoretools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2022/06/30 11:18:52 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/07/05 15:56:33 bouyer Exp $
 #
 
 # VERSION is set in xentool415/version.mk
-PKGREVISION=		1
 .include		"../../sysutils/xentools415/version.mk"
 
 PKGNAME=		xenstoretools-${VERSION}
diff --git a/sysutils/xentools415/Makefile b/sysutils/xentools415/Makefile
index 97eb9264600..1638b585f3b 100644
--- a/sysutils/xentools415/Makefile
+++ b/sysutils/xentools415/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/07/01 13:07:37 bouyer Exp $
+# $NetBSD: Makefile,v 1.19 2022/07/05 15:56:33 bouyer Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include        "version.mk"
 PKGNAME=		xentools415-${VERSION}
-PKGREVISION=    	3
 
 CATEGORIES=		sysutils
 
@@ -19,6 +18,9 @@ BUILD_DEPENDS+=	acpica-utils-[0-9]*:../../sysutils/acpica-utils
 .endif
 DEPENDS+=	${PYPKGPREFIX}-curses>=0:../../devel/py-curses
 
+TOOL_DEPENDS+=  ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 PKG_SYSCONFSUBDIR=	xen
 
 ONLY_FOR_PLATFORM=	NetBSD-9.99.6[4-9]-x86_64 NetBSD-9.99.[7-9]*-x86_64
@@ -159,6 +161,7 @@ pre-build:
 
 INSTALLATION_DIRS=	${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=	${PKGMANDIR}/man8 share/doc/xen
+INSTALLATION_DIRS+=	${PYSITELIB}
 
 BUILD_DEFS+=		VARBASE
 
@@ -221,7 +224,7 @@ BUILDLINK_TRANSFORM+=	rm:-falign-jumps=1 rm:-falign-loops=1 \
 MAKE_ENV+=	EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*:Q} TARGET_CC=${TARGET_CC}
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/extension.mk"
 #.include "../../devel/SDL/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
diff --git a/sysutils/xentools415/distinfo b/sysutils/xentools415/distinfo
index ba4b94296cc..71a1da8e290 100644
--- a/sysutils/xentools415/distinfo
+++ b/sysutils/xentools415/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2022/06/09 17:11:27 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2022/07/05 15:56:33 bouyer Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
@@ -6,9 +6,9 @@ Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 byt
 BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d
 SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
 Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
-BLAKE2s (xen415/xen-4.15.2.tar.gz) = f6e3d354a144c9ff49a198ebcafbd5e8a4414690d5672b3e2ed394c461ab8ab0
-SHA512 (xen415/xen-4.15.2.tar.gz) = 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
-Size (xen415/xen-4.15.2.tar.gz) = 40773378 bytes
+BLAKE2s (xen415/xen-4.15.3.tar.gz) = ce8af440eed3c04c6a14454ad7138d78ee179e5fc875c1eb06e6b7ea1454dda8
+SHA512 (xen415/xen-4.15.3.tar.gz) = c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
+Size (xen415/xen-4.15.3.tar.gz) = 40793144 bytes
 SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
 SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
 SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
diff --git a/sysutils/xentools415/version.mk b/sysutils/xentools415/version.mk
index 6d5689c945d..f128bd811ff 100644
--- a/sysutils/xentools415/version.mk
+++ b/sysutils/xentools415/version.mk
@@ -1,8 +1,8 @@
-# $NetBSD: version.mk,v 1.1 2022/06/28 16:26:34 bouyer Exp $
+# $NetBSD: version.mk,v 1.2 2022/07/05 15:56:33 bouyer Exp $
 #
 # Version number is used by xentools415 and xenstoretools
 
-VERSION=	4.15.2
+VERSION=	4.15.3
 
 DIST_SUBDIR=		xen415
 DISTNAME=		xen-${VERSION}
-- 
cgit v1.2.3