*** vbox.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c	Fri Mar 21 21:17:46 2008
--- vbox/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c	Fri Mar 21 21:18:08 2008
***************
*** 28,31 ****
--- 28,32 ----
  #include <sys/ddi_intr.h>
  #include <sys/sunddi.h>
+ #include <sys/open.h>
  #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
  
*** vbox.orig/src/VBox/Additions/x11/xmouse/Makefile.kmk	Fri Mar 21 21:02:15 2008
--- vbox/src/VBox/Additions/x11/xmouse/Makefile.kmk	Fri Mar 21 21:02:47 2008
***************
*** 102,105 ****
--- 102,106 ----
  	$(VBOX_PATH_X11_XORG_1_4)/X11 \
  	$(VBOX_PATH_X11_XORG_1_4)/xorg \
+ 	$(VBOX_PATH_X11_XORG_7_0) \
  	$(PATH_SUB_CURRENT)
  vboxmouse_drv_14_SOURCES = \
*** vbox.orig/src/VBox/Additions/x11/xclient/seamless-x11.h	Fri Mar 21 21:14:43 2008
--- vbox/src/VBox/Additions/x11/xclient/seamless-x11.h	Fri Mar 21 21:14:46 2008
***************
*** 25,28 ****
--- 25,29 ----
  
  #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
  #include <X11/extensions/shape.h>
  
*** vbox.orig/src/VBox/Additions/x11/xgraphics/Makefile.kmk	Fri Mar 21 20:59:58 2008
--- vbox/src/VBox/Additions/x11/xgraphics/Makefile.kmk	Fri Mar 21 21:00:46 2008
***************
*** 155,159 ****
  	$(VBOX_PATH_X11_XORG_1_3) \
  	$(VBOX_PATH_X11_XORG_1_3)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_3)/xorg
  vboxvideo_drv_13_SOURCES = \
  	vboxvideo_13.c \
--- 155,160 ----
  	$(VBOX_PATH_X11_XORG_1_3) \
  	$(VBOX_PATH_X11_XORG_1_3)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_3)/xorg \
! 	$(VBOX_PATH_X11_XORG_7_0)
  vboxvideo_drv_13_SOURCES = \
  	vboxvideo_13.c \
***************
*** 174,178 ****
  	$(VBOX_PATH_X11_XORG_1_4) \
  	$(VBOX_PATH_X11_XORG_1_4)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_4)/xorg
  vboxvideo_drv_14_SOURCES  = \
  	vboxvideo_13.c \
--- 175,180 ----
  	$(VBOX_PATH_X11_XORG_1_4) \
  	$(VBOX_PATH_X11_XORG_1_4)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_4)/xorg \
! 	$(VBOX_PATH_X11_XORG_7_0)
  vboxvideo_drv_14_SOURCES  = \
  	vboxvideo_13.c \
*** vbox.orig/src/VBox/Devices/Makefile.kmk	Fri Mar 21 21:27:01 2008
--- vbox/src/VBox/Devices/Makefile.kmk	Fri Mar 21 21:27:14 2008
***************
*** 160,164 ****
  endif
  ifeq ($(BUILD_TARGET),solaris)
!  VBoxDD_LIBS           += adm
   ifdef VBOX_WITH_CROSSBOW
    VBoxDD_LIBS          += dlpi
--- 160,164 ----
  endif
  ifeq ($(BUILD_TARGET),solaris)
!  VBoxDD_LIBS           += adm resolv
   ifdef VBOX_WITH_CROSSBOW
    VBoxDD_LIBS          += dlpi
*** vbox.orig/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp	Fri Mar 21 21:45:22 2008
--- vbox/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp	Fri Mar 21 21:45:37 2008
***************
*** 64,67 ****
--- 64,71 ----
  #endif
  
+ #ifndef INADDR_NONE
+     #define INADDR_NONE ((unsigned long) -1)
+ #endif
+ 
  #include <cstdio>
  #include <cstring>
*** vbox.orig/Config.kmk	Fri Mar 21 20:55:10 2008
--- vbox/Config.kmk	Fri Mar 21 20:55:28 2008
***************
*** 277,281 ****
  endif
  # Enable Crossbow support for Solaris.
! VBOX_WITH_CROSSBOW = 1
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
--- 277,281 ----
  endif
  # Enable Crossbow support for Solaris.
! VBOX_WITH_CROSSBOW =
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
*** vbox.orig/configure	Fri Mar 21 20:34:54 2008
--- vbox/configure	Fri Mar 21 20:37:05 2008
***************
*** 57,62 ****
  LIBCRYPTO="-lcrypto"
  LIBPTHREAD="-lpthread"
! LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
! INCX11="/usr/local/include"
  LIBXCURSOR="-lXcursor"
  INCZ=""
--- 57,62 ----
  LIBCRYPTO="-lcrypto"
  LIBPTHREAD="-lpthread"
! LIBX11="-L/tmp/build/lib -L/usr/openwin/lib -L/usr/X11R6/lib -lXext -lX11"
! INCX11="-I/tmp/build/include -I/usr/openwin/include -I/usr/X11R6/include"
  LIBXCURSOR="-lXcursor"
  INCZ=""
***************
*** 64,68 ****
  INCPNG=""
  LIBPNG="-lpng"
! QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
  QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
  QT4UIC3DIR="/usr/bin"
--- 64,68 ----
  INCPNG=""
  LIBPNG="-lpng"
! QT3DIR="/tmp/build"
  QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
  QT4UIC3DIR="/usr/bin"
***************
*** 916,921 ****
      cat > .tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL.h>
! #include <SDL_main.h>
  extern "C" int main(int argc, char** argv)
  {
--- 916,921 ----
      cat > .tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL/SDL.h>
! #include <SDL/SDL_main.h>
  extern "C" int main(int argc, char** argv)
  {