From owner-svn-ports-head@FreeBSD.ORG  Wed Oct 22 17:44:06 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 88CD2993;
 Wed, 22 Oct 2014 17:44:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7571BAC4;
 Wed, 22 Oct 2014 17:44:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9MHi6Wj078250;
 Wed, 22 Oct 2014 17:44:06 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9MHi6tu078249;
 Wed, 22 Oct 2014 17:44:06 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201410221744.s9MHi6tu078249@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 22 Oct 2014 17:44:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371364 - head/devel/libvirt
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2014 17:44:06 -0000

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 "