- Add workaround for regression in acpica 20101015 [1]

- Remove old patches not needed for newer VirtualBox versions anymore
- Fix alignment problem in VBoxHeadless on i386 when DEBUG option is enabled [2]
- Bump PORTREVISION

PR:		ports/144959 [2]
Submitted by:	Alexander Eichner [2],
		Anthony Jenkins <ajenkins at vtilt dot com> [2]
Reported by:	Michael Butler <imb at protected-networks dot net> [1],
		DomiX (irc on freenode) [2],
		Monty Hall <kungfu_disciple at sbcglobal dot net> [2],
		many others [2]

10 files changed, 76 insertions, 58 deletions

diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 16fe4b82ed4a..b34c825c28b3 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	3.2.10
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -170,7 +171,11 @@ PLIST_SUB+=	I386="@comment "
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 900012
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-include-iprt-string.h
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-include-iprt-string.h
+.endif
+
+.if ${OSVERSION} > 900020
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl
 .endif
 
 pre-everything::
diff --git a/emulators/virtualbox-ose-legacy/files/extrapatch-src-VBox-Devices-PC-vbox.dsl b/emulators/virtualbox-ose-legacy/files/extrapatch-src-VBox-Devices-PC-vbox.dsl
new file mode 100644
index 000000000000..0de4a378a79a
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/extrapatch-src-VBox-Devices-PC-vbox.dsl
@@ -0,0 +1,21 @@
+Workaround for an regression in acpica 20101015.
+
+Compile error:
+kBuild: iasl DevicesR3 - src/VBox/Devices/PC/vbox.dsl
+   736:                           Name (_CID, "smc-napa")
+Error 4001 - String must be entirely alphanumeric ^
+(smc-napa)
+
+See: http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
+
+--- src/VBox/Devices/PC/vbox.dsl.orig	2010-10-08 22:10:12.000000000 +0200
++++ src/VBox/Devices/PC/vbox.dsl	2010-10-27 14:45:38.000000000 +0200
+@@ -733,7 +733,7 @@
+                 Device (SMC)
+                 {
+                     Name (_HID, EisaId ("APP0001"))
+-                    Name (_CID, "smc-napa")
++                    Name (_CID, "smcnapa")
+ 
+                     Method (_STA, 0, NotSerialized)
+                     {
diff --git a/emulators/virtualbox-ose-legacy/files/patch-Config.kmk b/emulators/virtualbox-ose-legacy/files/patch-Config.kmk
deleted file mode 100644
index 2ce55eb8a12d..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-Config.kmk
+++ /dev/null
@@ -1,10 +0,0 @@
---- Config.kmk.bak	2009-09-02 18:34:01.000000000 +0200
-+++ Config.kmk	2009-09-02 19:19:09.000000000 +0200
-@@ -781,6 +781,7 @@
-  VBOX_WITH_VBOXBFE=
-  VBOX_WITH_OGL=
-  VBOX_WITH_KCHMVIEWER=
-+ VBOX_WITH_HGSMI=
- endif
- 
- #
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-Makefile.kmk
deleted file mode 100644
index 87ecbfe7212b..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-Makefile.kmk
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/VBox/Frontends/Makefile.kmk.orig	2010-05-25 14:16:00.000000000 +0200
-+++ src/VBox/Frontends/Makefile.kmk	2010-06-04 09:51:37.000000000 +0200
-@@ -24,6 +24,7 @@
- endif
- ifndef VBOX_ONLY_DOCS
-  ifdef VBOX_WITH_VBOXSDL
-+  include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
-   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
-  endif
-  ifdef VBOX_WITH_VBOXBFE
-@@ -38,7 +39,6 @@
-  ifdef VBOX_WITH_QTGUI
-   include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
-  endif
-- include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
- endif # !VBOX_ONLY_DOCS
- 
- ## @todo Include Python shell into binary delivery?
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-recompiler-target-i386-cpu.h b/emulators/virtualbox-ose-legacy/files/patch-src-recompiler-target-i386-cpu.h
new file mode 100644
index 000000000000..b8c3a9acb71a
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-recompiler-target-i386-cpu.h
@@ -0,0 +1,11 @@
+--- src/recompiler/target-i386/cpu.h.orig	2010-07-15 20:13:56.000000000 +0200
++++ src/recompiler/target-i386/cpu.h	2010-11-01 12:23:16.000000000 +0100
+@@ -678,7 +678,7 @@
+        user */
+     struct APICState *apic_state;
+ #else
+-    uint32_t alignment2[3];
++    uint32_t alignment2[2];
+     /** Profiling tb_flush. */
+     STAMPROFILE StatTbFlush;
+ #endif
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 16fe4b82ed4a..b34c825c28b3 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	3.2.10
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -170,7 +171,11 @@ PLIST_SUB+=	I386="@comment "
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 900012
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-include-iprt-string.h
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-include-iprt-string.h
+.endif
+
+.if ${OSVERSION} > 900020
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl
 .endif
 
 pre-everything::
diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl
new file mode 100644
index 000000000000..0de4a378a79a
--- /dev/null
+++ b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-vbox.dsl
@@ -0,0 +1,21 @@
+Workaround for an regression in acpica 20101015.
+
+Compile error:
+kBuild: iasl DevicesR3 - src/VBox/Devices/PC/vbox.dsl
+   736:                           Name (_CID, "smc-napa")
+Error 4001 - String must be entirely alphanumeric ^
+(smc-napa)
+
+See: http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
+
+--- src/VBox/Devices/PC/vbox.dsl.orig	2010-10-08 22:10:12.000000000 +0200
++++ src/VBox/Devices/PC/vbox.dsl	2010-10-27 14:45:38.000000000 +0200
+@@ -733,7 +733,7 @@
+                 Device (SMC)
+                 {
+                     Name (_HID, EisaId ("APP0001"))
+-                    Name (_CID, "smc-napa")
++                    Name (_CID, "smcnapa")
+ 
+                     Method (_STA, 0, NotSerialized)
+                     {
diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk
deleted file mode 100644
index 2ce55eb8a12d..000000000000
--- a/emulators/virtualbox-ose/files/patch-Config.kmk
+++ /dev/null
@@ -1,10 +0,0 @@
---- Config.kmk.bak	2009-09-02 18:34:01.000000000 +0200
-+++ Config.kmk	2009-09-02 19:19:09.000000000 +0200
-@@ -781,6 +781,7 @@
-  VBOX_WITH_VBOXBFE=
-  VBOX_WITH_OGL=
-  VBOX_WITH_KCHMVIEWER=
-+ VBOX_WITH_HGSMI=
- endif
- 
- #
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-Makefile.kmk
deleted file mode 100644
index 87ecbfe7212b..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-Makefile.kmk
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/VBox/Frontends/Makefile.kmk.orig	2010-05-25 14:16:00.000000000 +0200
-+++ src/VBox/Frontends/Makefile.kmk	2010-06-04 09:51:37.000000000 +0200
-@@ -24,6 +24,7 @@
- endif
- ifndef VBOX_ONLY_DOCS
-  ifdef VBOX_WITH_VBOXSDL
-+  include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
-   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
-  endif
-  ifdef VBOX_WITH_VBOXBFE
-@@ -38,7 +39,6 @@
-  ifdef VBOX_WITH_QTGUI
-   include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
-  endif
-- include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
- endif # !VBOX_ONLY_DOCS
- 
- ## @todo Include Python shell into binary delivery?
diff --git a/emulators/virtualbox-ose/files/patch-src-recompiler-target-i386-cpu.h b/emulators/virtualbox-ose/files/patch-src-recompiler-target-i386-cpu.h
new file mode 100644
index 000000000000..b8c3a9acb71a
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-recompiler-target-i386-cpu.h
@@ -0,0 +1,11 @@
+--- src/recompiler/target-i386/cpu.h.orig	2010-07-15 20:13:56.000000000 +0200
++++ src/recompiler/target-i386/cpu.h	2010-11-01 12:23:16.000000000 +0100
+@@ -678,7 +678,7 @@
+        user */
+     struct APICState *apic_state;
+ #else
+-    uint32_t alignment2[3];
++    uint32_t alignment2[2];
+     /** Profiling tb_flush. */
+     STAMPROFILE StatTbFlush;
+ #endif