Also remove sysutils/xenstoretools, which depends on deleted

sysutils/xentools46. Pointed out by joerg@

5 files changed, 1 insertions, 130 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index ba7dac76b08..fb9c22c56ac 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.895 2020/08/19 10:39:22 bouyer Exp $
+# $NetBSD: Makefile,v 1.896 2020/08/19 13:10:00 bouyer Exp $
 #
 
 COMMENT=	System utilities
@@ -777,7 +777,6 @@ SUBDIR+=	xdu
 SUBDIR+=	xe-guest-utilities
 SUBDIR+=	xenkernel411
 SUBDIR+=	xenkernel413
-SUBDIR+=	xenstoretools
 SUBDIR+=	xentools411
 SUBDIR+=	xentools413
 SUBDIR+=	xenvstat
diff --git a/sysutils/xenstoretools/DESCR b/sysutils/xenstoretools/DESCR
deleted file mode 100644
index 0a40b5bb284..00000000000
--- a/sysutils/xenstoretools/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package is a subset of the xentools41 package. It contains
-just the tools to manipulate xenstore from the guest VM.
diff --git a/sysutils/xenstoretools/Makefile b/sysutils/xenstoretools/Makefile
deleted file mode 100644
index 46f114b8fac..00000000000
--- a/sysutils/xenstoretools/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2020/03/08 16:51:25 wiz Exp $
-#
-
-# VERSION is set in xentool46/version.mk
-PKGREVISION=		2
-.include		"../../sysutils/xentools46/version.mk"
-
-DISTNAME=	xen-${VERSION}
-PKGNAME=	xenstoretools-${VERSION}
-CATEGORIES=	sysutils
-MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
-
-DISTFILES=					${DISTNAME}.tar.gz
-DISTFILES+=					ipxe-git-${VERSION_IPXE}.tar.gz
-SITES.ipxe-git-${VERSION_IPXE}.tar.gz +=	http://xenbits.xensource.com/xen-extfiles/
-
-MAINTAINER=		sborrill@NetBSD.org
-HOMEPAGE=		http://xen.org/
-COMMENT=		Xenstore Tools for Xen 4.6.x
-
-LICENSE=		gnu-gpl-v2
-DISTINFO_FILE=		${.CURDIR}/../../sysutils/xentools46/distinfo
-PATCHDIR=		${.CURDIR}/../../sysutils/xentools46/patches
-BUILD_DIRS=		xenstore
-BUILD_TARGET=		clients
-INSTALL_DIRS=		xenstore
-INSTALL_MAKE_FLAGS+=	XENSTORE_XENSTORED=n
-
-.if !exists(/usr/bin/iasl)
-BUILD_DEPENDS+=	acpica-utils-[0-9]*:../../sysutils/acpica-utils
-.endif
-
-GNU_CONFIGURE=		yes
-# configure checks for more components than are required to build the
-# xenstore subdirectory, so provide dummy args to allow it to complete
-# without adding unnecessary dependencies
-CONFIGURE_ARGS+=	ac_cv_path_AS86=/dummy
-CONFIGURE_ARGS+=	ac_cv_path_LD86=/dummy
-CONFIGURE_ARGS+=	ac_cv_path_BCC=/dummy
-CONFIGURE_ARGS+=	ac_cv_lib_yajl_yajl_alloc=yes
-CONFIGURE_ARGS+=	ac_cv_lib_z_deflateCopy=yes
-CONFIGURE_ARGS+=	ac_cv_header_argp_h=yes
-CONFIGURE_ARGS+=	ac_cv_lib_argp_argp_usage=yes
-CONFIGURE_ARGS+=	pixman_CFLAGS=dummy
-CONFIGURE_ARGS+=	pixman_LIBS=/dummy
-
-PKG_SYSCONFSUBDIR=	xen
-WRKSRC=			${WRKDIR}/xen-${VERSION}/tools
-BUILD_DEFS+=		VARBASE
-
-ONLY_FOR_PLATFORM=	Linux-2.6*-i386 Linux-2.6*-x86_64
-ONLY_FOR_PLATFORM+=	NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
-
-CONFLICTS+=		libxen-[0-9]*
-CONFLICTS+=		xentools20-[0-9]*
-CONFLICTS+=		xentools3*
-CONFLICTS+=		xentools4*
-
-USE_TOOLS+=		bash gmake pkg-config
-
-MAKE_ENV+=		PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
-MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
-MAKE_ENV+=		VARBASE=${VARBASE}
-
-RCD_SCRIPTS=		xendomname
-FILES_SUBST+=		PREFIX=${PREFIX}
-
-.include "../../mk/bsd.prefs.mk"
-
-INSTALLATION_DIRS=	bin include lib
-
-pre-build:
-	${LN} -s ../../xen/include/public ${WRKSRC}/xenstore/xen
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../devel/glib2/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xenstoretools/PLIST b/sysutils/xenstoretools/PLIST
deleted file mode 100644
index f8b4cc23844..00000000000
--- a/sysutils/xenstoretools/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2017/01/04 16:40:11 sborrill Exp $
-bin/xenstore
-bin/xenstore-chmod
-bin/xenstore-control
-bin/xenstore-exists
-bin/xenstore-list
-bin/xenstore-ls
-bin/xenstore-read
-bin/xenstore-rm
-bin/xenstore-watch
-bin/xenstore-write
-include/xenstore-compat/xs.h
-include/xenstore-compat/xs_lib.h
-include/xenstore.h
-include/xenstore_lib.h
-include/xs.h
-include/xs_lib.h
-lib/libxenstore.a
-lib/libxenstore.so
-lib/libxenstore.so.3.0
-lib/libxenstore.so.3.0.3
diff --git a/sysutils/xenstoretools/files/xendomname.sh b/sysutils/xenstoretools/files/xendomname.sh
deleted file mode 100644
index 6f37a9414a8..00000000000
--- a/sysutils/xenstoretools/files/xendomname.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-
-# PROVIDE: xendomname
-# REQUIRE: network mountcritlocal
-# BEFORE:  dhcpcd
-#
-# Sets the hostname to the xen domain name
-# (dhcpcd can pick it up and send it to the DHCP server.)
-#
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name=xendomname
-rcvar=$name
-start_cmd="xendomname_start"
-
-xendomname_start()
-{
-	mount /kern || true
-	dname="`@PREFIX@/bin/xenstore-read name`"
-	echo "Setting hostname to xen domain name: $dname"
-	hostname "$dname"
-}
-
-load_rc_config $name
-run_rc_command "$1"