CVS commit: pkgsrc/sysutils/libvirt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Nov  4 12:32:11 UTC 2023

Modified Files:
        pkgsrc/sysutils/libvirt: PLIST buildlink3.mk options.mk

Log Message:
bvirt: remove hal option

while here, remove broken xen option
Both default off, no bump needed.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/libvirt/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/libvirt/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/libvirt/options.mk

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

Modified files:

Index: pkgsrc/sysutils/libvirt/PLIST
diff -u pkgsrc/sysutils/libvirt/PLIST:1.12 pkgsrc/sysutils/libvirt/PLIST:1.13
--- pkgsrc/sysutils/libvirt/PLIST:1.12  Sat Jul  9 12:47:05 2016
+++ pkgsrc/sysutils/libvirt/PLIST       Sat Nov  4 12:32:11 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2016/07/09 12:47:05 rillig Exp $
+@comment $NetBSD: PLIST,v 1.13 2023/11/04 12:32:11 wiz Exp $
 bin/virsh
 bin/virt-host-validate
 bin/virt-pki-validate
@@ -10,9 +10,7 @@ include/libvirt/virterror.h
 lib/libvirt-lxc.la
 lib/libvirt-qemu.la
 lib/libvirt.la
-${PLIST.xen}lib/libvirt/connection-driver/libvirt_driver_libxl.la
 lib/libvirt/connection-driver/libvirt_driver_network.la
-${PLIST.hal}lib/libvirt/connection-driver/libvirt_driver_nodedev.la
 lib/libvirt/connection-driver/libvirt_driver_qemu.la
 lib/libvirt/connection-driver/libvirt_driver_secret.la
 lib/libvirt/connection-driver/libvirt_driver_storage.la

Index: pkgsrc/sysutils/libvirt/buildlink3.mk
diff -u pkgsrc/sysutils/libvirt/buildlink3.mk:1.10 pkgsrc/sysutils/libvirt/buildlink3.mk:1.11
--- pkgsrc/sysutils/libvirt/buildlink3.mk:1.10  Tue Oct 24 22:11:10 2023
+++ pkgsrc/sysutils/libvirt/buildlink3.mk       Sat Nov  4 12:32:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2023/10/24 22:11:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2023/11/04 12:32:11 wiz Exp $
 
 BUILDLINK_TREE+=       libvirt
 
@@ -21,15 +21,9 @@ BUILDLINK_PKGSRCDIR.libvirt?=        ../../sysu
 pkgbase := libvirt
 .include "../../mk/pkg-build-options.mk"
 
-.if ${PKG_BUILD_OPTIONS.libvirt:Mxen}
-.include "../../sysutils/xentools42/buildlink3.mk"
-.endif
 .if ${PKG_BUILD_OPTIONS.libvirt:Mlibssh2}
 .include "../../security/libssh2/buildlink3.mk"
 .endif
-.if ${PKG_BUILD_OPTIONS.libvirt:Mhal}
-.include "../../sysutils/hal/buildlink3.mk"
-.endif
 .if ${PKG_BUILD_OPTIONS.libvirt:Mdbus}
 .include "../../sysutils/dbus/buildlink3.mk"
 .endif

Index: pkgsrc/sysutils/libvirt/options.mk
diff -u pkgsrc/sysutils/libvirt/options.mk:1.5 pkgsrc/sysutils/libvirt/options.mk:1.6
--- pkgsrc/sysutils/libvirt/options.mk:1.5      Mon Nov  4 21:28:48 2019
+++ pkgsrc/sysutils/libvirt/options.mk  Sat Nov  4 12:32:11 2023
@@ -1,26 +1,13 @@
-# $NetBSD: options.mk,v 1.5 2019/11/04 21:28:48 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2023/11/04 12:32:11 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libvirt
 
 # Common options.
-PKG_SUPPORTED_OPTIONS+=        xen libssh2 lvm hal dbus avahi
+PKG_SUPPORTED_OPTIONS+=        libssh2 lvm dbus avahi
 PKG_SUGGESTED_OPTIONS= libssh2
 
 .include "../../mk/bsd.options.mk"
 
-# xentools42 is the only version to install
-# the include files
-PLIST_VARS+=   xen hal
-
-# xen means xen 4.2.
-.if !empty(PKG_OPTIONS:Mxen)
-PLIST.xen= yes
-CONFIGURE_ARGS+=       --without-xen
-CONFIGURE_ARGS+=       --with-libxl=${BUILDLINK_PREFIX.xentools42}
-CONFIGURE_ARGS+=       --with-xenapi=${BUILDLINK_PREFIX.xentools42}
-.  include "../../sysutils/xentools42/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mlibssh2)
 CONFIGURE_ARGS+=       --with-ssh2=${BUILDLINK_PREFIX.libssh2}
 .  include "../../security/libssh2/buildlink3.mk"
@@ -30,12 +17,6 @@ CONFIGURE_ARGS+=     --with-ssh2=${BUILDLINK
 CONFIGURE_ARGS+=       --with-storage-lvm
 .endif
 
-.if !empty(PKG_OPTIONS:Mhal)
-PLIST.hal= yes
-CONFIGURE_ARGS+=       --with-hal=${BUILDLINK_PREFIX.hal}
-.  include "../../sysutils/hal/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=       --with-dbus=${BUILDLINK_PREFIX.dbus}
 .  include "../../sysutils/dbus/buildlink3.mk"