CVS commit: pkgsrc/sysutils/xenstoretools

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue Oct 21 13:42:06 UTC 2025

Modified Files:
        pkgsrc/sysutils/xenstoretools: DESCR Makefile PLIST

Log Message:
switch xenstoretool from EOL 4.15 to 4.20_20250821


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xenstoretools/DESCR
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/xenstoretools/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/xenstoretools/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xenstoretools/DESCR
diff -u pkgsrc/sysutils/xenstoretools/DESCR:1.4 pkgsrc/sysutils/xenstoretools/DESCR:1.5
--- pkgsrc/sysutils/xenstoretools/DESCR:1.4     Tue Jun 28 16:28:06 2022
+++ pkgsrc/sysutils/xenstoretools/DESCR Tue Oct 21 13:42:06 2025
@@ -1,2 +1,2 @@
-This package is a subset of the xentools415 package. It contains
+This package is a subset of the xentools420 package. It contains
 just the tools to manipulate xenstore from the guest VM.

Index: pkgsrc/sysutils/xenstoretools/Makefile
diff -u pkgsrc/sysutils/xenstoretools/Makefile:1.29 pkgsrc/sysutils/xenstoretools/Makefile:1.30
--- pkgsrc/sysutils/xenstoretools/Makefile:1.29 Mon Mar 31 11:33:15 2025
+++ pkgsrc/sysutils/xenstoretools/Makefile      Tue Oct 21 13:42:06 2025
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.29 2025/03/31 11:33:15 sborrill Exp $
+# $NetBSD: Makefile,v 1.30 2025/10/21 13:42:06 bouyer Exp $
 #
 
-# VERSION is set in xentool415/version.mk
+# VERSION is set in xentool420/version.mk
 #PKGREVISION=          1
-.include               "../../sysutils/xentools415/version.mk"
+.include               "../../sysutils/xentools420/version.mk"
 
-PKGNAME=               xenstoretools-${VERSION}
+PKGNAME=               xenstoretools-4.20_${VERSION}
 CATEGORIES=            sysutils
 
 MAINTAINER=            sborrill%NetBSD.org@localhost
 HOMEPAGE=              http://xen.org/
-COMMENT=               Xenstore Tools for Xen 4.15.x
+COMMENT=               Xenstore Tools for Xen 4.20.x
 
 LICENSE=               gnu-gpl-v2
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/xentools415/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/xentools415/patches
-INSTALL_DIRS=          tools/xenstore tools/libs/toolcore tools/libs/store
+DISTINFO_FILE=         ${.CURDIR}/../../sysutils/xentools420/distinfo
+PATCHDIR=              ${.CURDIR}/../../sysutils/xentools420/patches
+INSTALL_DIRS=          tools/xs-clients tools/libs/toolcore tools/libs/store
 INSTALL_DIRS+=         tools/libs/toollog tools/libs/call tools/libs/evtchn
 INSTALL_DIRS+=         tools/libs/gnttab tools/libs/foreignmemory
 INSTALL_DIRS+=         tools/libs/devicemodel tools/libs/ctrl tools/libs/guest
@@ -72,6 +72,44 @@ SUBST_SED.rpath-link+=               -e 's/-rpath-lin
 
 INSTALLATION_DIRS=     bin include lib
 
+post-extract:
+       ${MV} ${WRKDIR}/${QEMU_DIST} ${WRKSRC}/tools/qemu-xen
+#${MV} ${WRKDIR}/${QEMUTRAD_DIST} ${WRKSRC}/tools/qemu-xen-traditional
+
+pre-build:
+       rm -f ${WRKSRC}/check/check_x11_devel
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xenstore-chmod.1.pod |\
+           pod2man -n xenstore-chmod >${WRKDIR}/xenstore-chmod.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xenstore-ls.1.pod |\
+           pod2man -n xenstore-ls >${WRKDIR}/xenstore-ls.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xenstore.1.pod |\
+           pod2man -n xenstore >${WRKDIR}/xenstore.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xentop.1.pod |\
+           pod2man -n xentop >${WRKDIR}/xentop.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xentrace.8.pod |\
+           pod2man -n xentrace >${WRKDIR}/xentrace.8
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl.cfg.5.pod.in |\
+           pod2man -n xl.cfg >${WRKDIR}/xl.cfg.5
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl.conf.5.pod |\
+           pod2man -n xl.conf >${WRKDIR}/xl.conf.5
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl.1.pod.in |\
+           pod2man -n xl >${WRKDIR}/xl.1
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xlcpupool.cfg.5.pod |\
+           pod2man -n xlcpupool.cfg >${WRKDIR}/xlcpupool.cfg.5
+       ${SED} -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
+               ${WRKSRC}/docs/man/xl-disk-configuration.5.pod |\
+           pod2man -n xl-disk-configuration >${WRKDIR}/xl-disk-configuration.5
+
+
 do-build:
        cd ${WRKSRC}/ && ${BUILD_MAKE_CMD} build-tools-public-headers
        cd ${WRKSRC}/tools/libs/toolcore &&                             \
@@ -95,7 +133,7 @@ do-build:
        cd ${WRKSRC}/tools/libs/guest &&                                \
                ${BUILD_MAKE_CMD} all
        ${RUN}${_ULIMIT_CMD}                                            \
-       cd ${WRKSRC}/tools/xenstore  &&                                 \
+       cd ${WRKSRC}/tools/xs-clients  &&                                 \
                ${BUILD_MAKE_CMD} clients
 
 pre-install:

Index: pkgsrc/sysutils/xenstoretools/PLIST
diff -u pkgsrc/sysutils/xenstoretools/PLIST:1.8 pkgsrc/sysutils/xenstoretools/PLIST:1.9
--- pkgsrc/sysutils/xenstoretools/PLIST:1.8     Tue Jun 28 16:28:06 2022
+++ pkgsrc/sysutils/xenstoretools/PLIST Tue Oct 21 13:42:06 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2022/06/28 16:28:06 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/10/21 13:42:06 bouyer Exp $
 bin/xenstore
 bin/xenstore-chmod
 bin/xenstore-control
@@ -9,6 +9,7 @@ bin/xenstore-read
 bin/xenstore-rm
 bin/xenstore-watch
 bin/xenstore-write
+include/xen-barrier.h
 include/xencall.h
 include/xenctrl.h
 include/xenctrl_compat.h
@@ -22,7 +23,6 @@ include/xenstore-compat/xs_lib.h
 include/xenstore.h
 include/xenstore_lib.h
 include/xentoolcore.h
-include/xentoolcore_internal.h
 include/xentoollog.h
 include/xs.h
 include/xs_lib.h
@@ -32,8 +32,8 @@ lib/libxencall.so.1
 lib/libxencall.so.1.3
 lib/libxenctrl.a
 lib/libxenctrl.so
-lib/libxenctrl.so.4.15
-lib/libxenctrl.so.4.15.0
+lib/libxenctrl.so.4.20
+lib/libxenctrl.so.4.20.0
 lib/libxendevicemodel.a
 lib/libxendevicemodel.so
 lib/libxendevicemodel.so.1
@@ -52,12 +52,12 @@ lib/libxengnttab.so.1
 lib/libxengnttab.so.1.2
 lib/libxenguest.a
 lib/libxenguest.so
-lib/libxenguest.so.4.15
-lib/libxenguest.so.4.15.0
+lib/libxenguest.so.4.20
+lib/libxenguest.so.4.20.0
 lib/libxenstore.a
 lib/libxenstore.so
-lib/libxenstore.so.3.0
-lib/libxenstore.so.3.0.3
+lib/libxenstore.so.4
+lib/libxenstore.so.4.0
 lib/libxentoolcore.a
 lib/libxentoolcore.so
 lib/libxentoolcore.so.1