Anonymous

[~/svn/vbox] edwin@vaio-edwin>svn diff
Index: configure
===================================================================
--- configure   (revision 7199)
+++ configure   (working copy)
@@ -60,9 +60,9 @@
 LIBXCURSOR="-lXcursor"
 INCZ=""
 LIBZ="-lz"
-INCPNG=""
-LIBPNG="-lpng"
-QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
+INCPNG="-I/usr/local/include"
+LIBPNG="-L/usr/local/lib -lpng"
+QTDIR="/usr/local/ /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
 KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
 DEVDIR="`cd \`dirname $0\`; pwd`/tools"
 if [ -d "/lib/modules/`uname -r`/build" ]; then
@@ -573,6 +573,7 @@
           if test_execute; then
             cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
             cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+           cnf_append "SDK_VBOX_LIBXML2_LIBPATH" "`strip_L "$LIBXML2"`"
           fi
         fi
       fi
Index: Config.kmk
===================================================================
--- Config.kmk  (revision 7199)
+++ Config.kmk  (working copy)
@@ -345,14 +345,19 @@
 endif
 
 ifeq ($(BUILD_TARGET),freebsd)
- VBOX_WITH_INSTALLER=
  VBOX_WITH_SECURELABEL=
  VBOX_WITH_VRDP_AUTHMOD=
  VBOX_WITH_VRDP_RDESKTOP=
  VBOX_WITH_TESTSUITE=
+ VBOX_WITH_EHCI=
+
+ VBOX_WITH_INSTALLER=
  VBOX_WITH_USB=
- VBOX_WITH_EHCI=
  VBOX_WITH_DOCS=
+#VBOX_WITH_INSTALLER=
+#VBOX_WITH_USB=
+#VBOX_WITH_DOCS=
+# XXX Mavvie
 endif
 
 
Index: src/VBox/Main/ConsoleImpl.cpp
===================================================================
--- src/VBox/Main/ConsoleImpl.cpp       (revision 7199)
+++ src/VBox/Main/ConsoleImpl.cpp       (working copy)
@@ -18,15 +18,21 @@
 #include <iprt/types.h> /* for stdint.h constants */
 
 #if defined(RT_OS_WINDOWS)
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 #   include <errno.h>
 #   include <sys/ioctl.h>
 #   include <sys/poll.h>
 #   include <sys/fcntl.h>
 #   include <sys/types.h>
 #   include <sys/wait.h>
+#if defined(RT_OS_FREEBSD)
+#   include <sys/types.h>
+#   include <sys/socket.h>
+#endif
 #   include <net/if.h>
+#if defined(RT_OS_LINUX)
 #   include <linux/if_tun.h>
+#endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #   include <string.h>