Index: head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake
===================================================================
--- head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake	(revision 400204)
+++ head/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake	(revision 400205)
@@ -1,19 +1,13 @@
 Adapt libusb name for FreeBSD
 
---- CMakeTests/FindLibUSB.cmake.orig	2015-10-09 20:30:03.218968702 +0000
-+++ CMakeTests/FindLibUSB.cmake	2015-10-09 20:36:02.787944507 +0000
-@@ -23,7 +23,13 @@
+--- CMakeTests/FindLibUSB.cmake.orig	2015-07-31 10:04:05.000000000 +0000
++++ CMakeTests/FindLibUSB.cmake	2015-10-25 12:51:34.455592341 +0000
+@@ -23,7 +23,7 @@
         /usr/local/include
      )
  
 -    find_library(LIBUSB_LIBRARIES NAMES usb-1.0
-+    if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+        set(LIBUSB_LIBRARY "usb")
-+    else()
-+        set(LIBUSB_LIBRARY "usb-1.0")
-+    endif()
-+
-+    find_library(LIBUSB_LIBRARIES NAMES ${LIBUSB_LIBRARY}
++    find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
         PATHS
         ${LIBUSB_PKG_LIBRARY_DIRS}
         /usr/lib
Index: head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp
===================================================================
--- head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp	(revision 400204)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp	(revision 400205)
@@ -1,56 +1,56 @@
 Disable hotplug support for FreeBSD
 
 --- Source/Core/Core/HW/SI_GCAdapter.cpp.orig	2015-10-09 20:50:29.920884454 +0000
 +++ Source/Core/Core/HW/SI_GCAdapter.cpp	2015-10-09 20:53:25.933872616 +0000
 @@ -49,7 +49,9 @@
  static bool s_libusb_driver_not_supported = false;
  static libusb_context* s_libusb_context = nullptr;
  static bool s_libusb_hotplug_enabled = false;
-+#if !defined(__FreeBSD__)
++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
  static libusb_hotplug_callback_handle s_hotplug_handle;
 +#endif
  
  static u8 s_endpoint_in = 0;
  static u8 s_endpoint_out = 0;
 @@ -71,6 +73,7 @@
  	}
  }
  
-+#if !defined(__FreeBSD__)
++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
  static int HotplugCallback(libusb_context* ctx, libusb_device* dev, libusb_hotplug_event event, void* user_data)
  {
  	if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED)
 @@ -85,12 +88,14 @@
  	}
  	return 0;
  }
 +#endif
  
  static void ScanThreadFunc()
  {
  	Common::SetCurrentThreadName("GC Adapter Scanning Thread");
  	NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread started");
  
-+#if !defined(__FreeBSD__)
++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
  	s_libusb_hotplug_enabled = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0;
  	if (s_libusb_hotplug_enabled)
  	{
 @@ -99,6 +104,7 @@
  		if (s_libusb_hotplug_enabled)
  			NOTICE_LOG(SERIALINTERFACE, "Using libUSB hotplug detection");
  	}
 +#endif
  
  	while (s_adapter_detect_thread_running.IsSet())
  	{
 @@ -298,8 +304,10 @@
  void Shutdown()
  {
  	StopScanThread();
-+#if !defined(__FreeBSD__)
++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
  	if (s_libusb_hotplug_enabled)
  		libusb_hotplug_deregister_callback(s_libusb_context, s_hotplug_handle);
 +#endif
  	Reset();
  
  	if (s_libusb_context)