*** VirtualBox-2.2.4_OSE.orig/configure	Wed Dec  2 23:51:56 2009
--- VirtualBox-2.2.4_OSE/configure	Wed Dec  2 23:53:36 2009
***************
*** 90,95 ****
  GSOAP=""
  GSOAP_IMPORT=""
! LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
! INCX11="/usr/local/include"
  LIBXCURSOR="-lXcursor"
  LIBXMU="-lXmu"
--- 90,95 ----
  GSOAP=""
  GSOAP_IMPORT=""
! 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"
  LIBXMU="-lXmu"
***************
*** 101,105 ****
  PKGCONFIG="`which_wrapper pkg-config`"
  PYTHONDIR="/usr /usr/local"
! QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr"
  QT4DIR_PKGCONFIG=1
  QT4UIC3DIR="/usr/bin"
--- 101,105 ----
  PKGCONFIG="`which_wrapper pkg-config`"
  PYTHONDIR="/usr /usr/local"
! QT4DIR="/tmp/build"
  QT4DIR_PKGCONFIG=1
  QT4UIC3DIR="/usr/bin"
***************
*** 268,272 ****
  {
    echo "executing the binary (LD_LIBRARY_PATH=$1)" >> $LOG
!   LD_LIBRARY_PATH=$1 $ODIR.tmp_out > $ODIR.test_execute.log
    rc=$?
    cat $ODIR.test_execute.log | tee -a $LOG
--- 268,272 ----
  {
    echo "executing the binary (LD_LIBRARY_PATH=$1)" >> $LOG
!   $ODIR.tmp_out > $ODIR.test_execute.log
    rc=$?
    cat $ODIR.test_execute.log | tee -a $LOG
***************
*** 1017,1022 ****
      cat > $ODIR.tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL.h>
! #include <SDL_main.h>
  #undef main
  extern "C" int main(int argc, char** argv)
--- 1017,1022 ----
      cat > $ODIR.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)
***************
*** 1302,1306 ****
          # this braindead path is necessary for mdv2008.1
          qt4_ver=`\
-             PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \
              pkg-config QtCore --modversion 2>> $LOG`
          if [ $? -ne 0 ]; then
--- 1302,1305 ----
***************
*** 1309,1317 ****
          else
            FLGQT4=`\
-               PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \
                pkg-config QtCore --cflags`
            INCQT4=`strip_I "$FLGQT4"`
            LIBQT4=`\
-               PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \
                PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
                pkg-config QtCore --libs`
--- 1308,1314 ----
*** VirtualBox-2.2.4_OSE.orig/Config.kmk	Wed Dec  2 23:51:56 2009
--- VirtualBox-2.2.4_OSE/Config.kmk	Wed Dec  2 23:55:40 2009
***************
*** 335,341 ****
  VBOX_WITH_KCHMVIEWER = 1
  # Build the testsuite.
! VBOX_WITH_TESTSUITE = 1
  # Build the testcases.
! VBOX_WITH_TESTCASES = 1
  # Set this to not use COM or XPCOM in places where it can be avoided.
  #VBOX_WITHOUT_COM = 1
--- 335,341 ----
  VBOX_WITH_KCHMVIEWER = 1
  # Build the testsuite.
! VBOX_WITH_TESTSUITE =
  # Build the testcases.
! VBOX_WITH_TESTCASES =
  # Set this to not use COM or XPCOM in places where it can be avoided.
  #VBOX_WITHOUT_COM = 1
***************
*** 373,377 ****
  endif
  # Enable Crossbow support for Solaris.
! VBOX_WITH_CROSSBOW = 1
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
--- 373,377 ----
  endif
  # Enable Crossbow support for Solaris.
! VBOX_WITH_CROSSBOW =
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
***************
*** 391,395 ****
  endif
  # Use the new VBI module on Solaris.
! VBOX_WITH_SOLARIS_VBI = 1
  # Enable 64 bits guest pointers.
  VBOX_WITH_64_BITS_GUESTS = 1
--- 391,395 ----
  endif
  # Use the new VBI module on Solaris.
! VBOX_WITH_SOLARIS_VBI =
  # Enable 64 bits guest pointers.
  VBOX_WITH_64_BITS_GUESTS = 1
***************
*** 429,433 ****
  ifdef VBOX_WITH_HARDENING
   if1of ($(KBUILD_TARGET), solaris)
!   VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox/$(if-expr $(KBUILD_TARGET_ARCH) == "amd64",amd64,i386)
   else ifeq ($(KBUILD_TARGET),darwin)
    VBOX_PATH_APP_PRIVATE      = /Applications/VirtualBox.app/Contents/MacOS
--- 429,433 ----
  ifdef VBOX_WITH_HARDENING
   if1of ($(KBUILD_TARGET), solaris)
!   VBOX_PATH_APP_PRIVATE      = /opt/virtualbox-2.2.4
   else ifeq ($(KBUILD_TARGET),darwin)
    VBOX_PATH_APP_PRIVATE      = /Applications/VirtualBox.app/Contents/MacOS
***************
*** 1508,1512 ****
  VBOX_ORIGIN = $$ORIGIN
  ifeq ($(KBUILD_TARGET),solaris)
!  VBOX_GCC_RPATH_OPT = -R
  else
   VBOX_GCC_RPATH_OPT = -Wl,-rpath,
--- 1508,1512 ----
  VBOX_ORIGIN = $$ORIGIN
  ifeq ($(KBUILD_TARGET),solaris)
!  VBOX_GCC_RPATH_OPT = -R/usr/sfw/lib -R
  else
   VBOX_GCC_RPATH_OPT = -Wl,-rpath,