virtualbox-svn: Import missing headers

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Aug 12 22:09:35 2016 +0200
Changeset:	3a9cecbf5fbb6f00939523fd753d65189490528e

Modified Files:
	virtualbox-svn/distinfo
	virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk

Log Message:
virtualbox-svn: Import missing headers

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3a9cecbf5fbb6f00939523fd753d65189490528e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox-svn/distinfo                            |  2 +-
 .../patches/patch-src_VBox_Runtime_Makefile.kmk    | 51 +++++++++++++++++++---
 2 files changed, 45 insertions(+), 8 deletions(-)

diffs:
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index 48aa182..f3704e4 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -10,6 +10,6 @@ SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = d073de54d5de4f61e
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = f24f7d6dd449e6ad664b8e5a8f5861dd7e0f13e8
 SHA1 (patch-src_VBox_Main_cbinding_VBoxCAPIGlue.c) = 03d23375afaf4448751141bedb7771abc7635f3c
 SHA1 (patch-src_VBox_Main_glue_NativeEventQueue.cpp) = 58ff96858e861b03a495323fd5d6141044ac36f5
-SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = 9b59aa4f151abecbbe25ce5d300789cc9ad0c86f
+SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = deaa4e4f3d2fcbf0de22b430b547f63d075ca670
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h) = 45e4d9f4a67449099651e96b54b7d108bebe606c
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
diff --git a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
index 3b039e2..f383629 100644
--- a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
+++ b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
@@ -2,7 +2,14 @@ $NetBSD$
 
 --- src/VBox/Runtime/Makefile.kmk.orig	2016-08-12 18:06:15.000000000 +0000
 +++ src/VBox/Runtime/Makefile.kmk
-@@ -1984,6 +1984,8 @@ RuntimeR0Drv_INCS.freebsd = \
+@@ -1978,12 +1978,15 @@ RuntimeR0Drv_SDKS.win   = ReorderCompile
+ RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL
+ RuntimeR0Drv_DEFS.win   = IN_SUP_R0 LDR_ONLY_PE
+ RuntimeR0Drv_DEFS.linux = MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) IN_SUP_R0
++RuntimeR0Drv_DEFS.netbsd = _KERNEL
+ 
+ RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT) include
+ RuntimeR0Drv_INCS.freebsd = \
  	$(PATH_STAGE)/gen-sys-hdrs
  RuntimeR0Drv_INCS.linux = \
  	r0drv/linux
@@ -11,19 +18,25 @@ $NetBSD$
  RuntimeR0Drv_INCS.solaris = \
  	r0drv/solaris/vbi/i86pc \
  	r0drv/solaris/vbi/i86pc/sys
-@@ -2514,6 +2516,11 @@ RuntimeR0Drv_ORDERDEPS.freebsd = \
+@@ -2514,6 +2517,17 @@ RuntimeR0Drv_ORDERDEPS.freebsd = \
  	$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
  	$(PATH_STAGE)/gen-sys-hdrs/device_if.h
  
 +RuntimeR0Drv_ORDERDEPS.netbsd = \
 +	$(PATH_STAGE)/machine/bus_defs.h \
++	$(PATH_STAGE)/machine/bus_funcs.h \
++	$(PATH_STAGE)/machine/cpufunc.h \
++	$(PATH_STAGE)/machine/pic.h \
 +	$(PATH_STAGE)/x86/bus_defs.h \
-+	$(PATH_STAGE)/x86/busdefs.h
++	$(PATH_STAGE)/x86/bus_funcs.h \
++	$(PATH_STAGE)/x86/busdefs.h \
++	$(PATH_STAGE)/x86/cpufunc.h \
++	$(PATH_STAGE)/x86/pic.h
 +
  
  #
  # RuntimeGuestR0 - Guest driver runtime.
-@@ -2830,6 +2837,32 @@ $$(FreeBSDGeneratedKernelHeaders_0_OUTDI
+@@ -2830,6 +2844,56 @@ $$(FreeBSDGeneratedKernelHeaders_0_OUTDI
  endif # FreeBSD
  
  
@@ -32,31 +45,55 @@ $NetBSD$
 +INSTALLS += NetBSDGeneratedKernelHeadersMachine
 +NetBSDGeneratedKernelHeadersMachine_INST = machine/
 +NetBSDGeneratedKernelHeadersMachine_SOURCES = \
-+	$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_defs.h
++	$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_defs.h \
++	$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_funcs.h \
++	$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/cpufunc.h \
++	$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/pic.h
 +NetBSDGeneratedKernelHeadersMachine_CLEAN = $(NetBSDGeneratedKernelHeadersMachine_SOURCES)
 +
 +$$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_defs.h: /usr/src/sys/arch/amd64/include/bus_defs.h | $$(dir $$@)
 +	$(QUIET)$(CP) -f $< $(@D)/bus_defs.h
 +
++$$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/bus_funcs.h: /usr/src/sys/arch/amd64/include/bus_funcs.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/bus_funcs.h
++
++$$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/cpufunc.h: /usr/src/sys/arch/amd64/include/cpufunc.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/cpufunc.h
++
++$$(NetBSDGeneratedKernelHeadersMachine_0_OUTDIR)/pic.h: /usr/src/sys/arch/amd64/include/pic.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/pic.h
++
 +# Cherry-pick useful headers and simulate the <x86/*.h> header space
 +INSTALLS += NetBSDGeneratedKernelHeadersX86
 +NetBSDGeneratedKernelHeadersX86_INST = x86/
 +NetBSDGeneratedKernelHeadersX86_SOURCES = \
 +	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/bus_defs.h \
-+	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/busdefs.h
++	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/bus_funcs.h \
++	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/busdefs.h \
++	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/cpufunc.h \
++	$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/pic.h
 +NetBSDGeneratedKernelHeadersX86_CLEAN = $(NetBSDGeneratedKernelHeadersX86_SOURCES)
 +
 +$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/bus_defs.h: /usr/src/sys/arch/x86/include/bus_defs.h | $$(dir $$@)
 +	$(QUIET)$(CP) -f $< $(@D)/bus_defs.h
 +
++$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/bus_funcs.h: /usr/src/sys/arch/x86/include/bus_funcs.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/bus_funcs.h
++
 +$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/busdefs.h: /usr/src/sys/arch/x86/include/busdefs.h | $$(dir $$@)
 +	$(QUIET)$(CP) -f $< $(@D)/busdefs.h
++
++$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/cpufunc.h: /usr/src/sys/arch/x86/include/cpufunc.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/cpufunc.h
++
++$$(NetBSDGeneratedKernelHeadersX86_0_OUTDIR)/pic.h: /usr/src/sys/arch/x86/include/pic.h | $$(dir $$@)
++	$(QUIET)$(CP) -f $< $(@D)/pic.h
 +endif # NetBSD
 +
  #
  # Aliases for .cpp.h files so we can more easily do syntax checking from the editor.
  #
-@@ -3127,4 +3160,3 @@ taf-template.o taf-template.obj: taf-cor
+@@ -3127,4 +3191,3 @@ taf-template.o taf-template.obj: taf-cor
  tsp-template.o tsp-template.obj: tsp-core.o tsp-asn1-decoder.o tsp-sanity.o tsp-init.o
  x509-template.o x509-template.obj: x509-core.o x509-asn1-decoder.o x509-sanity.o x509-init.o
  pkcs7-template.o pkcs7-template.obj: pkcs7-core.o pkcs7-asn1-decoder.o pkcs7-sanity.o pkcs7-init.o