Tue Jul 5 15:56:33 2022 UTC ()
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


(bouyer)
diff -r1.23 -r1.24 pkgsrc/sysutils/xenstoretools/Makefile
diff -r1.18 -r1.19 pkgsrc/sysutils/xentools415/Makefile
diff -r1.10 -r1.11 pkgsrc/sysutils/xentools415/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/xentools415/version.mk
cvs diff -r1.23 -r1.24 pkgsrc/sysutils/xenstoretools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenstoretools/Makefile 2022/06/30 11:18:52 1.23
+++ pkgsrc/sysutils/xenstoretools/Makefile 2022/07/05 15:56:33 1.24
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2022/06/30 11:18:52 nia Exp $ 1# $NetBSD: Makefile,v 1.24 2022/07/05 15:56:33 bouyer Exp $
2# 2#
3 3
4# VERSION is set in xentool415/version.mk 4# VERSION is set in xentool415/version.mk
5PKGREVISION= 1 
6.include "../../sysutils/xentools415/version.mk" 5.include "../../sysutils/xentools415/version.mk"
7 6
8PKGNAME= xenstoretools-${VERSION} 7PKGNAME= xenstoretools-${VERSION}
9CATEGORIES= sysutils 8CATEGORIES= sysutils
10 9
11MAINTAINER= sborrill@NetBSD.org 10MAINTAINER= sborrill@NetBSD.org
12HOMEPAGE= http://xen.org/ 11HOMEPAGE= http://xen.org/
13COMMENT= Xenstore Tools for Xen 4.15.x 12COMMENT= Xenstore Tools for Xen 4.15.x
14 13
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16DISTINFO_FILE= ${.CURDIR}/../../sysutils/xentools415/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../sysutils/xentools415/distinfo
17PATCHDIR= ${.CURDIR}/../../sysutils/xentools415/patches 16PATCHDIR= ${.CURDIR}/../../sysutils/xentools415/patches
18INSTALL_DIRS= tools/xenstore tools/libs/toolcore tools/libs/store 17INSTALL_DIRS= tools/xenstore tools/libs/toolcore tools/libs/store
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/xentools415/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools415/Makefile 2022/07/01 13:07:37 1.18
+++ pkgsrc/sysutils/xentools415/Makefile 2022/07/05 15:56:33 1.19
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.18 2022/07/01 13:07:37 bouyer Exp $ 1# $NetBSD: Makefile,v 1.19 2022/07/05 15:56:33 bouyer Exp $
2# 2#
3# VERSION is set in version.mk as it is shared with other packages 3# VERSION is set in version.mk as it is shared with other packages
4.include "version.mk" 4.include "version.mk"
5PKGNAME= xentools415-${VERSION} 5PKGNAME= xentools415-${VERSION}
6PKGREVISION= 3 
7 6
8CATEGORIES= sysutils 7CATEGORIES= sysutils
9 8
10MAINTAINER= bouyer@NetBSD.org 9MAINTAINER= bouyer@NetBSD.org
11HOMEPAGE= https://xenproject.org/ 10HOMEPAGE= https://xenproject.org/
12COMMENT= Userland Tools for Xen 4.15.x 11COMMENT= Userland Tools for Xen 4.15.x
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15# XXX add version check: Xen requires dev86 >= 0.16.14 14# XXX add version check: Xen requires dev86 >= 0.16.14
16BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware 15BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
17.if !exists(/usr/bin/iasl) 16.if !exists(/usr/bin/iasl)
18BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils 17BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
19.endif 18.endif
20DEPENDS+= ${PYPKGPREFIX}-curses>=0:../../devel/py-curses 19DEPENDS+= ${PYPKGPREFIX}-curses>=0:../../devel/py-curses
21 20
 21TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 22PYTHON_VERSIONS_INCOMPATIBLE= 27
 23
22PKG_SYSCONFSUBDIR= xen 24PKG_SYSCONFSUBDIR= xen
23 25
24ONLY_FOR_PLATFORM= NetBSD-9.99.6[4-9]-x86_64 NetBSD-9.99.[7-9]*-x86_64 26ONLY_FOR_PLATFORM= NetBSD-9.99.6[4-9]-x86_64 NetBSD-9.99.[7-9]*-x86_64
25ONLY_FOR_PLATFORM+= NetBSD-9.[1-9]-x86_64 27ONLY_FOR_PLATFORM+= NetBSD-9.[1-9]-x86_64
26ONLY_FOR_PLATFORM+= NetBSD-9.[1-9]_*-x86_64 28ONLY_FOR_PLATFORM+= NetBSD-9.[1-9]_*-x86_64
27ONLY_FOR_PLATFORM+= NetBSD-9.0_STABLE-x86_64 29ONLY_FOR_PLATFORM+= NetBSD-9.0_STABLE-x86_64
28 30
29SSP_SUPPORTED= no 31SSP_SUPPORTED= no
30MKPIE_SUPPORTED= no 32MKPIE_SUPPORTED= no
31 33
32CONFLICTS+= libxen-[0-9]* 34CONFLICTS+= libxen-[0-9]*
33CONFLICTS+= xenstoretools-[0-9]* 35CONFLICTS+= xenstoretools-[0-9]*
34 36
@@ -149,26 +151,27 @@ pre-build: @@ -149,26 +151,27 @@ pre-build:
149 pod2man -n xl.conf >${WRKDIR}/xl.conf.5 151 pod2man -n xl.conf >${WRKDIR}/xl.conf.5
150 ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 152 ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
151 ${WRKSRC}/docs/man/xl.1.pod.in |\ 153 ${WRKSRC}/docs/man/xl.1.pod.in |\
152 pod2man -n xl >${WRKDIR}/xl.1 154 pod2man -n xl >${WRKDIR}/xl.1
153 ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 155 ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
154 ${WRKSRC}/docs/man/xlcpupool.cfg.5.pod |\ 156 ${WRKSRC}/docs/man/xlcpupool.cfg.5.pod |\
155 pod2man -n xlcpupool.cfg >${WRKDIR}/xlcpupool.cfg.5 157 pod2man -n xlcpupool.cfg >${WRKDIR}/xlcpupool.cfg.5
156 ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 158 ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
157 ${WRKSRC}/docs/man/xl-disk-configuration.5.pod |\ 159 ${WRKSRC}/docs/man/xl-disk-configuration.5.pod |\
158 pod2man -n xl-disk-configuration >${WRKDIR}/xl-disk-configuration.5 160 pod2man -n xl-disk-configuration >${WRKDIR}/xl-disk-configuration.5
159 161
160INSTALLATION_DIRS= ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 162INSTALLATION_DIRS= ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
161INSTALLATION_DIRS+= ${PKGMANDIR}/man8 share/doc/xen 163INSTALLATION_DIRS+= ${PKGMANDIR}/man8 share/doc/xen
 164INSTALLATION_DIRS+= ${PYSITELIB}
162 165
163BUILD_DEFS+= VARBASE 166BUILD_DEFS+= VARBASE
164 167
165do-build: 168do-build:
166 cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-tools 169 cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-tools
167 cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-docs 170 cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-docs
168 171
169do-install: 172do-install:
170 cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-tools 173 cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-tools
171 cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-docs 174 cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-docs
172 175
173post-install: 176post-install:
174 ${INSTALL_MAN} ${WRKDIR}/xenstore-chmod.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 177 ${INSTALL_MAN} ${WRKDIR}/xenstore-chmod.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
@@ -211,27 +214,27 @@ EXTRA_CFLAGS+= -Wno-error=ignored-attrib @@ -211,27 +214,27 @@ EXTRA_CFLAGS+= -Wno-error=ignored-attrib
211 -Wno-error=unused-function -Wno-error=format \ 214 -Wno-error=unused-function -Wno-error=format \
212 -Wno-error=unused-const-variable \ 215 -Wno-error=unused-const-variable \
213 -Wno-error=gnu-designator -Wno-error=uninitialized \ 216 -Wno-error=gnu-designator -Wno-error=uninitialized \
214 -Wno-error=parentheses-equality \ 217 -Wno-error=parentheses-equality \
215 -Wno-error=enum-conversion \ 218 -Wno-error=enum-conversion \
216 -Wno-error=address-of-packed-member 219 -Wno-error=address-of-packed-member
217BUILDLINK_TRANSFORM+= rm:-falign-jumps=1 rm:-falign-loops=1 \ 220BUILDLINK_TRANSFORM+= rm:-falign-jumps=1 rm:-falign-loops=1 \
218 rm:-mpreferred-stack-boundary=2 221 rm:-mpreferred-stack-boundary=2
219.endif 222.endif
220 223
221MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*:Q} TARGET_CC=${TARGET_CC} 224MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*:Q} TARGET_CC=${TARGET_CC}
222 225
223.include "../../lang/python/application.mk" 226.include "../../lang/python/application.mk"
224.include "../../lang/python/egg.mk" 227.include "../../lang/python/extension.mk"
225#.include "../../devel/SDL/buildlink3.mk" 228#.include "../../devel/SDL/buildlink3.mk"
226.include "../../lang/ocaml/buildlink3.mk" 229.include "../../lang/ocaml/buildlink3.mk"
227.include "../../devel/ocaml-findlib/buildlink3.mk" 230.include "../../devel/ocaml-findlib/buildlink3.mk"
228BUILDLINK_API_DEPENDS.pciutils+= pciutils>=3.8 231BUILDLINK_API_DEPENDS.pciutils+= pciutils>=3.8
229.include "../../sysutils/pciutils/buildlink3.mk" 232.include "../../sysutils/pciutils/buildlink3.mk"
230.include "../../devel/glib2/buildlink3.mk" 233.include "../../devel/glib2/buildlink3.mk"
231.include "../../devel/yajl/buildlink3.mk" 234.include "../../devel/yajl/buildlink3.mk"
232.include "../../devel/argp/buildlink3.mk" 235.include "../../devel/argp/buildlink3.mk"
233.include "../../security/libgcrypt/buildlink3.mk" 236.include "../../security/libgcrypt/buildlink3.mk"
234.include "../../x11/pixman/buildlink3.mk" 237.include "../../x11/pixman/buildlink3.mk"
235 238
236.include "../../mk/curses.buildlink3.mk" 239.include "../../mk/curses.buildlink3.mk"
237.include "../../mk/bsd.pkg.mk" 240.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/xentools415/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools415/distinfo 2022/06/09 17:11:27 1.10
+++ pkgsrc/sysutils/xentools415/distinfo 2022/07/05 15:56:33 1.11
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.10 2022/06/09 17:11:27 bouyer Exp $ 1$NetBSD: distinfo,v 1.11 2022/07/05 15:56:33 bouyer Exp $
2 2
3BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b 3BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
4SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403 4SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
5Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes 5Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes
6BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d 6BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d
7SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238 7SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
8Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes 8Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
9BLAKE2s (xen415/xen-4.15.2.tar.gz) = f6e3d354a144c9ff49a198ebcafbd5e8a4414690d5672b3e2ed394c461ab8ab0 9BLAKE2s (xen415/xen-4.15.3.tar.gz) = ce8af440eed3c04c6a14454ad7138d78ee179e5fc875c1eb06e6b7ea1454dda8
10SHA512 (xen415/xen-4.15.2.tar.gz) = 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54 10SHA512 (xen415/xen-4.15.3.tar.gz) = c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
11Size (xen415/xen-4.15.2.tar.gz) = 40773378 bytes 11Size (xen415/xen-4.15.3.tar.gz) = 40793144 bytes
12SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3 12SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
13SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6 13SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
14SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21 14SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
15SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765 15SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
16SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4 16SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4
17SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81 17SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81
18SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86 18SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86
19SHA1 (patch-docs_misc_vtd.txt) = 26c12a3023315f35a6f59b6715b811c989c67680 19SHA1 (patch-docs_misc_vtd.txt) = 26c12a3023315f35a6f59b6715b811c989c67680
20SHA1 (patch-tools_Makefile) = 65dcdf590339717db22fd89fadab3aaa68d9b6a4 20SHA1 (patch-tools_Makefile) = 65dcdf590339717db22fd89fadab3aaa68d9b6a4
21SHA1 (patch-tools_configure) = 93cb52d3d650aa9b04b4eb0a00f8fa51c46b81ce 21SHA1 (patch-tools_configure) = 93cb52d3d650aa9b04b4eb0a00f8fa51c46b81ce
22SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0 22SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0
23SHA1 (patch-tools_examples_Makefile) = d43095ab76444fd16a6f63b93fc68606452fb893 23SHA1 (patch-tools_examples_Makefile) = d43095ab76444fd16a6f63b93fc68606452fb893
24SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf 24SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/xentools415/version.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools415/version.mk 2022/06/28 16:26:34 1.1
+++ pkgsrc/sysutils/xentools415/version.mk 2022/07/05 15:56:33 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: version.mk,v 1.1 2022/06/28 16:26:34 bouyer Exp $ 1# $NetBSD: version.mk,v 1.2 2022/07/05 15:56:33 bouyer Exp $
2# 2#
3# Version number is used by xentools415 and xenstoretools 3# Version number is used by xentools415 and xenstoretools
4 4
5VERSION= 4.15.2 5VERSION= 4.15.3
6 6
7DIST_SUBDIR= xen415 7DIST_SUBDIR= xen415
8DISTNAME= xen-${VERSION} 8DISTNAME= xen-${VERSION}
9MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 9MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
10DISTFILES= ${DISTNAME}.tar.gz 10DISTFILES= ${DISTNAME}.tar.gz
11 11
12IPXE_VERSION= 988d2c13cdf0f0b4140685af35ced70ac5b3283c 12IPXE_VERSION= 988d2c13cdf0f0b4140685af35ced70ac5b3283c
13IPXE_DIST= ipxe-${IPXE_VERSION}.tar.gz 13IPXE_DIST= ipxe-${IPXE_VERSION}.tar.gz
14DISTFILES+= ${IPXE_DIST} 14DISTFILES+= ${IPXE_DIST}
15SITES.${IPXE_DIST}= -https://github.com/ipxe/ipxe/archive/${IPXE_VERSION}.tar.gz 15SITES.${IPXE_DIST}= -https://github.com/ipxe/ipxe/archive/${IPXE_VERSION}.tar.gz
16 16
17SEABIOS_VERSION= 1.14.0 17SEABIOS_VERSION= 1.14.0
18SEABIOS_DIST= seabios-${SEABIOS_VERSION}.tar.gz 18SEABIOS_DIST= seabios-${SEABIOS_VERSION}.tar.gz