Index: Makefile
===================================================================
--- Makefile	(revision 348274)
+++ Makefile	(working copy)
@@ -18,8 +18,9 @@
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libssh2.so:${PORTSDIR}/security/libssh2
 
-OPTIONS_DEFINE=	QEMU DOCS NLS
+OPTIONS_DEFINE=	DOCS NLS BHYVE QEMU
 QEMU_DESC=	QEMU driver
+BHYVE_DESC=	bhyve driver
 
 OPTIONS_SUB=	yes
 
@@ -29,6 +30,8 @@
 QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
 			qemu-io:${PORTSDIR}/emulators/qemu-devel
 
+BHYVE_CONFIGURE_WITH=	bhyve
+
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 348274)
+++ pkg-plist	(working copy)
@@ -49,116 +49,119 @@
 %%QEMU%%share/augeas/lenses/libvirtd_qemu.aug
 share/augeas/lenses/tests/test_libvirtd.aug
 %%QEMU%%share/augeas/lenses/tests/test_libvirtd_qemu.aug
-%%DOCSDIR%%%%PORTVERSION%%/html/32favicon.png
-%%DOCSDIR%%%%PORTVERSION%%/html/404.html
-%%DOCSDIR%%%%PORTVERSION%%/html/acl.html
-%%DOCSDIR%%%%PORTVERSION%%/html/aclpolkit.html
-%%DOCSDIR%%%%PORTVERSION%%/html/api.html
-%%DOCSDIR%%%%PORTVERSION%%/html/api_extension.html
-%%DOCSDIR%%%%PORTVERSION%%/html/apps.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archdomain.html
-%%DOCSDIR%%%%PORTVERSION%%/html/architecture.gif
-%%DOCSDIR%%%%PORTVERSION%%/html/architecture.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archnetwork.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archnode.html
-%%DOCSDIR%%%%PORTVERSION%%/html/archstorage.html
-%%DOCSDIR%%%%PORTVERSION%%/html/auditlog.html
-%%DOCSDIR%%%%PORTVERSION%%/html/auth.html
-%%DOCSDIR%%%%PORTVERSION%%/html/bindings.html
-%%DOCSDIR%%%%PORTVERSION%%/html/bugs.html
-%%DOCSDIR%%%%PORTVERSION%%/html/compiling.html
-%%DOCSDIR%%%%PORTVERSION%%/html/contact.html
-%%DOCSDIR%%%%PORTVERSION%%/html/cgroups.html
-%%DOCSDIR%%%%PORTVERSION%%/html/csharp.html
-%%DOCSDIR%%%%PORTVERSION%%/html/deployment.html
-%%DOCSDIR%%%%PORTVERSION%%/html/devguide.html
-%%DOCSDIR%%%%PORTVERSION%%/html/docs.html
-%%DOCSDIR%%%%PORTVERSION%%/html/downloads.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drivers.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvesx.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvhyperv.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvlxc.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvopenvz.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvparallels.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvphyp.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvqemu.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvremote.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvtest.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvuml.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvvbox.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvvmware.html
-%%DOCSDIR%%%%PORTVERSION%%/html/drvxen.html
-%%DOCSDIR%%%%PORTVERSION%%/html/errors.html
-%%DOCSDIR%%%%PORTVERSION%%/html/et.png
-%%DOCSDIR%%%%PORTVERSION%%/html/firewall.html
-%%DOCSDIR%%%%PORTVERSION%%/html/footer_corner.png
-%%DOCSDIR%%%%PORTVERSION%%/html/footer_pattern.png
-%%DOCSDIR%%%%PORTVERSION%%/html/format.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatcaps.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatdomain.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatnetwork.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatnode.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatnwfilter.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatsecret.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatsnapshot.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatstorage.html
-%%DOCSDIR%%%%PORTVERSION%%/html/formatstorageencryption.html
-%%DOCSDIR%%%%PORTVERSION%%/html/generic.css
-%%DOCSDIR%%%%PORTVERSION%%/html/goals.html
-%%DOCSDIR%%%%PORTVERSION%%/html/hacking.html
-%%DOCSDIR%%%%PORTVERSION%%/html/hooks.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/home.png
-%%DOCSDIR%%%%PORTVERSION%%/html/html/index.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/left.png
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-virterror.html
-%%DOCSDIR%%%%PORTVERSION%%/html/html/right.png
-%%DOCSDIR%%%%PORTVERSION%%/html/html/up.png
-%%DOCSDIR%%%%PORTVERSION%%/html/hvsupport.html
-%%DOCSDIR%%%%PORTVERSION%%/html/index.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals/command.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals/locking.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals/rpc.html
-%%DOCSDIR%%%%PORTVERSION%%/html/intro.html
-%%DOCSDIR%%%%PORTVERSION%%/html/java.html
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-daemon-arch.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-driver-arch.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-header-bg.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-header-logo.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-net-logical.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-net-physical.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-object-model.png
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirt.css
-%%DOCSDIR%%%%PORTVERSION%%/html/libvirtLogo.png
-%%DOCSDIR%%%%PORTVERSION%%/html/locking.html
-%%DOCSDIR%%%%PORTVERSION%%/html/logging.html
-%%DOCSDIR%%%%PORTVERSION%%/html/madeWith.png
-%%DOCSDIR%%%%PORTVERSION%%/html/main.css
-%%DOCSDIR%%%%PORTVERSION%%/html/migration.html
-%%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-direct.png
-%%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-p2p.png
-%%DOCSDIR%%%%PORTVERSION%%/html/migration-native.png
-%%DOCSDIR%%%%PORTVERSION%%/html/migration-tunnel.png
-%%DOCSDIR%%%%PORTVERSION%%/html/migration-unmanaged-direct.png
-%%DOCSDIR%%%%PORTVERSION%%/html/news.html
-%%DOCSDIR%%%%PORTVERSION%%/html/node.gif
-%%DOCSDIR%%%%PORTVERSION%%/html/pending.html
-%%DOCSDIR%%%%PORTVERSION%%/html/php.html
-%%DOCSDIR%%%%PORTVERSION%%/html/python.html
-%%DOCSDIR%%%%PORTVERSION%%/html/relatedlinks.html
-%%DOCSDIR%%%%PORTVERSION%%/html/remote.html
-%%DOCSDIR%%%%PORTVERSION%%/html/secureusage.html
-%%DOCSDIR%%%%PORTVERSION%%/html/securityprocess.html
-%%DOCSDIR%%%%PORTVERSION%%/html/sitemap.html
-%%DOCSDIR%%%%PORTVERSION%%/html/storage.html
-%%DOCSDIR%%%%PORTVERSION%%/html/testapi.html
-%%DOCSDIR%%%%PORTVERSION%%/html/testsuites.html
-%%DOCSDIR%%%%PORTVERSION%%/html/testtck.html
-%%DOCSDIR%%%%PORTVERSION%%/html/todo.html
-%%DOCSDIR%%%%PORTVERSION%%/html/uri.html
-%%DOCSDIR%%%%PORTVERSION%%/html/virshcmdref.html
-%%DOCSDIR%%%%PORTVERSION%%/html/windows.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/32favicon.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/404.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/acl.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/aclpolkit.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/api.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/api_extension.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/apps.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/archdomain.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/architecture.gif
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/archnetwork.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/archnode.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/archstorage.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/auditlog.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/auth.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/bindings.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/compiling.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/contact.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/cgroups.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/csharp.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/deployment.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/devguide.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/docs.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/downloads.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drivers.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvesx.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvhyperv.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvlxc.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvopenvz.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvparallels.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvphyp.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvqemu.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvremote.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvtest.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvuml.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvvbox.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvvmware.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvxen.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/errors.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/et.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/firewall.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/footer_corner.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/footer_pattern.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/format.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatcaps.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatdomain.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatnetwork.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatnode.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatnwfilter.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatsecret.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatsnapshot.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatstorage.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/formatstorageencryption.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/generic.css
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/goals.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/hacking.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/hooks.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/internals.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/home.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/left.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-virterror.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/right.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/html/up.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/hvsupport.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/internals/command.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/internals/locking.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/internals/rpc.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/java.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-daemon-arch.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-driver-arch.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-header-bg.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-header-logo.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-net-logical.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-net-physical.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt-object-model.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirt.css
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/libvirtLogo.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/locking.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/logging.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/madeWith.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/main.css
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/migration.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-direct.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-p2p.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/migration-native.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/migration-tunnel.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/migration-unmanaged-direct.png
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/news.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/node.gif
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/pending.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/php.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/python.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/relatedlinks.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/remote.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/secureusage.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/securityprocess.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/sitemap.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/storage.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/testapi.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/testsuites.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/testtck.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/todo.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/uri.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/virshcmdref.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/windows.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/drvbhyve.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/governance.html
+%%PORTDOCS%%%%DOCSDIR%%%%PORTVERSION%%/html/internals/oomtesting.html
 share/gtk-doc/html/libvirt/general.html
 share/gtk-doc/html/libvirt/home.png
 share/gtk-doc/html/libvirt/index.html
@@ -266,6 +269,8 @@
 %%NLS%%share/locale/zu/LC_MESSAGES/libvirt.mo
 %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.so
 %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.la
+%%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.la
+%%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.so
 lib/libvirt/connection-driver/libvirt_driver_secret.so
 lib/libvirt/connection-driver/libvirt_driver_secret.la
 lib/libvirt/connection-driver/libvirt_driver_storage.so