From owner-svn-ports-all@FreeBSD.ORG  Thu Mar 13 17:41:52 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DCA0A7B;
 Thu, 13 Mar 2014 17:41:52 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A1F88D2;
 Thu, 13 Mar 2014 17:41:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2DHfquE007481;
 Thu, 13 Mar 2014 17:41:52 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2DHfq1U007480;
 Thu, 13 Mar 2014 17:41:52 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201403131741.s2DHfq1U007480@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 13 Mar 2014 17:41:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348107 - head/emulators/virtualbox-ose/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Mar 2014 17:41:52 -0000

Author: jkim
Date: Thu Mar 13 17:41:51 2014
New Revision: 348107
URL: http://svnweb.freebsd.org/changeset/ports/348107
QAT: https://qat.redports.org/buildarchive/r348107/

Log:
  Work around build problems on recent stable/9.
  
  PR:		ports/183739

Added:
  head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h   (contents, props changed)

Added: head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h	Thu Mar 13 17:41:51 2014	(r348107)
@@ -0,0 +1,18 @@
+--- include/iprt/x86.h.orig	2014-02-25 11:59:50.000000000 -0500
++++ include/iprt/x86.h	2014-03-11 16:46:08.000000000 -0400
+@@ -35,6 +35,15 @@
+ # pragma D depends_on library vbox-types.d
+ #endif
+ 
++/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
++#ifdef RT_OS_FREEBSD
++# undef MSR_P5_MC_ADDR
++# undef MSR_P5_MC_TYPE
++# undef MSR_IA32_PLATFORM_ID
++# undef MSR_BBL_CR_CTL3
++# undef MSR_IA32_MISC_ENABLE
++#endif
++
+ /* Workaround for Solaris sys/regset.h defining CS, DS */
+ #ifdef RT_OS_SOLARIS
+ # undef CS