*** VirtualBox-1.6.2.orig/src/VBox/Additions/x11/xmouse/Makefile.kmk	Tue May 13 12:57:36 2008
--- VirtualBox-1.6.2/src/VBox/Additions/x11/xmouse/Makefile.kmk	Thu Jun 26 14:29:39 2008
***************
*** 106,109 ****
--- 106,110 ----
  	$(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 = \
*** VirtualBox-1.6.2.orig/src/VBox/Additions/x11/xclient/seamless-x11.h	Sun Apr 20 23:52:00 2008
--- VirtualBox-1.6.2/src/VBox/Additions/x11/xclient/seamless-x11.h	Thu Jun 26 14:29:39 2008
***************
*** 29,32 ****
--- 29,33 ----
  
  #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
  #include <X11/extensions/shape.h>
  
*** VirtualBox-1.6.2.orig/src/VBox/Additions/x11/xgraphics/Makefile.kmk	Tue May 13 12:57:36 2008
--- VirtualBox-1.6.2/src/VBox/Additions/x11/xgraphics/Makefile.kmk	Thu Jun 26 14:29:39 2008
***************
*** 159,163 ****
  	$(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 \
--- 159,164 ----
  	$(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 \
***************
*** 178,182 ****
  	$(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 \
--- 179,184 ----
  	$(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 \
*** VirtualBox-1.6.2.orig/src/VBox/Devices/Makefile.kmk	Mon May 26 19:20:23 2008
--- VirtualBox-1.6.2/src/VBox/Devices/Makefile.kmk	Thu Jun 26 14:29:39 2008
***************
*** 172,176 ****
  endif
  ifeq ($(KBUILD_TARGET),solaris)
!  VBoxDD_LIBS           += adm
   ifdef VBOX_WITH_SUID_WRAPPER
    VBoxDD_LIBS          += secdb
--- 172,176 ----
  endif
  ifeq ($(KBUILD_TARGET),solaris)
!  VBoxDD_LIBS           += adm resolv
   ifdef VBOX_WITH_SUID_WRAPPER
    VBoxDD_LIBS          += secdb
*** VirtualBox-1.6.2.orig/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp	Sun Apr 20 23:51:24 2008
--- VirtualBox-1.6.2/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp	Thu Jun 26 14:29:39 2008
***************
*** 68,71 ****
--- 68,76 ----
  #endif
  
+ /* undefined on Solaris 10 */
+ #ifndef INADDR_NONE
+ # define INADDR_NONE ((unsigned long) -1)
+ #endif
+ 
  #include <cstdio>
  #include <cstring>
*** VirtualBox-1.6.2.orig/Config.kmk	Sat May 31 20:22:52 2008
--- VirtualBox-1.6.2/Config.kmk	Thu Jun 26 18:21:48 2008
***************
*** 274,279 ****
  IPRT_WITH_KSTUFF = 1
  endif
! # Enable Crossbow support for Solaris.
! VBOX_WITH_CROSSBOW = 1
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
--- 274,279 ----
  IPRT_WITH_KSTUFF = 1
  endif
! # Disable Crossbow support for Solaris 10 so that libdlpi is not needed.
! VBOX_WITH_CROSSBOW =
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
***************
*** 293,298 ****
  # Temporary switch for enabling / disabling the new USB code on Darwin.
  VBOX_WITH_NEW_USB_CODE_ON_DARWIN=1
! # Use the new VBI module on Solaris.
! VBOX_WITH_SOLARIS_VBI = 1
  
  #
--- 293,298 ----
  # Temporary switch for enabling / disabling the new USB code on Darwin.
  VBOX_WITH_NEW_USB_CODE_ON_DARWIN=1
! # Disable the VBI module on Solaris 10, as the module is not present.
! VBOX_WITH_SOLARIS_VBI =
  
  #
*** VirtualBox-1.6.2.orig/configure	Wed May 28 15:45:38 2008
--- VirtualBox-1.6.2/configure	Thu Jun 26 14:29:39 2008
***************
*** 60,65 ****
  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=""
--- 60,65 ----
  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=""
***************
*** 67,71 ****
  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"
--- 67,71 ----
  INCPNG=""
  LIBPNG="-lpng"
! QT3DIR="/tmp/build"
  QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
  QT4UIC3DIR="/usr/bin"
***************
*** 988,993 ****
      cat > .tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL.h>
! #include <SDL_main.h>
  #undef main
  extern "C" int main(int argc, char** argv)
--- 988,993 ----
      cat > .tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL/SDL.h>
! #include <SDL/SDL_main.h>
  #undef main
  extern "C" int main(int argc, char** argv)
*** VirtualBox-1.6.2.orig/src/VBox/Additions/solaris/Makefile.kmk	Mon May 26 00:37:58 2008
--- VirtualBox-1.6.2/src/VBox/Additions/solaris/Makefile.kmk	Thu Jun 26 15:10:04 2008
***************
*** 29,33 ****
  
  ifeq ($(KBUILD_HOST),solaris)
!  include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
  endif
  
--- 29,35 ----
  
  ifeq ($(KBUILD_HOST),solaris)
! # Cannot compile shared folders on Sun Solaris 10 as the file sys/vfs_opreg.h
! # cannot be found.
! # include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
  endif