svn commit: r477167 - head/devel/libvirt

[Roman Bogorodskiy]

Author: novel
Date: Tue Aug 14 16:03:27 2018
New Revision: 477167
URL: https://svnweb.freebsd.org/changeset/ports/477167

Log:
  devel/libvirt: fix build with QEMU enabled
  
  Libvirt has switched from yajl to jansson for JSON parsing,
  so update dependencies accordingly. Also add some missing
  directories to plist.
  
  Bump PORTREVISION.
  
  PR:		230583 (based on)
  Submitted by:	hashiz at meridiani.jp

Modified:
  head/devel/libvirt/Makefile
  head/devel/libvirt/pkg-plist

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Tue Aug 14 15:31:01 2018	(r477166)
+++ head/devel/libvirt/Makefile	Tue Aug 14 16:03:27 2018	(r477167)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	4.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -117,10 +118,10 @@ SUB_LIST+=	PORTVERSION="-${PORTVERSION}"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS}
-LIB_DEPENDS+=		libyajl.so:devel/yajl
-CONFIGURE_ARGS+=	--with-yajl=${LOCALBASE}
+LIB_DEPENDS+=		libjansson.so:devel/jansson
+CONFIGURE_ARGS+=	--with-jansson
 .else
-CONFIGURE_ARGS+=	--without-yajl
+CONFIGURE_ARGS+=	--without-jansson
 .endif
 
 .if !${PLIST_SUB:MXEN}

Modified: head/devel/libvirt/pkg-plist
==============================================================================
--- head/devel/libvirt/pkg-plist	Tue Aug 14 15:31:01 2018	(r477166)
+++ head/devel/libvirt/pkg-plist	Tue Aug 14 16:03:27 2018	(r477167)
@@ -397,11 +397,16 @@ lib/libvirt/connection-driver/libvirt_driver_vbox.so
 lib/libvirt/storage-backend/libvirt_storage_backend_fs.so
 %%ZFS%%lib/libvirt/storage-backend/libvirt_storage_backend_zfs.so
 lib/libvirt/storage-file/libvirt_storage_file_fs.so
-%%QEMU%%@dir /var/run/libvirt/qemu
+%%QEMU%%@dir /var/cache/libvirt/qemu
 %%QEMU%%@dir /var/lib/libvirt/qemu/channel/target
 %%QEMU%%@dir /var/lib/libvirt/qemu/channel
 %%QEMU%%@dir /var/lib/libvirt/qemu
-%%QEMU%%@dir /var/cache/libvirt/qemu
+%%QEMU%%@dir /var/lib/libvirt/swtpm
+%%QEMU%%@dir /var/log/swtpm/libvirt/qemu
+%%QEMU%%@dir /var/log/swtpm/libvirt
+%%QEMU%%@dir /var/log/swtpm
+%%QEMU%%@dir /var/run/libvirt/qemu/swtpm
+%%QEMU%%@dir /var/run/libvirt/qemu
 %%XEN%%@dir /var/lib/libvirt/libxl
 %%XEN%%@dir /var/log/libvirt/libxl
 %%XEN%%@dir /var/run/libvirt/libxl