diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 8c9d053f890..b9be6575dfa 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.236 2015/08/27 14:16:50 robert Exp $
+# $OpenBSD: Makefile,v 1.237 2015/09/05 16:06:50 robert Exp $
 
 ONLY_FOR_ARCHS=		i386 amd64
 DPB_PROPERTIES=		parallel
 
 COMMENT=		Chromium browser
 
-V=			44.0.2403.157
+V=			45.0.2454.85
 DISTNAME=		chromium-${V}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-REVISION=		0
 
 CATEGORIES=		www
 
@@ -27,7 +26,7 @@ PERMIT_PACKAGE_FTP =	Yes
 
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
 
-MODULES=	lang/clang lang/python
+MODULES=	lang/clang lang/python gcc4
 
 MODCLANG_ARCHS=	*
 MODCLANG_LANGS=	c++
@@ -44,7 +43,7 @@ WANTLIB += png pthread speex
 WANTLIB += xml2 xslt
 WANTLIB += sndio
 WANTLIB += Xcomposite
-WANTLIB += stdc++
+WANTLIB += estdc++>=17
 WANTLIB += Xi Xtst
 WANTLIB += Xdamage
 WANTLIB += Xcursor Xrandr gio-2.0
@@ -64,15 +63,17 @@ BUILD_DEPENDS=	archivers/bzip2 \
 		shells/bash \
 		sysutils/flock \
 		sysutils/pciutils \
-		x11/gnome/libgnome-keyring
-BUILD_DEPENDS+=	devel/ninja
+		x11/gnome/libgnome-keyring \
+		devel/ninja \
+		lang/gcc/4.9,-c++>=4.9,<4.10
 LIB_DEPENDS=	devel/libexecinfo \
 		security/nss \
 		devel/gconf2 \
 		textproc/libxslt \
 		x11/gtk+2 \
 		audio/speex \
-		print/cups,-libs
+		print/cups,-libs \
+		lang/gcc/4.9,-libs>=4.9,<4.10
 
 .include <bsd.own.mk>
 
@@ -123,6 +124,7 @@ GYP_DEFS=	-Duse_system_bzip2=1 \
 		-Dno_gc_sections=1 \
 		-Ddisable_fatal_linker_warnings=1 \
 		-Dv8_use_external_startup_data=0 \
+		-Dlibraries_for_target='-lestdc++' \
 		-DOS=openbsd
 
 # Note: these keys are for OpenBSD use ONLY. For your own distribution,
@@ -133,6 +135,14 @@ GYP_DEFS+=	-Dgoogle_api_key='AIzaSyA015yecfJyWi8UQpneQVrNzIKlxjv4MhI' \
 		-Dffmpeg_branding=Chrome \
 		-Dproprietary_codecs=1
 
+.if ${MACHINE_ARCH} == "i386"
+CARCH=		i386
+.elif ${MACHINE_ARCH} == "amd64"
+CARCH=		x86_64
+.endif
+
+MAKE_ENV+=	CPATH=${LOCALBASE}/include/c++/4.9.3/bits/:${LOCALBASE}/include/c++/4.9.3/:${LOCALBASE}/include/c++/4.9.3/${CARCH}-unknown-openbsd5.8/
+
 .if ${FLAVOR:Mdebug}
 GYP_DEFS+=	-Dremove_webcore_debug_symbols=1
 MAKE_ENV+=	V=1
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 0791e317959..30ac072458a 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chromium-44.0.2403.157.tar.xz) = 4aTV/QMIQmhNaehA1BH0W05czzd9fxMf43zhoTQ587Q=
-SIZE (chromium-44.0.2403.157.tar.xz) = 298278532
+SHA256 (chromium-45.0.2454.85.tar.xz) = PowDpabqTMNQF0BKWGh8oYIH7tcHgbrX8tfXBhCTTJE=
+SIZE (chromium-45.0.2454.85.tar.xz) = 321222028
diff --git a/www/chromium/patches/patch-apps_ui_views_app_window_frame_view_cc b/www/chromium/patches/patch-apps_ui_views_app_window_frame_view_cc
index ac8eb5f1132..2b21e25e22f 100644
--- a/www/chromium/patches/patch-apps_ui_views_app_window_frame_view_cc
+++ b/www/chromium/patches/patch-apps_ui_views_app_window_frame_view_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.1 2014/07/20 17:22:33 robert Exp $
---- apps/ui/views/app_window_frame_view.cc.orig.port	Sat Jul 19 05:41:40 2014
-+++ apps/ui/views/app_window_frame_view.cc	Sat Jul 19 05:42:40 2014
-@@ -133,7 +133,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
+$OpenBSD: patch-apps_ui_views_app_window_frame_view_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- apps/ui/views/app_window_frame_view.cc.orig.port	Sat Aug 22 21:01:50 2015
++++ apps/ui/views/app_window_frame_view.cc	Wed Sep  2 07:31:54 2015
+@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
  gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
      const gfx::Rect& client_bounds) const {
    gfx::Rect window_bounds = client_bounds;
diff --git a/www/chromium/patches/patch-ash_display_mirror_window_controller_cc b/www/chromium/patches/patch-ash_display_mirror_window_controller_cc
index 3bbe3a299a0..06553424a43 100644
--- a/www/chromium/patches/patch-ash_display_mirror_window_controller_cc
+++ b/www/chromium/patches/patch-ash_display_mirror_window_controller_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.2 2015/07/24 07:29:52 robert Exp $
---- ash/display/mirror_window_controller.cc.orig.port	Wed Jul 22 15:29:18 2015
-+++ ash/display/mirror_window_controller.cc	Fri Jul 24 09:24:20 2015
-@@ -257,7 +257,11 @@ void MirrorWindowController::UpdateWindow(
+$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- ash/display/mirror_window_controller.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ ash/display/mirror_window_controller.cc	Wed Sep  2 07:31:54 2015
+@@ -259,7 +259,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
                         }) == display_info_list.end()) {
          CloseAndDeleteHost(iter->second, true);
diff --git a/www/chromium/patches/patch-base_base_gypi b/www/chromium/patches/patch-base_base_gypi
index c37e4db650c..0b5a048c308 100644
--- a/www/chromium/patches/patch-base_base_gypi
+++ b/www/chromium/patches/patch-base_base_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_base_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
---- base/base.gypi.orig.port	Wed Jul 15 22:29:55 2015
-+++ base/base.gypi	Wed Jul 22 08:37:29 2015
-@@ -970,11 +970,17 @@
+$OpenBSD: patch-base_base_gypi,v 1.36 2015/09/05 16:06:50 robert Exp $
+--- base/base.gypi.orig.port	Tue Sep  1 22:10:41 2015
++++ base/base.gypi	Wed Sep  2 07:31:54 2015
+@@ -980,11 +980,17 @@
                'process/memory_stubs.cc',
              ],
              'sources/': [
diff --git a/www/chromium/patches/patch-base_debug_debugger_posix_cc b/www/chromium/patches/patch-base_debug_debugger_posix_cc
index f753710ff5e..34849394a15 100644
--- a/www/chromium/patches/patch-base_debug_debugger_posix_cc
+++ b/www/chromium/patches/patch-base_debug_debugger_posix_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.15 2014/07/20 17:22:33 robert Exp $
---- base/debug/debugger_posix.cc.orig.port	Tue Jul 15 13:01:12 2014
-+++ base/debug/debugger_posix.cc	Thu Jul 17 12:25:31 2014
+$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.16 2015/09/05 16:06:50 robert Exp $
+--- base/debug/debugger_posix.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ base/debug/debugger_posix.cc	Wed Sep  2 07:31:54 2015
 @@ -28,6 +28,10 @@
  #include <sys/sysctl.h>
  #endif
@@ -12,7 +12,7 @@ $OpenBSD: patch-base_debug_debugger_posix_cc,v 1.15 2014/07/20 17:22:33 robert E
  #if defined(OS_FREEBSD)
  #include <sys/user.h>
  #endif
-@@ -88,33 +92,38 @@ bool BeingDebugged() {
+@@ -87,33 +91,38 @@ bool BeingDebugged() {
  
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
    // binary interfaces may change.
diff --git a/www/chromium/patches/patch-base_message_loop_message_loop_cc b/www/chromium/patches/patch-base_message_loop_message_loop_cc
index 11331f60bb3..c1ca0c882cc 100644
--- a/www/chromium/patches/patch-base_message_loop_message_loop_cc
+++ b/www/chromium/patches/patch-base_message_loop_message_loop_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.3 2015/04/27 16:38:25 robert Exp $
---- base/message_loop/message_loop.cc.orig.port	Wed Apr 15 00:31:20 2015
-+++ base/message_loop/message_loop.cc	Wed Apr 15 08:32:50 2015
-@@ -221,7 +221,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePump
+$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- base/message_loop/message_loop.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ base/message_loop/message_loop.cc	Wed Sep  2 07:31:54 2015
+@@ -204,7 +204,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePump
  // TODO(rvargas): Get rid of the OS guards.
  #if defined(USE_GLIB) && !defined(OS_NACL)
    typedef MessagePumpGlib MessagePumpForUI;
diff --git a/www/chromium/patches/patch-base_posix_unix_domain_socket_linux_cc b/www/chromium/patches/patch-base_posix_unix_domain_socket_linux_cc
index 2557bfd80a3..ecc2d09ec67 100644
--- a/www/chromium/patches/patch-base_posix_unix_domain_socket_linux_cc
+++ b/www/chromium/patches/patch-base_posix_unix_domain_socket_linux_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.4 2015/05/24 15:51:52 robert Exp $
---- base/posix/unix_domain_socket_linux.cc.orig.port	Wed May 20 09:59:28 2015
-+++ base/posix/unix_domain_socket_linux.cc	Wed May 20 11:34:37 2015
+$OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- base/posix/unix_domain_socket_linux.cc.orig.port	Sat Aug 22 21:01:50 2015
++++ base/posix/unix_domain_socket_linux.cc	Wed Sep  2 07:31:54 2015
 @@ -5,7 +5,10 @@
  #include "base/posix/unix_domain_socket_linux.h"
  
@@ -12,7 +12,7 @@ $OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.4 2015/05/24 15:51:52
  #include <unistd.h>
  
  #include <vector>
-@@ -23,6 +26,14 @@
+@@ -25,6 +28,14 @@ namespace base {
  
  const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
  
@@ -27,7 +27,7 @@ $OpenBSD: patch-base_posix_unix_domain_socket_linux_cc,v 1.4 2015/05/24 15:51:52
  #if !defined(OS_NACL_NONSFI)
  // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes
  // ownership of the newly allocated file descriptors to |one| and |two|.
-@@ -148,7 +159,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
            cmsg->cmsg_type == SCM_CREDENTIALS) {
          DCHECK_EQ(payload_len, sizeof(struct ucred));
          DCHECK_EQ(pid, -1);
diff --git a/www/chromium/patches/patch-base_process_process_posix_cc b/www/chromium/patches/patch-base_process_process_posix_cc
index 9e3d51b062d..92af16235cb 100644
--- a/www/chromium/patches/patch-base_process_process_posix_cc
+++ b/www/chromium/patches/patch-base_process_process_posix_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_process_process_posix_cc,v 1.2 2015/07/23 13:44:04 robert Exp $
---- base/process/process_posix.cc.orig.port	Wed Jul 15 22:29:55 2015
-+++ base/process/process_posix.cc	Wed Jul 22 16:22:41 2015
+$OpenBSD: patch-base_process_process_posix_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- base/process/process_posix.cc.orig.port	Sat Aug 22 21:01:51 2015
++++ base/process/process_posix.cc	Wed Sep  2 07:31:55 2015
 @@ -16,9 +16,13 @@
  #if defined(OS_MACOSX)
  #include <sys/event.h>
@@ -15,7 +15,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.2 2015/07/23 13:44:04 robert E
  #if !defined(OS_NACL_NONSFI)
  
  bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -253,13 +257,6 @@ Process Process::DeprecatedGetProcessFromHandle(Proces
+@@ -255,13 +259,6 @@ Process Process::DeprecatedGetProcessFromHandle(Proces
    return Process(handle);
  }
  
@@ -29,7 +29,7 @@ $OpenBSD: patch-base_process_process_posix_cc,v 1.2 2015/07/23 13:44:04 robert E
  bool Process::IsValid() const {
    return process_ != kNullProcessHandle;
  }
-@@ -353,21 +350,26 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout
+@@ -356,21 +353,26 @@ bool Process::WaitForExitWithTimeout(TimeDelta timeout
    return WaitForExitWithTimeoutImpl(Handle(), exit_code, timeout);
  }
  
diff --git a/www/chromium/patches/patch-base_threading_platform_thread_linux_cc b/www/chromium/patches/patch-base_threading_platform_thread_linux_cc
index 82832a07d83..24aa24a46ec 100644
--- a/www/chromium/patches/patch-base_threading_platform_thread_linux_cc
+++ b/www/chromium/patches/patch-base_threading_platform_thread_linux_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
---- base/threading/platform_thread_linux.cc.orig.port	Wed Jul 15 22:29:55 2015
-+++ base/threading/platform_thread_linux.cc	Wed Jul 22 08:37:29 2015
+$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- base/threading/platform_thread_linux.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ base/threading/platform_thread_linux.cc	Wed Sep  2 07:31:55 2015
 @@ -15,7 +15,9 @@
  
  #if !defined(OS_NACL)
@@ -11,7 +11,7 @@ $OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.6 2015/07/23 13:44:0
  #include <sys/types.h>
  #include <unistd.h>
  #endif
-@@ -74,7 +76,7 @@ void PlatformThread::SetName(const std::string& name) 
+@@ -85,7 +87,7 @@ void PlatformThread::SetName(const std::string& name) 
    ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
    tracked_objects::ThreadData::InitializeThreadContext(name);
  
diff --git a/www/chromium/patches/patch-build_all_gyp b/www/chromium/patches/patch-build_all_gyp
index 8b4144af617..88daae198ff 100644
--- a/www/chromium/patches/patch-build_all_gyp
+++ b/www/chromium/patches/patch-build_all_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-build_all_gyp,v 1.25 2015/07/23 13:44:04 robert Exp $
---- build/all.gyp.orig.port	Wed Jul 15 22:29:56 2015
-+++ build/all.gyp	Wed Jul 22 08:37:29 2015
-@@ -353,7 +353,6 @@
+$OpenBSD: patch-build_all_gyp,v 1.26 2015/09/05 16:06:50 robert Exp $
+--- build/all.gyp.orig.port	Tue Sep  1 22:10:41 2015
++++ build/all.gyp	Wed Sep  2 07:31:55 2015
+@@ -354,7 +354,6 @@
              '../media/midi/midi.gyp:midi_unittests',
              '../mojo/mojo.gyp:mojo',
              '../ppapi/ppapi_internal.gyp:ppapi_unittests',
diff --git a/www/chromium/patches/patch-build_common_gypi b/www/chromium/patches/patch-build_common_gypi
index 01380ab71d2..80ea8150d6d 100644
--- a/www/chromium/patches/patch-build_common_gypi
+++ b/www/chromium/patches/patch-build_common_gypi
@@ -1,16 +1,16 @@
-$OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
---- build/common.gypi.orig.port	Wed Jul 15 22:29:56 2015
-+++ build/common.gypi	Wed Jul 22 08:37:29 2015
-@@ -97,7 +97,7 @@
+$OpenBSD: patch-build_common_gypi,v 1.36 2015/09/05 16:06:50 robert Exp $
+--- build/common.gypi.orig.port	Wed Sep  2 07:33:36 2015
++++ build/common.gypi	Wed Sep  2 07:36:10 2015
+@@ -105,7 +105,7 @@
  
            'conditions': [
-             # ChromeOS and Windows use Aura and Ash.
--            ['chromeos==1 or OS=="win" or OS=="linux"', {
-+            ['chromeos==1 or OS=="win" or OS=="linux" or OS=="openbsd"', {
+             # Windows and Linux (including Chrome OS) use Aura and Ash.
+-            ['OS=="win" or OS=="linux"', {
++            ['OS=="win" or OS=="linux" or OS=="openbsd"', {
                'use_ash%': 1,
                'use_aura%': 1,
              }],
-@@ -735,7 +735,7 @@
+@@ -767,7 +767,7 @@
          }],
  
          # DBus usage.
@@ -19,7 +19,7 @@ $OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
            'use_dbus%': 1,
          }, {
            'use_dbus%': 0,
-@@ -845,7 +845,7 @@
+@@ -880,7 +880,7 @@
  
          # Use GPU accelerated cross process image transport by default
          # on linux builds with the Aura window manager
@@ -28,7 +28,7 @@ $OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
            'ui_compositor_image_transport%': 1,
          }, {
            'ui_compositor_image_transport%': 0,
-@@ -970,7 +970,7 @@
+@@ -981,7 +981,7 @@
          # --help for more information. Meant to be overriden with GYP_DEFINES.
          # TODO(maruel): Remove the conditions as more configurations are
          # supported.
@@ -37,7 +37,7 @@ $OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
            'test_isolation_mode%': 'check',
          }, {
            'test_isolation_mode%': 'noop',
-@@ -986,7 +986,7 @@
+@@ -997,7 +997,7 @@
          }, {
            'use_openmax_dl_fft%': 0,
          }],
@@ -46,7 +46,7 @@ $OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
              'enable_mdns%' : 1,
          }],
  
-@@ -3561,6 +3561,14 @@
+@@ -3612,6 +3612,14 @@
      },
    },
    'conditions': [
@@ -61,7 +61,7 @@ $OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
      ['os_posix==1', {
        'target_defaults': {
          'ldflags': [
-@@ -4626,7 +4634,7 @@
+@@ -4693,7 +4701,7 @@
      }],
      # FreeBSD-specific options; note that most FreeBSD options are set above,
      # with Linux.
@@ -70,7 +70,7 @@ $OpenBSD: patch-build_common_gypi,v 1.35 2015/07/23 13:44:04 robert Exp $
        'target_defaults': {
          'ldflags': [
            '-Wl,--no-keep-memory',
-@@ -5860,8 +5868,8 @@
+@@ -5939,8 +5947,8 @@
      ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
          'and OS!="win"', {
        'make_global_settings': [
diff --git a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc
index 38cf7c2e35d..5ac1e9a9468 100644
--- a/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc
+++ b/www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 robert Exp $
---- chrome/app/chrome_main_delegate.cc.orig.port	Wed Jul 15 22:29:56 2015
-+++ chrome/app/chrome_main_delegate.cc	Wed Jul 22 08:37:29 2015
-@@ -97,11 +97,11 @@
+$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.24 2015/09/05 16:06:50 robert Exp $
+--- chrome/app/chrome_main_delegate.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/app/chrome_main_delegate.cc	Wed Sep  2 07:31:55 2015
+@@ -99,11 +99,11 @@
  #include "ui/base/x/x11_util.h"
  #endif
  
@@ -15,7 +15,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
  #include "base/environment.h"
  #endif
  
-@@ -139,7 +139,7 @@ base::LazyInstance<chrome::ChromeContentBrowserClient>
+@@ -141,7 +141,7 @@ base::LazyInstance<chrome::ChromeContentBrowserClient>
      g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -24,7 +24,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
  base::LazyInstance<chrome::ChromeCrashReporterClient>::Leaky
      g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -248,7 +248,7 @@ bool SubprocessNeedsResourceBundle(const std::string& 
+@@ -250,7 +250,7 @@ bool SubprocessNeedsResourceBundle(const std::string& 
        // Mac needs them for the plugin process name.
        process_type == switches::kPluginProcess ||
  #endif
@@ -33,7 +33,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -302,7 +302,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -304,7 +304,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
  }
  #endif
  
@@ -42,7 +42,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
  void SIGTERMProfilingShutdown(int signal) {
    Profiling::Stop();
    struct sigaction sigact;
-@@ -336,7 +336,7 @@ void InitializeUserDataDir() {
+@@ -338,7 +338,7 @@ void InitializeUserDataDir() {
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -51,7 +51,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -656,7 +656,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -661,7 +661,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -60,7 +60,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
    crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
  #endif
  
-@@ -781,7 +781,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -786,7 +786,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    chrome::InitializePDF();
  #endif
  
@@ -69,7 +69,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.23 2015/07/23 13:44:04 ro
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -910,7 +910,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
+@@ -915,7 +915,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
  #endif
    return process_type == switches::kRelauncherProcess;
  }
diff --git a/www/chromium/patches/patch-chrome_app_chromium_strings_grd b/www/chromium/patches/patch-chrome_app_chromium_strings_grd
index b7a4f5881e4..7d5c2d0e203 100644
--- a/www/chromium/patches/patch-chrome_app_chromium_strings_grd
+++ b/www/chromium/patches/patch-chrome_app_chromium_strings_grd
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.9 2015/07/23 13:44:04 robert Exp $
---- chrome/app/chromium_strings.grd.orig.port	Wed Jul 15 22:29:56 2015
-+++ chrome/app/chromium_strings.grd	Wed Jul 22 08:37:29 2015
-@@ -1129,7 +1129,7 @@ Signing in anyway will merge Chromium information like
+$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.10 2015/09/05 16:06:50 robert Exp $
+--- chrome/app/chromium_strings.grd.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/app/chromium_strings.grd	Wed Sep  2 07:31:55 2015
+@@ -1138,7 +1138,7 @@ Signing in anyway will merge Chromium information like
        </message>
  
        <!-- ProcessSingleton -->
diff --git a/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd b/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd
index 377a15b1b45..104315cfaa4 100644
--- a/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd
+++ b/www/chromium/patches/patch-chrome_app_google_chrome_strings_grd
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.8 2015/07/23 13:44:04 robert Exp $
---- chrome/app/google_chrome_strings.grd.orig.port	Wed Jul 15 22:29:56 2015
-+++ chrome/app/google_chrome_strings.grd	Wed Jul 22 08:37:29 2015
-@@ -1052,7 +1052,7 @@ Signing in anyway will merge Chrome information like b
+$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.9 2015/09/05 16:06:50 robert Exp $
+--- chrome/app/google_chrome_strings.grd.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/app/google_chrome_strings.grd	Wed Sep  2 07:31:55 2015
+@@ -1061,7 +1061,7 @@ Signing in anyway will merge Chrome information like b
        </message>
  
        <!-- ProcessSingleton -->
diff --git a/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd b/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd
index 34369c28edf..b40a1a06172 100644
--- a/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd
+++ b/www/chromium/patches/patch-chrome_app_theme_theme_resources_grd
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.15 2015/07/23 13:44:04 robert Exp $
---- chrome/app/theme/theme_resources.grd.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/app/theme/theme_resources.grd	Wed Jul 22 08:37:29 2015
-@@ -495,7 +495,7 @@
+$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.16 2015/09/05 16:06:50 robert Exp $
+--- chrome/app/theme/theme_resources.grd.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/app/theme/theme_resources.grd	Wed Sep  2 07:31:55 2015
+@@ -489,7 +489,7 @@
          <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW" file="cros/notification_peripheral_battery_low.png" />
          <structure type="chrome_scaled_image" name="IDR_PORTAL_DETECTION_ALERT" file="cros/captive_portal_icon.png" />
        </if>
diff --git a/www/chromium/patches/patch-chrome_browser_about_flags_cc b/www/chromium/patches/patch-chrome_browser_about_flags_cc
index 85a79599600..6ebe378cde1 100644
--- a/www/chromium/patches/patch-chrome_browser_about_flags_cc
+++ b/www/chromium/patches/patch-chrome_browser_about_flags_cc
@@ -1,21 +1,21 @@
-$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.19 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/about_flags.cc.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/browser/about_flags.cc	Wed Jul 22 08:37:29 2015
-@@ -743,7 +743,7 @@ const Experiment kExperiments[] = {
-     kOsLinux,
-     SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)
-   },
+$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.20 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/about_flags.cc.orig.port	Wed Sep  2 07:36:16 2015
++++ chrome/browser/about_flags.cc	Wed Sep  2 07:36:50 2015
+@@ -710,7 +710,7 @@ const Experiment kExperiments[] = {
+      // On by default for the Mac (different implementation in WebKit).
+      kOsLinux | kOsWin,
+      SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)},
 -#if defined(USE_AURA) || defined(OS_LINUX)
 +#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD)
-   {
-     "overlay-scrollbars",
-     IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_NAME,
-@@ -1584,7 +1584,7 @@ const Experiment kExperiments[] = {
-     SINGLE_VALUE_TYPE(switches::kResetAppListInstallState)
-   },
- #if defined(ENABLE_APP_LIST)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   {
-     // This is compiled out on non-Linux platforms because otherwise it would be
-     // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing.
+     {"overlay-scrollbars",
+      IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_NAME,
+      IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_DESCRIPTION,
+@@ -825,7 +825,7 @@ const Experiment kExperiments[] = {
+      SINGLE_VALUE_TYPE(switches::kEnableSpellingAutoCorrect)},
+ #endif
+ #if defined(ENABLE_SPELLCHECK) && \
+-    (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS))
++    (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD))
+     {"enable-multilingual-spellchecker",
+      IDS_FLAGS_ENABLE_MULTILINGUAL_SPELLCHECKER_NAME,
+      IDS_FLAGS_ENABLE_MULTILINGUAL_SPELLCHECKER_DESCRIPTION,
diff --git a/www/chromium/patches/patch-chrome_browser_browser_resources_grd b/www/chromium/patches/patch-chrome_browser_browser_resources_grd
index db48b79f4d3..d54dc462af6 100644
--- a/www/chromium/patches/patch-chrome_browser_browser_resources_grd
+++ b/www/chromium/patches/patch-chrome_browser_browser_resources_grd
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.20 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/browser_resources.grd.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/browser/browser_resources.grd	Wed Jul 22 08:37:29 2015
-@@ -240,7 +240,7 @@
+$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.21 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/browser_resources.grd.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/browser/browser_resources.grd	Wed Sep  2 07:31:55 2015
+@@ -234,7 +234,7 @@
        <if expr="chromeos">
          <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
        </if>
diff --git a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
index f2c9c737d1e..4b3b856275a 100644
--- a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
+++ b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.20 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/chrome_content_browser_client.cc.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/browser/chrome_content_browser_client.cc	Wed Jul 22 08:37:29 2015
-@@ -167,7 +167,7 @@
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.21 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/chrome_content_browser_client.cc.orig.port	Wed Sep  2 07:36:55 2015
++++ chrome/browser/chrome_content_browser_client.cc	Wed Sep  2 07:37:42 2015
+@@ -178,7 +178,7 @@
  #include "chrome/browser/chrome_browser_main_posix.h"
  #endif
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.20 2015/07/2
  #include "base/debug/leak_annotations.h"
  #include "components/crash/app/breakpad_linux.h"
  #include "components/crash/browser/crash_handler_host_linux.h"
-@@ -429,7 +429,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
+@@ -444,7 +444,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
    return false;
  }
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.20 2015/07/2
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -1178,7 +1178,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -1246,7 +1246,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -28,12 +28,12 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.20 2015/07/2
    if (breakpad::IsCrashReporterEnabled()) {
      scoped_ptr<metrics::ClientInfo> client_info =
          GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2219,7 +2219,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
-   }
+@@ -2332,7 +2332,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
+   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
+   DCHECK(!app_data_path.empty());
  }
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
diff --git a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
index fcf63e9b350..a2c8d35a7ae 100644
--- a/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
+++ b/www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
@@ -1,12 +1,12 @@
-$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.14 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/chrome_content_browser_client.h.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/browser/chrome_content_browser_client.h	Wed Jul 22 08:37:29 2015
-@@ -239,7 +239,7 @@ class ChromeContentBrowserClient : public content::Con
-       content::RenderFrameHost* render_frame_host,
-       blink::WebPageVisibilityState* visibility_state) override;
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.15 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/chrome_content_browser_client.h.orig.port	Wed Sep  2 07:37:47 2015
++++ chrome/browser/chrome_content_browser_client.h	Wed Sep  2 07:37:52 2015
+@@ -253,7 +253,7 @@ class ChromeContentBrowserClient : public content::Con
+       int child_process_id,
+       content::FileDescriptorInfo* mappings,
+       std::map<int, base::MemoryMappedFile::Region>* regions) override;
+-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    void GetAdditionalMappedFilesForChildProcess(
        const base::CommandLine& command_line,
        int child_process_id,
diff --git a/www/chromium/patches/patch-chrome_browser_download_download_commands_cc b/www/chromium/patches/patch-chrome_browser_download_download_commands_cc
index 3aebdacf0c8..691f5e30207 100644
--- a/www/chromium/patches/patch-chrome_browser_download_download_commands_cc
+++ b/www/chromium/patches/patch-chrome_browser_download_download_commands_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.2 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/download/download_commands.cc.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/browser/download/download_commands.cc	Wed Jul 22 08:37:29 2015
-@@ -118,7 +118,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
+$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/download/download_commands.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/browser/download/download_commands.cc	Wed Sep  2 07:31:55 2015
+@@ -117,7 +117,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
               download_crx_util::IsExtensionDownload(*download_item_);
      case ALWAYS_OPEN_TYPE:
  #if defined(OS_WIN) || defined(OS_LINUX) || \
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.2 2015/07/23 13
        if (CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
              download_item_->GetBrowserContext());
-@@ -161,7 +161,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+@@ -160,7 +160,7 @@ void DownloadCommands::ExecuteCommand(Command command)
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
            download_item_->GetBrowserContext());
  #if defined(OS_WIN) || defined(OS_LINUX) || \
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.2 2015/07/23 13
        if (CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          DownloadItemModel(download_item_)
-@@ -228,7 +228,7 @@ Browser* DownloadCommands::GetBrowser() const {
+@@ -227,7 +227,7 @@ Browser* DownloadCommands::GetBrowser() const {
    return browser_displayer.browser();
  }
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.2 2015/07/23 13
  bool DownloadCommands::IsDownloadPdf() const {
    base::FilePath path = download_item_->GetTargetFilePath();
    return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -245,7 +245,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
+@@ -244,7 +244,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
    return IsDownloadPdf() &&
           (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                            : true);
diff --git a/www/chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc b/www/chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc
index 132d0fed536..db2862a7045 100644
--- a/www/chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc
+++ b/www/chromium/patches/patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.6 2014/07/20 17:22:33 robert Exp $
---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig.port	Thu Jul 17 12:39:23 2014
-+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	Thu Jul 17 12:39:33 2014
-@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDevicesFunction:
+$OpenBSD: patch-chrome_browser_extensions_api_image_writer_private_image_writer_private_api_cc,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	Wed Sep  2 07:31:55 2015
+@@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDevicesFunction:
  }
  
  bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
diff --git a/www/chromium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc b/www/chromium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc
index 63ab9bef90a..52403c7f28f 100644
--- a/www/chromium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc
+++ b/www/chromium/patches/patch-chrome_browser_extensions_api_messaging_message_service_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.1 2015/05/24 15:51:53 robert Exp $
---- chrome/browser/extensions/api/messaging/message_service.cc.orig.port	Sat May 23 00:59:48 2015
-+++ chrome/browser/extensions/api/messaging/message_service.cc	Sat May 23 01:03:20 2015
+$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/extensions/api/messaging/message_service.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/browser/extensions/api/messaging/message_service.cc	Wed Sep  2 07:31:55 2015
 @@ -108,7 +108,7 @@ MessageService::PolicyPermission MessageService::IsNat
  
  const char kReceivingEndDoesntExistError[] =
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.1
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -406,7 +406,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -412,7 +412,7 @@ void MessageService::OpenChannelToNativeApp(
    if (!source)
      return;
  
diff --git a/www/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc b/www/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc
deleted file mode 100644
index 9293a787baa..00000000000
--- a/www/chromium/patches/patch-chrome_browser_extensions_api_tabs_tabs_api_cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-chrome_browser_extensions_api_tabs_tabs_api_cc,v 1.1 2015/07/25 12:59:15 robert Exp $
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig.port	Fri Jul 24 10:30:19 2015
-+++ chrome/browser/extensions/api/tabs/tabs_api.cc	Fri Jul 24 10:31:21 2015
-@@ -659,7 +659,7 @@ bool WindowsCreateFunction::RunSync() {
- 
-   WindowController* controller = new_window->extension_window_controller();
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   // On Desktop Linux, window managers may ignore hints until the X11 window is
-   // mapped, which happens in the blocking call to Show() above.
-   // DesktopWindowTreeHostX11 currently only checks for an attempt to maximize
-@@ -669,7 +669,7 @@ bool WindowsCreateFunction::RunSync() {
-   if (create_params.initial_show_state == ui::SHOW_STATE_MINIMIZED)
-     new_window->window()->Minimize();
- #endif
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
-+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
-   // On Desktop Linux and Windows, managers don't handle fullscreen state to
-   // create window for now.
-   if (create_params.initial_show_state == ui::SHOW_STATE_FULLSCREEN)
diff --git a/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc b/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc
index beb8ea82c1b..59251dc8b6f 100644
--- a/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc
+++ b/www/chromium/patches/patch-chrome_browser_extensions_bookmark_app_helper_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.2 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/extensions/bookmark_app_helper.cc.orig.port	Wed Jul 15 22:29:57 2015
-+++ chrome/browser/extensions/bookmark_app_helper.cc	Wed Jul 22 08:37:29 2015
-@@ -621,7 +621,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
+$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig.port	Tue Sep  1 22:10:41 2015
++++ chrome/browser/extensions/bookmark_app_helper.cc	Wed Sep  2 07:31:55 2015
+@@ -656,7 +656,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
    chrome::HostDesktopType desktop = browser->host_desktop_type();
    if (desktop != chrome::HOST_DESKTOP_TYPE_ASH) {
      web_app::ShortcutLocations creation_locations;
diff --git a/www/chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc b/www/chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
index f43cdee4823..4940229fa2f 100644
--- a/www/chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
+++ b/www/chromium/patches/patch-chrome_browser_media_galleries_media_file_system_registry_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.12 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/media_galleries/media_file_system_registry.cc	Wed Jul 22 08:37:29 2015
-@@ -763,7 +763,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.13 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/media_galleries/media_file_system_registry.cc	Wed Sep  2 07:31:55 2015
+@@ -764,7 +764,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/chromium/patches/patch-chrome_browser_memory_details_cc b/www/chromium/patches/patch-chrome_browser_memory_details_cc
index 4319d8eec30..1f3f1495988 100644
--- a/www/chromium/patches/patch-chrome_browser_memory_details_cc
+++ b/www/chromium/patches/patch-chrome_browser_memory_details_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.27 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/memory_details.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/memory_details.cc	Wed Jul 22 08:37:29 2015
+$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.28 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/memory_details.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/memory_details.cc	Wed Sep  2 07:31:55 2015
 @@ -30,7 +30,7 @@
  #include "content/public/common/content_constants.h"
  #include "ui/base/l10n/l10n_util.h"
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.27 2015/07/23 13:44:04 robe
    const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
  #endif
  
-@@ -352,7 +352,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -354,7 +354,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
        }
      }
  
diff --git a/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc b/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc
index 1bb1d70262c..0def352d0ee 100644
--- a/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc
+++ b/www/chromium/patches/patch-chrome_browser_process_singleton_posix_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.2 2015/03/18 19:26:29 robert Exp $
---- chrome/browser/process_singleton_posix.cc.orig.port	Tue Mar 10 23:29:07 2015
-+++ chrome/browser/process_singleton_posix.cc	Wed Mar 11 07:22:50 2015
-@@ -82,11 +82,11 @@
+$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/process_singleton_posix.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/process_singleton_posix.cc	Wed Sep  2 07:31:55 2015
+@@ -84,11 +84,11 @@
  #include "net/base/net_util.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -15,7 +15,7 @@ $OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.2 2015/03/18 19:26
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -322,7 +322,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -324,7 +324,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
    if (g_disable_prompt)
      return false;
  
@@ -24,7 +24,7 @@ $OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.2 2015/03/18 19:26
    base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
        IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
    return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -878,7 +878,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
+@@ -877,7 +877,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
      // The other process is shutting down, it's safe to start a new process.
      return PROCESS_NONE;
    } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
diff --git a/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json b/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json
index a01e14712c7..d43a90581b5 100644
--- a/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json
+++ b/www/chromium/patches/patch-chrome_browser_resources_plugin_metadata_plugins_linux_json
@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.1 2013/05/31 15:38:59 robert Exp $
---- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig.port	Thu May 30 22:40:41 2013
-+++ chrome/browser/resources/plugin_metadata/plugins_linux.json	Thu May 30 22:42:13 2013
+$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig.port	Wed Sep  2 07:40:25 2015
++++ chrome/browser/resources/plugin_metadata/plugins_linux.json	Wed Sep  2 07:40:38 2015
 @@ -70,28 +70,6 @@
      "displayurl": true,
      "group_name_matcher": "Java*"
@@ -15,15 +15,15 @@ $OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.
 -    ],
 -    "versions": [
 -      {
--        "version": "11.1.102",
+-        "version": "18.0.0.233",
 -        "status": "up_to_date",
--        "reference": "http://www.adobe.com/support/security/bulletins/apsb12-03.html"
+-        "reference": "https://helpx.adobe.com/security/products/flash-player/apsb15-19.html"
 -      }
 -    ],
 -    "lang": "en-US",
 -    "name": "Adobe Flash Player",
 -    "help_url": "https://support.google.com/chrome/?p=plugin_flash",
--    "url": "http://get.adobe.com/flashplayer/",
+-    "url": "https://support.google.com/chrome/answer/6258784",
 -    "displayurl": true,
 -    "group_name_matcher": "*Shockwave Flash*"
 -  },
diff --git a/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc b/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc
index 9010949ee87..33fa0ae1f5b 100644
--- a/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc
+++ b/www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ssl_ssl_blocking_page_cc,v 1.7 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ssl/ssl_blocking_page.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/ssl/ssl_blocking_page.cc	Wed Jul 22 08:37:29 2015
-@@ -152,7 +152,7 @@ void LaunchDateAndTimeSettings() {
+$OpenBSD: patch-chrome_browser_ssl_ssl_blocking_page_cc,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ssl/ssl_blocking_page.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ssl/ssl_blocking_page.cc	Wed Sep  2 07:31:55 2015
+@@ -145,7 +145,7 @@ void LaunchDateAndTimeSettings() {
    // iOS does not have a way to launch the date and time settings.
    NOTREACHED();
  
diff --git a/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc b/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc
index 8445836096a..1b9fae7529d 100644
--- a/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc
+++ b/www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.13 2015/05/24 15:51:53 robert Exp $
---- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port	Thu May 14 00:23:03 2015
-+++ chrome/browser/sync/profile_sync_components_factory_impl.cc	Wed May 20 08:34:56 2015
-@@ -406,7 +406,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop
+$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.14 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/sync/profile_sync_components_factory_impl.cc	Wed Sep  2 07:31:55 2015
+@@ -421,7 +421,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop
    }
  #endif
  
diff --git a/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc b/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc
index dffcaba4d66..ca35d6d8fb5 100644
--- a/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc
+++ b/www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
---- chrome/browser/tracing/crash_service_uploader.cc.orig.port	Wed Apr 15 15:38:34 2015
-+++ chrome/browser/tracing/crash_service_uploader.cc	Wed Apr 15 15:38:45 2015
-@@ -127,6 +127,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
+$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/tracing/crash_service_uploader.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/tracing/crash_service_uploader.cc	Wed Sep  2 07:31:55 2015
+@@ -143,6 +143,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
    const char product[] = "Chrome_ChromeOS";
diff --git a/www/chromium/patches/patch-chrome_browser_ui_browser_cc b/www/chromium/patches/patch-chrome_browser_ui_browser_cc
index 66ccd32508d..329c8e1895e 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_browser_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_browser_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.10 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/browser.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/ui/browser.cc	Wed Jul 22 08:37:29 2015
-@@ -1312,7 +1312,7 @@ void Browser::OnWindowDidShow() {
+$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.11 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/browser.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/browser.cc	Wed Sep  2 07:31:55 2015
+@@ -1371,7 +1371,7 @@ void Browser::OnWindowDidShow() {
    window_has_shown_ = true;
  
  // CurrentProcessInfo::CreationTime() is missing on some platforms.
diff --git a/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc b/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc
index edf59178e24..22af50fc0c9 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.14 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig.port	Wed Jul 22 08:43:51 2015
-+++ chrome/browser/ui/toolbar/wrench_menu_model.cc	Wed Jul 22 08:44:17 2015
-@@ -796,7 +796,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_i
+$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.15 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/toolbar/wrench_menu_model.cc	Wed Sep  2 07:31:55 2015
+@@ -808,7 +808,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_i
      case IDC_UPGRADE_DIALOG:
        return browser_defaults::kShowUpgradeMenuItem &&
            UpgradeDetector::GetInstance()->notify_upgrade();
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc b/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc
index 177584c22af..a3c945f421f 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.2 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc	Wed Jul 22 08:37:29 2015
+$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc	Wed Sep  2 07:31:55 2015
 @@ -34,7 +34,7 @@
  #include "ash/shell_window_ids.h"
  #endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
-@@ -135,7 +135,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
+@@ -141,7 +141,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
      const AppWindow::CreateParams& create_params,
      views::Widget::InitParams* init_params,
      views::Widget* widget) {
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc
index 7928d105b07..e01384dcd60 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc
@@ -1,39 +1,30 @@
-$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.9 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/ui/views/chrome_views_delegate.cc	Wed Jul 22 16:06:27 2015
+$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.10 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port	Wed Sep  2 07:40:44 2015
++++ chrome/browser/ui/views/chrome_views_delegate.cc	Thu Sep  3 07:27:38 2015
 @@ -47,7 +47,7 @@
  #include "ui/views/widget/native_widget_aura.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -233,7 +233,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW
+@@ -234,7 +234,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW
    return chrome::IsNativeViewInAsh(window);
  }
  
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
    return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
-@@ -372,7 +372,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
+@@ -373,7 +373,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
  #endif
  }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
    // On Ubuntu Unity, the system always provides a title bar for maximized
    // windows.
-@@ -389,7 +389,7 @@ std::string ChromeViewsDelegate::GetApplicationName() 
-   return chrome::VersionInfo().Name();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- scoped_refptr<base::TaskRunner>
-     ChromeViewsDelegate::GetTaskRunnerForAuraLinuxAccessibilityInit() {
-   // This should be on the FILE thread so that we can open libatk-bridge.so
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
index a121e1736b5..02099b18155 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
@@ -1,27 +1,21 @@
-$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.7 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/views/chrome_views_delegate.h.orig.port	Wed Jul 22 08:44:23 2015
-+++ chrome/browser/ui/views/chrome_views_delegate.h	Wed Jul 22 08:44:55 2015
-@@ -31,7 +31,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig.port	Wed Sep  2 07:42:47 2015
++++ chrome/browser/ui/views/chrome_views_delegate.h	Thu Sep  3 07:29:00 2015
+@@ -33,7 +33,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
    HICON GetDefaultWindowIcon() const override;
    HICON GetSmallWindowIcon() const override;
    bool IsWindowInMetro(gfx::NativeWindow window) const override;
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    gfx::ImageSkia* GetDefaultWindowIcon() const override;
  #endif
  
-@@ -44,12 +44,12 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+@@ -46,7 +46,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
    void OnBeforeWidgetInit(
        views::Widget::InitParams* params,
        views::internal::NativeWidgetDelegate* delegate) override;
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    bool WindowManagerProvidesTitleBar(bool maximized) override;
  #endif
    ui::ContextFactory* GetContextFactory() override;
-   std::string GetApplicationName() override;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   scoped_refptr<base::TaskRunner>
-       GetTaskRunnerForAuraLinuxAccessibilityInit() override;
- #endif
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
index 7a846aa7ba3..5b52bf17882 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.12 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port	Wed Jul 15 22:29:58 2015
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	Wed Jul 22 08:37:29 2015
-@@ -53,7 +53,7 @@
+$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.13 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	Wed Sep  2 07:31:55 2015
+@@ -54,7 +54,7 @@
  #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
  #endif
  
@@ -10,16 +10,16 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.1
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -78,7 +78,7 @@ const int kContentEdgeShadowThickness = 2;
- // The icon never shrinks below 16 px on a side.
+@@ -81,7 +81,7 @@ const int kContentEdgeShadowThickness = 2;
  const int kIconMinimumSize = 16;
+ #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  // The number of pixels to move the frame background image upwards when using
  // the GTK+ theme and the titlebar is condensed.
  const int kGTKThemeCondensedFrameTopInset = 15;
-@@ -333,7 +333,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+@@ -336,7 +336,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
  
  void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
                                                   const gfx::Point& point) {
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.1
    views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
                                  views::MenuRunner::HAS_MNEMONICS);
    ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
-@@ -619,7 +619,7 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder
+@@ -622,7 +622,7 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder
    frame_background_->set_theme_image(GetFrameImage());
    frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
    frame_background_->set_top_area_height(GetTopAreaHeight());
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_message_center_web_notification_tray_cc b/www/chromium/patches/patch-chrome_browser_ui_views_message_center_web_notification_tray_cc
index 6b1b8a19591..5227387f127 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_message_center_web_notification_tray_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_message_center_web_notification_tray_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_views_message_center_web_notification_tray_cc,v 1.1 2015/01/22 11:16:41 robert Exp $
---- chrome/browser/ui/views/message_center/web_notification_tray.cc.orig.port	Sat Dec 27 12:59:28 2014
-+++ chrome/browser/ui/views/message_center/web_notification_tray.cc	Sat Dec 27 13:07:51 2014
-@@ -31,7 +31,7 @@
+$OpenBSD: patch-chrome_browser_ui_views_message_center_web_notification_tray_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/message_center/web_notification_tray.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/ui/views/message_center/web_notification_tray.cc	Wed Sep  2 07:31:55 2015
+@@ -34,7 +34,7 @@
  #include "ui/strings/grit/ui_strings.h"
  #include "ui/views/widget/widget.h"
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_message_center_web_notification_tray_cc,
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -66,7 +66,7 @@ gfx::ImageSkia* GetIcon(int unread_count, bool is_quie
+@@ -69,7 +69,7 @@ gfx::ImageSkia* GetIcon(int unread_count, bool is_quie
  }
  
  bool CanDestroyStatusIcon() {
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc
index ec8b0e35801..a0abacd892b 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_panels_panel_frame_view_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_views_panels_panel_frame_view_cc,v 1.4 2015/05/24 15:51:53 robert Exp $
---- chrome/browser/ui/views/panels/panel_frame_view.cc.orig.port	Thu May 14 00:23:04 2015
-+++ chrome/browser/ui/views/panels/panel_frame_view.cc	Wed May 20 08:34:56 2015
-@@ -586,7 +586,7 @@ bool PanelFrameView::OnMousePressed(const ui::MouseEve
+$OpenBSD: patch-chrome_browser_ui_views_panels_panel_frame_view_cc,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/panels/panel_frame_view.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/ui/views/panels/panel_frame_view.cc	Wed Sep  2 07:31:55 2015
+@@ -587,7 +587,7 @@ bool PanelFrameView::OnMousePressed(const ui::MouseEve
  }
  
  bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) {
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc b/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
index 977114fbc35..bb6a3ccdfbb 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.6 2015/05/24 15:51:53 robert Exp $
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig.port	Thu May 14 00:23:04 2015
-+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc	Wed May 20 08:34:56 2015
-@@ -266,7 +266,7 @@ void TabDragController::Init(
+$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig.port	Sat Aug 22 21:01:52 2015
++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc	Wed Sep  2 07:31:55 2015
+@@ -272,7 +272,7 @@ void TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.6 2015/0
    can_release_capture_ = false;
  #else
    can_release_capture_ =
-@@ -618,7 +618,7 @@ TabDragController::DragBrowserToNewTabStrip(
+@@ -624,7 +624,7 @@ TabDragController::DragBrowserToNewTabStrip(
      // that to effect the position of any windows.
      SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.6 2015/0
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -1784,7 +1784,7 @@ gfx::NativeWindow TabDragController::GetLocalProcessWi
+@@ -1804,7 +1804,7 @@ gfx::NativeWindow TabDragController::GetLocalProcessWi
      if (dragged_window)
        exclude.insert(dragged_window);
    }
diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_task_manager_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_task_manager_view_cc
index 63272da2d32..a3bbf5a6510 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_views_task_manager_view_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_views_task_manager_view_cc
@@ -1,9 +1,9 @@
-$OpenBSD: patch-chrome_browser_ui_views_task_manager_view_cc,v 1.1 2015/05/24 15:51:53 robert Exp $
---- chrome/browser/ui/views/task_manager_view.cc.orig.port	Sat May 23 00:59:48 2015
-+++ chrome/browser/ui/views/task_manager_view.cc	Sat May 23 01:06:30 2015
-@@ -326,7 +326,7 @@ void TaskManagerView::Init() {
-                       ui::TableColumn::RIGHT, -1, 0));
+$OpenBSD: patch-chrome_browser_ui_views_task_manager_view_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/views/task_manager_view.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/views/task_manager_view.cc	Wed Sep  2 07:31:55 2015
+@@ -339,7 +339,7 @@ void TaskManagerView::Init() {
    columns_.back().sortable = true;
+   columns_.back().initial_sort_is_ascending = false;
    // TODO(port) http://crbug.com/120488 for non-Linux.
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
index 44a0b45ad5d..a9cfcb3731c 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.28 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/webui/about_ui.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/browser/ui/webui/about_ui.cc	Wed Jul 22 08:37:29 2015
-@@ -64,7 +64,7 @@
+$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.29 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/webui/about_ui.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/webui/about_ui.cc	Wed Sep  2 07:31:55 2015
+@@ -65,7 +65,7 @@
  #include "chrome/browser/ui/webui/theme_source.h"
  #endif
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.28 2015/07/23 13:44:04 r
  #include "content/public/browser/zygote_host_linux.h"
  #include "content/public/common/sandbox_linux.h"
  #endif
-@@ -658,7 +658,7 @@ void FinishMemoryDataRequest(
+@@ -656,7 +656,7 @@ void FinishMemoryDataRequest(
    }
  }
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.28 2015/07/23 13:44:04 r
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -674,6 +674,7 @@ std::string AboutLinuxProxyConfig() {
+@@ -672,6 +672,7 @@ std::string AboutLinuxProxyConfig() {
    return data;
  }
  
@@ -27,7 +27,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.28 2015/07/23 13:44:04 r
  void AboutSandboxRow(std::string* data, int name_id, bool good) {
    data->append("<tr><td>");
    data->append(l10n_util::GetStringUTF8(name_id));
-@@ -741,6 +742,7 @@ std::string AboutSandbox() {
+@@ -739,6 +740,7 @@ std::string AboutSandbox() {
    return data;
  }
  #endif
@@ -35,7 +35,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.28 2015/07/23 13:44:04 r
  
  // AboutMemoryHandler ----------------------------------------------------------
  
-@@ -913,7 +915,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -911,7 +913,7 @@ void AboutUIHTMLSource::StartDataRequest(
    } else if (source_name_ == chrome::kChromeUIDNSHost) {
      AboutDnsHandler::Start(profile(), callback);
      return;
@@ -44,7 +44,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.28 2015/07/23 13:44:04 r
    } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
      response = AboutLinuxProxyConfig();
  #endif
-@@ -927,7 +929,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -925,7 +927,7 @@ void AboutUIHTMLSource::StartDataRequest(
      ChromeOSCreditsHandler::Start(path, callback);
      return;
  #endif
diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
index 981fc72be59..b0d232163af 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.5 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	Wed Jul 22 08:37:29 2015
-@@ -501,7 +501,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	Wed Sep  2 07:31:55 2015
+@@ -503,7 +503,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
diff --git a/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc b/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc
index 0771d1fd610..6ed404c143d 100644
--- a/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc
+++ b/www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.15 2015/07/23 13:44:04 robert Exp $
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc	Wed Jul 22 08:37:29 2015
-@@ -476,7 +476,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
+$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.16 2015/09/05 16:06:50 robert Exp $
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/browser/ui/webui/options/browser_options_handler.cc	Wed Sep  2 07:31:55 2015
+@@ -480,7 +480,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
      { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
  #endif  // defined(OS_CHROMEOS)
  
diff --git a/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi b/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi
index fe8988b7d35..7a4a60c7c7a 100644
--- a/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi
+++ b/www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi
@@ -1,15 +1,7 @@
-$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.21 2015/07/28 10:06:07 sthen Exp $
---- chrome/chrome_browser_extensions.gypi.orig.port	Fri Jul 24 21:26:02 2015
-+++ chrome/chrome_browser_extensions.gypi	Mon Jul 27 22:31:20 2015
-@@ -907,6 +907,7 @@
-         'installer_util',
-         'safe_browsing_proto',
-         '../components/components.gyp:copresence',
-+        '../components/components.gyp:dom_distiller_core',
-         '../components/components.gyp:onc_component',
-         '../components/components.gyp:proximity_auth',
-         '../components/components.gyp:update_client',
-@@ -955,6 +956,11 @@
+$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.22 2015/09/05 16:06:50 robert Exp $
+--- chrome/chrome_browser_extensions.gypi.orig.port	Wed Sep  2 07:43:13 2015
++++ chrome/chrome_browser_extensions.gypi	Wed Sep  2 07:44:13 2015
+@@ -985,6 +985,11 @@
          '<@(chrome_browser_extensions_enabled_sources)',
        ],
        'conditions': [
@@ -19,14 +11,14 @@ $OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.21 2015/07/28 10:06:07
 +          ],
 +        }],
          ['chromeos==1', {
-           'include_dirs': [
-             '../third_party/libjingle/source',
-@@ -989,7 +995,7 @@
-             '../ui/keyboard/keyboard.gyp:keyboard_resources',
+           'dependencies': [
+             '../build/linux/system.gyp:dbus',
+@@ -1021,7 +1026,7 @@
+             '../ui/views/views.gyp:views',
            ],
          }],
 -        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
++        ['OS=="linux" or os_bsd==1', {
            'conditions': [
              ['use_aura==1', {
                'dependencies': [
diff --git a/www/chromium/patches/patch-chrome_chrome_browser_gypi b/www/chromium/patches/patch-chrome_chrome_browser_gypi
index 1b1a12d5f19..5e1a9d16144 100644
--- a/www/chromium/patches/patch-chrome_chrome_browser_gypi
+++ b/www/chromium/patches/patch-chrome_chrome_browser_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.38 2015/07/23 13:44:04 robert Exp $
---- chrome/chrome_browser.gypi.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/chrome_browser.gypi	Wed Jul 22 08:37:29 2015
-@@ -3416,7 +3416,7 @@
+$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.39 2015/09/05 16:06:50 robert Exp $
+--- chrome/chrome_browser.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/chrome_browser.gypi	Thu Sep  3 07:20:51 2015
+@@ -3528,7 +3528,7 @@
              '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
            ],
          }],
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.38 2015/07/23 13:44:04 robert Exp
            'dependencies': [
              '../build/linux/system.gyp:libspeechd',
            ],
-@@ -3472,7 +3472,7 @@
+@@ -3584,7 +3584,7 @@
          ['use_x11==1', {
            'sources': [ '<@(chrome_browser_x11_sources)' ],
          }],
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.38 2015/07/23 13:44:04 robert Exp
            'sources': [
              'app/chrome_crash_reporter_client.cc',
              'app/chrome_crash_reporter_client.h',
-@@ -3574,6 +3574,13 @@
+@@ -3698,6 +3698,14 @@
              }],
            ],
          }],
@@ -28,12 +28,13 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.38 2015/07/23 13:44:04 robert Exp
 +            ['exclude', '^browser/chrome_browser_main_linux.cc'],
 +            ['exclude', '^browser/chrome_browser_main_linux.h'],
 +            ['exclude', '^browser/media_galleries/linux/'],
++            ['exclude', '^browser/memory/system_memory_stats_recorder_linux.cc'],
 +          ],
 +        }],
          ['OS=="mac"', {
            'dependencies': [
              '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
-@@ -3667,7 +3674,7 @@
+@@ -3796,7 +3804,7 @@
              }],
            ],
          }],
diff --git a/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi b/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi
index 25008bf1c8b..34b6b0b7e6c 100644
--- a/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi
+++ b/www/chromium/patches/patch-chrome_chrome_browser_ui_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.13 2015/07/23 13:44:04 robert Exp $
---- chrome/chrome_browser_ui.gypi.orig.port	Wed Jul 22 08:45:00 2015
-+++ chrome/chrome_browser_ui.gypi	Wed Jul 22 08:45:52 2015
-@@ -2922,7 +2922,7 @@
+$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.14 2015/09/05 16:06:50 robert Exp $
+--- chrome/chrome_browser_ui.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/chrome_browser_ui.gypi	Wed Sep  2 07:31:55 2015
+@@ -2934,7 +2934,7 @@
              }],
            ],
          }],
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.13 2015/07/23 13:44:04 robert
            'dependencies': [
              # gtk2 is the only component that can interact with gtk2 in our new
              # world.
-@@ -2930,7 +2930,7 @@
+@@ -2942,7 +2942,7 @@
              '../build/linux/system.gyp:gio',
            ],
          }],
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.13 2015/07/23 13:44:04 robert
            'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
          }],
          ['use_aura==1', {
-@@ -3083,10 +3083,10 @@
+@@ -3105,10 +3105,10 @@
              }],
            ],
          }],
diff --git a/www/chromium/patches/patch-chrome_chrome_common_gypi b/www/chromium/patches/patch-chrome_chrome_common_gypi
index 3547f4cf0f2..9d4dcad2304 100644
--- a/www/chromium/patches/patch-chrome_chrome_common_gypi
+++ b/www/chromium/patches/patch-chrome_chrome_common_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_chrome_common_gypi,v 1.2 2015/07/23 13:44:04 robert Exp $
---- chrome/chrome_common.gypi.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/chrome_common.gypi	Wed Jul 22 08:37:29 2015
-@@ -540,6 +540,7 @@
+$OpenBSD: patch-chrome_chrome_common_gypi,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- chrome/chrome_common.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/chrome_common.gypi	Wed Sep  2 07:31:55 2015
+@@ -541,6 +541,7 @@
          }],
          ['safe_browsing==1', {
            'sources': [ '<@(chrome_common_full_safe_browsing_sources)', ],
diff --git a/www/chromium/patches/patch-chrome_chrome_utility_gypi b/www/chromium/patches/patch-chrome_chrome_utility_gypi
index 47cacb0cbbc..d8fa0a57095 100644
--- a/www/chromium/patches/patch-chrome_chrome_utility_gypi
+++ b/www/chromium/patches/patch-chrome_chrome_utility_gypi
@@ -1,11 +1,11 @@
-$OpenBSD: patch-chrome_chrome_utility_gypi,v 1.2 2015/07/23 13:44:04 robert Exp $
---- chrome/chrome_utility.gypi.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/chrome_utility.gypi	Wed Jul 22 08:37:29 2015
-@@ -100,6 +100,7 @@
+$OpenBSD: patch-chrome_chrome_utility_gypi,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- chrome/chrome_utility.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/chrome_utility.gypi	Wed Sep  2 07:31:55 2015
+@@ -102,6 +102,7 @@
        'variables': { 'enable_wexit_time_destructors': 1, },
        'dependencies': [
          '../base/base.gyp:base',
 +	'../chrome/chrome.gyp:safe_browsing_proto',
          '../components/components_strings.gyp:components_strings',
+         '../components/components.gyp:safe_json_parser_message_filter',
          '../components/components.gyp:search_engines',
-         '../components/components.gyp:url_fixer',
diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_cc b/www/chromium/patches/patch-chrome_common_chrome_paths_cc
index 472697baf24..b7929a9b41a 100644
--- a/www/chromium/patches/patch-chrome_common_chrome_paths_cc
+++ b/www/chromium/patches/patch-chrome_common_chrome_paths_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.27 2015/07/23 13:44:04 robert Exp $
---- chrome/common/chrome_paths.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/chrome_paths.cc	Wed Jul 22 08:37:29 2015
-@@ -179,7 +179,7 @@ bool PathProvider(int key, base::FilePath* result) {
+$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.28 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/chrome_paths.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/chrome_paths.cc	Wed Sep  2 07:31:55 2015
+@@ -172,7 +172,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.27 2015/07/23 13:44:04 robert
        if (!GetUserDownloadsDirectorySafe(&cur))
          return false;
        break;
-@@ -452,7 +452,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -455,7 +455,7 @@ bool PathProvider(int key, base::FilePath* result) {
        if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_h b/www/chromium/patches/patch-chrome_common_chrome_paths_h
index 5cc67b0ad08..93fcd8b8228 100644
--- a/www/chromium/patches/patch-chrome_common_chrome_paths_h
+++ b/www/chromium/patches/patch-chrome_common_chrome_paths_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.8 2015/07/23 13:44:04 robert Exp $
---- chrome/common/chrome_paths.h.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/chrome_paths.h	Wed Jul 22 08:37:29 2015
-@@ -111,7 +111,7 @@ enum {
+$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.9 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/chrome_paths.h.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/chrome_paths.h	Wed Sep  2 07:31:55 2015
+@@ -112,7 +112,7 @@ enum {
    DIR_SUPERVISED_USERS_DEFAULT_APPS,  // Directory where installer places .crx
                                        // files to be installed when managed user
                                        // session starts.
diff --git a/www/chromium/patches/patch-chrome_common_chrome_switches_cc b/www/chromium/patches/patch-chrome_common_chrome_switches_cc
index 13155cedec0..40662febfff 100644
--- a/www/chromium/patches/patch-chrome_common_chrome_switches_cc
+++ b/www/chromium/patches/patch-chrome_common_chrome_switches_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.13 2015/07/23 13:44:04 robert Exp $
---- chrome/common/chrome_switches.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/chrome_switches.cc	Wed Jul 22 08:37:29 2015
-@@ -1211,7 +1211,7 @@ const char kHelpShort[]                     = "h";
+$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.14 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/chrome_switches.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/chrome_switches.cc	Wed Sep  2 07:31:55 2015
+@@ -1217,7 +1217,7 @@ const char kHelpShort[]                     = "h";
  const char kPasswordStore[]                 = "password-store";
  #endif
  
diff --git a/www/chromium/patches/patch-chrome_common_chrome_switches_h b/www/chromium/patches/patch-chrome_common_chrome_switches_h
index 05301455ad9..6d9f4cd991b 100644
--- a/www/chromium/patches/patch-chrome_common_chrome_switches_h
+++ b/www/chromium/patches/patch-chrome_common_chrome_switches_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.19 2015/07/23 13:44:04 robert Exp $
---- chrome/common/chrome_switches.h.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/chrome_switches.h	Wed Jul 22 08:37:29 2015
-@@ -341,7 +341,7 @@ extern const char kHelpShort[];
+$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.20 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/chrome_switches.h.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/chrome_switches.h	Wed Sep  2 07:31:55 2015
+@@ -344,7 +344,7 @@ extern const char kHelpShort[];
  extern const char kPasswordStore[];
  #endif
  
diff --git a/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi b/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi
index 991919f0a19..64a74d39706 100644
--- a/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi
+++ b/www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.6 2015/07/23 13:44:04 robert Exp $
---- chrome/common/extensions/api/schemas.gypi.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/extensions/api/schemas.gypi	Wed Jul 22 08:37:29 2015
-@@ -165,6 +165,11 @@
+$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/extensions/api/schemas.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/extensions/api/schemas.gypi	Wed Sep  2 07:31:55 2015
+@@ -166,6 +166,11 @@
            '<@(webrtc_schema_files)',
          ],
        }],
diff --git a/www/chromium/patches/patch-chrome_common_pref_names_cc b/www/chromium/patches/patch-chrome_common_pref_names_cc
index a3d8c5ca629..6309ec16a16 100644
--- a/www/chromium/patches/patch-chrome_common_pref_names_cc
+++ b/www/chromium/patches/patch-chrome_common_pref_names_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_pref_names_cc,v 1.16 2015/07/23 13:44:04 robert Exp $
---- chrome/common/pref_names.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/pref_names.cc	Wed Jul 22 08:37:29 2015
-@@ -870,7 +870,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force
+$OpenBSD: patch-chrome_common_pref_names_cc,v 1.17 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/pref_names.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/pref_names.cc	Wed Sep  2 07:31:55 2015
+@@ -862,7 +862,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force
  // supervised users.
  const char kRecordHistory[] = "settings.history_recorded";
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_pref_names_cc,v 1.16 2015/07/23 13:44:04 robert Ex
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
-@@ -1425,7 +1425,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1399,7 +1399,7 @@ const char kDownloadDefaultDirectory[] = "download.def
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
diff --git a/www/chromium/patches/patch-chrome_common_pref_names_h b/www/chromium/patches/patch-chrome_common_pref_names_h
index 4a410707a76..86c6ecdb6b0 100644
--- a/www/chromium/patches/patch-chrome_common_pref_names_h
+++ b/www/chromium/patches/patch-chrome_common_pref_names_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_common_pref_names_h,v 1.16 2015/07/23 13:44:04 robert Exp $
---- chrome/common/pref_names.h.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/pref_names.h	Wed Jul 22 08:37:29 2015
-@@ -296,7 +296,7 @@ extern const char kForceYouTubeSafetyMode[];
+$OpenBSD: patch-chrome_common_pref_names_h,v 1.17 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/pref_names.h.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/pref_names.h	Wed Sep  2 07:31:55 2015
+@@ -294,7 +294,7 @@ extern const char kForceYouTubeSafetyMode[];
  extern const char kRecordHistory[];
  extern const char kDeleteTimePeriod[];
  extern const char kLastClearBrowsingDataTime[];
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_pref_names_h,v 1.16 2015/07/23 13:44:04 robert Exp
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -501,7 +501,7 @@ extern const char kAppWindowPlacement[];
+@@ -494,7 +494,7 @@ extern const char kAppWindowPlacement[];
  extern const char kDownloadDefaultDirectory[];
  extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadDirUpgraded[];
diff --git a/www/chromium/patches/patch-chrome_common_url_constants_cc b/www/chromium/patches/patch-chrome_common_url_constants_cc
index 05974953238..23bcaf820b4 100644
--- a/www/chromium/patches/patch-chrome_common_url_constants_cc
+++ b/www/chromium/patches/patch-chrome_common_url_constants_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_common_url_constants_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
---- chrome/common/url_constants.cc.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/url_constants.cc	Wed Jul 22 08:37:29 2015
+$OpenBSD: patch-chrome_common_url_constants_cc,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/url_constants.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/url_constants.cc	Wed Sep  2 07:31:55 2015
 @@ -131,7 +131,7 @@ const char kChromeUIGestureConfigURL[] = "chrome://ges
  const char kChromeUIGestureConfigHost[] = "gesture";
  #endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_url_constants_cc,v 1.6 2015/07/23 13:44:04 robert
  const char kChromeUITabModalConfirmDialogURL[] =
      "chrome://tab-modal-confirm-dialog/";
  #endif
-@@ -312,7 +312,7 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos
+@@ -309,7 +309,7 @@ const char kChromeOSAssetPath[] = "/usr/share/chromeos
  const char kChromeUIMetroFlowHost[] = "make-metro";
  #endif
  
diff --git a/www/chromium/patches/patch-chrome_common_url_constants_h b/www/chromium/patches/patch-chrome_common_url_constants_h
index cf545e5b1fc..26ff6379909 100644
--- a/www/chromium/patches/patch-chrome_common_url_constants_h
+++ b/www/chromium/patches/patch-chrome_common_url_constants_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-chrome_common_url_constants_h,v 1.6 2015/07/23 13:44:04 robert Exp $
---- chrome/common/url_constants.h.orig.port	Wed Jul 15 22:29:59 2015
-+++ chrome/common/url_constants.h	Wed Jul 22 08:37:29 2015
+$OpenBSD: patch-chrome_common_url_constants_h,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- chrome/common/url_constants.h.orig.port	Tue Sep  1 22:10:42 2015
++++ chrome/common/url_constants.h	Wed Sep  2 07:31:55 2015
 @@ -123,7 +123,7 @@ extern const char kChromeUIGestureConfigURL[];
  extern const char kChromeUIGestureConfigHost[];
  #endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_url_constants_h,v 1.6 2015/07/23 13:44:04 robert E
  extern const char kChromeUITabModalConfirmDialogURL[];
  #endif
  
-@@ -295,7 +295,7 @@ extern const char kChromeOSAssetPath[];
+@@ -292,7 +292,7 @@ extern const char kChromeOSAssetPath[];
  extern const char kChromeUIMetroFlowHost[];
  #endif
  
diff --git a/www/chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc b/www/chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc
index e71da324843..d6ce30e2a6d 100644
--- a/www/chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc
+++ b/www/chromium/patches/patch-chromecast_browser_cast_content_browser_client_cc
@@ -1,8 +1,8 @@
-$OpenBSD: patch-chromecast_browser_cast_content_browser_client_cc,v 1.1 2015/07/28 11:30:25 robert Exp $
---- chromecast/browser/cast_content_browser_client.cc.orig.port	Tue Jul 28 07:49:12 2015
-+++ chromecast/browser/cast_content_browser_client.cc	Tue Jul 28 07:57:48 2015
-@@ -178,7 +178,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
-       command_line->AppendSwitch(switches::kEnableCmaMediaPipeline);
+$OpenBSD: patch-chromecast_browser_cast_content_browser_client_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- chromecast/browser/cast_content_browser_client.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ chromecast/browser/cast_content_browser_client.cc	Wed Sep  2 07:31:55 2015
+@@ -200,7 +200,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+       command_line->AppendSwitch(switches::kEnableLegacyHolePunching);
    }
  
 -#if defined(OS_LINUX)
diff --git a/www/chromium/patches/patch-components_omnibox_omnibox_field_trial_cc b/www/chromium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc
similarity index 58%
rename from www/chromium/patches/patch-components_omnibox_omnibox_field_trial_cc
rename to www/chromium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc
index f706fecb296..7032fc01d2d 100644
--- a/www/chromium/patches/patch-components_omnibox_omnibox_field_trial_cc
+++ b/www/chromium/patches/patch-components_omnibox_browser_omnibox_field_trial_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-components_omnibox_omnibox_field_trial_cc,v 1.1 2015/05/24 15:51:53 robert Exp $
---- components/omnibox/omnibox_field_trial.cc.orig.port	Sat May 23 00:59:48 2015
-+++ components/omnibox/omnibox_field_trial.cc	Sat May 23 01:09:33 2015
+$OpenBSD: patch-components_omnibox_browser_omnibox_field_trial_cc,v 1.1 2015/09/05 16:06:50 robert Exp $
+--- components/omnibox/browser/omnibox_field_trial.cc.orig.port	Wed Sep  2 07:44:30 2015
++++ components/omnibox/browser/omnibox_field_trial.cc	Wed Sep  2 07:44:44 2015
 @@ -155,7 +155,7 @@ bool OmniboxFieldTrial::InZeroSuggestFieldTrial() {
            kBundledExperimentFieldTrialName, kZeroSuggestRule) == "false")
      return false;
diff --git a/www/chromium/patches/patch-content_app_content_main_runner_cc b/www/chromium/patches/patch-content_app_content_main_runner_cc
index a8d532589d9..ed3ab2c718e 100644
--- a/www/chromium/patches/patch-content_app_content_main_runner_cc
+++ b/www/chromium/patches/patch-content_app_content_main_runner_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_app_content_main_runner_cc,v 1.23 2015/07/23 13:44:04 robert Exp $
---- content/app/content_main_runner.cc.orig.port	Wed Jul 15 22:30:02 2015
-+++ content/app/content_main_runner.cc	Wed Jul 22 08:37:29 2015
-@@ -97,11 +97,11 @@
+$OpenBSD: patch-content_app_content_main_runner_cc,v 1.24 2015/09/05 16:06:50 robert Exp $
+--- content/app/content_main_runner.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ content/app/content_main_runner.cc	Wed Sep  2 07:31:55 2015
+@@ -100,11 +100,11 @@
  #include "base/posix/global_descriptors.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -15,7 +15,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.23 2015/07/23 13:44:04 ro
  #include "content/zygote/zygote_main.h"
  #endif
  
-@@ -262,7 +262,7 @@ struct MainFunction {
+@@ -265,7 +265,7 @@ struct MainFunction {
    int (*function)(const MainFunctionParams&);
  };
  
@@ -24,7 +24,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.23 2015/07/23 13:44:04 ro
  // On platforms that use the zygote, we have a special subset of
  // subprocesses that are launched via the zygote.  This function
  // fills in some process-launching bits around ZygoteMain().
-@@ -382,7 +382,7 @@ int RunNamedProcessTypeMain(
+@@ -385,7 +385,7 @@ int RunNamedProcessTypeMain(
      }
    }
  
diff --git a/www/chromium/patches/patch-content_browser_browser_main_loop_cc b/www/chromium/patches/patch-content_browser_browser_main_loop_cc
index e9896fee534..a375ba1ddab 100644
--- a/www/chromium/patches/patch-content_browser_browser_main_loop_cc
+++ b/www/chromium/patches/patch-content_browser_browser_main_loop_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.28 2015/07/23 13:44:04 robert Exp $
---- content/browser/browser_main_loop.cc.orig.port	Wed Jul 15 22:30:02 2015
-+++ content/browser/browser_main_loop.cc	Wed Jul 22 08:37:29 2015
-@@ -157,7 +157,7 @@
+$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.29 2015/09/05 16:06:50 robert Exp $
+--- content/browser/browser_main_loop.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ content/browser/browser_main_loop.cc	Wed Sep  2 07:31:55 2015
+@@ -161,7 +161,7 @@
  namespace content {
  namespace {
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.28 2015/07/23 13:44:04
  void SetupSandbox(const base::CommandLine& parsed_command_line) {
    TRACE_EVENT0("startup", "SetupSandbox");
    base::FilePath sandbox_binary;
-@@ -433,7 +433,7 @@ void BrowserMainLoop::EarlyInitialization() {
+@@ -415,7 +415,7 @@ void BrowserMainLoop::EarlyInitialization() {
    TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
    TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization");
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.28 2015/07/23 13:44:04
    // No thread should be created before this call, as SetupSandbox()
    // will end-up using fork().
    SetupSandbox(parsed_command_line_);
-@@ -951,7 +951,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
+@@ -943,7 +943,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
    }
  #endif
  
diff --git a/www/chromium/patches/patch-content_browser_child_process_launcher_cc b/www/chromium/patches/patch-content_browser_child_process_launcher_cc
index c27008c31c9..0823f60b78a 100644
--- a/www/chromium/patches/patch-content_browser_child_process_launcher_cc
+++ b/www/chromium/patches/patch-content_browser_child_process_launcher_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.22 2015/07/23 13:44:04 robert Exp $
---- content/browser/child_process_launcher.cc.orig.port	Wed Jul 15 22:30:02 2015
-+++ content/browser/child_process_launcher.cc	Wed Jul 22 08:37:29 2015
-@@ -111,7 +111,11 @@ void LaunchOnLauncherThread(const NotifyCallback& call
+$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.23 2015/09/05 16:06:50 robert Exp $
+--- content/browser/child_process_launcher.cc.orig.port	Wed Sep  2 07:44:50 2015
++++ content/browser/child_process_launcher.cc	Wed Sep  2 07:46:27 2015
+@@ -114,7 +114,11 @@ void LaunchOnLauncherThread(const NotifyCallback& call
    base::EnvironmentMap env = delegate->GetEnvironment();
    base::ScopedFD ipcfd = delegate->TakeIpcFd();
  #elif defined(OS_POSIX) && !defined(OS_ANDROID)
@@ -13,16 +13,16 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.22 2015/07/23 13:4
    base::EnvironmentMap env = delegate->GetEnvironment();
    base::ScopedFD ipcfd = delegate->TakeIpcFd();
  #endif
-@@ -157,7 +161,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call
+@@ -196,7 +200,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call
    // We need to close the client end of the IPC channel to reliably detect
    // child termination.
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-       *cmd_line, child_process_id, files_to_register.get());
    if (use_zygote) {
-@@ -173,7 +177,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call
+     base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
+         cmd_line->argv(), files_to_register.Pass(), process_type);
+@@ -210,7 +214,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call
          files_to_register->GetMappingWithIDAdjustment(
              base::GlobalDescriptors::kBaseDescriptor);
  
@@ -31,7 +31,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.22 2015/07/23 13:4
      if (process_type == switches::kRendererProcess) {
        const int sandbox_fd =
            RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -254,7 +258,7 @@ void TerminateOnLauncherThread(bool zygote, base::Proc
+@@ -294,7 +298,7 @@ void TerminateOnLauncherThread(bool zygote, base::Proc
    process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
  #if defined(OS_POSIX)
@@ -40,7 +40,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.22 2015/07/23 13:4
    if (zygote) {
      // If the renderer was created via a zygote, we have to proxy the reaping
      // through the zygote process.
-@@ -359,7 +363,7 @@ void ChildProcessLauncher::Launch(
+@@ -399,7 +403,7 @@ void ChildProcessLauncher::Launch(
  
  void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
    DCHECK(CalledOnValidThread());
@@ -49,7 +49,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.22 2015/07/23 13:4
    if (zygote_) {
      termination_status_ = ZygoteHostImpl::GetInstance()->
          GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
-@@ -441,7 +445,7 @@ void ChildProcessLauncher::Notify(
+@@ -481,7 +485,7 @@ void ChildProcessLauncher::Notify(
    starting_ = false;
    process_ = process.Pass();
  
diff --git a/www/chromium/patches/patch-content_browser_download_base_file_cc b/www/chromium/patches/patch-content_browser_download_base_file_cc
index a9118b93926..4efceea5b89 100644
--- a/www/chromium/patches/patch-content_browser_download_base_file_cc
+++ b/www/chromium/patches/patch-content_browser_download_base_file_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_browser_download_base_file_cc,v 1.4 2014/11/19 21:27:32 robert Exp $
---- content/browser/download/base_file.cc.orig.port	Wed Nov 19 05:53:03 2014
-+++ content/browser/download/base_file.cc	Wed Nov 19 08:38:25 2014
-@@ -208,7 +208,7 @@ void BaseFile::SetClientGuid(const std::string& guid) 
+$OpenBSD: patch-content_browser_download_base_file_cc,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- content/browser/download/base_file.cc.orig.port	Sat Aug 22 21:01:54 2015
++++ content/browser/download/base_file.cc	Wed Sep  2 07:31:55 2015
+@@ -209,7 +209,7 @@ void BaseFile::SetClientGuid(const std::string& guid) 
  }
  
  // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
diff --git a/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
index 2ceb17ede8b..74e867dcf1d 100644
--- a/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
+++ b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.10 2015/07/23 13:44:04 robert Exp $
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port	Wed Jul 15 22:30:02 2015
-+++ content/browser/renderer_host/render_widget_host_view_aura.cc	Wed Jul 22 08:37:29 2015
+$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.11 2015/09/05 16:06:50 robert Exp $
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ content/browser/renderer_host/render_widget_host_view_aura.cc	Wed Sep  2 07:31:55 2015
 @@ -94,7 +94,7 @@
  #include "ui/gfx/win/dpi.h"
  #endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v
  #include "content/common/input_messages.h"
  #include "ui/events/linux/text_edit_command_auralinux.h"
  #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -2470,7 +2470,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2473,7 +2473,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v
    return NeedsInputGrab();
  #endif
    return false;
-@@ -2689,7 +2689,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod()
+@@ -2695,7 +2695,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod()
  
  void RenderWidgetHostViewAura::ForwardKeyboardEvent(
      const NativeWebKeyboardEvent& event) {
diff --git a/www/chromium/patches/patch-content_content_browser_gypi b/www/chromium/patches/patch-content_content_browser_gypi
index 7bc06f7d890..7f06efc2a0d 100644
--- a/www/chromium/patches/patch-content_content_browser_gypi
+++ b/www/chromium/patches/patch-content_content_browser_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_content_browser_gypi,v 1.33 2015/07/23 13:44:04 robert Exp $
---- content/content_browser.gypi.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/content_browser.gypi	Wed Jul 22 08:37:29 2015
-@@ -1976,9 +1976,26 @@
+$OpenBSD: patch-content_content_browser_gypi,v 1.34 2015/09/05 16:06:50 robert Exp $
+--- content/content_browser.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ content/content_browser.gypi	Wed Sep  2 07:31:55 2015
+@@ -2028,9 +2028,26 @@
        ],
      }],
      ['os_bsd==1', {
@@ -30,7 +30,7 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.33 2015/07/23 13:44:04 robert E
      }],
      ['use_aura==1', {
        'dependencies': [
-@@ -2025,10 +2042,7 @@
+@@ -2077,10 +2094,7 @@
          'browser/geolocation/empty_wifi_data_provider.cc',
        ],
      }],
diff --git a/www/chromium/patches/patch-content_content_common_gypi b/www/chromium/patches/patch-content_content_common_gypi
index 32aee3cdc5e..792874c0e12 100644
--- a/www/chromium/patches/patch-content_content_common_gypi
+++ b/www/chromium/patches/patch-content_content_common_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_content_common_gypi,v 1.22 2015/07/23 13:44:04 robert Exp $
---- content/content_common.gypi.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/content_common.gypi	Wed Jul 22 08:37:29 2015
-@@ -715,6 +715,34 @@
+$OpenBSD: patch-content_content_common_gypi,v 1.23 2015/09/05 16:06:50 robert Exp $
+--- content/content_common.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ content/content_common.gypi	Wed Sep  2 07:31:55 2015
+@@ -731,6 +731,34 @@
          'content.gyp:common_aidl',
        ],
      }],
diff --git a/www/chromium/patches/patch-content_content_renderer_gypi b/www/chromium/patches/patch-content_content_renderer_gypi
index 17e3ea7f597..fabd249a95b 100644
--- a/www/chromium/patches/patch-content_content_renderer_gypi
+++ b/www/chromium/patches/patch-content_content_renderer_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_content_renderer_gypi,v 1.7 2015/07/23 13:44:04 robert Exp $
---- content/content_renderer.gypi.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/content_renderer.gypi	Wed Jul 22 08:37:29 2015
-@@ -27,6 +27,7 @@
+$OpenBSD: patch-content_content_renderer_gypi,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- content/content_renderer.gypi.orig.port	Tue Sep  1 22:10:42 2015
++++ content/content_renderer.gypi	Wed Sep  2 07:31:55 2015
+@@ -30,6 +30,7 @@
      '../third_party/icu/icu.gyp:icuuc',
      '../third_party/libjingle/libjingle.gyp:libjingle',
      '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
diff --git a/www/chromium/patches/patch-content_gpu_gpu_main_cc b/www/chromium/patches/patch-content_gpu_gpu_main_cc
index b6e52430194..1dec9736c96 100644
--- a/www/chromium/patches/patch-content_gpu_gpu_main_cc
+++ b/www/chromium/patches/patch-content_gpu_gpu_main_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
---- content/gpu/gpu_main.cc.orig.port	Wed Jul 22 08:46:00 2015
-+++ content/gpu/gpu_main.cc	Wed Jul 22 08:47:47 2015
-@@ -85,7 +85,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li
+$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- content/gpu/gpu_main.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ content/gpu/gpu_main.cc	Wed Sep  2 07:31:55 2015
+@@ -87,7 +87,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li
  bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
  #endif
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
  #if !defined(OS_CHROMEOS)
  bool CanAccessNvidiaDeviceFile();
  #endif
-@@ -163,13 +163,13 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -165,13 +165,13 @@ int GpuMain(const MainFunctionParams& parameters) {
    // Use a UI message loop because ANGLE and the desktop GL platform can
    // create child windows to render to.
    base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
@@ -26,7 +26,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
    base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
  #elif defined(OS_MACOSX)
    // This is necessary for CoreAnimation layers hosted in the GPU process to be
-@@ -240,6 +240,10 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -242,6 +242,10 @@ int GpuMain(const MainFunctionParams& parameters) {
        initialized_sandbox = true;
      }
  #endif  // defined(OS_LINUX)
@@ -37,7 +37,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
  
      base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
  
-@@ -287,7 +291,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -289,7 +293,7 @@ int GpuMain(const MainFunctionParams& parameters) {
        }
  #endif
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
        initialized_gl_context = true;
  #if !defined(OS_CHROMEOS)
        if (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA
-@@ -326,14 +330,16 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -328,14 +332,16 @@ int GpuMain(const MainFunctionParams& parameters) {
        watchdog_thread = NULL;
      }
  
@@ -64,7 +64,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.6 2015/07/23 13:44:04 robert Exp $
  #elif defined(OS_WIN)
      gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info);
  #elif defined(OS_MACOSX)
-@@ -431,7 +437,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
+@@ -436,7 +442,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
  }
  #endif
  
diff --git a/www/chromium/patches/patch-content_public_common_content_switches_cc b/www/chromium/patches/patch-content_public_common_content_switches_cc
index ed736a3da4e..e50eebab1cc 100644
--- a/www/chromium/patches/patch-content_public_common_content_switches_cc
+++ b/www/chromium/patches/patch-content_public_common_content_switches_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_public_common_content_switches_cc,v 1.7 2015/07/23 13:44:04 robert Exp $
---- content/public/common/content_switches.cc.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/public/common/content_switches.cc	Wed Jul 22 08:37:30 2015
-@@ -969,7 +969,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
+$OpenBSD: patch-content_public_common_content_switches_cc,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- content/public/common/content_switches.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ content/public/common/content_switches.cc	Wed Sep  2 07:31:55 2015
+@@ -968,7 +968,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
      "disable-vaapi-accelerated-video-encode";
  #endif
  
diff --git a/www/chromium/patches/patch-content_public_common_content_switches_h b/www/chromium/patches/patch-content_public_common_content_switches_h
index 654ec88511b..4ca1809dc76 100644
--- a/www/chromium/patches/patch-content_public_common_content_switches_h
+++ b/www/chromium/patches/patch-content_public_common_content_switches_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_public_common_content_switches_h,v 1.7 2015/07/23 13:44:04 robert Exp $
---- content/public/common/content_switches.h.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/public/common/content_switches.h	Wed Jul 22 08:37:30 2015
-@@ -278,7 +278,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[
+$OpenBSD: patch-content_public_common_content_switches_h,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- content/public/common/content_switches.h.orig.port	Tue Sep  1 22:10:42 2015
++++ content/public/common/content_switches.h	Wed Sep  2 07:31:55 2015
+@@ -280,7 +280,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
  
diff --git a/www/chromium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc b/www/chromium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc
index 297b8e768a7..1b605a33f56 100644
--- a/www/chromium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc
+++ b/www/chromium/patches/patch-content_renderer_devtools_v8_sampling_profiler_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.1 2015/05/24 15:51:53 robert Exp $
---- content/renderer/devtools/v8_sampling_profiler.cc.orig.port	Sat May 23 00:02:06 2015
-+++ content/renderer/devtools/v8_sampling_profiler.cc	Sat May 23 00:16:46 2015
+$OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- content/renderer/devtools/v8_sampling_profiler.cc.orig.port	Sat Aug 22 21:01:55 2015
++++ content/renderer/devtools/v8_sampling_profiler.cc	Wed Sep  2 07:31:55 2015
 @@ -4,7 +4,7 @@
  
  #include "content/renderer/devtools/v8_sampling_profiler.h"
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.1 2015/05/
  #include <signal.h>
  #define USE_SIGNALS
  #endif
-@@ -197,7 +197,10 @@ class Sampler {
+@@ -199,7 +199,10 @@ class Sampler {
    static const unsigned kNumberOfSamples = 10;
    typedef LockFreeCircularQueue<SampleRecord, kNumberOfSamples> SamplingQueue;
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.1 2015/05/
    Isolate* isolate_;
    scoped_ptr<SamplingQueue> samples_data_;
    base::subtle::Atomic32 code_added_events_count_;
-@@ -291,6 +294,7 @@ void Sampler::DoSample(const v8::RegisterState& state)
+@@ -293,6 +296,7 @@ void Sampler::DoSample(const v8::RegisterState& state)
  }
  
  void Sampler::InjectPendingEvents() {
@@ -29,7 +29,7 @@ $OpenBSD: patch-content_renderer_devtools_v8_sampling_profiler_cc,v 1.1 2015/05/
    SampleRecord* record = samples_data_->Peek();
    while (record) {
      TRACE_EVENT_SAMPLE_WITH_TID_AND_TIMESTAMP1(
-@@ -302,6 +306,7 @@ void Sampler::InjectPendingEvents() {
+@@ -304,6 +308,7 @@ void Sampler::InjectPendingEvents() {
      record = samples_data_->Peek();
      base::subtle::NoBarrier_AtomicIncrement(&samples_count_, 1);
    }
diff --git a/www/chromium/patches/patch-content_renderer_render_thread_impl_cc b/www/chromium/patches/patch-content_renderer_render_thread_impl_cc
index 6e877ca790e..b656aa18499 100644
--- a/www/chromium/patches/patch-content_renderer_render_thread_impl_cc
+++ b/www/chromium/patches/patch-content_renderer_render_thread_impl_cc
@@ -1,12 +1,12 @@
-$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.4 2015/07/23 13:44:04 robert Exp $
---- content/renderer/render_thread_impl.cc.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/renderer/render_thread_impl.cc	Wed Jul 22 08:37:30 2015
-@@ -670,7 +670,7 @@ void RenderThreadImpl::Init() {
-                   static_cast<unsigned>(compositor_raster_threads_.size() + 1))
-                   .c_str()));
-       raster_thread->Start();
+$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- content/renderer/render_thread_impl.cc.orig.port	Wed Sep  2 07:46:34 2015
++++ content/renderer/render_thread_impl.cc	Wed Sep  2 07:46:41 2015
+@@ -768,7 +768,7 @@ void RenderThreadImpl::Init() {
+   is_gather_pixel_refs_enabled_ = num_raster_threads > 1;
+ 
+   base::SimpleThread::Options thread_options;
 -#if defined(OS_ANDROID) || defined(OS_LINUX)
 +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-       if (!command_line.HasSwitch(
-               switches::kUseNormalPriorityForTileTaskWorkerThreads)) {
-         raster_thread->SetThreadPriority(base::ThreadPriority::BACKGROUND);
+   if (!command_line.HasSwitch(
+           switches::kUseNormalPriorityForTileTaskWorkerThreads)) {
+     thread_options.set_priority(base::ThreadPriority::BACKGROUND);
diff --git a/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc b/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
index f9b2b8dd251..bb14c9acba5 100644
--- a/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
+++ b/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.5 2015/07/23 13:44:04 robert Exp $
---- content/renderer/renderer_blink_platform_impl.cc.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/renderer/renderer_blink_platform_impl.cc	Wed Jul 22 08:37:30 2015
-@@ -99,7 +99,7 @@
+$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- content/renderer/renderer_blink_platform_impl.cc.orig.port	Tue Sep  1 22:10:42 2015
++++ content/renderer/renderer_blink_platform_impl.cc	Wed Sep  2 07:31:55 2015
+@@ -102,7 +102,7 @@
  
  #if defined(OS_POSIX)
  #include "base/file_descriptor_posix.h"
@@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.5 2015/07/2
  #include <map>
  #include <string>
  
-@@ -189,7 +189,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi
+@@ -192,7 +192,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi
    scoped_refptr<ThreadSafeSender> thread_safe_sender_;
  };
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.5 2015/07/2
  class RendererBlinkPlatformImpl::SandboxSupport
      : public blink::WebSandboxSupport {
   public:
-@@ -232,7 +232,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -235,7 +235,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        plugin_refresh_allowed_(true),
        default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
        web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
@@ -28,7 +28,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.5 2015/07/2
    if (g_sandbox_enabled && sandboxEnabled()) {
      sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
    } else {
-@@ -285,7 +285,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::fi
+@@ -288,7 +288,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::fi
  }
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
@@ -37,7 +37,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.5 2015/07/2
    // These platforms do not require sandbox support.
    return NULL;
  #else
-@@ -553,7 +553,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFo
+@@ -556,7 +556,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFo
    return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
  }
  
diff --git a/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h b/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h
index 1257b6b23e0..3e18442cabd 100644
--- a/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h
+++ b/www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_h,v 1.2 2015/07/23 13:44:04 robert Exp $
---- content/renderer/renderer_blink_platform_impl.h.orig.port	Wed Jul 15 22:30:03 2015
-+++ content/renderer/renderer_blink_platform_impl.h	Wed Jul 22 08:37:30 2015
-@@ -223,7 +223,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_h,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- content/renderer/renderer_blink_platform_impl.h.orig.port	Tue Sep  1 22:10:42 2015
++++ content/renderer/renderer_blink_platform_impl.h	Wed Sep  2 07:31:55 2015
+@@ -219,7 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    class MimeRegistry;
    scoped_ptr<MimeRegistry> mime_registry_;
  
diff --git a/www/chromium/patches/patch-device_serial_serial_service_impl_cc b/www/chromium/patches/patch-device_serial_serial_service_impl_cc
index bead8c63c11..8175acf8e4c 100644
--- a/www/chromium/patches/patch-device_serial_serial_service_impl_cc
+++ b/www/chromium/patches/patch-device_serial_serial_service_impl_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.3 2015/07/23 13:44:04 robert Exp $
---- device/serial/serial_service_impl.cc.orig.port	Wed Jul 15 22:30:04 2015
-+++ device/serial/serial_service_impl.cc	Wed Jul 22 08:37:30 2015
-@@ -69,9 +69,14 @@ void SerialServiceImpl::Connect(
+$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- device/serial/serial_service_impl.cc.orig.port	Sat Aug 22 21:01:55 2015
++++ device/serial/serial_service_impl.cc	Wed Sep  2 07:31:55 2015
+@@ -72,9 +72,14 @@ void SerialServiceImpl::Connect(
  }
  
  SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {
diff --git a/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc b/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc
deleted file mode 100644
index 92349250f3a..00000000000
--- a/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v 1.4 2015/07/23 13:44:04 robert Exp $
---- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig.port	Wed Jul 15 22:30:04 2015
-+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc	Wed Jul 22 08:37:30 2015
-@@ -91,7 +91,7 @@ class TransferThread : public base::Thread {
-  public:
-   TransferThread() : base::Thread(kAsyncTransferThreadName) {
-     Start();
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     SetPriority(base::ThreadPriority::BACKGROUND);
- #endif
-   }
-@@ -467,14 +467,14 @@ bool AsyncPixelTransferDelegateEGL::TransferIsInProgre
- 
- void AsyncPixelTransferDelegateEGL::WaitForTransferCompletion() {
-   if (state_->TransferIsInProgress()) {
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::DISPLAY);
- #endif
- 
-     state_->WaitForTransferCompletion();
-     DCHECK(!state_->TransferIsInProgress());
- 
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::BACKGROUND);
- #endif
-   }
diff --git a/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_share_group_cc b/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_share_group_cc
index 20fcb6549f7..89cb66b4d62 100644
--- a/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_share_group_cc
+++ b/www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_share_group_cc
@@ -1,12 +1,12 @@
-$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_share_group_cc,v 1.3 2015/07/23 13:44:04 robert Exp $
---- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig.port	Wed Jul 15 22:30:04 2015
-+++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc	Wed Jul 22 08:37:30 2015
+$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_share_group_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig.port	Wed Sep  2 07:47:12 2015
++++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc	Wed Sep  2 07:47:18 2015
 @@ -48,7 +48,7 @@ class TransferThread : public base::Thread {
        : base::Thread(kAsyncTransferThreadName),
          initialized_(false) {
-     Start();
+     base::Thread::Options options;
 -#if defined(OS_ANDROID) || defined(OS_LINUX)
 +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     SetPriority(base::ThreadPriority::BACKGROUND);
+     options.priority = base::ThreadPriority::BACKGROUND;
  #endif
-   }
+     StartWithOptions(options);
diff --git a/www/chromium/patches/patch-media_media_gyp b/www/chromium/patches/patch-media_media_gyp
index 884d74ea1f7..c673821e9ab 100644
--- a/www/chromium/patches/patch-media_media_gyp
+++ b/www/chromium/patches/patch-media_media_gyp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-media_media_gyp,v 1.37 2015/07/23 13:44:04 robert Exp $
---- media/media.gyp.orig.port	Wed Jul 22 08:49:15 2015
-+++ media/media.gyp	Wed Jul 22 08:51:52 2015
+$OpenBSD: patch-media_media_gyp,v 1.38 2015/09/05 16:06:50 robert Exp $
+--- media/media.gyp.orig.port	Wed Sep  2 07:47:24 2015
++++ media/media.gyp	Wed Sep  2 07:49:32 2015
 @@ -21,7 +21,7 @@
          'media_use_libvpx%': 1,
        }],
@@ -18,10 +18,10 @@ $OpenBSD: patch-media_media_gyp,v 1.37 2015/07/23 13:44:04 robert Exp $
 +      ['OS=="openbsd"', {
 +        'use_sndioaudio%': 0,
 +      }],
-       ['sysroot!=""', {
-         'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
-       }, {
-@@ -173,6 +177,8 @@
+       # low memory buffer is used in non-Android based chromecast build due to hardware limitation.
+       ['chromecast==1 and OS!="android"', {
+         'use_low_memory_buffer%': 1,
+@@ -168,6 +172,8 @@
          'audio/pulse/pulse_output.h',
          'audio/pulse/pulse_util.cc',
          'audio/pulse/pulse_util.h',
@@ -30,7 +30,7 @@ $OpenBSD: patch-media_media_gyp,v 1.37 2015/07/23 13:44:04 robert Exp $
          'audio/sample_rates.cc',
          'audio/sample_rates.h',
          'audio/scoped_task_runner_observer.cc',
-@@ -707,6 +713,24 @@
+@@ -723,6 +729,24 @@
              'filters/h264_bitstream_buffer.h',
            ],
          }],
@@ -55,7 +55,7 @@ $OpenBSD: patch-media_media_gyp,v 1.37 2015/07/23 13:44:04 robert Exp $
          ['use_alsa==1', {
            'link_settings': {
              'libraries': [
-@@ -729,11 +753,21 @@
+@@ -745,11 +769,21 @@
            ],
          }, {  # else: openbsd==1
            'sources!': [
@@ -74,21 +74,21 @@ $OpenBSD: patch-media_media_gyp,v 1.37 2015/07/23 13:44:04 robert Exp $
            ],
          }],
 -        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="openbsd"', {
++        ['OS=="linux" or os_bsd==1', {
            'conditions': [
              ['use_x11==1', {
                'dependencies': [
-@@ -824,7 +858,7 @@
+@@ -840,7 +874,7 @@
              'ozone/media_ozone_platform.h',
            ]
          }],
 -        ['OS!="linux"', {
-+        ['OS!="linux" and OS!="openbsd"', {
++        ['OS!="linux" and os_bsd!=1', {
            'sources!': [
              'audio/cras/audio_manager_cras.cc',
              'audio/cras/audio_manager_cras.h',
-@@ -1043,7 +1077,7 @@
-             'base/simd/convert_yuv_to_rgb_x86.cc',
+@@ -1063,7 +1097,7 @@
+             'base/simd/filter_yuv_sse2.cc',
            ],
          }],
 -        ['OS!="linux" and OS!="win"', {
@@ -96,12 +96,12 @@ $OpenBSD: patch-media_media_gyp,v 1.37 2015/07/23 13:44:04 robert Exp $
            'sources!': [
              'base/keyboard_event_counter.cc',
              'base/keyboard_event_counter.h',
-@@ -1833,7 +1867,7 @@
+@@ -1854,7 +1888,7 @@
              'test/pipeline_integration_test_base.cc',
            ],
            'conditions': [
 -            ['os_posix==1 and OS!="mac"', {
-+            ['os_posix==1 and OS!="mac" and OS!="openbsd"', {
++            ['os_posix==1 and OS!="mac" and os_bsd!=1', {
                'conditions': [
                  ['use_allocator!="none"', {
                    'dependencies': [
diff --git a/www/chromium/patches/patch-media_video_capture_fake_video_capture_device_factory_cc b/www/chromium/patches/patch-media_video_capture_fake_video_capture_device_factory_cc
index f4cb8cd9f93..ca2d8627386 100644
--- a/www/chromium/patches/patch-media_video_capture_fake_video_capture_device_factory_cc
+++ b/www/chromium/patches/patch-media_video_capture_fake_video_capture_device_factory_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-media_video_capture_fake_video_capture_device_factory_cc,v 1.2 2015/07/23 13:44:04 robert Exp $
---- media/video/capture/fake_video_capture_device_factory.cc.orig.port	Wed Jul 15 22:30:05 2015
-+++ media/video/capture/fake_video_capture_device_factory.cc	Wed Jul 22 08:37:30 2015
-@@ -50,7 +50,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceNames(
+$OpenBSD: patch-media_video_capture_fake_video_capture_device_factory_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- media/video/capture/fake_video_capture_device_factory.cc.orig.port	Tue Sep  1 22:10:43 2015
++++ media/video/capture/fake_video_capture_device_factory.cc	Wed Sep  2 07:31:55 2015
+@@ -48,7 +48,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceNames(
    for (int n = 0; n < number_of_devices_; ++n) {
      VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
                                    base::StringPrintf("/dev/video%d", n)
diff --git a/www/chromium/patches/patch-media_video_capture_video_capture_device_h b/www/chromium/patches/patch-media_video_capture_video_capture_device_h
index 5bf3f3bfde5..b6e9ae18ec8 100644
--- a/www/chromium/patches/patch-media_video_capture_video_capture_device_h
+++ b/www/chromium/patches/patch-media_video_capture_video_capture_device_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-media_video_capture_video_capture_device_h,v 1.2 2015/07/23 13:44:04 robert Exp $
---- media/video/capture/video_capture_device.h.orig.port	Wed Jul 15 22:30:05 2015
-+++ media/video/capture/video_capture_device.h	Wed Jul 22 08:37:30 2015
-@@ -42,7 +42,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+$OpenBSD: patch-media_video_capture_video_capture_device_h,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- media/video/capture/video_capture_device.h.orig.port	Tue Sep  1 22:10:43 2015
++++ media/video/capture/video_capture_device.h	Wed Sep  2 07:31:55 2015
+@@ -43,7 +43,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
      Name();
      Name(const std::string& name, const std::string& id);
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-media_video_capture_video_capture_device_h,v 1.2 2015/07/23 13:4
      // Linux/CrOS targets Capture Api type: it can only be set on construction.
      enum CaptureApiType {
        V4L2_SINGLE_PLANE,
-@@ -86,7 +86,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+@@ -87,7 +87,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
@@ -19,7 +19,7 @@ $OpenBSD: patch-media_video_capture_video_capture_device_h,v 1.2 2015/07/23 13:4
      Name(const std::string& name, const std::string& id,
           const CaptureApiType api_type);
  #endif
-@@ -124,7 +124,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+@@ -125,7 +125,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
      }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
@@ -28,7 +28,7 @@ $OpenBSD: patch-media_video_capture_video_capture_device_h,v 1.2 2015/07/23 13:4
      CaptureApiType capture_api_type() const {
        return capture_api_class_.capture_api_type();
      }
-@@ -156,7 +156,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+@@ -157,7 +157,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
      std::string device_name_;
      std::string unique_id_;
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
diff --git a/www/chromium/patches/patch-net_base_net_util_linux_cc b/www/chromium/patches/patch-net_base_net_util_linux_cc
deleted file mode 100644
index 2d9c1bdaa59..00000000000
--- a/www/chromium/patches/patch-net_base_net_util_linux_cc
+++ /dev/null
@@ -1,96 +0,0 @@
-$OpenBSD: patch-net_base_net_util_linux_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
---- net/base/net_util_linux.cc.orig.port	Wed Apr 15 09:36:13 2015
-+++ net/base/net_util_linux.cc	Wed Apr 15 15:52:35 2015
-@@ -4,12 +4,14 @@
- 
- #include "net/base/net_util_linux.h"
- 
--#if !defined(OS_ANDROID)
-+#if !defined(OS_ANDROID) && !defined(OS_BSD)
- #include <linux/ethtool.h>
- #endif  // !defined(OS_ANDROID)
-+#if !defined(OS_BSD)
- #include <linux/if.h>
- #include <linux/sockios.h>
- #include <linux/wireless.h>
-+#endif
- #include <set>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-@@ -39,6 +41,7 @@ namespace {
- // application layer.
- bool TryConvertNativeToNetIPAttributes(int native_attributes,
-                                        int* net_attributes) {
-+#if !defined(OS_BSD)
-   // For Linux/ChromeOS/Android, we disallow addresses with attributes
-   // IFA_F_OPTIMISTIC, IFA_F_DADFAILED, and IFA_F_TENTATIVE as these
-   // are still progressing through duplicated address detection (DAD)
-@@ -61,6 +64,9 @@ bool TryConvertNativeToNetIPAttributes(int native_attr
-   }
- 
-   return true;
-+#else
-+  return false;
-+#endif
- }
- 
- }  // namespace
-@@ -79,6 +85,7 @@ inline const unsigned char* GetIPAddressData(const IPA
- // or ethtool extensions.
- NetworkChangeNotifier::ConnectionType GetInterfaceConnectionType(
-     const std::string& ifname) {
-+#if !defined(OS_BSD)
-   base::ScopedFD s(socket(AF_INET, SOCK_STREAM, 0));
-   if (!s.is_valid())
-     return NetworkChangeNotifier::CONNECTION_UNKNOWN;
-@@ -99,11 +106,13 @@ NetworkChangeNotifier::ConnectionType GetInterfaceConn
-   if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
-     return NetworkChangeNotifier::CONNECTION_ETHERNET;
- #endif  // !defined(OS_ANDROID)
-+#endif
- 
-   return NetworkChangeNotifier::CONNECTION_UNKNOWN;
- }
- 
- std::string GetInterfaceSSID(const std::string& ifname) {
-+#if !defined(OS_BSD)
-   base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
-   if (!ioctl_socket.is_valid())
-     return "";
-@@ -115,9 +124,11 @@ std::string GetInterfaceSSID(const std::string& ifname
-   wreq.u.essid.length = IW_ESSID_MAX_SIZE;
-   if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
-     return ssid;
-+#endif
-   return "";
- }
- 
-+#if !defined(OS_BSD)
- bool GetNetworkListImpl(
-     NetworkInterfaceList* networks,
-     int policy,
-@@ -186,6 +197,7 @@ bool GetNetworkListImpl(
- 
-   return true;
- }
-+#endif
- 
- std::string GetWifiSSIDFromInterfaceListInternal(
-     const NetworkInterfaceList& interfaces,
-@@ -210,12 +222,16 @@ bool GetNetworkList(NetworkInterfaceList* networks, in
-   if (networks == NULL)
-     return false;
- 
-+#if !defined(OS_BSD)
-   internal::AddressTrackerLinux tracker;
-   tracker.Init();
- 
-   return internal::GetNetworkListImpl(
-       networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(),
-       &internal::AddressTrackerLinux::GetInterfaceName);
-+#else
-+  return false;
-+#endif
- }
- 
- std::string GetWifiSSID() {
diff --git a/www/chromium/patches/patch-net_base_network_change_notifier_cc b/www/chromium/patches/patch-net_base_network_change_notifier_cc
index f2dbdac7986..5050be176a7 100644
--- a/www/chromium/patches/patch-net_base_network_change_notifier_cc
+++ b/www/chromium/patches/patch-net_base_network_change_notifier_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.13 2015/03/18 19:26:29 robert Exp $
---- net/base/network_change_notifier.cc.orig.port	Tue Mar 10 23:41:41 2015
-+++ net/base/network_change_notifier.cc	Wed Mar 11 07:22:50 2015
-@@ -523,7 +523,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
+$OpenBSD: patch-net_base_network_change_notifier_cc,v 1.14 2015/09/05 16:06:50 robert Exp $
+--- net/base/network_change_notifier.cc.orig.port	Tue Sep  1 22:10:43 2015
++++ net/base/network_change_notifier.cc	Wed Sep  2 07:31:55 2015
+@@ -524,7 +524,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
  #elif defined(OS_MACOSX)
    return new NetworkChangeNotifierMac();
  #else
diff --git a/www/chromium/patches/patch-net_base_network_interfaces_posix_cc b/www/chromium/patches/patch-net_base_network_interfaces_posix_cc
new file mode 100644
index 00000000000..c3651030e85
--- /dev/null
+++ b/www/chromium/patches/patch-net_base_network_interfaces_posix_cc
@@ -0,0 +1,21 @@
+$OpenBSD: patch-net_base_network_interfaces_posix_cc,v 1.1 2015/09/05 16:06:50 robert Exp $
+--- net/base/network_interfaces_posix.cc.orig.port	Fri Sep  4 09:33:24 2015
++++ net/base/network_interfaces_posix.cc	Fri Sep  4 09:33:09 2015
+@@ -9,7 +9,7 @@
+ 
+ #include "base/memory/scoped_ptr.h"
+ 
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+ #include "net/base/network_interfaces_posix.h"
+ #include <net/if.h>
+ #include <netinet/in.h>
+@@ -17,7 +17,7 @@
+ 
+ namespace net {
+ 
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+ namespace internal {
+ 
+ // The application layer can pass |policy| defined in net_util.h to
diff --git a/www/chromium/patches/patch-net_net_gypi b/www/chromium/patches/patch-net_net_gypi
index 5f851c387d3..b0974e8eac9 100644
--- a/www/chromium/patches/patch-net_net_gypi
+++ b/www/chromium/patches/patch-net_net_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-net_net_gypi,v 1.9 2015/07/23 13:44:04 robert Exp $
---- net/net.gypi.orig.port	Wed Jul 15 22:30:05 2015
-+++ net/net.gypi	Wed Jul 22 08:37:30 2015
-@@ -196,8 +196,6 @@
+$OpenBSD: patch-net_net_gypi,v 1.10 2015/09/05 16:06:50 robert Exp $
+--- net/net.gypi.orig.port	Tue Sep  1 22:10:43 2015
++++ net/net.gypi	Thu Sep  3 07:31:33 2015
+@@ -201,8 +201,6 @@
        'android/network_change_notifier_factory_android.h',
        'android/network_library.cc',
        'android/network_library.h',
@@ -10,3 +10,11 @@ $OpenBSD: patch-net_net_gypi,v 1.9 2015/07/23 13:44:04 robert Exp $
        'base/backoff_entry.cc',
        'base/backoff_entry.h',
        'base/backoff_entry_serializer.cc',
+@@ -274,7 +272,6 @@
+       'base/network_change_notifier_win.h',
+       'base/network_config_watcher_mac.cc',
+       'base/network_config_watcher_mac.h',
+-      'base/network_interfaces_linux.cc',
+       'base/network_interfaces_mac.cc',
+       'base/network_interfaces_win.cc',
+       'base/network_delegate.cc',
diff --git a/www/chromium/patches/patch-net_url_request_url_request_context_builder_cc b/www/chromium/patches/patch-net_url_request_url_request_context_builder_cc
index 86cabe1ae55..6b3d969ae73 100644
--- a/www/chromium/patches/patch-net_url_request_url_request_context_builder_cc
+++ b/www/chromium/patches/patch-net_url_request_url_request_context_builder_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-net_url_request_url_request_context_builder_cc,v 1.2 2015/07/23 13:44:04 robert Exp $
---- net/url_request/url_request_context_builder.cc.orig.port	Wed Jul 15 22:30:05 2015
-+++ net/url_request/url_request_context_builder.cc	Wed Jul 22 08:37:30 2015
-@@ -276,7 +276,7 @@ URLRequestContext* URLRequestContextBuilder::Build() {
+$OpenBSD: patch-net_url_request_url_request_context_builder_cc,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- net/url_request/url_request_context_builder.cc.orig.port	Tue Sep  1 22:10:43 2015
++++ net/url_request/url_request_context_builder.cc	Wed Sep  2 07:31:55 2015
+@@ -270,7 +270,7 @@ URLRequestContext* URLRequestContextBuilder::Build() {
    if (!proxy_service_) {
      // TODO(willchan): Switch to using this code when
      // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
diff --git a/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc b/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc
index 1c1edc2fd8c..aa0a306cb84 100644
--- a/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc
+++ b/www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.3 2015/07/23 13:44:04 robert Exp $
---- pdf/pdfium/pdfium_engine.cc.orig.port	Wed Jul 15 22:30:05 2015
-+++ pdf/pdfium/pdfium_engine.cc	Wed Jul 22 08:37:30 2015
-@@ -114,7 +114,7 @@ std::vector<uint32_t> GetPageNumbersFromPrintPageNumbe
+$OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- pdf/pdfium/pdfium_engine.cc.orig.port	Tue Sep  1 22:10:43 2015
++++ pdf/pdfium/pdfium_engine.cc	Wed Sep  2 07:31:55 2015
+@@ -116,7 +116,7 @@ std::vector<uint32_t> GetPageNumbersFromPrintPageNumbe
    return page_numbers;
  }
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.3 2015/07/23 13:44:04 robert Exp
  
  PP_Instance g_last_instance_id;
  
-@@ -544,7 +544,7 @@ pp::VarDictionary TraverseBookmarks(FPDF_DOCUMENT doc,
+@@ -558,7 +558,7 @@ pp::VarDictionary TraverseBookmarks(FPDF_DOCUMENT doc,
  bool InitializeSDK() {
    FPDF_InitLibrary();
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.3 2015/07/23 13:44:04 robert Exp
    // Font loading doesn't work in the renderer sandbox in Linux.
    FPDF_SetSystemFontInfo(&g_font_info);
  #endif
-@@ -1441,7 +1441,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF(
+@@ -1458,7 +1458,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF(
      FPDF_ClosePage(pdf_page);
    }
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.3 2015/07/23 13:44:04 robert Exp
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -2826,7 +2826,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
+@@ -2860,7 +2860,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
    DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
    DCHECK(image_data);
  
@@ -37,7 +37,7 @@ $OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.3 2015/07/23 13:44:04 robert Exp
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -3282,7 +3282,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+@@ -3316,7 +3316,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
      FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
    }
    most_visible_page_ = index;
diff --git a/www/chromium/patches/patch-printing_printing_gyp b/www/chromium/patches/patch-printing_printing_gyp
index bfcb6291aa7..78ffbc98501 100644
--- a/www/chromium/patches/patch-printing_printing_gyp
+++ b/www/chromium/patches/patch-printing_printing_gyp
@@ -1,19 +1,19 @@
-$OpenBSD: patch-printing_printing_gyp,v 1.30 2014/11/19 21:27:32 robert Exp $
---- printing/printing.gyp.orig.port	Wed Nov 19 06:13:10 2014
-+++ printing/printing.gyp	Wed Nov 19 08:38:26 2014
+$OpenBSD: patch-printing_printing_gyp,v 1.31 2015/09/05 16:06:50 robert Exp $
+--- printing/printing.gyp.orig.port	Wed Sep  2 07:49:47 2015
++++ printing/printing.gyp	Wed Sep  2 07:50:44 2015
 @@ -187,7 +187,7 @@
              'backend/print_backend_chromeos.cc',
            ],
          }],
 -        ['OS=="linux" and chromeos==0', {
-+        ['(OS=="linux" or os_bsd == 1) and chromeos==0', {
++        ['(OS=="linux" or os_bsd ==1) and chromeos==0', {
            'sources': [
              'printing_context_linux.cc',
              'printing_context_linux.h',
 @@ -280,6 +280,12 @@
                ['os_bsd==1', {
                  'cflags': [
-                   '<!@(python cups_config_helper.py --cflags)',
+                   '<!@(python cups_config_helper.py --cflags <(sysroot))',
 +                ],
 +              }],
 +              [ 'OS == "openbsd"', {
diff --git a/www/chromium/patches/patch-remoting_remoting_host_gypi b/www/chromium/patches/patch-remoting_remoting_host_gypi
index 515db4d463b..74f329d193a 100644
--- a/www/chromium/patches/patch-remoting_remoting_host_gypi
+++ b/www/chromium/patches/patch-remoting_remoting_host_gypi
@@ -1,6 +1,6 @@
-$OpenBSD: patch-remoting_remoting_host_gypi,v 1.10 2015/05/24 15:51:53 robert Exp $
---- remoting/remoting_host.gypi.orig.port	Thu May 14 00:35:47 2015
-+++ remoting/remoting_host.gypi	Wed May 20 08:34:56 2015
+$OpenBSD: patch-remoting_remoting_host_gypi,v 1.11 2015/09/05 16:06:50 robert Exp $
+--- remoting/remoting_host.gypi.orig.port	Tue Sep  1 22:10:43 2015
++++ remoting/remoting_host.gypi	Wed Sep  2 07:31:55 2015
 @@ -18,7 +18,7 @@
          'remoting_host_win.gypi',
        ],
@@ -10,7 +10,7 @@ $OpenBSD: patch-remoting_remoting_host_gypi,v 1.10 2015/05/24 15:51:53 robert Ex
        'includes': [
          'remoting_host_linux.gypi',
        ],
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
              '<@(remoting_host_sources)',
            ],
            'conditions': [
@@ -19,7 +19,7 @@ $OpenBSD: patch-remoting_remoting_host_gypi,v 1.10 2015/05/24 15:51:53 robert Ex
                'conditions': [
                  ['use_x11==1', {
                    'dependencies': [
-@@ -632,7 +632,7 @@
+@@ -661,7 +661,7 @@
                  'host/it2me/it2me_native_messaging_host_main.h',
                ],
                'conditions': [
diff --git a/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp b/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp
index eda0a65c271..d3c0ec8a599 100644
--- a/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp
+++ b/www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp
@@ -1,12 +1,12 @@
-$OpenBSD: patch-skia_ext_SkMemory_new_handler_cpp,v 1.1 2015/04/27 16:38:25 robert Exp $
---- skia/ext/SkMemory_new_handler.cpp.orig.port	Thu Apr 23 09:49:23 2015
-+++ skia/ext/SkMemory_new_handler.cpp	Thu Apr 23 09:49:31 2015
-@@ -53,7 +53,7 @@ void* sk_malloc_throw(size_t size) {
- static void* sk_malloc_nothrow(size_t size) {
+$OpenBSD: patch-skia_ext_SkMemory_new_handler_cpp,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- skia/ext/SkMemory_new_handler.cpp.orig.port	Wed Sep  2 20:10:58 2015
++++ skia/ext/SkMemory_new_handler.cpp	Wed Sep  2 20:11:14 2015
+@@ -62,7 +62,7 @@ static void* sk_malloc_nothrow(size_t size) {
      // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
      // doesn't work as intended everywhere.
+     void* result;
 -#if  defined(OS_IOS)
 +#if  defined(OS_IOS) || defined(OS_BSD)
-     return malloc(size);
+     result = malloc(size);
  #else
-     void* result;
+     // It's the responsibility of the caller to check the return value.
diff --git a/www/chromium/patches/patch-skia_skia_chrome_gypi b/www/chromium/patches/patch-skia_skia_chrome_gypi
index 6710acf2930..e2313112939 100644
--- a/www/chromium/patches/patch-skia_skia_chrome_gypi
+++ b/www/chromium/patches/patch-skia_skia_chrome_gypi
@@ -1,8 +1,8 @@
-$OpenBSD: patch-skia_skia_chrome_gypi,v 1.10 2015/04/27 16:38:25 robert Exp $
---- skia/skia_chrome.gypi.orig.port	Wed Apr 15 00:18:57 2015
-+++ skia/skia_chrome.gypi	Wed Apr 15 08:32:50 2015
-@@ -79,6 +79,11 @@
-     'ext/skia_utils_win.h',
+$OpenBSD: patch-skia_skia_chrome_gypi,v 1.11 2015/09/05 16:06:50 robert Exp $
+--- skia/skia_chrome.gypi.orig.port	Tue Sep  1 22:10:43 2015
++++ skia/skia_chrome.gypi	Wed Sep  2 07:31:55 2015
+@@ -54,6 +54,11 @@
+     'ext/skia_utils_win.cc',
    ],
    'conditions': [
 +    [ 'use_cairo == 1', {
diff --git a/www/chromium/patches/patch-sync_util_get_session_name_cc b/www/chromium/patches/patch-sync_util_get_session_name_cc
index 4eab85140b9..0d11933912c 100644
--- a/www/chromium/patches/patch-sync_util_get_session_name_cc
+++ b/www/chromium/patches/patch-sync_util_get_session_name_cc
@@ -1,19 +1,19 @@
-$OpenBSD: patch-sync_util_get_session_name_cc,v 1.3 2014/11/19 21:27:32 robert Exp $
---- sync/util/get_session_name.cc.orig.port	Wed Nov 19 05:53:06 2014
-+++ sync/util/get_session_name.cc	Wed Nov 19 08:38:26 2014
-@@ -12,7 +12,7 @@
- #include "base/sys_info.h"
- #include "base/task_runner.h"
+$OpenBSD: patch-sync_util_get_session_name_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- sync/util/get_session_name.cc.orig.port	Wed Sep  2 20:11:21 2015
++++ sync/util/get_session_name.cc	Wed Sep  2 20:11:30 2015
+@@ -14,7 +14,7 @@
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS)
+ #include "chromeos/system/devicetype.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
  #include "sync/util/get_session_name_linux.h"
  #elif defined(OS_IOS)
  #include "sync/util/get_session_name_ios.h"
-@@ -37,7 +37,7 @@ std::string GetSessionNameSynchronously() {
-   // like "stumpy-signed-mp-v2keys" etc. The information can be checked on
-   // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
-   session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";
+@@ -50,7 +50,7 @@ std::string GetSessionNameSynchronously() {
+       session_name = "Chromebook";
+       break;
+   }
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    session_name = internal::GetHostname();
diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp
index d2143f65553..ddb7ef66c64 100644
--- a/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.16 2015/07/23 13:44:04 robert Exp $
---- third_party/WebKit/Source/core/core.gyp.orig.port	Wed Jul 15 22:31:12 2015
-+++ third_party/WebKit/Source/core/core.gyp	Wed Jul 22 08:37:30 2015
+$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.17 2015/09/05 16:06:50 robert Exp $
+--- third_party/WebKit/Source/core/core.gyp.orig.port	Tue Sep  1 22:10:52 2015
++++ third_party/WebKit/Source/core/core.gyp	Wed Sep  2 07:31:55 2015
 @@ -504,13 +504,13 @@
            # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
            'cflags': ['-Wno-uninitialized'],
@@ -17,7 +17,7 @@ $OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.16 2015/07/23 13:44:
            'sources!': [
              'layout/LayoutThemeFontProviderLinux.cpp',
            ],
-@@ -839,13 +839,13 @@
+@@ -831,13 +831,13 @@
                # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
                'cflags': ['-Wno-uninitialized'],
              }],
diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp
index f8af39fe98a..4316bb23502 100644
--- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp
@@ -1,16 +1,16 @@
-$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.10 2015/05/24 15:51:53 robert Exp $
---- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port	Thu May 14 00:49:00 2015
-+++ third_party/WebKit/Source/platform/blink_platform.gyp	Wed May 20 08:34:56 2015
-@@ -246,7 +246,7 @@
-     # compiler optimizations, see crbug.com/237063
-     'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
-     'conditions': [
+$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.11 2015/09/05 16:06:50 robert Exp $
+--- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port	Wed Sep  2 20:12:19 2015
++++ third_party/WebKit/Source/platform/blink_platform.gyp	Wed Sep  2 20:12:51 2015
+@@ -251,7 +251,7 @@
+           ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'],
+         ],
+       }],
 -      ['OS=="linux" or OS=="android" or OS=="win"', {
 +      ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', {
          'sources/': [
            # Cherry-pick files excluded by the broader regular expressions above.
            ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
-@@ -257,7 +257,7 @@
+@@ -262,7 +262,7 @@
          ],
        },
        ],
@@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.10 201
          'sources/': [
            ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
          ]
-@@ -340,7 +340,7 @@
+@@ -345,7 +345,7 @@
            ['exclude', 'scroll/ScrollbarThemeMac'],
          ],
        }],
@@ -28,7 +28,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.10 201
          'sources/': [
            ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
          ],
-@@ -383,7 +383,7 @@
+@@ -388,7 +388,7 @@
            ['exclude', 'Android\\.cpp$'],
          ],
        }],
diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp
index bde5e4bc297..98defe39fe6 100644
--- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1.3 2015/07/23 13:44:04 robert Exp $
---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig.port	Wed Jul 15 22:31:13 2015
-+++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp	Wed Jul 22 08:37:30 2015
+$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig.port	Sat Aug 22 21:03:03 2015
++++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp	Wed Sep  2 07:31:55 2015
 @@ -49,7 +49,7 @@ namespace blink {
  const float smallCapsFontSizeMultiplier = 0.7f;
  const float emphasisMarkFontSizeMultiplier = 0.5f;
@@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1.
  // This is the largest VDMX table which we'll try to load and parse.
  static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB
  #endif
-@@ -104,7 +104,7 @@ void SimpleFontData::platformInit()
+@@ -102,7 +102,7 @@ void SimpleFontData::platformInit()
      int vdmxAscent = 0, vdmxDescent = 0;
      bool isVDMXValid = false;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_fonts_SimpleFontData_cpp,v 1.
      // Manually digging up VDMX metrics is only applicable when bytecode hinting using FreeType.
      // With GDI, the metrics will already have taken this into account (as needed).
      // With DirectWrite or CoreText, no bytecode hinting is ever done.
-@@ -138,7 +138,7 @@ void SimpleFontData::platformInit()
+@@ -136,7 +136,7 @@ void SimpleFontData::platformInit()
      } else {
          ascent = SkScalarRoundToInt(-metrics.fAscent);
          descent = SkScalarRoundToInt(metrics.fDescent);
diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h
index 6f930ae234f..6c3383a818c 100644
--- a/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_ThreadState_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_h,v 1.5 2015/07/23 13:44:04 robert Exp $
---- third_party/WebKit/Source/platform/heap/ThreadState.h.orig.port	Wed Jul 15 22:31:13 2015
-+++ third_party/WebKit/Source/platform/heap/ThreadState.h	Wed Jul 22 08:37:30 2015
-@@ -262,7 +262,7 @@ class PLATFORM_EXPORT ThreadState { (public)
+$OpenBSD: patch-third_party_WebKit_Source_platform_heap_ThreadState_h,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- third_party/WebKit/Source/platform/heap/ThreadState.h.orig.port	Tue Sep  1 22:10:53 2015
++++ third_party/WebKit/Source/platform/heap/ThreadState.h	Wed Sep  2 07:31:55 2015
+@@ -294,7 +294,7 @@ class PLATFORM_EXPORT ThreadState { (public)
  
      static ThreadState* current()
      {
diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp
deleted file mode 100644
index cce57b70665..00000000000
--- a/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupListBox_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-third_party_WebKit_Source_web_PopupListBox_cpp,v 1.4 2015/07/23 13:44:04 robert Exp $
---- third_party/WebKit/Source/web/PopupListBox.cpp.orig.port	Wed Jul 15 22:31:13 2015
-+++ third_party/WebKit/Source/web/PopupListBox.cpp	Wed Jul 22 08:37:30 2015
-@@ -404,7 +404,7 @@ void PopupListBox::paintRow(GraphicsContext* gc, const
-     } else {
-         backColor = style.backgroundColor();
-         textColor = style.foregroundColor();
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(OPENBSD)
-         // On other platforms, the <option> background color is the same as the
-         // <select> background color. On Linux, that makes the <option>
-         // background color very dark, so by default, try to use a lighter
diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp
new file mode 100644
index 00000000000..b6b1ef1c0aa
--- /dev/null
+++ b/www/chromium/patches/patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-third_party_WebKit_Source_web_PopupMenuImpl_cpp,v 1.1 2015/09/05 16:06:50 robert Exp $
+--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig.port	Wed Sep  2 20:13:12 2015
++++ third_party/WebKit/Source/web/PopupMenuImpl.cpp	Wed Sep  2 20:13:26 2015
+@@ -168,7 +168,7 @@ class PopupMenuImpl::ItemIterationContext { (public)
+         , m_buffer(buffer)
+     {
+         ASSERT(m_buffer);
+-#if OS(LINUX)
++#if OS(LINUX) || OS(OPENBSD)
+         // On other platforms, the <option> background color is the same as the
+         // <select> background color. On Linux, that makes the <option>
+         // background color very dark, so by default, try to use a lighter
diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm
index abb8c4781f1..9e376a90586 100644
--- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm
+++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm,v 1.14 2015/05/24 15:51:53 robert Exp $
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig.port	Fri May 22 19:39:53 2015
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm	Sat May 23 00:04:41 2015
-@@ -0,0 +1,1846 @@
+$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_asm,v 1.15 2015/09/05 16:06:50 robert Exp $
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig.port	Sat Sep  5 13:42:42 2015
++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm	Sat Sep  5 13:44:55 2015
+@@ -0,0 +1,1894 @@
 +%define ARCH_AARCH64 0
 +%define ARCH_ALPHA 0
 +%define ARCH_ARM 0
@@ -35,8 +35,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_VFPV3 0
 +%define HAVE_SETEND 0
 +%define HAVE_ALTIVEC 0
-+%define HAVE_DCBZL 1
-+%define HAVE_LDBRX 1
++%define HAVE_DCBZL 0
++%define HAVE_LDBRX 0
++%define HAVE_POWER8 0
 +%define HAVE_PPC4XX 0
 +%define HAVE_VSX 0
 +%define HAVE_AMD3DNOW 1
@@ -57,10 +58,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_CPUNOP 1
 +%define HAVE_I686 1
 +%define HAVE_MIPSFPU 0
-+%define HAVE_MIPS32R2 1
++%define HAVE_MIPS32R2 0
++%define HAVE_MIPS32R5 0
++%define HAVE_MIPS64R6 0
 +%define HAVE_MIPSDSPR1 0
 +%define HAVE_MIPSDSPR2 0
-+%define HAVE_LOONGSON 1
++%define HAVE_MSA 0
++%define HAVE_LOONGSON3 0
 +%define HAVE_ARMV5TE_EXTERNAL 0
 +%define HAVE_ARMV6_EXTERNAL 0
 +%define HAVE_ARMV6T2_EXTERNAL 0
@@ -72,6 +76,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_ALTIVEC_EXTERNAL 0
 +%define HAVE_DCBZL_EXTERNAL 0
 +%define HAVE_LDBRX_EXTERNAL 0
++%define HAVE_POWER8_EXTERNAL 0
 +%define HAVE_PPC4XX_EXTERNAL 0
 +%define HAVE_VSX_EXTERNAL 0
 +%define HAVE_AMD3DNOW_EXTERNAL 1
@@ -93,9 +98,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_I686_EXTERNAL 0
 +%define HAVE_MIPSFPU_EXTERNAL 0
 +%define HAVE_MIPS32R2_EXTERNAL 0
++%define HAVE_MIPS32R5_EXTERNAL 0
++%define HAVE_MIPS64R6_EXTERNAL 0
 +%define HAVE_MIPSDSPR1_EXTERNAL 0
 +%define HAVE_MIPSDSPR2_EXTERNAL 0
-+%define HAVE_LOONGSON_EXTERNAL 0
++%define HAVE_MSA_EXTERNAL 0
++%define HAVE_LOONGSON3_EXTERNAL 0
 +%define HAVE_ARMV5TE_INLINE 0
 +%define HAVE_ARMV6_INLINE 0
 +%define HAVE_ARMV6T2_INLINE 0
@@ -107,6 +115,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_ALTIVEC_INLINE 0
 +%define HAVE_DCBZL_INLINE 0
 +%define HAVE_LDBRX_INLINE 0
++%define HAVE_POWER8_INLINE 0
 +%define HAVE_PPC4XX_INLINE 0
 +%define HAVE_VSX_INLINE 0
 +%define HAVE_AMD3DNOW_INLINE 1
@@ -128,9 +137,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_I686_INLINE 0
 +%define HAVE_MIPSFPU_INLINE 0
 +%define HAVE_MIPS32R2_INLINE 0
++%define HAVE_MIPS32R5_INLINE 0
++%define HAVE_MIPS64R6_INLINE 0
 +%define HAVE_MIPSDSPR1_INLINE 0
 +%define HAVE_MIPSDSPR2_INLINE 0
-+%define HAVE_LOONGSON_INLINE 0
++%define HAVE_MSA_INLINE 0
++%define HAVE_LOONGSON3_INLINE 0
 +%define HAVE_ALIGNED_STACK 1
 +%define HAVE_FAST_64BIT 0
 +%define HAVE_FAST_CLZ 1
@@ -143,7 +155,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_ATOMICS_SUNCC 0
 +%define HAVE_ATOMICS_WIN32 0
 +%define HAVE_ATOMIC_CAS_PTR 0
-+%define HAVE_ATOMIC_COMPARE_EXCHANGE 1
++%define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 +%define HAVE_MACHINE_RW_BARRIER 0
 +%define HAVE_MEMORYBARRIER 0
 +%define HAVE_MM_EMPTY 0
@@ -169,6 +181,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 +%define HAVE_DIRECT_H 0
 +%define HAVE_DLFCN_H 1
++%define HAVE_D3D11_H 0
 +%define HAVE_DXVA_H 0
 +%define HAVE_ES2_GL_H 0
 +%define HAVE_GSM_H 0
@@ -193,6 +206,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_TERMIOS_H 1
 +%define HAVE_UDPLITE_H 0
 +%define HAVE_UNISTD_H 1
++%define HAVE_VALGRIND_VALGRIND_H 0
 +%define HAVE_WINDOWS_H 0
 +%define HAVE_WINSOCK2_H 0
 +%define HAVE_INTRINSICS_NEON 0
@@ -282,22 +296,21 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_ATTRIBUTE_MAY_ALIAS 1
 +%define HAVE_ATTRIBUTE_PACKED 1
 +%define HAVE_EBP_AVAILABLE 1
-+%define HAVE_EBX_AVAILABLE 1
++%define HAVE_EBX_AVAILABLE 0
 +%define HAVE_GNU_AS 0
 +%define HAVE_GNU_WINDRES 0
 +%define HAVE_IBM_ASM 0
 +%define HAVE_INLINE_ASM_LABELS 1
 +%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
 +%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
-+%define HAVE_PRAGMA_DEPRECATED 1
++%define HAVE_PRAGMA_DEPRECATED 0
 +%define HAVE_RSYNC_CONTIMEOUT 0
-+%define HAVE_SYMVER_ASM_LABEL 1
++%define HAVE_SYMVER_ASM_LABEL 0
 +%define HAVE_SYMVER_GNU_ASM 1
 +%define HAVE_VFP_ARGS 0
 +%define HAVE_XFORM_ASM 0
-+%define HAVE_XMM_CLOBBERS 1
++%define HAVE_XMM_CLOBBERS 0
 +%define HAVE_CONDITION_VARIABLE_PTR 0
-+%define HAVE_DXVA_PICPARAMS_HEVC 0
 +%define HAVE_SOCKLEN_T 0
 +%define HAVE_STRUCT_ADDRINFO 0
 +%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -310,7 +323,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_STRUCT_SOCKADDR_SA_LEN 0
 +%define HAVE_STRUCT_SOCKADDR_STORAGE 0
 +%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
++%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 +%define HAVE_ATOMICS_NATIVE 1
 +%define HAVE_DOS_PATHS 0
 +%define HAVE_DXVA2API_COBJ 0
@@ -322,7 +335,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define HAVE_MAKEINFO_HTML 0
 +%define HAVE_PERL 1
 +%define HAVE_POD2MAN 1
-+%define HAVE_SDL 1
++%define HAVE_SDL 0
 +%define HAVE_SECTION_DATA_REL_RO 0
 +%define HAVE_TEXI2HTML 0
 +%define HAVE_THREADS 1
@@ -342,10 +355,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_PROTOCOLS 0
 +%define CONFIG_DOC 0
 +%define CONFIG_HTMLPAGES 0
-+%define CONFIG_MANPAGES 1
-+%define CONFIG_PODPAGES 1
-+%define CONFIG_TXTPAGES 1
++%define CONFIG_MANPAGES 0
++%define CONFIG_PODPAGES 0
++%define CONFIG_TXTPAGES 0
 +%define CONFIG_AVIO_READING_EXAMPLE 1
++%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
 +%define CONFIG_DECODING_ENCODING_EXAMPLE 1
 +%define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 +%define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -429,12 +443,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_LIBZMQ 0
 +%define CONFIG_LIBZVBI 0
 +%define CONFIG_LZMA 0
++%define CONFIG_MMAL 0
 +%define CONFIG_NVENC 0
 +%define CONFIG_OPENAL 0
 +%define CONFIG_OPENCL 0
 +%define CONFIG_OPENGL 0
 +%define CONFIG_OPENSSL 0
-+%define CONFIG_SDL 1
++%define CONFIG_SDL 0
++%define CONFIG_SECURETRANSPORT 0
 +%define CONFIG_X11GRAB 0
 +%define CONFIG_XLIB 0
 +%define CONFIG_ZLIB 0
@@ -443,10 +459,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_HARDCODED_TABLES 0
 +%define CONFIG_RUNTIME_CPUDETECT 1
 +%define CONFIG_SAFE_BITSTREAM_READER 1
-+%define CONFIG_SHARED 1
++%define CONFIG_SHARED 0
 +%define CONFIG_SMALL 0
-+%define CONFIG_STATIC 0
++%define CONFIG_STATIC 1
 +%define CONFIG_SWSCALE_ALPHA 1
++%define CONFIG_D3D11VA 0
 +%define CONFIG_DXVA2 0
 +%define CONFIG_VAAPI 0
 +%define CONFIG_VDA 0
@@ -489,6 +506,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_POD2MAN 1
 +%define CONFIG_RAISE_MAJOR 0
 +%define CONFIG_THUMB 0
++%define CONFIG_VALGRIND_BACKTRACE 0
 +%define CONFIG_XMM_CLOBBER_TEST 0
 +%define CONFIG_AANDCTTABLES 0
 +%define CONFIG_AC3DSP 0
@@ -505,6 +523,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_FMTCONVERT 0
 +%define CONFIG_FRAME_THREAD_ENCODER 0
 +%define CONFIG_GCRYPT 0
++%define CONFIG_GMP 0
 +%define CONFIG_GOLOMB 1
 +%define CONFIG_GPLV3 0
 +%define CONFIG_H263DSP 0
@@ -520,6 +539,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_IIRFILTER 0
 +%define CONFIG_IMDCT15 1
 +%define CONFIG_INTRAX8 0
++%define CONFIG_JPEGTABLES 0
 +%define CONFIG_LGPLV3 0
 +%define CONFIG_LLAUDDSP 0
 +%define CONFIG_LLVIDDSP 0
@@ -530,10 +550,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_MPEGAUDIODSP 1
 +%define CONFIG_MPEGVIDEO 0
 +%define CONFIG_MPEGVIDEOENC 0
-+%define CONFIG_NETTLE 0
 +%define CONFIG_PIXBLOCKDSP 0
 +%define CONFIG_QPELDSP 0
 +%define CONFIG_QSV 0
++%define CONFIG_QSVDEC 0
++%define CONFIG_QSVENC 0
 +%define CONFIG_RANGECODER 0
 +%define CONFIG_RIFFDEC 1
 +%define CONFIG_RIFFENC 0
@@ -553,6 +574,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_MJPEG2JPEG_BSF 0
 +%define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 +%define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
 +%define CONFIG_MOV2TEXTSUB_BSF 0
 +%define CONFIG_NOISE_BSF 0
 +%define CONFIG_REMOVE_EXTRADATA_BSF 0
@@ -627,11 +649,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_H263P_DECODER 0
 +%define CONFIG_H264_DECODER 1
 +%define CONFIG_H264_CRYSTALHD_DECODER 0
++%define CONFIG_H264_MMAL_DECODER 0
 +%define CONFIG_H264_QSV_DECODER 0
 +%define CONFIG_H264_VDA_DECODER 0
 +%define CONFIG_H264_VDPAU_DECODER 0
 +%define CONFIG_HEVC_DECODER 0
 +%define CONFIG_HNM4_VIDEO_DECODER 0
++%define CONFIG_HQ_HQA_DECODER 0
 +%define CONFIG_HQX_DECODER 0
 +%define CONFIG_HUFFYUV_DECODER 0
 +%define CONFIG_IDCIN_DECODER 0
@@ -995,6 +1019,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_BINK_DEMUXER 0
 +%define CONFIG_BIT_DEMUXER 0
 +%define CONFIG_BMV_DEMUXER 0
++%define CONFIG_BFSTM_DEMUXER 0
 +%define CONFIG_BRSTM_DEMUXER 0
 +%define CONFIG_BOA_DEMUXER 0
 +%define CONFIG_C93_DEMUXER 0
@@ -1082,6 +1107,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_MPEGTS_DEMUXER 0
 +%define CONFIG_MPEGTSRAW_DEMUXER 0
 +%define CONFIG_MPEGVIDEO_DEMUXER 0
++%define CONFIG_MPJPEG_DEMUXER 0
 +%define CONFIG_MPL2_DEMUXER 0
 +%define CONFIG_MPSUB_DEMUXER 0
 +%define CONFIG_MSNWC_TCP_DEMUXER 0
@@ -1197,6 +1223,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
@@ -1209,6 +1236,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_A64MULTI5_ENCODER 0
 +%define CONFIG_ALIAS_PIX_ENCODER 0
 +%define CONFIG_AMV_ENCODER 0
++%define CONFIG_APNG_ENCODER 0
 +%define CONFIG_ASV1_ENCODER 0
 +%define CONFIG_ASV2_ENCODER 0
 +%define CONFIG_AVRP_ENCODER 0
@@ -1241,7 +1269,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_MSMPEG4V2_ENCODER 0
 +%define CONFIG_MSMPEG4V3_ENCODER 0
 +%define CONFIG_MSVIDEO1_ENCODER 0
-+%define CONFIG_NVENC_ENCODER 0
 +%define CONFIG_PAM_ENCODER 0
 +%define CONFIG_PBM_ENCODER 0
 +%define CONFIG_PCX_ENCODER 0
@@ -1364,6 +1391,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_LIBVPX_VP8_ENCODER 0
 +%define CONFIG_LIBVPX_VP9_ENCODER 0
 +%define CONFIG_LIBWAVPACK_ENCODER 0
++%define CONFIG_LIBWEBP_ANIM_ENCODER 0
 +%define CONFIG_LIBWEBP_ENCODER 0
 +%define CONFIG_LIBX264_ENCODER 0
 +%define CONFIG_LIBX264RGB_ENCODER 0
@@ -1372,6 +1400,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_LIBXVID_ENCODER 0
 +%define CONFIG_LIBAACPLUS_ENCODER 0
 +%define CONFIG_LIBOPENH264_ENCODER 0
++%define CONFIG_H264_QSV_ENCODER 0
++%define CONFIG_NVENC_ENCODER 0
++%define CONFIG_NVENC_H264_ENCODER 0
++%define CONFIG_NVENC_HEVC_ENCODER 0
 +%define CONFIG_ADELAY_FILTER 0
 +%define CONFIG_AECHO_FILTER 0
 +%define CONFIG_AEVAL_FILTER 0
@@ -1407,6 +1439,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_BS2B_FILTER 0
 +%define CONFIG_CHANNELMAP_FILTER 0
 +%define CONFIG_CHANNELSPLIT_FILTER 0
++%define CONFIG_CHORUS_FILTER 0
 +%define CONFIG_COMPAND_FILTER 0
 +%define CONFIG_DCSHIFT_FILTER 0
 +%define CONFIG_EARWAX_FILTER 0
@@ -1441,9 +1474,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_CODECVIEW_FILTER 0
 +%define CONFIG_COLORBALANCE_FILTER 0
 +%define CONFIG_COLORCHANNELMIXER_FILTER 0
++%define CONFIG_COLORKEY_FILTER 0
 +%define CONFIG_COLORLEVELS_FILTER 0
 +%define CONFIG_COLORMATRIX_FILTER 0
 +%define CONFIG_COPY_FILTER 0
++%define CONFIG_COVER_RECT_FILTER 0
 +%define CONFIG_CROP_FILTER 0
 +%define CONFIG_CROPDETECT_FILTER 0
 +%define CONFIG_CURVES_FILTER 0
@@ -1452,6 +1487,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_DEJUDDER_FILTER 0
 +%define CONFIG_DELOGO_FILTER 0
 +%define CONFIG_DESHAKE_FILTER 0
++%define CONFIG_DETELECINE_FILTER 0
 +%define CONFIG_DRAWBOX_FILTER 0
 +%define CONFIG_DRAWGRID_FILTER 0
 +%define CONFIG_DRAWTEXT_FILTER 0
@@ -1464,6 +1500,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_FIELD_FILTER 0
 +%define CONFIG_FIELDMATCH_FILTER 0
 +%define CONFIG_FIELDORDER_FILTER 0
++%define CONFIG_FIND_RECT_FILTER 0
 +%define CONFIG_FORMAT_FILTER 0
 +%define CONFIG_FPS_FILTER 0
 +%define CONFIG_FRAMEPACK_FILTER 0
@@ -1576,24 +1613,30 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_MOVIE_FILTER 0
 +%define CONFIG_H263_VAAPI_HWACCEL 0
 +%define CONFIG_H263_VDPAU_HWACCEL 0
++%define CONFIG_H264_D3D11VA_HWACCEL 0
 +%define CONFIG_H264_DXVA2_HWACCEL 0
++%define CONFIG_H264_MMAL_HWACCEL 0
 +%define CONFIG_H264_QSV_HWACCEL 0
 +%define CONFIG_H264_VAAPI_HWACCEL 0
 +%define CONFIG_H264_VDA_HWACCEL 0
 +%define CONFIG_H264_VDA_OLD_HWACCEL 0
 +%define CONFIG_H264_VDPAU_HWACCEL 0
++%define CONFIG_HEVC_D3D11VA_HWACCEL 0
 +%define CONFIG_HEVC_DXVA2_HWACCEL 0
 +%define CONFIG_MPEG1_XVMC_HWACCEL 0
 +%define CONFIG_MPEG1_VDPAU_HWACCEL 0
 +%define CONFIG_MPEG2_XVMC_HWACCEL 0
++%define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 +%define CONFIG_MPEG2_DXVA2_HWACCEL 0
 +%define CONFIG_MPEG2_VAAPI_HWACCEL 0
 +%define CONFIG_MPEG2_VDPAU_HWACCEL 0
 +%define CONFIG_MPEG4_VAAPI_HWACCEL 0
 +%define CONFIG_MPEG4_VDPAU_HWACCEL 0
++%define CONFIG_VC1_D3D11VA_HWACCEL 0
 +%define CONFIG_VC1_DXVA2_HWACCEL 0
 +%define CONFIG_VC1_VAAPI_HWACCEL 0
 +%define CONFIG_VC1_VDPAU_HWACCEL 0
++%define CONFIG_WMV3_D3D11VA_HWACCEL 0
 +%define CONFIG_WMV3_DXVA2_HWACCEL 0
 +%define CONFIG_WMV3_VAAPI_HWACCEL 0
 +%define CONFIG_WMV3_VDPAU_HWACCEL 0
@@ -1625,6 +1668,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_ADX_MUXER 0
 +%define CONFIG_AIFF_MUXER 0
 +%define CONFIG_AMR_MUXER 0
++%define CONFIG_APNG_MUXER 0
 +%define CONFIG_ASF_MUXER 0
 +%define CONFIG_ASS_MUXER 0
 +%define CONFIG_AST_MUXER 0
@@ -1734,6 +1778,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_SAP_MUXER 0
 +%define CONFIG_SEGMENT_MUXER 0
 +%define CONFIG_STREAM_SEGMENT_MUXER 0
++%define CONFIG_SINGLEJPEG_MUXER 0
 +%define CONFIG_SMJPEG_MUXER 0
 +%define CONFIG_SMOOTHSTREAMING_MUXER 0
 +%define CONFIG_SOX_MUXER 0
@@ -1754,6 +1799,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_WAV_MUXER 0
 +%define CONFIG_WEBM_MUXER 0
 +%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
++%define CONFIG_WEBM_CHUNK_MUXER 0
 +%define CONFIG_WEBP_MUXER 0
 +%define CONFIG_WEBVTT_MUXER 0
 +%define CONFIG_WTV_MUXER 0
@@ -1837,7 +1883,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_as
 +%define CONFIG_SRTP_PROTOCOL 0
 +%define CONFIG_SUBFILE_PROTOCOL 0
 +%define CONFIG_TCP_PROTOCOL 0
-+%define CONFIG_TLS_PROTOCOL 0
++%define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
++%define CONFIG_TLS_GNUTLS_PROTOCOL 0
++%define CONFIG_TLS_OPENSSL_PROTOCOL 0
 +%define CONFIG_UDP_PROTOCOL 0
 +%define CONFIG_UDPLITE_PROTOCOL 0
 +%define CONFIG_UNIX_PROTOCOL 0
diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h
index 2e7d34e6b2c..4f7164ad968 100644
--- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h
+++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h
@@ -1,16 +1,16 @@
-$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,v 1.14 2015/05/24 15:51:53 robert Exp $
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig.port	Fri May 22 19:39:53 2015
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h	Sat May 23 00:04:46 2015
-@@ -0,0 +1,1863 @@
+$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,v 1.15 2015/09/05 16:06:50 robert Exp $
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig.port	Sat Sep  5 13:42:42 2015
++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h	Sat Sep  5 13:44:52 2015
+@@ -0,0 +1,1911 @@
 +/* Automatically generated by configure - do not modify! */
 +#ifndef FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIG_H
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags=-O2 --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --cc=clang --cxx=clang++"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder=vorbis --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vorbis' --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio'"
 +#define FFMPEG_LICENSE "LGPL version 2.1 or later"
 +#define CONFIG_THIS_YEAR 2015
 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 +#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "clang version 3.5 (trunk)"
++#define CC_IDENT "gcc 4.2.1 (GCC) 20070719"
 +#define av_restrict restrict
 +#define EXTERN_PREFIX ""
 +#define EXTERN_ASM 
@@ -51,8 +51,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_VFPV3 0
 +#define HAVE_SETEND 0
 +#define HAVE_ALTIVEC 0
-+#define HAVE_DCBZL 1
-+#define HAVE_LDBRX 1
++#define HAVE_DCBZL 0
++#define HAVE_LDBRX 0
++#define HAVE_POWER8 0
 +#define HAVE_PPC4XX 0
 +#define HAVE_VSX 0
 +#define HAVE_AMD3DNOW 1
@@ -73,10 +74,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_CPUNOP 1
 +#define HAVE_I686 1
 +#define HAVE_MIPSFPU 0
-+#define HAVE_MIPS32R2 1
++#define HAVE_MIPS32R2 0
++#define HAVE_MIPS32R5 0
++#define HAVE_MIPS64R6 0
 +#define HAVE_MIPSDSPR1 0
 +#define HAVE_MIPSDSPR2 0
-+#define HAVE_LOONGSON 1
++#define HAVE_MSA 0
++#define HAVE_LOONGSON3 0
 +#define HAVE_ARMV5TE_EXTERNAL 0
 +#define HAVE_ARMV6_EXTERNAL 0
 +#define HAVE_ARMV6T2_EXTERNAL 0
@@ -88,6 +92,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_ALTIVEC_EXTERNAL 0
 +#define HAVE_DCBZL_EXTERNAL 0
 +#define HAVE_LDBRX_EXTERNAL 0
++#define HAVE_POWER8_EXTERNAL 0
 +#define HAVE_PPC4XX_EXTERNAL 0
 +#define HAVE_VSX_EXTERNAL 0
 +#define HAVE_AMD3DNOW_EXTERNAL 1
@@ -109,9 +114,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_I686_EXTERNAL 0
 +#define HAVE_MIPSFPU_EXTERNAL 0
 +#define HAVE_MIPS32R2_EXTERNAL 0
++#define HAVE_MIPS32R5_EXTERNAL 0
++#define HAVE_MIPS64R6_EXTERNAL 0
 +#define HAVE_MIPSDSPR1_EXTERNAL 0
 +#define HAVE_MIPSDSPR2_EXTERNAL 0
-+#define HAVE_LOONGSON_EXTERNAL 0
++#define HAVE_MSA_EXTERNAL 0
++#define HAVE_LOONGSON3_EXTERNAL 0
 +#define HAVE_ARMV5TE_INLINE 0
 +#define HAVE_ARMV6_INLINE 0
 +#define HAVE_ARMV6T2_INLINE 0
@@ -123,6 +131,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_ALTIVEC_INLINE 0
 +#define HAVE_DCBZL_INLINE 0
 +#define HAVE_LDBRX_INLINE 0
++#define HAVE_POWER8_INLINE 0
 +#define HAVE_PPC4XX_INLINE 0
 +#define HAVE_VSX_INLINE 0
 +#define HAVE_AMD3DNOW_INLINE 1
@@ -144,9 +153,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_I686_INLINE 0
 +#define HAVE_MIPSFPU_INLINE 0
 +#define HAVE_MIPS32R2_INLINE 0
++#define HAVE_MIPS32R5_INLINE 0
++#define HAVE_MIPS64R6_INLINE 0
 +#define HAVE_MIPSDSPR1_INLINE 0
 +#define HAVE_MIPSDSPR2_INLINE 0
-+#define HAVE_LOONGSON_INLINE 0
++#define HAVE_MSA_INLINE 0
++#define HAVE_LOONGSON3_INLINE 0
 +#define HAVE_ALIGNED_STACK 1
 +#define HAVE_FAST_64BIT 0
 +#define HAVE_FAST_CLZ 1
@@ -159,7 +171,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_ATOMICS_SUNCC 0
 +#define HAVE_ATOMICS_WIN32 0
 +#define HAVE_ATOMIC_CAS_PTR 0
-+#define HAVE_ATOMIC_COMPARE_EXCHANGE 1
++#define HAVE_ATOMIC_COMPARE_EXCHANGE 0
 +#define HAVE_MACHINE_RW_BARRIER 0
 +#define HAVE_MEMORYBARRIER 0
 +#define HAVE_MM_EMPTY 0
@@ -185,6 +197,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 +#define HAVE_DIRECT_H 0
 +#define HAVE_DLFCN_H 1
++#define HAVE_D3D11_H 0
 +#define HAVE_DXVA_H 0
 +#define HAVE_ES2_GL_H 0
 +#define HAVE_GSM_H 0
@@ -209,6 +222,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_TERMIOS_H 1
 +#define HAVE_UDPLITE_H 0
 +#define HAVE_UNISTD_H 1
++#define HAVE_VALGRIND_VALGRIND_H 0
 +#define HAVE_WINDOWS_H 0
 +#define HAVE_WINSOCK2_H 0
 +#define HAVE_INTRINSICS_NEON 0
@@ -298,22 +312,21 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_ATTRIBUTE_MAY_ALIAS 1
 +#define HAVE_ATTRIBUTE_PACKED 1
 +#define HAVE_EBP_AVAILABLE 1
-+#define HAVE_EBX_AVAILABLE 1
++#define HAVE_EBX_AVAILABLE 0
 +#define HAVE_GNU_AS 0
 +#define HAVE_GNU_WINDRES 0
 +#define HAVE_IBM_ASM 0
 +#define HAVE_INLINE_ASM_LABELS 1
 +#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
 +#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
-+#define HAVE_PRAGMA_DEPRECATED 1
++#define HAVE_PRAGMA_DEPRECATED 0
 +#define HAVE_RSYNC_CONTIMEOUT 0
-+#define HAVE_SYMVER_ASM_LABEL 1
++#define HAVE_SYMVER_ASM_LABEL 0
 +#define HAVE_SYMVER_GNU_ASM 1
 +#define HAVE_VFP_ARGS 0
 +#define HAVE_XFORM_ASM 0
-+#define HAVE_XMM_CLOBBERS 1
++#define HAVE_XMM_CLOBBERS 0
 +#define HAVE_CONDITION_VARIABLE_PTR 0
-+#define HAVE_DXVA_PICPARAMS_HEVC 0
 +#define HAVE_SOCKLEN_T 0
 +#define HAVE_STRUCT_ADDRINFO 0
 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -326,7 +339,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
 +#define HAVE_STRUCT_SOCKADDR_STORAGE 0
 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
++#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 +#define HAVE_ATOMICS_NATIVE 1
 +#define HAVE_DOS_PATHS 0
 +#define HAVE_DXVA2API_COBJ 0
@@ -338,7 +351,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define HAVE_MAKEINFO_HTML 0
 +#define HAVE_PERL 1
 +#define HAVE_POD2MAN 1
-+#define HAVE_SDL 1
++#define HAVE_SDL 0
 +#define HAVE_SECTION_DATA_REL_RO 0
 +#define HAVE_TEXI2HTML 0
 +#define HAVE_THREADS 1
@@ -358,10 +371,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_PROTOCOLS 0
 +#define CONFIG_DOC 0
 +#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 1
-+#define CONFIG_PODPAGES 1
-+#define CONFIG_TXTPAGES 1
++#define CONFIG_MANPAGES 0
++#define CONFIG_PODPAGES 0
++#define CONFIG_TXTPAGES 0
 +#define CONFIG_AVIO_READING_EXAMPLE 1
++#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
 +#define CONFIG_DECODING_ENCODING_EXAMPLE 1
 +#define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 +#define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -445,12 +459,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_LIBZMQ 0
 +#define CONFIG_LIBZVBI 0
 +#define CONFIG_LZMA 0
++#define CONFIG_MMAL 0
 +#define CONFIG_NVENC 0
 +#define CONFIG_OPENAL 0
 +#define CONFIG_OPENCL 0
 +#define CONFIG_OPENGL 0
 +#define CONFIG_OPENSSL 0
-+#define CONFIG_SDL 1
++#define CONFIG_SDL 0
++#define CONFIG_SECURETRANSPORT 0
 +#define CONFIG_X11GRAB 0
 +#define CONFIG_XLIB 0
 +#define CONFIG_ZLIB 0
@@ -459,10 +475,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_HARDCODED_TABLES 0
 +#define CONFIG_RUNTIME_CPUDETECT 1
 +#define CONFIG_SAFE_BITSTREAM_READER 1
-+#define CONFIG_SHARED 1
++#define CONFIG_SHARED 0
 +#define CONFIG_SMALL 0
-+#define CONFIG_STATIC 0
++#define CONFIG_STATIC 1
 +#define CONFIG_SWSCALE_ALPHA 1
++#define CONFIG_D3D11VA 0
 +#define CONFIG_DXVA2 0
 +#define CONFIG_VAAPI 0
 +#define CONFIG_VDA 0
@@ -505,6 +522,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_POD2MAN 1
 +#define CONFIG_RAISE_MAJOR 0
 +#define CONFIG_THUMB 0
++#define CONFIG_VALGRIND_BACKTRACE 0
 +#define CONFIG_XMM_CLOBBER_TEST 0
 +#define CONFIG_AANDCTTABLES 0
 +#define CONFIG_AC3DSP 0
@@ -521,6 +539,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_FMTCONVERT 0
 +#define CONFIG_FRAME_THREAD_ENCODER 0
 +#define CONFIG_GCRYPT 0
++#define CONFIG_GMP 0
 +#define CONFIG_GOLOMB 1
 +#define CONFIG_GPLV3 0
 +#define CONFIG_H263DSP 0
@@ -536,6 +555,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_IIRFILTER 0
 +#define CONFIG_IMDCT15 1
 +#define CONFIG_INTRAX8 0
++#define CONFIG_JPEGTABLES 0
 +#define CONFIG_LGPLV3 0
 +#define CONFIG_LLAUDDSP 0
 +#define CONFIG_LLVIDDSP 0
@@ -546,10 +566,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_MPEGAUDIODSP 1
 +#define CONFIG_MPEGVIDEO 0
 +#define CONFIG_MPEGVIDEOENC 0
-+#define CONFIG_NETTLE 0
 +#define CONFIG_PIXBLOCKDSP 0
 +#define CONFIG_QPELDSP 0
 +#define CONFIG_QSV 0
++#define CONFIG_QSVDEC 0
++#define CONFIG_QSVENC 0
 +#define CONFIG_RANGECODER 0
 +#define CONFIG_RIFFDEC 1
 +#define CONFIG_RIFFENC 0
@@ -569,6 +590,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_MJPEG2JPEG_BSF 0
 +#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 +#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
 +#define CONFIG_MOV2TEXTSUB_BSF 0
 +#define CONFIG_NOISE_BSF 0
 +#define CONFIG_REMOVE_EXTRADATA_BSF 0
@@ -643,11 +665,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_H263P_DECODER 0
 +#define CONFIG_H264_DECODER 1
 +#define CONFIG_H264_CRYSTALHD_DECODER 0
++#define CONFIG_H264_MMAL_DECODER 0
 +#define CONFIG_H264_QSV_DECODER 0
 +#define CONFIG_H264_VDA_DECODER 0
 +#define CONFIG_H264_VDPAU_DECODER 0
 +#define CONFIG_HEVC_DECODER 0
 +#define CONFIG_HNM4_VIDEO_DECODER 0
++#define CONFIG_HQ_HQA_DECODER 0
 +#define CONFIG_HQX_DECODER 0
 +#define CONFIG_HUFFYUV_DECODER 0
 +#define CONFIG_IDCIN_DECODER 0
@@ -1011,6 +1035,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_BINK_DEMUXER 0
 +#define CONFIG_BIT_DEMUXER 0
 +#define CONFIG_BMV_DEMUXER 0
++#define CONFIG_BFSTM_DEMUXER 0
 +#define CONFIG_BRSTM_DEMUXER 0
 +#define CONFIG_BOA_DEMUXER 0
 +#define CONFIG_C93_DEMUXER 0
@@ -1098,6 +1123,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_MPEGTS_DEMUXER 0
 +#define CONFIG_MPEGTSRAW_DEMUXER 0
 +#define CONFIG_MPEGVIDEO_DEMUXER 0
++#define CONFIG_MPJPEG_DEMUXER 0
 +#define CONFIG_MPL2_DEMUXER 0
 +#define CONFIG_MPSUB_DEMUXER 0
 +#define CONFIG_MSNWC_TCP_DEMUXER 0
@@ -1213,6 +1239,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
++#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
@@ -1225,6 +1252,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_A64MULTI5_ENCODER 0
 +#define CONFIG_ALIAS_PIX_ENCODER 0
 +#define CONFIG_AMV_ENCODER 0
++#define CONFIG_APNG_ENCODER 0
 +#define CONFIG_ASV1_ENCODER 0
 +#define CONFIG_ASV2_ENCODER 0
 +#define CONFIG_AVRP_ENCODER 0
@@ -1257,7 +1285,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_MSMPEG4V2_ENCODER 0
 +#define CONFIG_MSMPEG4V3_ENCODER 0
 +#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_NVENC_ENCODER 0
 +#define CONFIG_PAM_ENCODER 0
 +#define CONFIG_PBM_ENCODER 0
 +#define CONFIG_PCX_ENCODER 0
@@ -1380,6 +1407,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_LIBVPX_VP8_ENCODER 0
 +#define CONFIG_LIBVPX_VP9_ENCODER 0
 +#define CONFIG_LIBWAVPACK_ENCODER 0
++#define CONFIG_LIBWEBP_ANIM_ENCODER 0
 +#define CONFIG_LIBWEBP_ENCODER 0
 +#define CONFIG_LIBX264_ENCODER 0
 +#define CONFIG_LIBX264RGB_ENCODER 0
@@ -1388,6 +1416,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_LIBXVID_ENCODER 0
 +#define CONFIG_LIBAACPLUS_ENCODER 0
 +#define CONFIG_LIBOPENH264_ENCODER 0
++#define CONFIG_H264_QSV_ENCODER 0
++#define CONFIG_NVENC_ENCODER 0
++#define CONFIG_NVENC_H264_ENCODER 0
++#define CONFIG_NVENC_HEVC_ENCODER 0
 +#define CONFIG_ADELAY_FILTER 0
 +#define CONFIG_AECHO_FILTER 0
 +#define CONFIG_AEVAL_FILTER 0
@@ -1423,6 +1455,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_BS2B_FILTER 0
 +#define CONFIG_CHANNELMAP_FILTER 0
 +#define CONFIG_CHANNELSPLIT_FILTER 0
++#define CONFIG_CHORUS_FILTER 0
 +#define CONFIG_COMPAND_FILTER 0
 +#define CONFIG_DCSHIFT_FILTER 0
 +#define CONFIG_EARWAX_FILTER 0
@@ -1457,9 +1490,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_CODECVIEW_FILTER 0
 +#define CONFIG_COLORBALANCE_FILTER 0
 +#define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORKEY_FILTER 0
 +#define CONFIG_COLORLEVELS_FILTER 0
 +#define CONFIG_COLORMATRIX_FILTER 0
 +#define CONFIG_COPY_FILTER 0
++#define CONFIG_COVER_RECT_FILTER 0
 +#define CONFIG_CROP_FILTER 0
 +#define CONFIG_CROPDETECT_FILTER 0
 +#define CONFIG_CURVES_FILTER 0
@@ -1468,6 +1503,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_DEJUDDER_FILTER 0
 +#define CONFIG_DELOGO_FILTER 0
 +#define CONFIG_DESHAKE_FILTER 0
++#define CONFIG_DETELECINE_FILTER 0
 +#define CONFIG_DRAWBOX_FILTER 0
 +#define CONFIG_DRAWGRID_FILTER 0
 +#define CONFIG_DRAWTEXT_FILTER 0
@@ -1480,6 +1516,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_FIELD_FILTER 0
 +#define CONFIG_FIELDMATCH_FILTER 0
 +#define CONFIG_FIELDORDER_FILTER 0
++#define CONFIG_FIND_RECT_FILTER 0
 +#define CONFIG_FORMAT_FILTER 0
 +#define CONFIG_FPS_FILTER 0
 +#define CONFIG_FRAMEPACK_FILTER 0
@@ -1592,24 +1629,30 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_MOVIE_FILTER 0
 +#define CONFIG_H263_VAAPI_HWACCEL 0
 +#define CONFIG_H263_VDPAU_HWACCEL 0
++#define CONFIG_H264_D3D11VA_HWACCEL 0
 +#define CONFIG_H264_DXVA2_HWACCEL 0
++#define CONFIG_H264_MMAL_HWACCEL 0
 +#define CONFIG_H264_QSV_HWACCEL 0
 +#define CONFIG_H264_VAAPI_HWACCEL 0
 +#define CONFIG_H264_VDA_HWACCEL 0
 +#define CONFIG_H264_VDA_OLD_HWACCEL 0
 +#define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_D3D11VA_HWACCEL 0
 +#define CONFIG_HEVC_DXVA2_HWACCEL 0
 +#define CONFIG_MPEG1_XVMC_HWACCEL 0
 +#define CONFIG_MPEG1_VDPAU_HWACCEL 0
 +#define CONFIG_MPEG2_XVMC_HWACCEL 0
++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 +#define CONFIG_MPEG2_DXVA2_HWACCEL 0
 +#define CONFIG_MPEG2_VAAPI_HWACCEL 0
 +#define CONFIG_MPEG2_VDPAU_HWACCEL 0
 +#define CONFIG_MPEG4_VAAPI_HWACCEL 0
 +#define CONFIG_MPEG4_VDPAU_HWACCEL 0
++#define CONFIG_VC1_D3D11VA_HWACCEL 0
 +#define CONFIG_VC1_DXVA2_HWACCEL 0
 +#define CONFIG_VC1_VAAPI_HWACCEL 0
 +#define CONFIG_VC1_VDPAU_HWACCEL 0
++#define CONFIG_WMV3_D3D11VA_HWACCEL 0
 +#define CONFIG_WMV3_DXVA2_HWACCEL 0
 +#define CONFIG_WMV3_VAAPI_HWACCEL 0
 +#define CONFIG_WMV3_VDPAU_HWACCEL 0
@@ -1641,6 +1684,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_ADX_MUXER 0
 +#define CONFIG_AIFF_MUXER 0
 +#define CONFIG_AMR_MUXER 0
++#define CONFIG_APNG_MUXER 0
 +#define CONFIG_ASF_MUXER 0
 +#define CONFIG_ASS_MUXER 0
 +#define CONFIG_AST_MUXER 0
@@ -1750,6 +1794,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_SAP_MUXER 0
 +#define CONFIG_SEGMENT_MUXER 0
 +#define CONFIG_STREAM_SEGMENT_MUXER 0
++#define CONFIG_SINGLEJPEG_MUXER 0
 +#define CONFIG_SMJPEG_MUXER 0
 +#define CONFIG_SMOOTHSTREAMING_MUXER 0
 +#define CONFIG_SOX_MUXER 0
@@ -1770,6 +1815,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_WAV_MUXER 0
 +#define CONFIG_WEBM_MUXER 0
 +#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
++#define CONFIG_WEBM_CHUNK_MUXER 0
 +#define CONFIG_WEBP_MUXER 0
 +#define CONFIG_WEBVTT_MUXER 0
 +#define CONFIG_WTV_MUXER 0
@@ -1853,7 +1899,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config_h,
 +#define CONFIG_SRTP_PROTOCOL 0
 +#define CONFIG_SUBFILE_PROTOCOL 0
 +#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
++#define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
++#define CONFIG_TLS_GNUTLS_PROTOCOL 0
++#define CONFIG_TLS_OPENSSL_PROTOCOL 0
 +#define CONFIG_UDP_PROTOCOL 0
 +#define CONFIG_UDPLITE_PROTOCOL 0
 +#define CONFIG_UNIX_PROTOCOL 0
diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
index 582e3298bca..dd1bf676aab 100644
--- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
+++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm,v 1.14 2015/05/24 15:51:53 robert Exp $
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig.port	Wed May 20 08:34:56 2015
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm	Thu May 21 07:49:19 2015
-@@ -0,0 +1,1846 @@
+$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm,v 1.15 2015/09/05 16:06:50 robert Exp $
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig.port	Wed Sep  2 07:31:55 2015
++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm	Thu Sep  3 07:24:21 2015
+@@ -0,0 +1,1894 @@
 +%define ARCH_AARCH64 0
 +%define ARCH_ALPHA 0
 +%define ARCH_ARM 0
@@ -35,8 +35,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_VFPV3 0
 +%define HAVE_SETEND 0
 +%define HAVE_ALTIVEC 0
-+%define HAVE_DCBZL 1
-+%define HAVE_LDBRX 1
++%define HAVE_DCBZL 0
++%define HAVE_LDBRX 0
++%define HAVE_POWER8 0
 +%define HAVE_PPC4XX 0
 +%define HAVE_VSX 0
 +%define HAVE_AMD3DNOW 1
@@ -57,10 +58,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_CPUNOP 1
 +%define HAVE_I686 1
 +%define HAVE_MIPSFPU 0
-+%define HAVE_MIPS32R2 1
++%define HAVE_MIPS32R2 0
++%define HAVE_MIPS32R5 0
++%define HAVE_MIPS64R6 0
 +%define HAVE_MIPSDSPR1 0
 +%define HAVE_MIPSDSPR2 0
-+%define HAVE_LOONGSON 1
++%define HAVE_MSA 0
++%define HAVE_LOONGSON3 0
 +%define HAVE_ARMV5TE_EXTERNAL 0
 +%define HAVE_ARMV6_EXTERNAL 0
 +%define HAVE_ARMV6T2_EXTERNAL 0
@@ -72,6 +76,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_ALTIVEC_EXTERNAL 0
 +%define HAVE_DCBZL_EXTERNAL 0
 +%define HAVE_LDBRX_EXTERNAL 0
++%define HAVE_POWER8_EXTERNAL 0
 +%define HAVE_PPC4XX_EXTERNAL 0
 +%define HAVE_VSX_EXTERNAL 0
 +%define HAVE_AMD3DNOW_EXTERNAL 1
@@ -93,9 +98,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_I686_EXTERNAL 0
 +%define HAVE_MIPSFPU_EXTERNAL 0
 +%define HAVE_MIPS32R2_EXTERNAL 0
++%define HAVE_MIPS32R5_EXTERNAL 0
++%define HAVE_MIPS64R6_EXTERNAL 0
 +%define HAVE_MIPSDSPR1_EXTERNAL 0
 +%define HAVE_MIPSDSPR2_EXTERNAL 0
-+%define HAVE_LOONGSON_EXTERNAL 0
++%define HAVE_MSA_EXTERNAL 0
++%define HAVE_LOONGSON3_EXTERNAL 0
 +%define HAVE_ARMV5TE_INLINE 0
 +%define HAVE_ARMV6_INLINE 0
 +%define HAVE_ARMV6T2_INLINE 0
@@ -107,6 +115,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_ALTIVEC_INLINE 0
 +%define HAVE_DCBZL_INLINE 0
 +%define HAVE_LDBRX_INLINE 0
++%define HAVE_POWER8_INLINE 0
 +%define HAVE_PPC4XX_INLINE 0
 +%define HAVE_VSX_INLINE 0
 +%define HAVE_AMD3DNOW_INLINE 1
@@ -128,9 +137,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_I686_INLINE 0
 +%define HAVE_MIPSFPU_INLINE 0
 +%define HAVE_MIPS32R2_INLINE 0
++%define HAVE_MIPS32R5_INLINE 0
++%define HAVE_MIPS64R6_INLINE 0
 +%define HAVE_MIPSDSPR1_INLINE 0
 +%define HAVE_MIPSDSPR2_INLINE 0
-+%define HAVE_LOONGSON_INLINE 0
++%define HAVE_MSA_INLINE 0
++%define HAVE_LOONGSON3_INLINE 0
 +%define HAVE_ALIGNED_STACK 1
 +%define HAVE_FAST_64BIT 1
 +%define HAVE_FAST_CLZ 1
@@ -169,6 +181,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 +%define HAVE_DIRECT_H 0
 +%define HAVE_DLFCN_H 1
++%define HAVE_D3D11_H 0
 +%define HAVE_DXVA_H 0
 +%define HAVE_ES2_GL_H 0
 +%define HAVE_GSM_H 0
@@ -193,6 +206,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_TERMIOS_H 1
 +%define HAVE_UDPLITE_H 0
 +%define HAVE_UNISTD_H 1
++%define HAVE_VALGRIND_VALGRIND_H 0
 +%define HAVE_WINDOWS_H 0
 +%define HAVE_WINSOCK2_H 0
 +%define HAVE_INTRINSICS_NEON 0
@@ -297,7 +311,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_XFORM_ASM 0
 +%define HAVE_XMM_CLOBBERS 1
 +%define HAVE_CONDITION_VARIABLE_PTR 0
-+%define HAVE_DXVA_PICPARAMS_HEVC 0
 +%define HAVE_SOCKLEN_T 0
 +%define HAVE_STRUCT_ADDRINFO 0
 +%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -322,7 +335,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define HAVE_MAKEINFO_HTML 0
 +%define HAVE_PERL 1
 +%define HAVE_POD2MAN 1
-+%define HAVE_SDL 1
++%define HAVE_SDL 0
 +%define HAVE_SECTION_DATA_REL_RO 0
 +%define HAVE_TEXI2HTML 0
 +%define HAVE_THREADS 1
@@ -342,10 +355,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_PROTOCOLS 0
 +%define CONFIG_DOC 0
 +%define CONFIG_HTMLPAGES 0
-+%define CONFIG_MANPAGES 1
-+%define CONFIG_PODPAGES 1
-+%define CONFIG_TXTPAGES 1
++%define CONFIG_MANPAGES 0
++%define CONFIG_PODPAGES 0
++%define CONFIG_TXTPAGES 0
 +%define CONFIG_AVIO_READING_EXAMPLE 1
++%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
 +%define CONFIG_DECODING_ENCODING_EXAMPLE 1
 +%define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 +%define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -429,12 +443,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_LIBZMQ 0
 +%define CONFIG_LIBZVBI 0
 +%define CONFIG_LZMA 0
++%define CONFIG_MMAL 0
 +%define CONFIG_NVENC 0
 +%define CONFIG_OPENAL 0
 +%define CONFIG_OPENCL 0
 +%define CONFIG_OPENGL 0
 +%define CONFIG_OPENSSL 0
-+%define CONFIG_SDL 1
++%define CONFIG_SDL 0
++%define CONFIG_SECURETRANSPORT 0
 +%define CONFIG_X11GRAB 0
 +%define CONFIG_XLIB 0
 +%define CONFIG_ZLIB 0
@@ -443,10 +459,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_HARDCODED_TABLES 0
 +%define CONFIG_RUNTIME_CPUDETECT 1
 +%define CONFIG_SAFE_BITSTREAM_READER 1
-+%define CONFIG_SHARED 1
++%define CONFIG_SHARED 0
 +%define CONFIG_SMALL 0
-+%define CONFIG_STATIC 0
++%define CONFIG_STATIC 1
 +%define CONFIG_SWSCALE_ALPHA 1
++%define CONFIG_D3D11VA 0
 +%define CONFIG_DXVA2 0
 +%define CONFIG_VAAPI 0
 +%define CONFIG_VDA 0
@@ -489,6 +506,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_POD2MAN 1
 +%define CONFIG_RAISE_MAJOR 0
 +%define CONFIG_THUMB 0
++%define CONFIG_VALGRIND_BACKTRACE 0
 +%define CONFIG_XMM_CLOBBER_TEST 0
 +%define CONFIG_AANDCTTABLES 0
 +%define CONFIG_AC3DSP 0
@@ -505,6 +523,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_FMTCONVERT 0
 +%define CONFIG_FRAME_THREAD_ENCODER 0
 +%define CONFIG_GCRYPT 0
++%define CONFIG_GMP 0
 +%define CONFIG_GOLOMB 1
 +%define CONFIG_GPLV3 0
 +%define CONFIG_H263DSP 0
@@ -520,6 +539,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_IIRFILTER 0
 +%define CONFIG_IMDCT15 1
 +%define CONFIG_INTRAX8 0
++%define CONFIG_JPEGTABLES 0
 +%define CONFIG_LGPLV3 0
 +%define CONFIG_LLAUDDSP 0
 +%define CONFIG_LLVIDDSP 0
@@ -530,10 +550,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_MPEGAUDIODSP 1
 +%define CONFIG_MPEGVIDEO 0
 +%define CONFIG_MPEGVIDEOENC 0
-+%define CONFIG_NETTLE 0
 +%define CONFIG_PIXBLOCKDSP 0
 +%define CONFIG_QPELDSP 0
 +%define CONFIG_QSV 0
++%define CONFIG_QSVDEC 0
++%define CONFIG_QSVENC 0
 +%define CONFIG_RANGECODER 0
 +%define CONFIG_RIFFDEC 1
 +%define CONFIG_RIFFENC 0
@@ -553,6 +574,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_MJPEG2JPEG_BSF 0
 +%define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 +%define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
 +%define CONFIG_MOV2TEXTSUB_BSF 0
 +%define CONFIG_NOISE_BSF 0
 +%define CONFIG_REMOVE_EXTRADATA_BSF 0
@@ -627,11 +649,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_H263P_DECODER 0
 +%define CONFIG_H264_DECODER 1
 +%define CONFIG_H264_CRYSTALHD_DECODER 0
++%define CONFIG_H264_MMAL_DECODER 0
 +%define CONFIG_H264_QSV_DECODER 0
 +%define CONFIG_H264_VDA_DECODER 0
 +%define CONFIG_H264_VDPAU_DECODER 0
 +%define CONFIG_HEVC_DECODER 0
 +%define CONFIG_HNM4_VIDEO_DECODER 0
++%define CONFIG_HQ_HQA_DECODER 0
 +%define CONFIG_HQX_DECODER 0
 +%define CONFIG_HUFFYUV_DECODER 0
 +%define CONFIG_IDCIN_DECODER 0
@@ -995,6 +1019,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_BINK_DEMUXER 0
 +%define CONFIG_BIT_DEMUXER 0
 +%define CONFIG_BMV_DEMUXER 0
++%define CONFIG_BFSTM_DEMUXER 0
 +%define CONFIG_BRSTM_DEMUXER 0
 +%define CONFIG_BOA_DEMUXER 0
 +%define CONFIG_C93_DEMUXER 0
@@ -1082,6 +1107,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_MPEGTS_DEMUXER 0
 +%define CONFIG_MPEGTSRAW_DEMUXER 0
 +%define CONFIG_MPEGVIDEO_DEMUXER 0
++%define CONFIG_MPJPEG_DEMUXER 0
 +%define CONFIG_MPL2_DEMUXER 0
 +%define CONFIG_MPSUB_DEMUXER 0
 +%define CONFIG_MSNWC_TCP_DEMUXER 0
@@ -1197,6 +1223,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
 +%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
@@ -1209,6 +1236,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_A64MULTI5_ENCODER 0
 +%define CONFIG_ALIAS_PIX_ENCODER 0
 +%define CONFIG_AMV_ENCODER 0
++%define CONFIG_APNG_ENCODER 0
 +%define CONFIG_ASV1_ENCODER 0
 +%define CONFIG_ASV2_ENCODER 0
 +%define CONFIG_AVRP_ENCODER 0
@@ -1241,7 +1269,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_MSMPEG4V2_ENCODER 0
 +%define CONFIG_MSMPEG4V3_ENCODER 0
 +%define CONFIG_MSVIDEO1_ENCODER 0
-+%define CONFIG_NVENC_ENCODER 0
 +%define CONFIG_PAM_ENCODER 0
 +%define CONFIG_PBM_ENCODER 0
 +%define CONFIG_PCX_ENCODER 0
@@ -1364,6 +1391,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_LIBVPX_VP8_ENCODER 0
 +%define CONFIG_LIBVPX_VP9_ENCODER 0
 +%define CONFIG_LIBWAVPACK_ENCODER 0
++%define CONFIG_LIBWEBP_ANIM_ENCODER 0
 +%define CONFIG_LIBWEBP_ENCODER 0
 +%define CONFIG_LIBX264_ENCODER 0
 +%define CONFIG_LIBX264RGB_ENCODER 0
@@ -1372,6 +1400,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_LIBXVID_ENCODER 0
 +%define CONFIG_LIBAACPLUS_ENCODER 0
 +%define CONFIG_LIBOPENH264_ENCODER 0
++%define CONFIG_H264_QSV_ENCODER 0
++%define CONFIG_NVENC_ENCODER 0
++%define CONFIG_NVENC_H264_ENCODER 0
++%define CONFIG_NVENC_HEVC_ENCODER 0
 +%define CONFIG_ADELAY_FILTER 0
 +%define CONFIG_AECHO_FILTER 0
 +%define CONFIG_AEVAL_FILTER 0
@@ -1407,6 +1439,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_BS2B_FILTER 0
 +%define CONFIG_CHANNELMAP_FILTER 0
 +%define CONFIG_CHANNELSPLIT_FILTER 0
++%define CONFIG_CHORUS_FILTER 0
 +%define CONFIG_COMPAND_FILTER 0
 +%define CONFIG_DCSHIFT_FILTER 0
 +%define CONFIG_EARWAX_FILTER 0
@@ -1441,9 +1474,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_CODECVIEW_FILTER 0
 +%define CONFIG_COLORBALANCE_FILTER 0
 +%define CONFIG_COLORCHANNELMIXER_FILTER 0
++%define CONFIG_COLORKEY_FILTER 0
 +%define CONFIG_COLORLEVELS_FILTER 0
 +%define CONFIG_COLORMATRIX_FILTER 0
 +%define CONFIG_COPY_FILTER 0
++%define CONFIG_COVER_RECT_FILTER 0
 +%define CONFIG_CROP_FILTER 0
 +%define CONFIG_CROPDETECT_FILTER 0
 +%define CONFIG_CURVES_FILTER 0
@@ -1452,6 +1487,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_DEJUDDER_FILTER 0
 +%define CONFIG_DELOGO_FILTER 0
 +%define CONFIG_DESHAKE_FILTER 0
++%define CONFIG_DETELECINE_FILTER 0
 +%define CONFIG_DRAWBOX_FILTER 0
 +%define CONFIG_DRAWGRID_FILTER 0
 +%define CONFIG_DRAWTEXT_FILTER 0
@@ -1464,6 +1500,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_FIELD_FILTER 0
 +%define CONFIG_FIELDMATCH_FILTER 0
 +%define CONFIG_FIELDORDER_FILTER 0
++%define CONFIG_FIND_RECT_FILTER 0
 +%define CONFIG_FORMAT_FILTER 0
 +%define CONFIG_FPS_FILTER 0
 +%define CONFIG_FRAMEPACK_FILTER 0
@@ -1576,24 +1613,30 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_MOVIE_FILTER 0
 +%define CONFIG_H263_VAAPI_HWACCEL 0
 +%define CONFIG_H263_VDPAU_HWACCEL 0
++%define CONFIG_H264_D3D11VA_HWACCEL 0
 +%define CONFIG_H264_DXVA2_HWACCEL 0
++%define CONFIG_H264_MMAL_HWACCEL 0
 +%define CONFIG_H264_QSV_HWACCEL 0
 +%define CONFIG_H264_VAAPI_HWACCEL 0
 +%define CONFIG_H264_VDA_HWACCEL 0
 +%define CONFIG_H264_VDA_OLD_HWACCEL 0
 +%define CONFIG_H264_VDPAU_HWACCEL 0
++%define CONFIG_HEVC_D3D11VA_HWACCEL 0
 +%define CONFIG_HEVC_DXVA2_HWACCEL 0
 +%define CONFIG_MPEG1_XVMC_HWACCEL 0
 +%define CONFIG_MPEG1_VDPAU_HWACCEL 0
 +%define CONFIG_MPEG2_XVMC_HWACCEL 0
++%define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 +%define CONFIG_MPEG2_DXVA2_HWACCEL 0
 +%define CONFIG_MPEG2_VAAPI_HWACCEL 0
 +%define CONFIG_MPEG2_VDPAU_HWACCEL 0
 +%define CONFIG_MPEG4_VAAPI_HWACCEL 0
 +%define CONFIG_MPEG4_VDPAU_HWACCEL 0
++%define CONFIG_VC1_D3D11VA_HWACCEL 0
 +%define CONFIG_VC1_DXVA2_HWACCEL 0
 +%define CONFIG_VC1_VAAPI_HWACCEL 0
 +%define CONFIG_VC1_VDPAU_HWACCEL 0
++%define CONFIG_WMV3_D3D11VA_HWACCEL 0
 +%define CONFIG_WMV3_DXVA2_HWACCEL 0
 +%define CONFIG_WMV3_VAAPI_HWACCEL 0
 +%define CONFIG_WMV3_VDPAU_HWACCEL 0
@@ -1625,6 +1668,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_ADX_MUXER 0
 +%define CONFIG_AIFF_MUXER 0
 +%define CONFIG_AMR_MUXER 0
++%define CONFIG_APNG_MUXER 0
 +%define CONFIG_ASF_MUXER 0
 +%define CONFIG_ASS_MUXER 0
 +%define CONFIG_AST_MUXER 0
@@ -1734,6 +1778,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_SAP_MUXER 0
 +%define CONFIG_SEGMENT_MUXER 0
 +%define CONFIG_STREAM_SEGMENT_MUXER 0
++%define CONFIG_SINGLEJPEG_MUXER 0
 +%define CONFIG_SMJPEG_MUXER 0
 +%define CONFIG_SMOOTHSTREAMING_MUXER 0
 +%define CONFIG_SOX_MUXER 0
@@ -1754,6 +1799,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_WAV_MUXER 0
 +%define CONFIG_WEBM_MUXER 0
 +%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
++%define CONFIG_WEBM_CHUNK_MUXER 0
 +%define CONFIG_WEBP_MUXER 0
 +%define CONFIG_WEBVTT_MUXER 0
 +%define CONFIG_WTV_MUXER 0
@@ -1837,7 +1883,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_asm
 +%define CONFIG_SRTP_PROTOCOL 0
 +%define CONFIG_SUBFILE_PROTOCOL 0
 +%define CONFIG_TCP_PROTOCOL 0
-+%define CONFIG_TLS_PROTOCOL 0
++%define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
++%define CONFIG_TLS_GNUTLS_PROTOCOL 0
++%define CONFIG_TLS_OPENSSL_PROTOCOL 0
 +%define CONFIG_UDP_PROTOCOL 0
 +%define CONFIG_UDPLITE_PROTOCOL 0
 +%define CONFIG_UNIX_PROTOCOL 0
diff --git a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h
index 3e1afd99e13..827a110fa18 100644
--- a/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h
+++ b/www/chromium/patches/patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h
@@ -1,11 +1,11 @@
-$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v 1.14 2015/05/24 15:51:53 robert Exp $
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig.port	Wed May 20 08:34:56 2015
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h	Thu May 21 07:49:15 2015
-@@ -0,0 +1,1863 @@
+$OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v 1.15 2015/09/05 16:06:50 robert Exp $
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig.port	Wed Sep  2 07:31:55 2015
++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h	Thu Sep  3 07:24:18 2015
+@@ -0,0 +1,1911 @@
 +/* Automatically generated by configure - do not modify! */
 +#ifndef FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIG_H
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\0\0-O2\0\0' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --cc=clang --cxx=clang++"
++#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder=vorbis --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vorbis' --optflags='\0\0-O2\0\0' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --cc=clang --cxx=clang++"
 +#define FFMPEG_LICENSE "LGPL version 2.1 or later"
 +#define CONFIG_THIS_YEAR 2015
 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -51,8 +51,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_VFPV3 0
 +#define HAVE_SETEND 0
 +#define HAVE_ALTIVEC 0
-+#define HAVE_DCBZL 1
-+#define HAVE_LDBRX 1
++#define HAVE_DCBZL 0
++#define HAVE_LDBRX 0
++#define HAVE_POWER8 0
 +#define HAVE_PPC4XX 0
 +#define HAVE_VSX 0
 +#define HAVE_AMD3DNOW 1
@@ -73,10 +74,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_CPUNOP 1
 +#define HAVE_I686 1
 +#define HAVE_MIPSFPU 0
-+#define HAVE_MIPS32R2 1
++#define HAVE_MIPS32R2 0
++#define HAVE_MIPS32R5 0
++#define HAVE_MIPS64R6 0
 +#define HAVE_MIPSDSPR1 0
 +#define HAVE_MIPSDSPR2 0
-+#define HAVE_LOONGSON 1
++#define HAVE_MSA 0
++#define HAVE_LOONGSON3 0
 +#define HAVE_ARMV5TE_EXTERNAL 0
 +#define HAVE_ARMV6_EXTERNAL 0
 +#define HAVE_ARMV6T2_EXTERNAL 0
@@ -88,6 +92,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_ALTIVEC_EXTERNAL 0
 +#define HAVE_DCBZL_EXTERNAL 0
 +#define HAVE_LDBRX_EXTERNAL 0
++#define HAVE_POWER8_EXTERNAL 0
 +#define HAVE_PPC4XX_EXTERNAL 0
 +#define HAVE_VSX_EXTERNAL 0
 +#define HAVE_AMD3DNOW_EXTERNAL 1
@@ -109,9 +114,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_I686_EXTERNAL 0
 +#define HAVE_MIPSFPU_EXTERNAL 0
 +#define HAVE_MIPS32R2_EXTERNAL 0
++#define HAVE_MIPS32R5_EXTERNAL 0
++#define HAVE_MIPS64R6_EXTERNAL 0
 +#define HAVE_MIPSDSPR1_EXTERNAL 0
 +#define HAVE_MIPSDSPR2_EXTERNAL 0
-+#define HAVE_LOONGSON_EXTERNAL 0
++#define HAVE_MSA_EXTERNAL 0
++#define HAVE_LOONGSON3_EXTERNAL 0
 +#define HAVE_ARMV5TE_INLINE 0
 +#define HAVE_ARMV6_INLINE 0
 +#define HAVE_ARMV6T2_INLINE 0
@@ -123,6 +131,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_ALTIVEC_INLINE 0
 +#define HAVE_DCBZL_INLINE 0
 +#define HAVE_LDBRX_INLINE 0
++#define HAVE_POWER8_INLINE 0
 +#define HAVE_PPC4XX_INLINE 0
 +#define HAVE_VSX_INLINE 0
 +#define HAVE_AMD3DNOW_INLINE 1
@@ -144,9 +153,12 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_I686_INLINE 0
 +#define HAVE_MIPSFPU_INLINE 0
 +#define HAVE_MIPS32R2_INLINE 0
++#define HAVE_MIPS32R5_INLINE 0
++#define HAVE_MIPS64R6_INLINE 0
 +#define HAVE_MIPSDSPR1_INLINE 0
 +#define HAVE_MIPSDSPR2_INLINE 0
-+#define HAVE_LOONGSON_INLINE 0
++#define HAVE_MSA_INLINE 0
++#define HAVE_LOONGSON3_INLINE 0
 +#define HAVE_ALIGNED_STACK 1
 +#define HAVE_FAST_64BIT 1
 +#define HAVE_FAST_CLZ 1
@@ -185,6 +197,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 +#define HAVE_DIRECT_H 0
 +#define HAVE_DLFCN_H 1
++#define HAVE_D3D11_H 0
 +#define HAVE_DXVA_H 0
 +#define HAVE_ES2_GL_H 0
 +#define HAVE_GSM_H 0
@@ -209,6 +222,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_TERMIOS_H 1
 +#define HAVE_UDPLITE_H 0
 +#define HAVE_UNISTD_H 1
++#define HAVE_VALGRIND_VALGRIND_H 0
 +#define HAVE_WINDOWS_H 0
 +#define HAVE_WINSOCK2_H 0
 +#define HAVE_INTRINSICS_NEON 0
@@ -313,7 +327,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_XFORM_ASM 0
 +#define HAVE_XMM_CLOBBERS 1
 +#define HAVE_CONDITION_VARIABLE_PTR 0
-+#define HAVE_DXVA_PICPARAMS_HEVC 0
 +#define HAVE_SOCKLEN_T 0
 +#define HAVE_STRUCT_ADDRINFO 0
 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
@@ -338,7 +351,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define HAVE_MAKEINFO_HTML 0
 +#define HAVE_PERL 1
 +#define HAVE_POD2MAN 1
-+#define HAVE_SDL 1
++#define HAVE_SDL 0
 +#define HAVE_SECTION_DATA_REL_RO 0
 +#define HAVE_TEXI2HTML 0
 +#define HAVE_THREADS 1
@@ -358,10 +371,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_PROTOCOLS 0
 +#define CONFIG_DOC 0
 +#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 1
-+#define CONFIG_PODPAGES 1
-+#define CONFIG_TXTPAGES 1
++#define CONFIG_MANPAGES 0
++#define CONFIG_PODPAGES 0
++#define CONFIG_TXTPAGES 0
 +#define CONFIG_AVIO_READING_EXAMPLE 1
++#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
 +#define CONFIG_DECODING_ENCODING_EXAMPLE 1
 +#define CONFIG_DEMUXING_DECODING_EXAMPLE 1
 +#define CONFIG_EXTRACT_MVS_EXAMPLE 1
@@ -445,12 +459,14 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_LIBZMQ 0
 +#define CONFIG_LIBZVBI 0
 +#define CONFIG_LZMA 0
++#define CONFIG_MMAL 0
 +#define CONFIG_NVENC 0
 +#define CONFIG_OPENAL 0
 +#define CONFIG_OPENCL 0
 +#define CONFIG_OPENGL 0
 +#define CONFIG_OPENSSL 0
-+#define CONFIG_SDL 1
++#define CONFIG_SDL 0
++#define CONFIG_SECURETRANSPORT 0
 +#define CONFIG_X11GRAB 0
 +#define CONFIG_XLIB 0
 +#define CONFIG_ZLIB 0
@@ -459,10 +475,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_HARDCODED_TABLES 0
 +#define CONFIG_RUNTIME_CPUDETECT 1
 +#define CONFIG_SAFE_BITSTREAM_READER 1
-+#define CONFIG_SHARED 1
++#define CONFIG_SHARED 0
 +#define CONFIG_SMALL 0
-+#define CONFIG_STATIC 0
++#define CONFIG_STATIC 1
 +#define CONFIG_SWSCALE_ALPHA 1
++#define CONFIG_D3D11VA 0
 +#define CONFIG_DXVA2 0
 +#define CONFIG_VAAPI 0
 +#define CONFIG_VDA 0
@@ -505,6 +522,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_POD2MAN 1
 +#define CONFIG_RAISE_MAJOR 0
 +#define CONFIG_THUMB 0
++#define CONFIG_VALGRIND_BACKTRACE 0
 +#define CONFIG_XMM_CLOBBER_TEST 0
 +#define CONFIG_AANDCTTABLES 0
 +#define CONFIG_AC3DSP 0
@@ -521,6 +539,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_FMTCONVERT 0
 +#define CONFIG_FRAME_THREAD_ENCODER 0
 +#define CONFIG_GCRYPT 0
++#define CONFIG_GMP 0
 +#define CONFIG_GOLOMB 1
 +#define CONFIG_GPLV3 0
 +#define CONFIG_H263DSP 0
@@ -536,6 +555,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_IIRFILTER 0
 +#define CONFIG_IMDCT15 1
 +#define CONFIG_INTRAX8 0
++#define CONFIG_JPEGTABLES 0
 +#define CONFIG_LGPLV3 0
 +#define CONFIG_LLAUDDSP 0
 +#define CONFIG_LLVIDDSP 0
@@ -546,10 +566,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_MPEGAUDIODSP 1
 +#define CONFIG_MPEGVIDEO 0
 +#define CONFIG_MPEGVIDEOENC 0
-+#define CONFIG_NETTLE 0
 +#define CONFIG_PIXBLOCKDSP 0
 +#define CONFIG_QPELDSP 0
 +#define CONFIG_QSV 0
++#define CONFIG_QSVDEC 0
++#define CONFIG_QSVENC 0
 +#define CONFIG_RANGECODER 0
 +#define CONFIG_RIFFDEC 1
 +#define CONFIG_RIFFENC 0
@@ -569,6 +590,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_MJPEG2JPEG_BSF 0
 +#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 +#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
 +#define CONFIG_MOV2TEXTSUB_BSF 0
 +#define CONFIG_NOISE_BSF 0
 +#define CONFIG_REMOVE_EXTRADATA_BSF 0
@@ -643,11 +665,13 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_H263P_DECODER 0
 +#define CONFIG_H264_DECODER 1
 +#define CONFIG_H264_CRYSTALHD_DECODER 0
++#define CONFIG_H264_MMAL_DECODER 0
 +#define CONFIG_H264_QSV_DECODER 0
 +#define CONFIG_H264_VDA_DECODER 0
 +#define CONFIG_H264_VDPAU_DECODER 0
 +#define CONFIG_HEVC_DECODER 0
 +#define CONFIG_HNM4_VIDEO_DECODER 0
++#define CONFIG_HQ_HQA_DECODER 0
 +#define CONFIG_HQX_DECODER 0
 +#define CONFIG_HUFFYUV_DECODER 0
 +#define CONFIG_IDCIN_DECODER 0
@@ -1011,6 +1035,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_BINK_DEMUXER 0
 +#define CONFIG_BIT_DEMUXER 0
 +#define CONFIG_BMV_DEMUXER 0
++#define CONFIG_BFSTM_DEMUXER 0
 +#define CONFIG_BRSTM_DEMUXER 0
 +#define CONFIG_BOA_DEMUXER 0
 +#define CONFIG_C93_DEMUXER 0
@@ -1098,6 +1123,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_MPEGTS_DEMUXER 0
 +#define CONFIG_MPEGTSRAW_DEMUXER 0
 +#define CONFIG_MPEGVIDEO_DEMUXER 0
++#define CONFIG_MPJPEG_DEMUXER 0
 +#define CONFIG_MPL2_DEMUXER 0
 +#define CONFIG_MPSUB_DEMUXER 0
 +#define CONFIG_MSNWC_TCP_DEMUXER 0
@@ -1213,6 +1239,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
++#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
 +#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
@@ -1225,6 +1252,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_A64MULTI5_ENCODER 0
 +#define CONFIG_ALIAS_PIX_ENCODER 0
 +#define CONFIG_AMV_ENCODER 0
++#define CONFIG_APNG_ENCODER 0
 +#define CONFIG_ASV1_ENCODER 0
 +#define CONFIG_ASV2_ENCODER 0
 +#define CONFIG_AVRP_ENCODER 0
@@ -1257,7 +1285,6 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_MSMPEG4V2_ENCODER 0
 +#define CONFIG_MSMPEG4V3_ENCODER 0
 +#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_NVENC_ENCODER 0
 +#define CONFIG_PAM_ENCODER 0
 +#define CONFIG_PBM_ENCODER 0
 +#define CONFIG_PCX_ENCODER 0
@@ -1380,6 +1407,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_LIBVPX_VP8_ENCODER 0
 +#define CONFIG_LIBVPX_VP9_ENCODER 0
 +#define CONFIG_LIBWAVPACK_ENCODER 0
++#define CONFIG_LIBWEBP_ANIM_ENCODER 0
 +#define CONFIG_LIBWEBP_ENCODER 0
 +#define CONFIG_LIBX264_ENCODER 0
 +#define CONFIG_LIBX264RGB_ENCODER 0
@@ -1388,6 +1416,10 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_LIBXVID_ENCODER 0
 +#define CONFIG_LIBAACPLUS_ENCODER 0
 +#define CONFIG_LIBOPENH264_ENCODER 0
++#define CONFIG_H264_QSV_ENCODER 0
++#define CONFIG_NVENC_ENCODER 0
++#define CONFIG_NVENC_H264_ENCODER 0
++#define CONFIG_NVENC_HEVC_ENCODER 0
 +#define CONFIG_ADELAY_FILTER 0
 +#define CONFIG_AECHO_FILTER 0
 +#define CONFIG_AEVAL_FILTER 0
@@ -1423,6 +1455,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_BS2B_FILTER 0
 +#define CONFIG_CHANNELMAP_FILTER 0
 +#define CONFIG_CHANNELSPLIT_FILTER 0
++#define CONFIG_CHORUS_FILTER 0
 +#define CONFIG_COMPAND_FILTER 0
 +#define CONFIG_DCSHIFT_FILTER 0
 +#define CONFIG_EARWAX_FILTER 0
@@ -1457,9 +1490,11 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_CODECVIEW_FILTER 0
 +#define CONFIG_COLORBALANCE_FILTER 0
 +#define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORKEY_FILTER 0
 +#define CONFIG_COLORLEVELS_FILTER 0
 +#define CONFIG_COLORMATRIX_FILTER 0
 +#define CONFIG_COPY_FILTER 0
++#define CONFIG_COVER_RECT_FILTER 0
 +#define CONFIG_CROP_FILTER 0
 +#define CONFIG_CROPDETECT_FILTER 0
 +#define CONFIG_CURVES_FILTER 0
@@ -1468,6 +1503,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_DEJUDDER_FILTER 0
 +#define CONFIG_DELOGO_FILTER 0
 +#define CONFIG_DESHAKE_FILTER 0
++#define CONFIG_DETELECINE_FILTER 0
 +#define CONFIG_DRAWBOX_FILTER 0
 +#define CONFIG_DRAWGRID_FILTER 0
 +#define CONFIG_DRAWTEXT_FILTER 0
@@ -1480,6 +1516,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_FIELD_FILTER 0
 +#define CONFIG_FIELDMATCH_FILTER 0
 +#define CONFIG_FIELDORDER_FILTER 0
++#define CONFIG_FIND_RECT_FILTER 0
 +#define CONFIG_FORMAT_FILTER 0
 +#define CONFIG_FPS_FILTER 0
 +#define CONFIG_FRAMEPACK_FILTER 0
@@ -1592,24 +1629,30 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_MOVIE_FILTER 0
 +#define CONFIG_H263_VAAPI_HWACCEL 0
 +#define CONFIG_H263_VDPAU_HWACCEL 0
++#define CONFIG_H264_D3D11VA_HWACCEL 0
 +#define CONFIG_H264_DXVA2_HWACCEL 0
++#define CONFIG_H264_MMAL_HWACCEL 0
 +#define CONFIG_H264_QSV_HWACCEL 0
 +#define CONFIG_H264_VAAPI_HWACCEL 0
 +#define CONFIG_H264_VDA_HWACCEL 0
 +#define CONFIG_H264_VDA_OLD_HWACCEL 0
 +#define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_D3D11VA_HWACCEL 0
 +#define CONFIG_HEVC_DXVA2_HWACCEL 0
 +#define CONFIG_MPEG1_XVMC_HWACCEL 0
 +#define CONFIG_MPEG1_VDPAU_HWACCEL 0
 +#define CONFIG_MPEG2_XVMC_HWACCEL 0
++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
 +#define CONFIG_MPEG2_DXVA2_HWACCEL 0
 +#define CONFIG_MPEG2_VAAPI_HWACCEL 0
 +#define CONFIG_MPEG2_VDPAU_HWACCEL 0
 +#define CONFIG_MPEG4_VAAPI_HWACCEL 0
 +#define CONFIG_MPEG4_VDPAU_HWACCEL 0
++#define CONFIG_VC1_D3D11VA_HWACCEL 0
 +#define CONFIG_VC1_DXVA2_HWACCEL 0
 +#define CONFIG_VC1_VAAPI_HWACCEL 0
 +#define CONFIG_VC1_VDPAU_HWACCEL 0
++#define CONFIG_WMV3_D3D11VA_HWACCEL 0
 +#define CONFIG_WMV3_DXVA2_HWACCEL 0
 +#define CONFIG_WMV3_VAAPI_HWACCEL 0
 +#define CONFIG_WMV3_VDPAU_HWACCEL 0
@@ -1641,6 +1684,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_ADX_MUXER 0
 +#define CONFIG_AIFF_MUXER 0
 +#define CONFIG_AMR_MUXER 0
++#define CONFIG_APNG_MUXER 0
 +#define CONFIG_ASF_MUXER 0
 +#define CONFIG_ASS_MUXER 0
 +#define CONFIG_AST_MUXER 0
@@ -1750,6 +1794,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_SAP_MUXER 0
 +#define CONFIG_SEGMENT_MUXER 0
 +#define CONFIG_STREAM_SEGMENT_MUXER 0
++#define CONFIG_SINGLEJPEG_MUXER 0
 +#define CONFIG_SMJPEG_MUXER 0
 +#define CONFIG_SMOOTHSTREAMING_MUXER 0
 +#define CONFIG_SOX_MUXER 0
@@ -1770,6 +1815,7 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_WAV_MUXER 0
 +#define CONFIG_WEBM_MUXER 0
 +#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
++#define CONFIG_WEBM_CHUNK_MUXER 0
 +#define CONFIG_WEBP_MUXER 0
 +#define CONFIG_WEBVTT_MUXER 0
 +#define CONFIG_WTV_MUXER 0
@@ -1853,7 +1899,9 @@ $OpenBSD: patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_x64_config_h,v
 +#define CONFIG_SRTP_PROTOCOL 0
 +#define CONFIG_SUBFILE_PROTOCOL 0
 +#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
++#define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
++#define CONFIG_TLS_GNUTLS_PROTOCOL 0
++#define CONFIG_TLS_OPENSSL_PROTOCOL 0
 +#define CONFIG_UDP_PROTOCOL 0
 +#define CONFIG_UDPLITE_PROTOCOL 0
 +#define CONFIG_UNIX_PROTOCOL 0
diff --git a/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi b/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi
new file mode 100644
index 00000000000..3977006900e
--- /dev/null
+++ b/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_generated_gypi
@@ -0,0 +1,301 @@
+$OpenBSD: patch-third_party_ffmpeg_ffmpeg_generated_gypi,v 1.1 2015/09/05 16:06:50 robert Exp $
+--- third_party/ffmpeg/ffmpeg_generated.gypi.orig.port	Fri Sep  4 08:09:47 2015
++++ third_party/ffmpeg/ffmpeg_generated.gypi	Fri Sep  4 08:13:22 2015
+@@ -8,7 +8,7 @@
+ {
+   'variables': {
+     'conditions': [
+-      ['OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', {
++      ['OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', {
+         'c_sources': [
+           'libavcodec/arm/blockdsp_init_neon.c',
+           'libavcodec/arm/idctdsp_init_neon.c',
+@@ -19,13 +19,13 @@
+           'libavcodec/arm/mpegvideo_neon.S',
+           'libavcodec/arm/simple_idct_neon.S',
+         ],
+-      }],  # OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"
+-      ['OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', {
++      }],  # OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"
++      ['OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', {
+         'c_sources': [
+           'libavcodec/mips/h263dsp_init_mips.c',
+         ],
+-      }],  # OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"
++      ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/x86/blockdsp_init.c',
+           'libavcodec/x86/fdct.c',
+@@ -49,26 +49,26 @@
+           'libavcodec/x86/qpeldsp.asm',
+           'libavcodec/x86/xvididct.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
++      }],  # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
+       ['OS == "win" and target_arch == "x64"', {
+         'asm_sources': [
+           'libavutil/x86/emms.asm',
+         ],
+       }],  # OS == "win" and target_arch == "x64"
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
++      ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
+         'asm_sources': [
+           'libavcodec/arm/h264cmc_neon.S',
+           'libavcodec/arm/h264dsp_neon.S',
+           'libavcodec/arm/h264idct_neon.S',
+           'libavcodec/arm/h264qpel_neon.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
++      ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/arm/blockdsp_init_arm.c',
+           'libavcodec/arm/idctdsp_init_arm.c',
+@@ -90,8 +90,8 @@
+           'libavcodec/arm/simple_idct_armv5te.S',
+           'libavcodec/arm/simple_idct_armv6.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/aarch64/h264chroma_init_aarch64.c',
+           'libavcodec/aarch64/h264dsp_init_aarch64.c',
+@@ -107,8 +107,8 @@
+           'libavcodec/aarch64/imdct15_neon.S',
+           'libavcodec/aarch64/mpegaudiodsp_neon.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/mips/aacdec_mips.c',
+           'libavcodec/mips/aacpsdsp_mips.c',
+@@ -118,27 +118,27 @@
+           'libavcodec/mips/h264qpel_init_mips.c',
+           'libavcodec/mips/sbrdsp_mips.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
+         'asm_sources': [
+           'libavcodec/arm/aacpsdsp_neon.S',
+           'libavcodec/arm/sbrdsp_neon.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
++      }],  # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
+       ['OS == "win"', {
+         'c_sources': [
+           'compat/msvcrt/snprintf.c',
+         ],
+       }],  # OS == "win"
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
++      ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/x86/flacdsp_init.c',
+         ],
+         'asm_sources': [
+           'libavcodec/x86/flacdsp.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
++      ['(OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/x86/dct_init.c',
+           'libavcodec/x86/h264_qpel.c',
+@@ -163,8 +163,8 @@
+           'libavcodec/x86/qpel.asm',
+           'libavcodec/x86/sbrdsp.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")
+-      ['OS == "linux" and target_arch == "arm" and arm_neon == 1', {
++      }],  # (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")
++      ['OS == "openbsd" and target_arch == "arm" and arm_neon == 1', {
+         'c_sources': [
+           'libavcodec/arm/hpeldsp_init_neon.c',
+           'libavcodec/arm/vp8dsp_init_neon.c',
+@@ -175,8 +175,8 @@
+           'libavcodec/arm/vp3dsp_neon.S',
+           'libavcodec/arm/vp8dsp_neon.S',
+         ],
+-      }],  # OS == "linux" and target_arch == "arm" and arm_neon == 1
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
++      }],  # OS == "openbsd" and target_arch == "arm" and arm_neon == 1
++      ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/arm/h264chroma_init_arm.c',
+           'libavcodec/arm/h264dsp_init_arm.c',
+@@ -185,16 +185,16 @@
+         'asm_sources': [
+           'libavcodec/arm/startcode_armv6.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/arm/flacdsp_init_arm.c',
+         ],
+         'asm_sources': [
+           'libavcodec/arm/flacdsp_arm.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
+-      ['OS == "linux" and target_arch == "arm64"', {
++      }],  # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
++      ['OS == "openbsd" and target_arch == "arm64"', {
+         'c_sources': [
+           'libavcodec/aarch64/fft_init_aarch64.c',
+           'libavcodec/aarch64/hpeldsp_init_aarch64.c',
+@@ -211,14 +211,14 @@
+           'libavcodec/aarch64/vorbisdsp_neon.S',
+           'libavutil/aarch64/float_dsp_neon.S',
+         ],
+-      }],  # OS == "linux" and target_arch == "arm64"
+-      ['OS == "linux" and target_arch == "mipsel"', {
++      }],  # OS == "openbsd" and target_arch == "arm64"
++      ['OS == "openbsd" and target_arch == "mipsel"', {
+         'c_sources': [
+           'libavcodec/mips/h264pred_init_mips.c',
+           'libavutil/mips/float_dsp_mips.c',
+         ],
+-      }],  # OS == "linux" and target_arch == "mipsel"
+-      ['OS == "linux" and ffmpeg_branding == "ChromeOS"', {
++      }],  # OS == "openbsd" and target_arch == "mipsel"
++      ['OS == "openbsd" and ffmpeg_branding == "ChromeOS"', {
+         'c_sources': [
+           'libavcodec/acelp_filters.c',
+           'libavcodec/acelp_pitch_delay.c',
+@@ -271,8 +271,8 @@
+           'libavformat/avidec.c',
+           'libavformat/gsmdec.c',
+         ],
+-      }],  # OS == "linux" and ffmpeg_branding == "ChromeOS"
+-      ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
++      }],  # OS == "openbsd" and ffmpeg_branding == "ChromeOS"
++      ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/arm/aacpsdsp_init_arm.c',
+           'libavcodec/arm/mpegaudiodsp_init_arm.c',
+@@ -281,13 +281,13 @@
+         'asm_sources': [
+           'libavcodec/arm/mpegaudiodsp_fixed_armv6.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
++      }],  # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
+       ['(OS == "android" and target_arch == "arm") or (OS == "win")', {
+         'c_sources': [
+           'compat/strtod.c',
+         ],
+       }],  # (OS == "android" and target_arch == "arm") or (OS == "win")
+-      ['(OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1)', {
++      ['(OS == "android" and target_arch == "arm") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1)', {
+         'c_sources': [
+           'libavutil/arm/float_dsp_init_neon.c',
+         ],
+@@ -300,8 +300,8 @@
+           'libavcodec/arm/rdft_neon.S',
+           'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1)
+-      ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win")', {
++      }],  # (OS == "android" and target_arch == "arm") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1)
++      ['(OS == "openbsd" and target_arch == "ia32") or (OS == "openbsd" and target_arch == "x64") or (OS == "mac") or (OS == "win")', {
+         'c_sources': [
+           'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c',
+           'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c',
+@@ -331,8 +331,8 @@
+           'libavutil/x86/float_dsp.asm',
+           'libavutil/x86/lls.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm")', {
++      }],  # (OS == "openbsd" and target_arch == "ia32") or (OS == "openbsd" and target_arch == "x64") or (OS == "mac") or (OS == "win")
++      ['(OS == "openbsd" and target_arch == "arm" and arm_neon == 1) or (OS == "openbsd" and target_arch == "arm")', {
+         'c_sources': [
+           'libavcodec/arm/h264pred_init_arm.c',
+           'libavcodec/arm/hpeldsp_init_arm.c',
+@@ -350,8 +350,8 @@
+           'libavcodec/arm/vp8_armv6.S',
+           'libavcodec/arm/vp8dsp_armv6.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm")
+-      ['(OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # (OS == "openbsd" and target_arch == "arm" and arm_neon == 1) or (OS == "openbsd" and target_arch == "arm")
++      ['(OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/flac.c',
+           'libavcodec/flac_parser.c',
+@@ -360,8 +360,8 @@
+           'libavcodec/flacdsp.c',
+           'libavformat/autorename_libavformat_flacdec.c',
+         ],
+-      }],  # (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm")', {
++      }],  # (OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and ffmpeg_branding == "ChromiumOS")
++      ['(OS == "android" and target_arch == "arm") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1) or (OS == "openbsd" and target_arch == "arm")', {
+         'c_sources': [
+           'libavcodec/arm/fft_fixed_init_arm.c',
+           'libavcodec/arm/fft_init_arm.c',
+@@ -375,8 +375,8 @@
+           'libavcodec/arm/mdct_vfp.S',
+           'libavutil/arm/float_dsp_vfp.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm")
+-      ['(OS == "linux" and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "android" and target_arch == "arm") or (OS == "openbsd" and target_arch == "arm" and arm_neon == 1) or (OS == "openbsd" and target_arch == "arm")
++      ['(OS == "openbsd" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/cabac.c',
+           'libavcodec/h264.c',
+@@ -397,8 +397,8 @@
+           'libavcodec/h264qpel.c',
+           'libavcodec/startcode.c',
+         ],
+-      }],  # (OS == "linux" and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")
+-      ['(OS == "linux" and ffmpeg_branding == "ChromeOS") or (ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "openbsd" and ffmpeg_branding == "Chrome") or (OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")
++      ['(OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/aac_ac3_parser.c',
+           'libavcodec/aac_parser.c',
+@@ -431,13 +431,13 @@
+           'libavformat/mov_chan.c',
+           'libavformat/mp3dec.c',
+         ],
+-      }],  # (OS == "linux" and ffmpeg_branding == "ChromeOS") or (ffmpeg_branding == "Chrome")
+-      ['(OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (ffmpeg_branding == "Chrome")
++      ['(OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavformat/rawdec.c',
+         ],
+-      }],  # (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome")
+-      ['(OS == "linux") or (OS == "mac") or (OS == "win")', {
++      }],  # (OS == "openbsd" and ffmpeg_branding == "ChromeOS") or (OS == "openbsd" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome")
++      ['(OS == "openbsd") or (OS == "mac") or (OS == "win")', {
+         'c_sources': [
+           'libavcodec/h264pred.c',
+           'libavcodec/hpeldsp.c',
+@@ -450,7 +450,7 @@
+           'libavcodec/vp8_parser.c',
+           'libavcodec/vp8dsp.c',
+         ],
+-      }],  # (OS == "linux") or (OS == "mac") or (OS == "win")
++      }],  # (OS == "openbsd") or (OS == "mac") or (OS == "win")
+       ['(1)', {
+         'c_sources': [
+           'libavcodec/allcodecs.c',
diff --git a/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp b/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp
index 52df0951ee2..c8b96524c37 100644
--- a/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp
+++ b/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp
@@ -1,11 +1,12 @@
-$OpenBSD: patch-third_party_ffmpeg_ffmpeg_gyp,v 1.12 2015/07/25 12:59:15 robert Exp $
---- third_party/ffmpeg/ffmpeg.gyp.orig.port	Fri Jul 24 22:27:10 2015
-+++ third_party/ffmpeg/ffmpeg.gyp	Sat Jul 25 12:27:25 2015
-@@ -325,7 +325,6 @@
-               'link_settings': {
-                 'libraries': [
-                   '-lm',
--                  '-lrt',
-                   '-lz',
+$OpenBSD: patch-third_party_ffmpeg_ffmpeg_gyp,v 1.13 2015/09/05 16:06:50 robert Exp $
+--- third_party/ffmpeg/ffmpeg.gyp.orig.port	Wed Sep  2 20:13:33 2015
++++ third_party/ffmpeg/ffmpeg.gyp	Wed Sep  2 20:13:45 2015
+@@ -306,7 +306,7 @@
                  ],
                },
+               'conditions': [
+-                ['OS != "android"', {
++                ['OS != "android" and os_bsd != 1', {
+                   'link_settings': {
+                     'libraries': [
+                       '-lrt',
diff --git a/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp b/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp
index aaaeab5e9c1..a609ab45b22 100644
--- a/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp
+++ b/www/chromium/patches/patch-third_party_libjingle_libjingle_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_libjingle_libjingle_gyp,v 1.21 2015/07/23 13:44:04 robert Exp $
---- third_party/libjingle/libjingle.gyp.orig.port	Wed Jul 15 22:30:07 2015
-+++ third_party/libjingle/libjingle.gyp	Wed Jul 22 08:37:30 2015
-@@ -475,7 +475,7 @@
+$OpenBSD: patch-third_party_libjingle_libjingle_gyp,v 1.22 2015/09/05 16:06:50 robert Exp $
+--- third_party/libjingle/libjingle.gyp.orig.port	Tue Sep  1 22:10:43 2015
++++ third_party/libjingle/libjingle.gyp	Wed Sep  2 07:31:55 2015
+@@ -464,7 +464,7 @@
            ],
            'conditions': [
              # TODO(mallinath) - Enable SCTP for iOS.
diff --git a/www/chromium/patches/patch-third_party_libyuv_libyuv_gyp b/www/chromium/patches/patch-third_party_libyuv_libyuv_gyp
index 88b61d1cb93..5a809edf27c 100644
--- a/www/chromium/patches/patch-third_party_libyuv_libyuv_gyp
+++ b/www/chromium/patches/patch-third_party_libyuv_libyuv_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_libyuv_libyuv_gyp,v 1.8 2015/01/22 11:16:41 robert Exp $
---- third_party/libyuv/libyuv.gyp.orig.port	Wed Dec  3 03:32:35 2014
-+++ third_party/libyuv/libyuv.gyp	Sat Dec  6 11:34:27 2014
-@@ -110,11 +110,15 @@
+$OpenBSD: patch-third_party_libyuv_libyuv_gyp,v 1.9 2015/09/05 16:06:50 robert Exp $
+--- third_party/libyuv/libyuv.gyp.orig.port	Tue Sep  1 22:10:51 2015
++++ third_party/libyuv/libyuv.gyp	Wed Sep  2 07:31:55 2015
+@@ -115,11 +115,15 @@
                ],
              }],
              [ 'use_system_libjpeg == 1', {
diff --git a/www/chromium/patches/patch-third_party_pdfium_build_standalone_gypi b/www/chromium/patches/patch-third_party_pdfium_build_standalone_gypi
index 4d2075f7272..82a39b62596 100644
--- a/www/chromium/patches/patch-third_party_pdfium_build_standalone_gypi
+++ b/www/chromium/patches/patch-third_party_pdfium_build_standalone_gypi
@@ -1,6 +1,6 @@
-$OpenBSD: patch-third_party_pdfium_build_standalone_gypi,v 1.5 2015/07/23 13:44:04 robert Exp $
---- third_party/pdfium/build/standalone.gypi.orig.port	Wed Jul 15 22:31:51 2015
-+++ third_party/pdfium/build/standalone.gypi	Wed Jul 22 08:37:30 2015
+$OpenBSD: patch-third_party_pdfium_build_standalone_gypi,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- third_party/pdfium/build/standalone.gypi.orig.port	Sat Aug 22 21:03:37 2015
++++ third_party/pdfium/build/standalone.gypi	Wed Sep  2 07:31:55 2015
 @@ -13,7 +13,7 @@
        'variables': {
          'variables': {
@@ -19,10 +19,3 @@ $OpenBSD: patch-third_party_pdfium_build_standalone_gypi,v 1.5 2015/07/23 13:44:
              'cflags': [
                '-fdata-sections',
                '-ffunction-sections',
-@@ -283,4 +283,4 @@
-     # See comment in Chromium's common.gypi for why this is needed.
-     'SYMROOT': '<(DEPTH)/xcodebuild',
-   }
--}
-\ No newline at end of file
-+}
diff --git a/www/chromium/patches/patch-third_party_pdfium_core_include_fxcrt_fx_system_h b/www/chromium/patches/patch-third_party_pdfium_core_include_fxcrt_fx_system_h
index 05dce9ef279..1d27d0080f4 100644
--- a/www/chromium/patches/patch-third_party_pdfium_core_include_fxcrt_fx_system_h
+++ b/www/chromium/patches/patch-third_party_pdfium_core_include_fxcrt_fx_system_h
@@ -1,9 +1,9 @@
-$OpenBSD: patch-third_party_pdfium_core_include_fxcrt_fx_system_h,v 1.2 2015/07/23 13:44:04 robert Exp $
---- third_party/pdfium/core/include/fxcrt/fx_system.h.orig.port	Wed Jul 15 22:31:51 2015
-+++ third_party/pdfium/core/include/fxcrt/fx_system.h	Wed Jul 22 08:37:30 2015
-@@ -24,7 +24,7 @@
- #elif defined(_WIN32) || defined(_WIN64)
- #define _FX_OS_ _FX_WIN32_DESKTOP_
+$OpenBSD: patch-third_party_pdfium_core_include_fxcrt_fx_system_h,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- third_party/pdfium/core/include/fxcrt/fx_system.h.orig.port	Tue Sep  1 22:10:51 2015
++++ third_party/pdfium/core/include/fxcrt/fx_system.h	Wed Sep  2 07:31:55 2015
+@@ -40,7 +40,7 @@
+ #elif defined(_WIN64)
+ #define _FX_OS_ _FX_WIN64_DESKTOP_
  #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__OpenBSD__)
diff --git a/www/chromium/patches/patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp b/www/chromium/patches/patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp
index 64eea874c3a..6bad970c36a 100644
--- a/www/chromium/patches/patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp
+++ b/www/chromium/patches/patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp,v 1.5 2015/07/23 13:44:04 robert Exp $
---- third_party/pdfium/core/src/fxge/ge/fx_ge_linux.cpp.orig.port	Wed Jul 15 22:31:51 2015
-+++ third_party/pdfium/core/src/fxge/ge/fx_ge_linux.cpp	Wed Jul 22 08:37:30 2015
-@@ -211,8 +211,8 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(
+$OpenBSD: patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- third_party/pdfium/core/src/fxge/ge/fx_ge_linux.cpp.orig.port	Tue Sep  1 22:10:52 2015
++++ third_party/pdfium/core/src/fxge/ge/fx_ge_linux.cpp	Wed Sep  2 07:31:55 2015
+@@ -212,8 +212,8 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(
      CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo;
      if (!pInfo->ParseFontCfg()) {
          pInfo->AddPath("/usr/share/fonts");
diff --git a/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp b/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp
index c6ab4197400..48ea215c825 100644
--- a/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp
+++ b/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp,v 1.4 2015/07/23 13:44:04 robert Exp $
---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig.port	Wed Jul 15 22:31:51 2015
-+++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp	Wed Jul 22 08:37:30 2015
-@@ -1052,7 +1052,7 @@ CFX_WideString CJS_PublicMethods::MakeFormatDate(doubl
+$OpenBSD: patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig.port	Tue Sep  1 22:10:52 2015
++++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp	Wed Sep  2 07:31:55 2015
+@@ -1023,7 +1023,7 @@ CFX_WideString CJS_PublicMethods::MakeFormatDate(doubl
  //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend)
  FX_BOOL CJS_PublicMethods::AFNumber_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
  {
@@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_pdfium_fpdfsdk_src_javascript_PublicMethods_cpp,v 1.
  	v8::Isolate* isolate = ::GetIsolate(cc);
  	CJS_Context* pContext = (CJS_Context *)cc;
  	ASSERT(pContext != NULL);
-@@ -1391,7 +1391,7 @@ FX_BOOL CJS_PublicMethods::AFNumber_Keystroke(IFXJS_Co
+@@ -1361,7 +1361,7 @@ FX_BOOL CJS_PublicMethods::AFNumber_Keystroke(IFXJS_Co
  //function AFPercent_Format(nDec, sepStyle)
  FX_BOOL CJS_PublicMethods::AFPercent_Format(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
  {
diff --git a/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp b/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp
index 62c0053c453..44e7ceb9ab5 100644
--- a/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp
+++ b/www/chromium/patches/patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp,v 1.2 2015/07/23 13:44:04 robert Exp $
---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig.port	Wed Jul 22 08:51:58 2015
-+++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp	Wed Jul 22 08:52:59 2015
-@@ -747,6 +747,7 @@ void JS_ValueCopy(v8::Handle<v8::Value>& pTo, v8::Hand
+$OpenBSD: patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig.port	Tue Sep  1 22:10:52 2015
++++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp	Wed Sep  2 07:31:55 2015
+@@ -772,6 +772,7 @@ void JS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local
  
  double _getLocalTZA()
  {
@@ -9,7 +9,7 @@ $OpenBSD: patch-third_party_pdfium_fpdfsdk_src_jsapi_fxjs_v8_cpp,v 1.2 2015/07/2
  	if(!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
  		return 0;
  	time_t t = 0;
-@@ -759,7 +760,11 @@ double _getLocalTZA()
+@@ -784,7 +785,11 @@ double _getLocalTZA()
    long timezone = 0;
    _get_timezone(&timezone);
  #endif
diff --git a/www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h b/www/chromium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h
similarity index 51%
rename from www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h
rename to www/chromium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h
index 2a6a7bb13f5..4e151973492 100644
--- a/www/chromium/patches/patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h
+++ b/www/chromium/patches/patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-third_party_pdfium_core_src_fxcodec_fx_libopenjpeg_libopenjpeg20_opj_malloc_h,v 1.1 2015/04/27 16:38:25 robert Exp $
---- third_party/pdfium/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h.orig.port	Sun Apr 26 12:00:47 2015
-+++ third_party/pdfium/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h	Sun Apr 26 12:00:59 2015
+$OpenBSD: patch-third_party_pdfium_third_party_libopenjpeg20_opj_malloc_h,v 1.1 2015/09/05 16:06:50 robert Exp $
+--- third_party/pdfium/third_party/libopenjpeg20/opj_malloc.h.orig.port	Wed Sep  2 20:13:58 2015
++++ third_party/pdfium/third_party/libopenjpeg20/opj_malloc.h	Wed Sep  2 20:14:07 2015
 @@ -98,7 +98,7 @@ Allocate memory aligned to a 16 byte boundry
  #else /* Not _WIN32 */
  	#if defined(__sun)
diff --git a/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp b/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp
index da692212f09..783d3e90007 100644
--- a/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp
+++ b/www/chromium/patches/patch-third_party_skia_gyp_ports_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.5 2015/05/24 15:51:53 robert Exp $
---- third_party/skia/gyp/ports.gyp.orig.port	Wed May 20 10:17:34 2015
-+++ third_party/skia/gyp/ports.gyp	Wed May 20 10:17:58 2015
-@@ -70,11 +70,6 @@
+$OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- third_party/skia/gyp/ports.gyp.orig.port	Tue Sep  1 22:10:54 2015
++++ third_party/skia/gyp/ports.gyp	Wed Sep  2 07:31:55 2015
+@@ -85,11 +85,6 @@
          [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
            'conditions': [
              [ 'skia_embedded_fonts', {
@@ -13,7 +13,7 @@ $OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.5 2015/05/24 15:51:53 robert
                'variables': {
                  'embedded_font_data_identifier': 'sk_fonts',
                  'fonts_to_include': [
-@@ -106,11 +101,6 @@
+@@ -123,11 +118,6 @@
                  'SK_EMBEDDED_FONTS=<(embedded_font_data_identifier)',
                ],
              }, 'skia_no_fontconfig', {
@@ -23,9 +23,9 @@ $OpenBSD: patch-third_party_skia_gyp_ports_gyp,v 1.5 2015/05/24 15:51:53 robert
 -                ],
 -              },
                'sources': [
-                 '../src/ports/SkFontHost_linux.cpp',
-               ],
-@@ -118,7 +108,6 @@
+                 '../include/ports/SkFontMgr_custom.h',
+                 '../src/ports/SkFontMgr_custom.cpp',
+@@ -137,7 +127,6 @@
                'link_settings': {
                  'libraries': [
                    '-lfontconfig',
diff --git a/www/chromium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h b/www/chromium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h
index c2f635cfcb0..4be8cf7591e 100644
--- a/www/chromium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h
+++ b/www/chromium/patches/patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h
@@ -1,12 +1,12 @@
-$OpenBSD: patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h,v 1.1 2015/05/24 15:51:53 robert Exp $
---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig.port	Wed May 20 11:10:19 2015
-+++ third_party/skia/src/gpu/GrAutoLocaleSetter.h	Wed May 20 11:37:43 2015
+$OpenBSD: patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig.port	Wed Sep  2 20:14:12 2015
++++ third_party/skia/src/gpu/GrAutoLocaleSetter.h	Wed Sep  2 20:14:31 2015
 @@ -28,7 +28,7 @@ class GrAutoLocaleSetter { (public)
  #if defined(SK_BUILD_FOR_WIN)
          fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
          fOldLocale = setlocale(LC_ALL, name);
--#elif !defined(SK_BUILD_FOR_ANDROID)
-+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__OpenBSD__)
+-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
++#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(__OpenBSD__)
          fLocale = newlocale(LC_ALL, name, 0);
          if (fLocale) {
              fOldLocale = uselocale(fLocale);
@@ -14,8 +14,8 @@ $OpenBSD: patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h,v 1.1 2015/05/24 1
  #if defined(SK_BUILD_FOR_WIN)
          setlocale(LC_ALL, fOldLocale);
          _configthreadlocale(fOldPerThreadLocale);
--#elif !defined(SK_BUILD_FOR_ANDROID)
-+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__OpenBSD__)
+-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
++#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(__OpenBSD__)
          if (fLocale) {
               uselocale(fOldLocale);
               freelocale(fLocale);
@@ -23,8 +23,8 @@ $OpenBSD: patch-third_party_skia_src_gpu_GrAutoLocaleSetter_h,v 1.1 2015/05/24 1
  #if defined(SK_BUILD_FOR_WIN)
      int fOldPerThreadLocale;
      const char* fOldLocale;
--#elif !defined(SK_BUILD_FOR_ANDROID)
-+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__OpenBSD__)
+-#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
++#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(__OpenBSD__)
      locale_t fOldLocale;
      locale_t fLocale;
  #endif
diff --git a/www/chromium/patches/patch-third_party_webrtc_base_base_gyp b/www/chromium/patches/patch-third_party_webrtc_base_base_gyp
index add036750d1..27bc5becac6 100644
--- a/www/chromium/patches/patch-third_party_webrtc_base_base_gyp
+++ b/www/chromium/patches/patch-third_party_webrtc_base_base_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_webrtc_base_base_gyp,v 1.6 2015/07/23 13:44:04 robert Exp $
---- third_party/webrtc/base/base.gyp.orig.port	Wed Jul 15 22:32:12 2015
-+++ third_party/webrtc/base/base.gyp	Wed Jul 22 08:37:30 2015
-@@ -606,8 +606,6 @@
+$OpenBSD: patch-third_party_webrtc_base_base_gyp,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- third_party/webrtc/base/base.gyp.orig.port	Tue Sep  1 22:10:53 2015
++++ third_party/webrtc/base/base.gyp	Wed Sep  2 07:31:55 2015
+@@ -599,8 +599,6 @@
          ['use_x11 == 1', {
            'link_settings': {
              'libraries': [
diff --git a/www/chromium/patches/patch-third_party_webrtc_base_platform_thread_cc b/www/chromium/patches/patch-third_party_webrtc_base_platform_thread_cc
new file mode 100644
index 00000000000..7aeaa8ddc35
--- /dev/null
+++ b/www/chromium/patches/patch-third_party_webrtc_base_platform_thread_cc
@@ -0,0 +1,43 @@
+$OpenBSD: patch-third_party_webrtc_base_platform_thread_cc,v 1.1 2015/09/05 16:06:50 robert Exp $
+--- third_party/webrtc/base/platform_thread.cc.orig.port	Wed Sep  2 20:14:49 2015
++++ third_party/webrtc/base/platform_thread.cc	Wed Sep  2 21:09:32 2015
+@@ -15,7 +15,9 @@
+ #include "webrtc/base/checks.h"
+ 
+ #if defined(WEBRTC_LINUX)
++#if !defined(__OpenBSD__)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/syscall.h>
+ #endif
+ 
+@@ -28,10 +30,12 @@ PlatformThreadId CurrentThreadId() {
+ #elif defined(WEBRTC_POSIX)
+ #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   ret = pthread_mach_thread_np(pthread_self());
+-#elif defined(WEBRTC_LINUX)
++#elif defined(WEBRTC_LINUX) && !defined(__OpenBSD__)
+   ret =  syscall(__NR_gettid);
+ #elif defined(WEBRTC_ANDROID)
+   ret = gettid();
++#elif defined(__OpenBSD__)
++  ret = reinterpret_cast<uint64_t>(pthread_self());
+ #else
+   // Default implementation for nacl and solaris.
+   ret = reinterpret_cast<pid_t>(pthread_self());
+@@ -59,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons
+ 
+ void SetCurrentThreadName(const char* name) {
+   DCHECK(strlen(name) < 64);
++#if !defined(__OpenBSD__)
+ #if defined(WEBRTC_WIN)
+   struct {
+     DWORD dwType;
+@@ -76,6 +81,7 @@ void SetCurrentThreadName(const char* name) {
+   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   pthread_setname_np(name);
++#endif
+ #endif
+ }
+ 
diff --git a/www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc b/www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc
deleted file mode 100644
index 1897564f7e7..00000000000
--- a/www/chromium/patches/patch-third_party_webrtc_base_thread_checker_impl_cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-third_party_webrtc_base_thread_checker_impl_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
---- third_party/webrtc/base/thread_checker_impl.cc.orig.port	Wed Apr 15 15:47:10 2015
-+++ third_party/webrtc/base/thread_checker_impl.cc	Wed Apr 15 15:49:20 2015
-@@ -27,10 +27,12 @@ PlatformThreadId CurrentThreadId() {
- #elif defined(WEBRTC_POSIX)
- #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   ret = pthread_mach_thread_np(pthread_self());
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) && !defined(__OpenBSD__)
-   ret =  syscall(__NR_gettid);
- #elif defined(WEBRTC_ANDROID)
-   ret = gettid();
-+#elif defined(__OpenBSD__)
-+  ret = reinterpret_cast<uint64_t>(pthread_self());
- #else
-   // Default implementation for nacl and solaris.
-   ret = reinterpret_cast<pid_t>(pthread_self());
diff --git a/www/chromium/patches/patch-third_party_webrtc_build_common_gypi b/www/chromium/patches/patch-third_party_webrtc_build_common_gypi
index 91eaba2ba8c..66066bdf421 100644
--- a/www/chromium/patches/patch-third_party_webrtc_build_common_gypi
+++ b/www/chromium/patches/patch-third_party_webrtc_build_common_gypi
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.20 2015/07/23 13:44:04 robert Exp $
---- third_party/webrtc/build/common.gypi.orig.port	Wed Jul 15 22:32:13 2015
-+++ third_party/webrtc/build/common.gypi	Wed Jul 22 08:37:30 2015
-@@ -338,6 +338,13 @@
+$OpenBSD: patch-third_party_webrtc_build_common_gypi,v 1.21 2015/09/05 16:06:50 robert Exp $
+--- third_party/webrtc/build/common.gypi.orig.port	Sat Aug 22 21:03:58 2015
++++ third_party/webrtc/build/common.gypi	Wed Sep  2 07:31:55 2015
+@@ -347,6 +347,13 @@
            'WEBRTC_LINUX',
          ],
        }],
diff --git a/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc b/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc
index d52fd31b595..7431f73b6ac 100644
--- a/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc
+++ b/www/chromium/patches/patch-third_party_webrtc_system_wrappers_source_thread_posix_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-third_party_webrtc_system_wrappers_source_thread_posix_cc,v 1.6 2015/05/24 15:51:53 robert Exp $
---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig.port	Thu May 14 00:36:30 2015
-+++ third_party/webrtc/system_wrappers/source/thread_posix.cc	Wed May 20 08:34:56 2015
-@@ -15,9 +15,13 @@
+$OpenBSD: patch-third_party_webrtc_system_wrappers_source_thread_posix_cc,v 1.7 2015/09/05 16:06:50 robert Exp $
+--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig.port	Wed Sep  2 20:15:15 2015
++++ third_party/webrtc/system_wrappers/source/thread_posix.cc	Wed Sep  2 20:50:56 2015
+@@ -15,7 +15,9 @@
  #include <errno.h>
  #include <unistd.h>
  #ifdef WEBRTC_LINUX
@@ -9,18 +9,5 @@ $OpenBSD: patch-third_party_webrtc_system_wrappers_source_thread_posix_cc,v 1.6
  #include <linux/unistd.h>
 +#endif
  #include <sched.h>
-+#if !defined(__OpenBSD__)
- #include <sys/prctl.h>
-+#endif
- #include <sys/syscall.h>
  #include <sys/types.h>
  #endif
-@@ -152,7 +156,7 @@ void ThreadPosix::Run() {
-   if (!name_.empty()) {
-     // Setting the thread name may fail (harmlessly) if running inside a
-     // sandbox. Ignore failures if they happen.
--#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(__OpenBSD__)
-     prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name_.c_str()));
- #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-     pthread_setname_np(name_.substr(0, 63).c_str());
diff --git a/www/chromium/patches/patch-ui_accessibility_accessibility_gyp b/www/chromium/patches/patch-ui_accessibility_accessibility_gyp
index d05ea3d274c..62017defac3 100644
--- a/www/chromium/patches/patch-ui_accessibility_accessibility_gyp
+++ b/www/chromium/patches/patch-ui_accessibility_accessibility_gyp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-ui_accessibility_accessibility_gyp,v 1.1 2015/05/24 15:51:53 robert Exp $
---- ui/accessibility/accessibility.gyp.orig.port	Sat May 23 00:23:00 2015
-+++ ui/accessibility/accessibility.gyp	Sat May 23 00:23:37 2015
+$OpenBSD: patch-ui_accessibility_accessibility_gyp,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- ui/accessibility/accessibility.gyp.orig.port	Tue Sep  1 22:10:43 2015
++++ ui/accessibility/accessibility.gyp	Wed Sep  2 07:31:55 2015
 @@ -63,7 +63,7 @@
              '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2'
            ],
@@ -10,7 +10,7 @@ $OpenBSD: patch-ui_accessibility_accessibility_gyp,v 1.1 2015/05/24 15:51:53 rob
            'dependencies': [
              '../../build/linux/system.gyp:atk',
              '../../build/linux/system.gyp:gconf',
-@@ -76,7 +76,7 @@
+@@ -80,7 +80,7 @@
              ],
            },
          }],
diff --git a/www/chromium/patches/patch-ui_app_list_app_list_constants_cc b/www/chromium/patches/patch-ui_app_list_app_list_constants_cc
index c3fff91e334..1d3884f5327 100644
--- a/www/chromium/patches/patch-ui_app_list_app_list_constants_cc
+++ b/www/chromium/patches/patch-ui_app_list_app_list_constants_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_app_list_app_list_constants_cc,v 1.9 2015/07/23 13:44:04 robert Exp $
---- ui/app_list/app_list_constants.cc.orig.port	Wed Jul 15 22:30:08 2015
-+++ ui/app_list/app_list_constants.cc	Wed Jul 22 08:37:30 2015
-@@ -137,7 +137,7 @@ const char kSearchQueryLength[] = "Apps.AppListSearchQ
+$OpenBSD: patch-ui_app_list_app_list_constants_cc,v 1.10 2015/09/05 16:06:50 robert Exp $
+--- ui/app_list/app_list_constants.cc.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/app_list/app_list_constants.cc	Wed Sep  2 07:31:55 2015
+@@ -139,7 +139,7 @@ const char kSearchQueryLength[] = "Apps.AppListSearchQ
  const char kSearchResultDistanceFromOrigin[] =
      "Apps.AppListSearchResultDistanceFromOrigin";
  
diff --git a/www/chromium/patches/patch-ui_app_list_app_list_constants_h b/www/chromium/patches/patch-ui_app_list_app_list_constants_h
index 416a531a7c7..61bdffa7658 100644
--- a/www/chromium/patches/patch-ui_app_list_app_list_constants_h
+++ b/www/chromium/patches/patch-ui_app_list_app_list_constants_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_app_list_app_list_constants_h,v 1.7 2015/07/23 13:44:04 robert Exp $
---- ui/app_list/app_list_constants.h.orig.port	Wed Jul 15 22:30:08 2015
-+++ ui/app_list/app_list_constants.h	Wed Jul 22 08:37:30 2015
-@@ -85,7 +85,7 @@ APP_LIST_EXPORT extern const char kSearchResultOpenDis
+$OpenBSD: patch-ui_app_list_app_list_constants_h,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- ui/app_list/app_list_constants.h.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/app_list/app_list_constants.h	Wed Sep  2 07:31:55 2015
+@@ -87,7 +87,7 @@ APP_LIST_EXPORT extern const char kSearchResultOpenDis
  APP_LIST_EXPORT extern const char kSearchQueryLength[];
  APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[];
  
diff --git a/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc b/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc
index c020d600cdc..e2de125b7c4 100644
--- a/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc
+++ b/www/chromium/patches/patch-ui_app_list_views_app_list_item_view_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_app_list_views_app_list_item_view_cc,v 1.8 2015/07/23 13:44:04 robert Exp $
---- ui/app_list/views/app_list_item_view.cc.orig.port	Wed Jul 15 22:30:08 2015
-+++ ui/app_list/views/app_list_item_view.cc	Wed Jul 22 08:37:30 2015
-@@ -66,7 +66,7 @@ gfx::FontList GetFontList() {
+$OpenBSD: patch-ui_app_list_views_app_list_item_view_cc,v 1.9 2015/09/05 16:06:50 robert Exp $
+--- ui/app_list/views/app_list_item_view.cc.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/app_list/views/app_list_item_view.cc	Wed Sep  2 07:31:55 2015
+@@ -61,7 +61,7 @@ gfx::FontList GetFontList() {
    const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);
  // The font is different on each platform. The font size is adjusted on some
  // platforms to keep a consistent look.
diff --git a/www/chromium/patches/patch-ui_base_ime_input_method_factory_cc b/www/chromium/patches/patch-ui_base_ime_input_method_factory_cc
index b137617c6d7..d504461adf2 100644
--- a/www/chromium/patches/patch-ui_base_ime_input_method_factory_cc
+++ b/www/chromium/patches/patch-ui_base_ime_input_method_factory_cc
@@ -1,21 +1,21 @@
-$OpenBSD: patch-ui_base_ime_input_method_factory_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
---- ui/base/ime/input_method_factory.cc.orig.port	Wed Mar 11 07:50:37 2015
-+++ ui/base/ime/input_method_factory.cc	Wed Mar 11 07:51:03 2015
+$OpenBSD: patch-ui_base_ime_input_method_factory_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- ui/base/ime/input_method_factory.cc.orig.port	Wed Sep  2 20:16:03 2015
++++ ui/base/ime/input_method_factory.cc	Wed Sep  2 20:16:41 2015
 @@ -14,7 +14,7 @@
  #include "ui/base/ime/remote_input_method_win.h"
  #elif defined(OS_MACOSX)
  #include "ui/base/ime/input_method_mac.h"
--#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
++#elif defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) && \
+       !defined(OS_CHROMEOS)
  #include "ui/base/ime/input_method_auralinux.h"
  #else
- #include "ui/base/ime/input_method_minimal.h"
-@@ -47,7 +47,7 @@ scoped_ptr<InputMethod> CreateInputMethod(
+@@ -56,7 +56,7 @@ scoped_ptr<InputMethod> CreateInputMethod(
    return make_scoped_ptr(new InputMethodWin(delegate, widget));
  #elif defined(OS_MACOSX)
    return make_scoped_ptr(new InputMethodMac(delegate));
--#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
++#elif defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) && \
+       !defined(OS_CHROMEOS)
    return make_scoped_ptr(new InputMethodAuraLinux(delegate));
  #else
-   return make_scoped_ptr(new InputMethodMinimal(delegate));
diff --git a/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc b/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc
index 7640418e5a8..cd6fe829591 100644
--- a/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc
+++ b/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.11 2015/07/23 13:44:04 robert Exp $
---- ui/base/resource/resource_bundle.cc.orig.port	Wed Jul 15 22:30:08 2015
-+++ ui/base/resource/resource_bundle.cc	Wed Jul 22 08:37:30 2015
-@@ -610,7 +610,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
+$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.12 2015/09/05 16:06:50 robert Exp $
+--- ui/base/resource/resource_bundle.cc.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/base/resource/resource_bundle.cc	Wed Sep  2 07:31:55 2015
+@@ -617,7 +617,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
  #elif defined(OS_CHROMEOS)
    // TODO(oshima): Include 200P only if the device support 200P
    supported_scale_factors.push_back(SCALE_FACTOR_200P);
diff --git a/www/chromium/patches/patch-ui_base_ui_base_gyp b/www/chromium/patches/patch-ui_base_ui_base_gyp
index 862fd3d9c60..726d5ed1b2b 100644
--- a/www/chromium/patches/patch-ui_base_ui_base_gyp
+++ b/www/chromium/patches/patch-ui_base_ui_base_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_base_ui_base_gyp,v 1.7 2015/05/24 15:51:53 robert Exp $
---- ui/base/ui_base.gyp.orig.port	Thu May 14 00:35:47 2015
-+++ ui/base/ui_base.gyp	Wed May 20 08:34:57 2015
-@@ -391,7 +391,7 @@
+$OpenBSD: patch-ui_base_ui_base_gyp,v 1.8 2015/09/05 16:06:50 robert Exp $
+--- ui/base/ui_base.gyp.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/base/ui_base.gyp	Wed Sep  2 07:31:55 2015
+@@ -399,7 +399,7 @@
              'x/selection_utils.h',
            ]
          }],
diff --git a/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc b/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc
index fed219c32ec..fd743ec4e14 100644
--- a/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc
+++ b/www/chromium/patches/patch-ui_base_webui_web_ui_util_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_base_webui_web_ui_util_cc,v 1.5 2015/07/23 13:44:04 robert Exp $
---- ui/base/webui/web_ui_util.cc.orig.port	Wed Jul 15 22:30:08 2015
-+++ ui/base/webui/web_ui_util.cc	Wed Jul 22 08:37:30 2015
-@@ -166,7 +166,7 @@ std::string GetFontFamily() {
+$OpenBSD: patch-ui_base_webui_web_ui_util_cc,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- ui/base/webui/web_ui_util.cc.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/base/webui/web_ui_util.cc	Wed Sep  2 07:31:55 2015
+@@ -149,7 +149,7 @@ std::string GetFontFamily() {
  
  // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
  // into Ozone: crbug.com/320050
diff --git a/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc b/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc
index 58f66a27961..f9e3c8ce5b7 100644
--- a/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc
+++ b/www/chromium/patches/patch-ui_events_devices_x11_device_data_manager_x11_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.4 2015/05/24 15:51:53 robert Exp $
---- ui/events/devices/x11/device_data_manager_x11.cc.orig.port	Wed May 20 10:18:34 2015
-+++ ui/events/devices/x11/device_data_manager_x11.cc	Wed May 20 10:19:03 2015
-@@ -695,6 +695,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
+$OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/events/devices/x11/device_data_manager_x11.cc	Wed Sep  2 07:31:55 2015
+@@ -710,6 +710,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
  }
  
  void DeviceDataManagerX11::DisableDevice(int deviceid) {
@@ -10,7 +10,7 @@ $OpenBSD: patch-ui_events_devices_x11_device_data_manager_x11_cc,v 1.4 2015/05/2
    blocked_devices_.set(deviceid, true);
    // TODO(rsadam@): Support blocking touchscreen devices.
    std::vector<KeyboardDevice> keyboards = keyboard_devices();
-@@ -708,6 +710,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
+@@ -723,6 +725,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
      keyboards.erase(it);
      DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
    }
diff --git a/www/chromium/patches/patch-ui_gfx_canvas_skia_cc b/www/chromium/patches/patch-ui_gfx_canvas_skia_cc
index 97e3d13522c..1b7d0fcadc8 100644
--- a/www/chromium/patches/patch-ui_gfx_canvas_skia_cc
+++ b/www/chromium/patches/patch-ui_gfx_canvas_skia_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_gfx_canvas_skia_cc,v 1.5 2015/05/24 15:51:53 robert Exp $
---- ui/gfx/canvas_skia.cc.orig.port	Thu May 14 00:23:12 2015
-+++ ui/gfx/canvas_skia.cc	Wed May 20 08:34:57 2015
-@@ -237,7 +237,7 @@ void Canvas::DrawStringRectWithShadows(const base::str
+$OpenBSD: patch-ui_gfx_canvas_skia_cc,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- ui/gfx/canvas_skia.cc.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/gfx/canvas_skia.cc	Wed Sep  2 07:31:55 2015
+@@ -238,7 +238,7 @@ void Canvas::DrawStringRectWithShadows(const base::str
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/www/chromium/patches/patch-ui_gfx_gfx_gyp b/www/chromium/patches/patch-ui_gfx_gfx_gyp
new file mode 100644
index 00000000000..b44dcdf3bbd
--- /dev/null
+++ b/www/chromium/patches/patch-ui_gfx_gfx_gyp
@@ -0,0 +1,21 @@
+$OpenBSD: patch-ui_gfx_gfx_gyp,v 1.3 2015/09/05 16:06:50 robert Exp $
+--- ui/gfx/gfx.gyp.orig.port	Wed Sep  2 21:01:51 2015
++++ ui/gfx/gfx.gyp	Wed Sep  2 21:02:29 2015
+@@ -455,7 +455,7 @@
+             '<(DEPTH)/build/linux/system.gyp:pangocairo',
+           ],
+         }],
+-        ['desktop_linux==1 or chromeos==1', {
++        ['desktop_linux==1 or chromeos==1 or os_bsd==1', {
+           'dependencies': [
+             # font_render_params_linux.cc uses fontconfig
+             '<(DEPTH)/build/linux/system.gyp:fontconfig',
+@@ -506,7 +506,7 @@
+             ['exclude', 'cocoa']
+           ],
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or os_bsd==1', {
+           'dependencies': [
+             '../../build/linux/system.gyp:fontconfig',
+           ],
diff --git a/www/chromium/patches/patch-ui_gl_generate_bindings_py b/www/chromium/patches/patch-ui_gl_generate_bindings_py
index db59d3919cf..98ce796daea 100644
--- a/www/chromium/patches/patch-ui_gl_generate_bindings_py
+++ b/www/chromium/patches/patch-ui_gl_generate_bindings_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_gl_generate_bindings_py,v 1.5 2015/07/23 13:44:04 robert Exp $
---- ui/gl/generate_bindings.py.orig.port	Wed Jul 15 22:30:09 2015
-+++ ui/gl/generate_bindings.py	Wed Jul 22 08:37:30 2015
-@@ -1514,6 +1514,9 @@ GLX_FUNCTIONS = [
+$OpenBSD: patch-ui_gl_generate_bindings_py,v 1.6 2015/09/05 16:06:50 robert Exp $
+--- ui/gl/generate_bindings.py.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/gl/generate_bindings.py	Wed Sep  2 07:31:55 2015
+@@ -1527,6 +1527,9 @@ GLX_FUNCTIONS = [
    'arguments':
        'Display* dpy, GLXDrawable drawable, int32* numerator, '
        'int32* denominator' },
diff --git a/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc b/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc
index 7646d6258ad..1420c47ea73 100644
--- a/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc
+++ b/www/chromium/patches/patch-ui_gl_gl_bindings_autogen_glx_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
---- ui/gl/gl_bindings_autogen_glx.cc.orig.port	Thu Apr 23 10:58:18 2015
-+++ ui/gl/gl_bindings_autogen_glx.cc	Thu Apr 23 10:58:25 2015
+$OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- ui/gl/gl_bindings_autogen_glx.cc.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/gl/gl_bindings_autogen_glx.cc	Wed Sep  2 07:31:55 2015
 @@ -74,6 +74,7 @@ void DriverGLX::InitializeStaticBindings() {
    fn.glXGetFBConfigsFn = reinterpret_cast<glXGetFBConfigsProc>(
        GetGLProcAddress("glXGetFBConfigs"));
@@ -9,7 +9,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
    fn.glXGetSelectedEventFn = reinterpret_cast<glXGetSelectedEventProc>(
        GetGLProcAddress("glXGetSelectedEvent"));
    fn.glXGetSyncValuesOMLFn = 0;
-@@ -118,6 +119,8 @@ void DriverGLX::InitializeStaticBindings() {
+@@ -121,6 +122,8 @@ void DriverGLX::InitializeExtensionBindings() {
  
    ext.b_GLX_ARB_create_context =
        extensions.find("GLX_ARB_create_context ") != std::string::npos;
@@ -18,7 +18,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
    ext.b_GLX_EXT_swap_control =
        extensions.find("GLX_EXT_swap_control ") != std::string::npos;
    ext.b_GLX_EXT_texture_from_pixmap =
-@@ -170,6 +173,13 @@ void DriverGLX::InitializeStaticBindings() {
+@@ -173,6 +176,13 @@ void DriverGLX::InitializeExtensionBindings() {
      DCHECK(fn.glXGetMscRateOMLFn);
    }
  
@@ -32,7 +32,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
    debug_fn.glXGetSyncValuesOMLFn = 0;
    if (ext.b_GLX_OML_sync_control) {
      fn.glXGetSyncValuesOMLFn = reinterpret_cast<glXGetSyncValuesOMLProc>(
-@@ -268,8 +278,8 @@ static void GL_BINDING_CALL Debug_glXCopySubBufferMESA
+@@ -271,8 +281,8 @@ static void GL_BINDING_CALL Debug_glXCopySubBufferMESA
                   << "(" << static_cast<const void*>(dpy) << ", " << drawable
                   << ", " << x << ", " << y << ", " << width << ", " << height
                   << ")");
@@ -43,7 +43,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  }
  
  static GLXContext GL_BINDING_CALL Debug_glXCreateContext(Display* dpy,
-@@ -474,8 +484,8 @@ static int GL_BINDING_CALL Debug_glXGetFBConfigAttrib(
+@@ -477,8 +487,8 @@ static int GL_BINDING_CALL Debug_glXGetFBConfigAttrib(
                   << "(" << static_cast<const void*>(dpy) << ", " << config
                   << ", " << attribute << ", " << static_cast<const void*>(value)
                   << ")");
@@ -54,7 +54,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
    GL_SERVICE_LOG("GL_RESULT: " << result);
    return result;
  }
-@@ -516,6 +526,16 @@ static bool GL_BINDING_CALL Debug_glXGetMscRateOML(Dis
+@@ -519,6 +529,16 @@ static bool GL_BINDING_CALL Debug_glXGetMscRateOML(Dis
    return result;
  }
  
@@ -71,7 +71,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  static void GL_BINDING_CALL Debug_glXGetSelectedEvent(Display* dpy,
                                                        GLXDrawable drawable,
                                                        unsigned long* mask) {
-@@ -831,6 +851,10 @@ void DriverGLX::InitializeDebugBindings() {
+@@ -834,6 +854,10 @@ void DriverGLX::InitializeDebugBindings() {
      debug_fn.glXGetMscRateOMLFn = fn.glXGetMscRateOMLFn;
      fn.glXGetMscRateOMLFn = Debug_glXGetMscRateOML;
    }
@@ -82,7 +82,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
    if (!debug_fn.glXGetSelectedEventFn) {
      debug_fn.glXGetSelectedEventFn = fn.glXGetSelectedEventFn;
      fn.glXGetSelectedEventFn = Debug_glXGetSelectedEvent;
-@@ -918,9 +942,7 @@ void DriverGLX::InitializeDebugBindings() {
+@@ -921,9 +945,7 @@ void DriverGLX::InitializeDebugBindings() {
    g_debugBindingsInitialized = true;
  }
  
@@ -93,7 +93,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  
  void GLXApiBase::glXBindTexImageEXTFn(Display* dpy,
                                        GLXDrawable drawable,
-@@ -970,8 +992,8 @@ GLXContext GLXApiBase::glXCreateContextAttribsARBFn(Di
+@@ -973,8 +995,8 @@ GLXContext GLXApiBase::glXCreateContextAttribsARBFn(Di
                                                      GLXContext share_context,
                                                      int direct,
                                                      const int* attrib_list) {
@@ -104,7 +104,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  }
  
  GLXPixmap GLXApiBase::glXCreateGLXPixmapFn(Display* dpy,
-@@ -985,8 +1007,8 @@ GLXContext GLXApiBase::glXCreateNewContextFn(Display* 
+@@ -988,8 +1010,8 @@ GLXContext GLXApiBase::glXCreateNewContextFn(Display* 
                                               int renderType,
                                               GLXContext shareList,
                                               int direct) {
@@ -115,7 +115,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  }
  
  GLXPbuffer GLXApiBase::glXCreatePbufferFn(Display* dpy,
-@@ -1082,6 +1104,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy,
+@@ -1085,6 +1107,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy,
    return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
  }
  
@@ -126,7 +126,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  void GLXApiBase::glXGetSelectedEventFn(Display* dpy,
                                         GLXDrawable drawable,
                                         unsigned long* mask) {
-@@ -1180,9 +1206,7 @@ void GLXApiBase::glXUseXFontFn(Font font, int first, i
+@@ -1183,9 +1209,7 @@ void GLXApiBase::glXUseXFontFn(Font font, int first, i
    driver_->fn.glXUseXFontFn(font, first, count, list);
  }
  
@@ -137,7 +137,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  
  int GLXApiBase::glXWaitVideoSyncSGIFn(int divisor,
                                        int remainder,
-@@ -1190,9 +1214,7 @@ int GLXApiBase::glXWaitVideoSyncSGIFn(int divisor,
+@@ -1193,9 +1217,7 @@ int GLXApiBase::glXWaitVideoSyncSGIFn(int divisor,
    return driver_->fn.glXWaitVideoSyncSGIFn(divisor, remainder, count);
  }
  
@@ -148,7 +148,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  
  void TraceGLXApi::glXBindTexImageEXTFn(Display* dpy,
                                         GLXDrawable drawable,
-@@ -1249,8 +1271,8 @@ GLXContext TraceGLXApi::glXCreateContextAttribsARBFn(D
+@@ -1252,8 +1274,8 @@ GLXContext TraceGLXApi::glXCreateContextAttribsARBFn(D
                                                       int direct,
                                                       const int* attrib_list) {
    TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXCreateContextAttribsARB")
@@ -159,7 +159,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  }
  
  GLXPixmap TraceGLXApi::glXCreateGLXPixmapFn(Display* dpy,
-@@ -1266,8 +1288,8 @@ GLXContext TraceGLXApi::glXCreateNewContextFn(Display*
+@@ -1269,8 +1291,8 @@ GLXContext TraceGLXApi::glXCreateNewContextFn(Display*
                                                GLXContext shareList,
                                                int direct) {
    TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXCreateNewContext")
@@ -170,7 +170,7 @@ $OpenBSD: patch-ui_gl_gl_bindings_autogen_glx_cc,v 1.1 2015/04/27 16:38:25 rober
  }
  
  GLXPbuffer TraceGLXApi::glXCreatePbufferFn(Display* dpy,
-@@ -1380,6 +1402,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy,
+@@ -1383,6 +1405,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy,
                                       int32* denominator) {
    TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXGetMscRateOML")
    return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
diff --git a/www/chromium/patches/patch-ui_resources_ui_resources_grd b/www/chromium/patches/patch-ui_resources_ui_resources_grd
index 0e6ffeeda8f..ccf5ddfefb1 100644
--- a/www/chromium/patches/patch-ui_resources_ui_resources_grd
+++ b/www/chromium/patches/patch-ui_resources_ui_resources_grd
@@ -1,9 +1,9 @@
-$OpenBSD: patch-ui_resources_ui_resources_grd,v 1.4 2015/04/27 16:38:25 robert Exp $
---- ui/resources/ui_resources.grd.orig.port	Wed Apr 15 00:31:23 2015
-+++ ui/resources/ui_resources.grd	Wed Apr 15 08:32:50 2015
-@@ -36,7 +36,7 @@
-         <structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" />
-         <structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" />
+$OpenBSD: patch-ui_resources_ui_resources_grd,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- ui/resources/ui_resources.grd.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/resources/ui_resources.grd	Wed Sep  2 07:31:55 2015
+@@ -31,7 +31,7 @@
+           <structure type="chrome_scaled_image" name="IDR_APP_LIST_USER_INDICATOR" file="common/app_list_user_indicator.png" />
+         </if>
        </if>
 -      <if expr="is_linux and use_aura">
 +      <if expr="(is_linux or is_bsd) and use_aura">
diff --git a/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc b/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc
index fb78e0b17f7..eb85bf707ae 100644
--- a/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc
+++ b/www/chromium/patches/patch-ui_views_bubble_bubble_delegate_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_views_bubble_bubble_delegate_cc,v 1.4 2015/04/27 16:38:25 robert Exp $
---- ui/views/bubble/bubble_delegate.cc.orig.port	Wed Apr 15 00:31:23 2015
-+++ ui/views/bubble/bubble_delegate.cc	Wed Apr 15 08:32:50 2015
-@@ -104,7 +104,7 @@ Widget* BubbleDelegateView::CreateBubble(BubbleDelegat
+$OpenBSD: patch-ui_views_bubble_bubble_delegate_cc,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- ui/views/bubble/bubble_delegate.cc.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/views/bubble/bubble_delegate.cc	Wed Sep  2 07:31:55 2015
+@@ -106,7 +106,7 @@ Widget* BubbleDelegateView::CreateBubble(BubbleDelegat
    // the parent frame and let DWM handle compositing.  If not, then we don't
    // want to allow the bubble to extend the frame because it will be clipped.
    bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
diff --git a/www/chromium/patches/patch-ui_views_controls_combobox_combobox_cc b/www/chromium/patches/patch-ui_views_controls_combobox_combobox_cc
index 9cc4807d2de..9c21a5ddcbd 100644
--- a/www/chromium/patches/patch-ui_views_controls_combobox_combobox_cc
+++ b/www/chromium/patches/patch-ui_views_controls_combobox_combobox_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_views_controls_combobox_combobox_cc,v 1.1 2015/01/22 11:16:41 robert Exp $
---- ui/views/controls/combobox/combobox.cc.orig.port	Sat Dec 27 12:54:25 2014
-+++ ui/views/controls/combobox/combobox.cc	Sat Dec 27 12:56:07 2014
-@@ -848,7 +848,7 @@ int Combobox::GetDisclosureArrowRightPadding() const {
+$OpenBSD: patch-ui_views_controls_combobox_combobox_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- ui/views/controls/combobox/combobox.cc.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/views/controls/combobox/combobox.cc	Wed Sep  2 07:31:55 2015
+@@ -851,7 +851,7 @@ int Combobox::GetDisclosureArrowRightPadding() const {
  }
  
  gfx::Size Combobox::ArrowSize() const {
diff --git a/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc b/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc
index 2187e1948b0..3abd8f0da76 100644
--- a/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc
+++ b/www/chromium/patches/patch-ui_views_controls_textfield_textfield_cc
@@ -1,6 +1,6 @@
-$OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2015/07/23 13:44:04 robert Exp $
---- ui/views/controls/textfield/textfield.cc.orig.port	Wed Jul 15 22:30:11 2015
-+++ ui/views/controls/textfield/textfield.cc	Wed Jul 22 08:37:30 2015
+$OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.11 2015/09/05 16:06:50 robert Exp $
+--- ui/views/controls/textfield/textfield.cc.orig.port	Sat Aug 22 21:01:59 2015
++++ ui/views/controls/textfield/textfield.cc	Wed Sep  2 07:31:55 2015
 @@ -42,7 +42,7 @@
  #include "base/win/win_util.h"
  #endif
@@ -37,7 +37,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2015/07/23 13:44
  // Convert a custom text edit |command| to the equivalent views command ID.
  int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
    const bool select = command.extend_selection();
-@@ -625,7 +625,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
+@@ -631,7 +631,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
        OnAfterUserAction();
      }
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2015/07/23 13:44
      if (event.IsOnlyMiddleMouseButton()) {
        if (GetRenderText()->IsPointInSelection(event.location())) {
          OnBeforeUserAction();
-@@ -694,7 +694,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -700,7 +700,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
    if (!textfield)
      return handled;
  
@@ -55,7 +55,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2015/07/23 13:44
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -833,7 +833,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -835,7 +835,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -64,7 +64,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2015/07/23 13:44
    // Skip any accelerator handling that conflicts with custom keybindings.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
-@@ -1089,7 +1089,7 @@ void Textfield::WriteDragDataForView(View* sender,
+@@ -1093,7 +1093,7 @@ void Textfield::WriteDragDataForView(View* sender,
    scoped_ptr<gfx::Canvas> canvas(
        GetCanvasForDragImage(GetWidget(), label.size()));
    label.SetEnabledColor(GetTextColor());
@@ -73,7 +73,7 @@ $OpenBSD: patch-ui_views_controls_textfield_textfield_cc,v 1.10 2015/07/23 13:44
    // Desktop Linux Aura does not yet support transparency in drag images.
    canvas->DrawColor(GetBackgroundColor());
  #endif
-@@ -1888,7 +1888,7 @@ void Textfield::CreateTouchSelectionControllerAndNotif
+@@ -1871,7 +1871,7 @@ void Textfield::CreateTouchSelectionControllerAndNotif
  }
  
  void Textfield::UpdateSelectionClipboard() const {
diff --git a/www/chromium/patches/patch-ui_views_views_delegate_cc b/www/chromium/patches/patch-ui_views_views_delegate_cc
index 78c3e175c20..622dd97a81d 100644
--- a/www/chromium/patches/patch-ui_views_views_delegate_cc
+++ b/www/chromium/patches/patch-ui_views_views_delegate_cc
@@ -1,21 +1,12 @@
-$OpenBSD: patch-ui_views_views_delegate_cc,v 1.3 2015/07/23 13:44:04 robert Exp $
---- ui/views/views_delegate.cc.orig.port	Wed Jul 15 22:30:11 2015
-+++ ui/views/views_delegate.cc	Wed Jul 22 12:53:12 2015
-@@ -51,7 +51,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const {
+$OpenBSD: patch-ui_views_views_delegate_cc,v 1.4 2015/09/05 16:06:50 robert Exp $
+--- ui/views/views_delegate.cc.orig.port	Wed Sep  2 20:16:47 2015
++++ ui/views/views_delegate.cc	Wed Sep  2 20:17:03 2015
+@@ -62,7 +62,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const {
  bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
    return false;
  }
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
-   return NULL;
- }
-@@ -91,7 +91,7 @@ std::string ViewsDelegate::GetApplicationName() {
-   return program.BaseName().AsUTF8Unsafe();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- scoped_refptr<base::TaskRunner>
-     ViewsDelegate::GetTaskRunnerForAuraLinuxAccessibilityInit() {
    return nullptr;
+ }
diff --git a/www/chromium/patches/patch-ui_views_views_delegate_h b/www/chromium/patches/patch-ui_views_views_delegate_h
index 92d0a1c4507..b7f3362bc2b 100644
--- a/www/chromium/patches/patch-ui_views_views_delegate_h
+++ b/www/chromium/patches/patch-ui_views_views_delegate_h
@@ -1,21 +1,12 @@
-$OpenBSD: patch-ui_views_views_delegate_h,v 1.4 2015/07/23 13:44:04 robert Exp $
---- ui/views/views_delegate.h.orig.port	Wed Jul 15 22:30:11 2015
-+++ ui/views/views_delegate.h	Wed Jul 22 12:52:55 2015
-@@ -101,7 +101,7 @@ class VIEWS_EXPORT ViewsDelegate {
+$OpenBSD: patch-ui_views_views_delegate_h,v 1.5 2015/09/05 16:06:50 robert Exp $
+--- ui/views/views_delegate.h.orig.port	Wed Sep  2 20:17:12 2015
++++ ui/views/views_delegate.h	Wed Sep  2 20:17:22 2015
+@@ -110,7 +110,7 @@ class VIEWS_EXPORT ViewsDelegate {
    // Returns true if the window passed in is in the Windows 8 metro
    // environment.
    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
  #endif
  
-@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate {
-   // Returns the user-visible name of the application.
-   virtual std::string GetApplicationName();
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-   // Get a task runner suitable for posting initialization tasks for
-   // Aura Linux accessibility.
-   virtual scoped_refptr<base::TaskRunner>
diff --git a/www/chromium/patches/patch-ui_views_views_gyp b/www/chromium/patches/patch-ui_views_views_gyp
index 8dee18fbd9b..71400a9a8ed 100644
--- a/www/chromium/patches/patch-ui_views_views_gyp
+++ b/www/chromium/patches/patch-ui_views_views_gyp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_views_views_gyp,v 1.9 2015/07/23 13:44:04 robert Exp $
---- ui/views/views.gyp.orig.port	Wed Jul 15 22:30:11 2015
-+++ ui/views/views.gyp	Wed Jul 22 08:37:30 2015
-@@ -640,12 +640,12 @@
+$OpenBSD: patch-ui_views_views_gyp,v 1.10 2015/09/05 16:06:50 robert Exp $
+--- ui/views/views.gyp.orig.port	Tue Sep  1 22:10:44 2015
++++ ui/views/views.gyp	Wed Sep  2 07:31:55 2015
+@@ -641,12 +641,12 @@
              '../display/display.gyp:display_util',
            ],
          }],
@@ -16,7 +16,7 @@ $OpenBSD: patch-ui_views_views_gyp,v 1.9 2015/07/23 13:44:04 robert Exp $
            'dependencies': [
              '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
            ],
-@@ -710,7 +710,7 @@
+@@ -712,7 +712,7 @@
          ['use_aura and chromeos == 0', {
            'sources': [ '<@(views_desktop_aura_sources)' ],
            'conditions': [
diff --git a/www/chromium/patches/patch-ui_views_window_custom_frame_view_cc b/www/chromium/patches/patch-ui_views_window_custom_frame_view_cc
index 8a704d0b033..0ef5352216f 100644
--- a/www/chromium/patches/patch-ui_views_window_custom_frame_view_cc
+++ b/www/chromium/patches/patch-ui_views_window_custom_frame_view_cc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ui_views_window_custom_frame_view_cc,v 1.1 2015/01/22 11:16:41 robert Exp $
---- ui/views/window/custom_frame_view.cc.orig.port	Sat Dec 27 12:54:25 2014
-+++ ui/views/window/custom_frame_view.cc	Sat Dec 27 12:56:51 2014
-@@ -283,7 +283,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 
+$OpenBSD: patch-ui_views_window_custom_frame_view_cc,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- ui/views/window/custom_frame_view.cc.orig.port	Sat Aug 22 21:02:00 2015
++++ ui/views/window/custom_frame_view.cc	Wed Sep  2 07:31:55 2015
+@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 
  int CustomFrameView::CaptionButtonY() const {
    // Maximized buttons start at window top so that even if their images aren't
    // drawn flush with the screen edge, they still obey Fitts' Law.
diff --git a/www/chromium/patches/patch-ui_webui_resources_js_cr_js b/www/chromium/patches/patch-ui_webui_resources_js_cr_js
index 5c5b54cecc4..9f3c27bce2e 100644
--- a/www/chromium/patches/patch-ui_webui_resources_js_cr_js
+++ b/www/chromium/patches/patch-ui_webui_resources_js_cr_js
@@ -1,8 +1,8 @@
-$OpenBSD: patch-ui_webui_resources_js_cr_js,v 1.1 2015/08/27 14:16:50 robert Exp $
---- ui/webui/resources/js/cr.js.orig.port	Thu Aug 27 16:09:00 2015
-+++ ui/webui/resources/js/cr.js	Thu Aug 27 16:09:22 2015
-@@ -348,6 +348,11 @@ var cr = function() {
-       return /Linux/.test(navigator.userAgent);
+$OpenBSD: patch-ui_webui_resources_js_cr_js,v 1.2 2015/09/05 16:06:50 robert Exp $
+--- ui/webui/resources/js/cr.js.orig.port	Wed Sep  2 20:17:29 2015
++++ ui/webui/resources/js/cr.js	Wed Sep  2 20:17:52 2015
+@@ -427,6 +427,11 @@ var cr = function() {
+       return /CrOS/.test(navigator.userAgent);
      },
  
 +    /** Whether this is on *BSD. */
@@ -10,6 +10,6 @@ $OpenBSD: patch-ui_webui_resources_js_cr_js,v 1.1 2015/08/27 14:16:50 robert Exp
 +      return /BSD/.test(navigator.userAgent);
 +    },
 +
-     /** Whether this uses the views toolkit or not. */
-     get isViews() {
-       return typeof chrome.getVariableValue == 'function' &&
+     /** Whether this is on vanilla Linux (not chromeOS). */
+     get isLinux() {
+       return /Linux/.test(navigator.userAgent);
diff --git a/www/chromium/pkg/PLIST b/www/chromium/pkg/PLIST
index b947d31a6e8..e618238d3de 100644
--- a/www/chromium/pkg/PLIST
+++ b/www/chromium/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.50 2015/07/23 13:44:04 robert Exp $
+@comment $OpenBSD: PLIST,v 1.51 2015/09/05 16:06:50 robert Exp $
 @pkgpath www/chromium,proprietary
 bin/chrome
 chrome/
@@ -123,6 +123,14 @@ chrome/resources/inspector/Images/responsiveDesign.png
 chrome/resources/inspector/Images/responsiveDesign_2x.png
 chrome/resources/inspector/Images/searchNext.png
 chrome/resources/inspector/Images/searchPrev.png
+chrome/resources/inspector/Images/securityStateHttp.png
+chrome/resources/inspector/Images/securityStateHttp_2x.png
+chrome/resources/inspector/Images/securityStateInsecure.png
+chrome/resources/inspector/Images/securityStateInsecure_2x.png
+chrome/resources/inspector/Images/securityStateSecure.png
+chrome/resources/inspector/Images/securityStateSecure_2x.png
+chrome/resources/inspector/Images/securityStateWarning.png
+chrome/resources/inspector/Images/securityStateWarning_2x.png
 chrome/resources/inspector/Images/serviceWorker.svg
 chrome/resources/inspector/Images/sessionStorage.png
 chrome/resources/inspector/Images/settingsListRemove.png
@@ -146,15 +154,15 @@ chrome/resources/inspector/Images/updateServiceWorker.svg
 chrome/resources/inspector/InspectorBackendCommands.js
 chrome/resources/inspector/SupportedCSSProperties.js
 chrome/resources/inspector/accessibility_module.js
+chrome/resources/inspector/animation_module.js
 chrome/resources/inspector/audits_module.js
 chrome/resources/inspector/cm_modes_module.js
 chrome/resources/inspector/components_lazy_module.js
 chrome/resources/inspector/console_module.js
-chrome/resources/inspector/devtools.css
-chrome/resources/inspector/devtools.html
 chrome/resources/inspector/devtools.js
 chrome/resources/inspector/devtools_extension_api.js
 chrome/resources/inspector/elements_module.js
+chrome/resources/inspector/emulated_devices_module.js
 chrome/resources/inspector/heap_snapshot_worker_module.js
 chrome/resources/inspector/inspector.css
 chrome/resources/inspector/inspector.html
@@ -166,6 +174,7 @@ chrome/resources/inspector/promises_module.js
 chrome/resources/inspector/resources_module.js
 chrome/resources/inspector/screencast_module.js
 chrome/resources/inspector/script_formatter_worker_module.js
+chrome/resources/inspector/security_module.js
 chrome/resources/inspector/settings_module.js
 chrome/resources/inspector/snippets_module.js
 chrome/resources/inspector/source_frame_module.js