[pkgsrc/trunk]: pkgsrc/sysutils/xentools413 xentools413: merge some changes f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5a7525a782c
branches:  trunk
changeset: 383313:a5a7525a782c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Aug 17 17:40:04 2022 +0000

description:
xentools413: merge some changes from xentools415.

Install more docs, fix duplicated targets.

Bump PKGREVISION.

diffstat:

 sysutils/xentools413/Makefile |   14 +-
 sysutils/xentools413/PLIST    |  353 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 322 insertions(+), 45 deletions(-)

diffs (truncated from 455 to 300 lines):

diff -r fdc12e5f6c85 -r a5a7525a782c sysutils/xentools413/Makefile
--- a/sysutils/xentools413/Makefile     Wed Aug 17 17:26:35 2022 +0000
+++ b/sysutils/xentools413/Makefile     Wed Aug 17 17:40:04 2022 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2022/06/30 11:18:52 nia Exp $
+# $NetBSD: Makefile,v 1.32 2022/08/17 17:40:04 wiz Exp $
 #
 VERSION=       4.13.4
 
 DIST_SUBDIR=           xen413
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools413-${VERSION}
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 
@@ -33,6 +33,9 @@
 .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
@@ -41,7 +44,7 @@
 ONLY_FOR_PLATFORM+=    NetBSD-9.0_STABLE-x86_64
 
 SSP_SUPPORTED=         no
-MKPIE_SUPPORTED=       no
+MKPIE_SUPPORTED=       no
 
 CONFLICTS+=            libxen-[0-9]*
 CONFLICTS+=            xenstoretools-[0-9]*
@@ -172,14 +175,17 @@
 
 INSTALLATION_DIRS=     ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man8 share/doc/xen
+INSTALLATION_DIRS+=    ${PYSITELIB}
 
 BUILD_DEFS+=           VARBASE
 
 do-build:
        cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-tools
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-docs
 
 do-install:
        cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-tools
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} DESTDIR=${DESTDIR} install-docs
 
 post-install:
        ${INSTALL_MAN} ${WRKDIR}/xenstore-chmod.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
@@ -232,7 +238,7 @@
 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 -r fdc12e5f6c85 -r a5a7525a782c sysutils/xentools413/PLIST
--- a/sysutils/xentools413/PLIST        Wed Aug 17 17:26:35 2022 +0000
+++ b/sysutils/xentools413/PLIST        Wed Aug 17 17:40:04 2022 +0000
@@ -1,43 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/03/14 19:50:12 markd Exp $
-${PYSITELIB}/grub/ExtLinuxConf.py
-${PYSITELIB}/grub/ExtLinuxConf.pyc
-${PYSITELIB}/grub/GrubConf.py
-${PYSITELIB}/grub/GrubConf.pyc
-${PYSITELIB}/grub/LiloConf.py
-${PYSITELIB}/grub/LiloConf.pyc
-${PYSITELIB}/grub/__init__.py
-${PYSITELIB}/grub/__init__.pyc
-${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/pygrub-0.6-py${PYVERSSUFFIX}.egg-info/top_level.txt
-${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/xen-3.0-py${PYVERSSUFFIX}.egg-info/top_level.txt
-${PYSITELIB}/xenfsimage.so
-${PYSITELIB}/xen/__init__.py
-${PYSITELIB}/xen/__init__.pyc
-${PYSITELIB}/xen/lowlevel/__init__.py
-${PYSITELIB}/xen/lowlevel/__init__.pyc
-${PYSITELIB}/xen/lowlevel/xc.so
-${PYSITELIB}/xen/lowlevel/xs.so
-${PYSITELIB}/xen/migration/__init__.py
-${PYSITELIB}/xen/migration/__init__.pyc
-${PYSITELIB}/xen/migration/legacy.py
-${PYSITELIB}/xen/migration/legacy.pyc
-${PYSITELIB}/xen/migration/libxc.py
-${PYSITELIB}/xen/migration/libxc.pyc
-${PYSITELIB}/xen/migration/libxl.py
-${PYSITELIB}/xen/migration/libxl.pyc
-${PYSITELIB}/xen/migration/public.py
-${PYSITELIB}/xen/migration/public.pyc
-${PYSITELIB}/xen/migration/tests.py
-${PYSITELIB}/xen/migration/tests.pyc
-${PYSITELIB}/xen/migration/verify.py
-${PYSITELIB}/xen/migration/verify.pyc
-${PYSITELIB}/xen/migration/xl.py
-${PYSITELIB}/xen/migration/xl.pyc
+@comment $NetBSD: PLIST,v 1.4 2022/08/17 17:40:04 wiz Exp $
 bin/pygrub
 bin/qemu-img-xen
 bin/xen-cpuid
@@ -286,6 +247,45 @@
 lib/pkgconfig/xentoolcore.pc
 lib/pkgconfig/xentoollog.pc
 lib/pkgconfig/xlutil.pc
+${PYSITELIB}/grub/ExtLinuxConf.py
+${PYSITELIB}/grub/ExtLinuxConf.pyc
+${PYSITELIB}/grub/GrubConf.py
+${PYSITELIB}/grub/GrubConf.pyc
+${PYSITELIB}/grub/LiloConf.py
+${PYSITELIB}/grub/LiloConf.pyc
+${PYSITELIB}/grub/__init__.py
+${PYSITELIB}/grub/__init__.pyc
+${PYSITELIB}/pygrub-0.6-py3.10.egg-info/PKG-INFO
+${PYSITELIB}/pygrub-0.6-py3.10.egg-info/SOURCES.txt
+${PYSITELIB}/pygrub-0.6-py3.10.egg-info/dependency_links.txt
+${PYSITELIB}/pygrub-0.6-py3.10.egg-info/top_level.txt
+${PYSITELIB}/xen-3.0-py3.10.egg-info/PKG-INFO
+${PYSITELIB}/xen-3.0-py3.10.egg-info/SOURCES.txt
+${PYSITELIB}/xen-3.0-py3.10.egg-info/dependency_links.txt
+${PYSITELIB}/xen-3.0-py3.10.egg-info/top_level.txt
+${PYSITELIB}/xen/__init__.py
+${PYSITELIB}/xen/__init__.pyc
+${PYSITELIB}/xen/lowlevel/__init__.py
+${PYSITELIB}/xen/lowlevel/__init__.pyc
+${PYSITELIB}/xen/lowlevel/xc.so
+${PYSITELIB}/xen/lowlevel/xs.so
+${PYSITELIB}/xen/migration/__init__.py
+${PYSITELIB}/xen/migration/__init__.pyc
+${PYSITELIB}/xen/migration/legacy.py
+${PYSITELIB}/xen/migration/legacy.pyc
+${PYSITELIB}/xen/migration/libxc.py
+${PYSITELIB}/xen/migration/libxc.pyc
+${PYSITELIB}/xen/migration/libxl.py
+${PYSITELIB}/xen/migration/libxl.pyc
+${PYSITELIB}/xen/migration/public.py
+${PYSITELIB}/xen/migration/public.pyc
+${PYSITELIB}/xen/migration/tests.py
+${PYSITELIB}/xen/migration/tests.pyc
+${PYSITELIB}/xen/migration/verify.py
+${PYSITELIB}/xen/migration/verify.pyc
+${PYSITELIB}/xen/migration/xl.py
+${PYSITELIB}/xen/migration/xl.pyc
+${PYSITELIB}/xenfsimage.so
 lib/xenfsimage/ext2fs/fsimage.so
 lib/xenfsimage/fat/fsimage.so
 lib/xenfsimage/iso9660/fsimage.so
@@ -316,13 +316,23 @@
 libexec/xen/boot/xen-shim
 man/man1/xenstore-chmod.1
 man/man1/xenstore-ls.1
+man/man1/xenstore-read.1
+man/man1/xenstore-write.1
 man/man1/xenstore.1
 man/man1/xentop.1
 man/man1/xentrace_format.1
 man/man1/xl.1
+man/man5/xl-disk-configuration.5
+man/man5/xl-network-configuration.5
 man/man5/xl.cfg.5
 man/man5/xl.conf.5
 man/man5/xlcpupool.cfg.5
+man/man7/xen-pci-device-reservations.7
+man/man7/xen-pv-channel.7
+man/man7/xen-tscmode.7
+man/man7/xen-vtpm.7
+man/man7/xen-vtpmmgr.7
+man/man7/xl-numa-placement.7
 man/man8/xentrace.8
 sbin/flask-get-bool
 sbin/flask-getenforce
@@ -356,6 +366,268 @@
 sbin/xentrace_setsize
 sbin/xenwatchdogd
 sbin/xl
+share/doc/xen/html/hypercall/arm/.deps
+share/doc/xen/html/hypercall/arm/include,public,arch-arm,hvm,save.h.html
+share/doc/xen/html/hypercall/arm/include,public,arch-arm,smccc.h.html
+share/doc/xen/html/hypercall/arm/include,public,arch-arm.h.html
+share/doc/xen/html/hypercall/arm/include,public,argo.h.html
+share/doc/xen/html/hypercall/arm/include,public,callback.h.html
+share/doc/xen/html/hypercall/arm/include,public,device_tree_defs.h.html
+share/doc/xen/html/hypercall/arm/include,public,dom0_ops.h.html
+share/doc/xen/html/hypercall/arm/include,public,domctl.h.html
+share/doc/xen/html/hypercall/arm/include,public,elfnote.h.html
+share/doc/xen/html/hypercall/arm/include,public,errno.h.html
+share/doc/xen/html/hypercall/arm/include,public,event_channel.h.html
+share/doc/xen/html/hypercall/arm/include,public,features.h.html
+share/doc/xen/html/hypercall/arm/include,public,grant_table.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,dm_op.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,e820.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_info_table.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_op.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_vcpu.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,hvm_xs_strings.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,ioreq.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,params.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,pvdrivers.h.html
+share/doc/xen/html/hypercall/arm/include,public,hvm,save.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,9pfs.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,blkif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,cameraif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,console.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,displif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,fbif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,fsif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,kbdif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,libxenvchan.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,netif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,pciif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,protocols.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,pvcalls.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,ring.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,sndif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,tpmif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,usbif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,vscsiif.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,xenbus.h.html
+share/doc/xen/html/hypercall/arm/include,public,io,xs_wire.h.html
+share/doc/xen/html/hypercall/arm/include,public,kexec.h.html
+share/doc/xen/html/hypercall/arm/include,public,memory.h.html
+share/doc/xen/html/hypercall/arm/include,public,nmi.h.html
+share/doc/xen/html/hypercall/arm/include,public,physdev.h.html
+share/doc/xen/html/hypercall/arm/include,public,platform.h.html
+share/doc/xen/html/hypercall/arm/include,public,pmu.h.html
+share/doc/xen/html/hypercall/arm/include,public,sched.h.html
+share/doc/xen/html/hypercall/arm/include,public,sysctl.h.html
+share/doc/xen/html/hypercall/arm/include,public,tmem.h.html
+share/doc/xen/html/hypercall/arm/include,public,trace.h.html
+share/doc/xen/html/hypercall/arm/include,public,vcpu.h.html
+share/doc/xen/html/hypercall/arm/include,public,version.h.html
+share/doc/xen/html/hypercall/arm/include,public,vm_event.h.html
+share/doc/xen/html/hypercall/arm/include,public,xen-compat.h.html
+share/doc/xen/html/hypercall/arm/include,public,xen.h.html
+share/doc/xen/html/hypercall/arm/include,public,xencomm.h.html
+share/doc/xen/html/hypercall/arm/include,public,xenoprof.h.html
+share/doc/xen/html/hypercall/arm/include,public,xsm,flask_op.h.html
+share/doc/xen/html/hypercall/arm/include,xen,errno.h.html
+share/doc/xen/html/hypercall/arm/index.html
+share/doc/xen/html/hypercall/index.html
+share/doc/xen/html/hypercall/x86_32/.deps
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,cpufeatureset.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,cpuid.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,hvm,save.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,hvm,start_info.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,pmu.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,xen-mca.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,xen-x86_32.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86,xen.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,arch-x86_32.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,argo.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,callback.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,device_tree_defs.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,dom0_ops.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,domctl.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,elfnote.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,errno.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,event_channel.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,features.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,grant_table.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,dm_op.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,e820.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_info_table.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_op.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_vcpu.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,hvm_xs_strings.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,ioreq.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,params.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,pvdrivers.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,hvm,save.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,9pfs.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,blkif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,cameraif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,console.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,displif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,fbif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,fsif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,kbdif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,libxenvchan.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,netif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,pciif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,protocols.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,pvcalls.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,ring.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,sndif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,tpmif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,usbif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,vscsiif.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,xenbus.h.html
+share/doc/xen/html/hypercall/x86_32/include,public,io,xs_wire.h.html