svn commit: r371364 - head/devel/libvirt

[Bryan Drewery]

Author: bdrewery
Date: Wed Oct 22 17:44:05 2014
New Revision: 371364
URL: https://svnweb.freebsd.org/changeset/ports/371364
QAT: https://qat.redports.org/buildarchive/r371364/

Log:
  - Fix support for BHYVE on head/amd64.
  
    Modifying OPTIONS_DEFAULT after including bsd.port.option.mk is not valid.
    Just check for existence of bhyve for now instead to determine default.
  
  PR:		194531
  Reported by:	Conrad Meyer

Modified:
  head/devel/libvirt/Makefile

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Wed Oct 22 17:30:26 2014	(r371363)
+++ head/devel/libvirt/Makefile	Wed Oct 22 17:44:05 2014	(r371364)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -23,6 +23,9 @@ RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dns
 
 OPTIONS_DEFINE=	DOCS NLS QEMU
 OPTIONS_DEFINE_amd64=	BHYVE
+.if exists(/usr/sbin/bhyve)
+OPTIONS_DEFAULT_amd64=	BHYVE
+.endif
 QEMU_DESC=	QEMU driver
 BHYVE_DESC=	bhyve driver
 
@@ -73,10 +76,6 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} >= 1000000
-OPTIONS_DEFAULT_amd64=	BHYVE
-.endif
-
 #work around an options bug (thanks mat@)
 .if ${ARCH} != amd64
 PLIST_SUB+=	BHYVE="@comment "