Hi,

Here's an update to netsurf-3.10. The main browser has switched from
GTK2 to GTK3, and certificate error handling has been significantly
revamped. For more, see the changelog:
https://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt

As always, test reports on diverse architectures are greatly appreciated.

netsurf-fb also has an update, but I left it out of this diff because
there's some sort of regression in the SDL frontend I need to bisect.
That update can be handled independently of this one.

Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- browser/Makefile    11 Nov 2019 03:21:55 -0000      1.38
+++ browser/Makefile    26 May 2020 04:29:19 -0000
@@ -3,8 +3,7 @@
 COMMENT =              lightweight web browser, with GTK interface
 
 NETSURF_PROJECT =      netsurf
-NETSURF_VERSION =      3.9
-REVISION =             0
+NETSURF_VERSION =      3.10
 
 HOMEPAGE =             https://www.netsurf-browser.org/
 MASTER_SITES =         
https://download.netsurf-browser.org/netsurf/releases/source/
@@ -22,19 +21,18 @@ LIB_DEPENDS =               graphics/libwebp \
                        www/netsurf/libnspsl>=0.1.2 \
                        www/netsurf/libnsutils>=0.0.3 \
                        www/netsurf/libutf8proc>=1.3.1p0 \
-                       x11/gtk+2 \
+                       x11/gtk+3 \
                        x11/gnome/librsvg \
                        net/curl
 RUN_DEPENDS =          devel/desktop-file-utils
 TEST_DEPENDS =         devel/check
 
-WANTLIB =  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender atk-1.0 c cairo crypto css curl dom expat fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 hubbub iconv
-WANTLIB += intl jpeg m nsbmp nsgif nslog nspsl nsutils pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 parserutils png pthread rsvg-2
-WANTLIB += ssl utf8proc wapcaplet webp z
+WANTLIB += atk-1.0 c cairo cairo-gobject crypto css curl dom expat
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += gthread-2.0 gtk-3 harfbuzz hubbub iconv intl jpeg m
+WANTLIB += nsbmp nsgif nslog nspsl nsutils pango-1.0 pangocairo-1.0
+WANTLIB += parserutils png pthread rsvg-2 ssl utf8proc wapcaplet
+WANTLIB += webp z
 
 MAKE_FLAGS +=          NETSURF_USE_HARU_PDF=NO \
                        NETSURF_USE_LIBICONV_PLUG=NO \
Index: browser/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- browser/distinfo    9 Aug 2019 22:37:28 -0000       1.15
+++ browser/distinfo    26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (netsurf-3.9-src.tar.gz) = 1y8cb2EToB5UH4R2qTw0cjUGh3kUAJDfVbpALrSo7MM=
-SIZE (netsurf-3.9-src.tar.gz) = 3989742
+SHA256 (netsurf-3.10-src.tar.gz) = NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=
+SIZE (netsurf-3.10-src.tar.gz) = 4084480
Index: browser/patches/patch-frontends_gtk_res_options_gtk2_ui
===================================================================
RCS file: browser/patches/patch-frontends_gtk_res_options_gtk2_ui
diff -N browser/patches/patch-frontends_gtk_res_options_gtk2_ui
--- browser/patches/patch-frontends_gtk_res_options_gtk2_ui     25 Sep 2018 
08:48:58 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,943 +0,0 @@
-$OpenBSD: patch-frontends_gtk_res_options_gtk2_ui,v 1.2 2018/09/25 08:48:58 
bentley Exp $
-Index: frontends/gtk/res/options.gtk2.ui
---- frontends/gtk/res/options.gtk2.ui.orig
-+++ frontends/gtk/res/options.gtk2.ui
-@@ -106,19 +106,19 @@
-     </columns>
-     <data>
-       <row>
--        <col id="0" translatable="yes">preferencesFonttypeSans</col>
-+        <col id="0" translatable="yes">Sans-serif</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesFonttypeSerif</col>
-+        <col id="0" translatable="yes">Serif</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesFonttypeMonospace</col>
-+        <col id="0" translatable="yes">Monospace</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesFonttypeCursive</col>
-+        <col id="0" translatable="yes">Cursive</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesFonttypeFantasy</col>
-+        <col id="0" translatable="yes">Fantasy</col>
-       </row>
-     </data>
-   </object>
-@@ -129,13 +129,13 @@
-     </columns>
-     <data>
-       <row>
--        <col id="0" translatable="yes">preferencesDeveloperViewWindow</col>
-+        <col id="0" translatable="yes">Window</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesDeveloperViewTab</col>
-+        <col id="0" translatable="yes">Tab</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesDeveloperViewEditor</col>
-+        <col id="0" translatable="yes">Editor</col>
-       </row>
-     </data>
-   </object>
-@@ -146,16 +146,16 @@
-     </columns>
-     <data>
-       <row>
--        <col id="0" translatable="yes">preferencesImageLoadBoth</col>
-+        <col id="0" translatable="yes">foreground and background images</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesImageLoadFore</col>
-+        <col id="0" translatable="yes">foreground images</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesImageLoadBack</col>
-+        <col id="0" translatable="yes">background images</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesImageLoadNone</col>
-+        <col id="0" translatable="yes">no images</col>
-       </row>
-     </data>
-   </object>
-@@ -166,19 +166,19 @@
-     </columns>
-     <data>
-       <row>
--        <col id="0" translatable="yes">preferencesProxyTypeDirect</col>
-+        <col id="0" translatable="yes">Direct connection</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesProxyTypeManual</col>
-+        <col id="0" translatable="yes">Manual with no authentication</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesProxyTypeBasic</col>
-+        <col id="0" translatable="yes">Manual with basic authentication</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesProxyTypeNLTM</col>
-+        <col id="0" translatable="yes">Manual with NTLM authentication</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesProxyTypeSystem</col>
-+        <col id="0" translatable="yes">System settings</col>
-       </row>
-     </data>
-   </object>
-@@ -260,16 +260,16 @@
-     </columns>
-     <data>
-       <row>
--        <col id="0" translatable="yes">preferencesTabLocTop</col>
-+        <col id="0" translatable="yes">Top</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesTabLocLeft</col>
-+        <col id="0" translatable="yes">Left</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesTabLocRight</col>
-+        <col id="0" translatable="yes">Right</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesTabLocBottom</col>
-+        <col id="0" translatable="yes">Bottom</col>
-       </row>
-     </data>
-   </object>
-@@ -280,23 +280,23 @@
-     </columns>
-     <data>
-       <row>
--        <col id="0" translatable="yes">preferencesButtonTypeSmall</col>
-+        <col id="0" translatable="yes">Small Icons</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesButtonTypeLarge</col>
-+        <col id="0" translatable="yes">Large Icons</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesButtonTypeLargeText</col>
-+        <col id="0" translatable="yes">Large Icons and Text</col>
-       </row>
-       <row>
--        <col id="0" translatable="yes">preferencesButtonTypeText</col>
-+        <col id="0" translatable="yes">Text only</col>
-       </row>
-     </data>
-   </object>
-   <object class="GtkDialog" id="dialogPreferences">
-     <property name="can_focus">False</property>
-     <property name="border_width">5</property>
--    <property name="title" translatable="yes">preferencesTitle</property>
-+    <property name="title" translatable="yes">Netsurf Preferences</property>
-     <property name="window_position">center-on-parent</property>
-     <property name="destroy_with_parent">True</property>
-     <property name="type_hint">dialog</property>
-@@ -385,7 +385,7 @@
-                                   <object class="GtkLabel" 
id="label_startup_page">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesStartupPage</property>
-+                                    <property name="label" 
translatable="yes">Page</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -429,7 +429,7 @@
-                                 </child>
-                                 <child>
-                                   <object class="GtkButton" 
id="setDefaultPage">
--                                    <property name="label" 
translatable="yes">preferencesStartupPageDefault</property>
-+                                    <property name="label" 
translatable="yes">Use Default Page</property>
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="receives_default">True</property>
-@@ -444,7 +444,7 @@
-                                 </child>
-                                 <child>
-                                   <object class="GtkButton" 
id="setCurrentPage">
--                                    <property name="label" 
translatable="yes">preferencesStartupPageCurrent</property>
-+                                    <property name="label" 
translatable="yes">Use Current Page</property>
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="receives_default">True</property>
-@@ -472,7 +472,7 @@
-                       <object class="GtkLabel" id="label_main_startup">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesStartup</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Startup&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -504,7 +504,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkUrlSearch">
--                                <property name="label" 
translatable="yes">preferencesSearchURLBar</property>
-+                                <property name="label" 
translatable="yes">Search from URL bar</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -527,7 +527,7 @@
-                                   <object class="GtkLabel" id="label5">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesSearchProvider</property>
-+                                    <property name="label" 
translatable="yes">Provider</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -570,7 +570,7 @@
-                       <object class="GtkLabel" id="label4">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesSearch</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Search&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -602,7 +602,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkClearDownloads">
--                                <property name="label" 
translatable="yes">preferencesDownloadsRemove</property>
-+                                <property name="label" 
translatable="yes">Remove download from list when complete</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -618,7 +618,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkRequestOverwrite">
--                                <property name="label" 
translatable="yes">preferencesDownloadsConfirm</property>
-+                                <property name="label" 
translatable="yes">Confirm before overwriting files</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -641,7 +641,7 @@
-                                   <object class="GtkLabel" id="label8">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesDownloadsLocation</property>
-+                                    <property name="label" 
translatable="yes">Location</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -678,7 +678,7 @@
-                       <object class="GtkLabel" id="label7">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesDownloads</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Downloads&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -696,7 +696,7 @@
-               <object class="GtkLabel" id="label1">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="label" 
translatable="yes">preferencesMainTabtitle</property>
-+                <property name="label" translatable="yes">Main</property>
-               </object>
-               <packing>
-                 <property name="tab_fill">False</property>
-@@ -727,7 +727,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkShowSingleTab">
--                                <property name="label" 
translatable="yes">preferencesTabsAlways</property>
-+                                <property name="label" 
translatable="yes">Always show tab bar</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -743,7 +743,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkFocusNew">
--                                <property name="label" 
translatable="yes">preferencesTabsSwitch</property>
-+                                <property name="label" 
translatable="yes">Switch to newly opened tabs immediately</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -759,7 +759,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkNewBlank">
--                                <property name="label" 
translatable="yes">preferencesTabsNewly</property>
-+                                <property name="label" 
translatable="yes">Newly opened tabs are blank</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -782,7 +782,7 @@
-                                   <object class="GtkLabel" id="label9">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesTabsPosition</property>
-+                                    <property name="label" 
translatable="yes">Position</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -825,7 +825,7 @@
-                       <object class="GtkLabel" id="label6">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesTabs</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Tabs&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -864,7 +864,7 @@
-                                   <object class="GtkLabel" id="label13">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesDeveloperView</property>
-+                                    <property name="label" 
translatable="yes">Open developer views in a</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -907,7 +907,7 @@
-                       <object class="GtkLabel" id="label12">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesTools</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Tools&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -939,7 +939,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkDisplayRecentURLs">
--                                <property name="label" 
translatable="yes">preferencesURLbarDisplay</property>
-+                                <property name="label" 
translatable="yes">Display recently visited URLs as you type</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -961,7 +961,7 @@
-                       <object class="GtkLabel" id="label14">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesURLbar</property>
-+                        <property name="label" 
translatable="yes">&lt;b>URLbar&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1000,7 +1000,7 @@
-                                   <object class="GtkLabel" id="label16">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesToolbarButtons</property>
-+                                    <property name="label" 
translatable="yes">Buttons</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1043,7 +1043,7 @@
-                       <object class="GtkLabel" id="label15">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesToolbar</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Toolbar&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1064,7 +1064,7 @@
-               <object class="GtkLabel" id="label2">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="label" 
translatable="yes">preferencesAppearanceTabtitle</property>
-+                <property name="label" 
translatable="yes">Appearance</property>
-               </object>
-               <packing>
-                 <property name="position">1</property>
-@@ -1096,7 +1096,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkDisablePopups">
--                                <property name="label" 
translatable="yes">preferencesControlPrevent</property>
-+                                <property name="label" 
translatable="yes">Prevent pop-up windows</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1112,7 +1112,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkHideAdverts">
--                                <property name="label" 
translatable="yes">preferencesControlHide</property>
-+                                <property name="label" 
translatable="yes">Hide Adverts</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1128,7 +1128,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkEnableJavascript">
--                                <property name="label" 
translatable="yes">preferencesControlEnable</property>
-+                                <property name="label" 
translatable="yes">Enable JavaScript</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1144,7 +1144,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkDisablePlugins">
--                                <property name="label" 
translatable="yes">preferencesControlDisable</property>
-+                                <property name="label" 
translatable="yes">Disable plug-ins</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1160,7 +1160,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkResampleImages">
--                                <property name="label" 
translatable="yes">preferencesControlHigh</property>
-+                                <property name="label" 
translatable="yes">High quality image scaling</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1183,7 +1183,7 @@
-                                   <object class="GtkLabel" id="label17">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesControlLoad</property>
-+                                    <property name="label" 
translatable="yes">Load and display</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1226,7 +1226,7 @@
-                       <object class="GtkLabel" id="label11">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesControl</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Control&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1258,7 +1258,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkEnableAnimations">
--                                <property name="label" 
translatable="yes">preferencesAnimationEnable</property>
-+                                <property name="label" 
translatable="yes">Enable</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1281,7 +1281,7 @@
-                                   <object class="GtkLabel" id="label19">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesAnimationMinimum</property>
-+                                    <property name="label" 
translatable="yes">Minimum time between frames</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1294,7 +1294,7 @@
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="has_tooltip">True</property>
--                                    <property name="tooltip_text" 
translatable="yes">preferencesAnimationMinimumTooltip</property>
-+                                    <property name="tooltip_text" 
translatable="yes">Do not update animations any more often than this.</property>
-                                     <property 
name="invisible_char">●</property>
-                                     <property 
name="primary_icon_activatable">False</property>
-                                     <property 
name="secondary_icon_activatable">False</property>
-@@ -1329,7 +1329,7 @@
-                       <object class="GtkLabel" id="label18">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesAnimation</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Animation&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1368,7 +1368,7 @@
-                                   <object class="GtkLabel" id="label26">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesFontsDefault</property>
-+                                    <property name="label" 
translatable="yes">Default</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1412,7 +1412,7 @@
-                                   <object class="GtkLabel" id="label27">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesFontsSize</property>
-+                                    <property name="label" 
translatable="yes">Size</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1425,7 +1425,7 @@
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="has_tooltip">True</property>
--                                    <property name="tooltip_text" 
translatable="yes">preferencesFontsSizeTooltip</property>
-+                                    <property name="tooltip_text" 
translatable="yes">The base-line font size to use.</property>
-                                     <property name="max_length">4</property>
-                                     <property 
name="invisible_char">●</property>
-                                     <property name="width_chars">4</property>
-@@ -1455,7 +1455,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkButton" id="fontPreview">
--                                <property name="label" 
translatable="yes">preferencesFontsPreview</property>
-+                                <property name="label" 
translatable="yes">_Preview</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">True</property>
-@@ -1477,7 +1477,7 @@
-                       <object class="GtkLabel" id="label20">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesFonts</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Fonts&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1515,7 +1515,7 @@
-                                   <object class="GtkLabel" id="label21">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesLanguagePreferred</property>
-+                                    <property name="label" 
translatable="yes">Preferred language</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1528,7 +1528,7 @@
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
-                                     <property 
name="has_tooltip">True</property>
--                                    <property name="tooltip_text" 
translatable="yes">preferencesLanguagePreferredTooltip</property>
-+                                    <property name="tooltip_text" 
translatable="yes">The preferred language for web pages</property>
-                                     <property 
name="model">liststore_content_language</property>
-                                     <signal name="changed" 
handler="nsgtk_preferences_comboboxLanguage_changed" swapped="no"/>
-                                     <signal name="realize" 
handler="nsgtk_preferences_comboboxLanguage_realize" swapped="no"/>
-@@ -1570,7 +1570,7 @@
-                       <object class="GtkLabel" id="label25">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesLanguage</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Language&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1590,7 +1590,7 @@
-               <object class="GtkLabel" id="label10">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="label" 
translatable="yes">preferencesContentTabtitle</property>
-+                <property name="label" translatable="yes">Content</property>
-               </object>
-               <packing>
-                 <property name="position">2</property>
-@@ -1622,7 +1622,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkSendReferer">
--                                <property name="label" 
translatable="yes">preferencesGeneralReferral</property>
-+                                <property name="label" 
translatable="yes">Enable referral submission</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1638,7 +1638,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkSendDNT">
--                                <property name="label" 
translatable="yes">preferencesGeneralDNT</property>
-+                                <property name="label" 
translatable="yes">Enable sending "Do Not Track" request</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1660,7 +1660,7 @@
-                       <object class="GtkLabel" id="label61">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesGeneral</property>
-+                        <property name="label" 
translatable="yes">&lt;b>General&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1692,7 +1692,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkHoverURLs">
--                                <property name="label" 
translatable="yes">preferencesHistoryShow</property>
-+                                <property name="label" 
translatable="yes">Local history shows URL in tooltip</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -1715,7 +1715,7 @@
-                                   <object class="GtkLabel" id="label28">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesHistoryRemember</property>
-+                                    <property name="label" 
translatable="yes">Remember browsing history for up to</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1751,7 +1751,7 @@
-                                   <object class="GtkLabel" id="label29">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesHistoryDays</property>
-+                                    <property name="label" 
translatable="yes">days</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -1774,7 +1774,7 @@
-                       <object class="GtkLabel" id="label23">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesHistory</property>
-+                        <property name="label" 
translatable="yes">&lt;b>History&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -1817,7 +1817,7 @@
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
-                                     <property name="xalign">0</property>
--                                    <property name="label" 
translatable="yes">preferencesCacheMemory</property>
-+                                    <property name="label" 
translatable="yes">Memory cache size</property>
-                                   </object>
-                                   <packing>
-                                     <property 
name="x_options">GTK_FILL</property>
-@@ -1828,7 +1828,7 @@
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
-                                     <property name="xalign">0</property>
--                                    <property name="label" 
translatable="yes">preferencesCacheDisc</property>
-+                                    <property name="label" 
translatable="yes">Disc cache size</property>
-                                   </object>
-                                   <packing>
-                                     <property name="top_attach">1</property>
-@@ -1841,7 +1841,7 @@
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
-                                     <property name="xalign">0</property>
--                                    <property name="label" 
translatable="yes">preferencesCacheExpire</property>
-+                                    <property name="label" 
translatable="yes">Expire cache entries after</property>
-                                   </object>
-                                   <packing>
-                                     <property name="top_attach">2</property>
-@@ -1952,7 +1952,7 @@
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
-                                     <property name="xalign">0</property>
--                                    <property name="label" 
translatable="yes">preferencesHistoryDays</property>
-+                                    <property name="label" 
translatable="yes">days</property>
-                                   </object>
-                                   <packing>
-                                     <property name="left_attach">2</property>
-@@ -1978,7 +1978,7 @@
-                                 </child>
-                                 <child>
-                                   <object class="GtkButton" 
id="buttonCacheMaintenance">
--                                    <property name="label" 
translatable="yes">preferencesCacheMaintenance</property>
-+                                    <property name="label" 
translatable="yes">Maintenance</property>
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="receives_default">True</property>
-@@ -2004,7 +2004,7 @@
-                       <object class="GtkLabel" id="label24">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesCache</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Cache&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -2025,7 +2025,7 @@
-               <object class="GtkLabel" id="label22">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="label" 
translatable="yes">preferencesPrivacyTabtitle</property>
-+                <property name="label" translatable="yes">Privacy</property>
-               </object>
-               <packing>
-                 <property name="position">3</property>
-@@ -2063,7 +2063,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesProxyType</property>
-+                                <property name="label" 
translatable="yes">Proxy type</property>
-                               </object>
-                               <packing>
-                                 <property name="x_options">GTK_FILL</property>
-@@ -2074,7 +2074,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesProxyHost</property>
-+                                <property name="label" 
translatable="yes">Host</property>
-                               </object>
-                               <packing>
-                                 <property name="top_attach">1</property>
-@@ -2087,7 +2087,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesProxyUsername</property>
-+                                <property name="label" 
translatable="yes">Username</property>
-                               </object>
-                               <packing>
-                                 <property name="top_attach">2</property>
-@@ -2100,7 +2100,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesProxyPassword</property>
-+                                <property name="label" 
translatable="yes">Password</property>
-                               </object>
-                               <packing>
-                                 <property name="top_attach">3</property>
-@@ -2113,7 +2113,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesProxyTypeTooltip</property>
-+                                <property name="tooltip_text" 
translatable="yes">The type of HTTP proxy server.</property>
-                                 <property 
name="model">liststore_proxy_type</property>
-                                 <signal name="changed" 
handler="nsgtk_preferences_comboProxyType_changed" swapped="no"/>
-                                 <signal name="realize" 
handler="nsgtk_preferences_comboProxyType_realize" swapped="no"/>
-@@ -2139,7 +2139,7 @@
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="has_tooltip">True</property>
--                                    <property name="tooltip_text" 
translatable="yes">preferencesProxyHostTooltip</property>
-+                                    <property name="tooltip_text" 
translatable="yes">Host name of your proxy server.</property>
-                                     <property 
name="invisible_char">●</property>
-                                     <property 
name="primary_icon_activatable">False</property>
-                                     <property 
name="secondary_icon_activatable">False</property>
-@@ -2171,7 +2171,7 @@
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property 
name="has_tooltip">True</property>
--                                    <property name="tooltip_text" 
translatable="yes">preferencesProxyPortTooltip</property>
-+                                    <property name="tooltip_text" 
translatable="yes">Port number to connect to on proxy server.</property>
-                                     <property name="max_length">5</property>
-                                     <property 
name="invisible_char">●</property>
-                                     <property name="width_chars">5</property>
-@@ -2205,7 +2205,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesProxyUsernameTooltip</property>
-+                                <property name="tooltip_text" 
translatable="yes">Username to access the proxy.</property>
-                                 <property name="invisible_char">●</property>
-                                 <property 
name="primary_icon_activatable">False</property>
-                                 <property 
name="secondary_icon_activatable">False</property>
-@@ -2226,7 +2226,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesProxyPasswordTooltip</property>
-+                                <property name="tooltip_text" 
translatable="yes"></property>
-                                 <property name="visibility">False</property>
-                                 <property name="invisible_char">●</property>
-                                 <property 
name="primary_icon_activatable">False</property>
-@@ -2248,7 +2248,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesProxyNoproxy</property>
-+                                <property name="label" translatable="yes">No 
Proxy For</property>
-                               </object>
-                               <packing>
-                                 <property name="top_attach">4</property>
-@@ -2261,7 +2261,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesProxyNoproxyTooltip</property>
-+                                <property name="tooltip_text" 
translatable="yes">Comma separated list of host names that should not be 
proxied.</property>
-                                 <property 
name="caps_lock_warning">False</property>
-                                 <property 
name="primary_icon_activatable">False</property>
-                                 <property 
name="secondary_icon_activatable">False</property>
-@@ -2285,7 +2285,7 @@
-                       <object class="GtkLabel" id="label37">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesProxy</property>
-+                        <property name="label" translatable="yes">&lt;b>HTTP 
Proxy&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -2323,7 +2323,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesFetchingMax</property>
-+                                <property name="label" 
translatable="yes">Maximum fetchers</property>
-                               </object>
-                               <packing>
-                                 <property name="x_options">GTK_FILL</property>
-@@ -2334,7 +2334,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesFetchingPerhost</property>
-+                                <property name="label" 
translatable="yes">Fetches per host</property>
-                               </object>
-                               <packing>
-                                 <property name="top_attach">1</property>
-@@ -2347,7 +2347,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="xalign">0</property>
--                                <property name="label" 
translatable="yes">preferencesFetchingCached</property>
-+                                <property name="label" 
translatable="yes">Cached connections</property>
-                               </object>
-                               <packing>
-                                 <property name="top_attach">2</property>
-@@ -2360,7 +2360,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesFetchingMaxTooltip</property>
-+                                <property name="tooltip_text" 
translatable="yes">Maximum number of concurrent items to fetch at 
once.</property>
-                                 <property name="invisible_char">●</property>
-                                 <property name="width_chars">3</property>
-                                 <property 
name="primary_icon_activatable">False</property>
-@@ -2384,7 +2384,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesFetchingPerhostTooltip</property>
-+                                <property name="tooltip_text" 
translatable="yes">Maximum number of item fetches per web server.</property>
-                                 <property name="invisible_char">●</property>
-                                 <property name="width_chars">3</property>
-                                 <property 
name="primary_icon_activatable">False</property>
-@@ -2410,7 +2410,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_tooltip">True</property>
--                                <property name="tooltip_text" 
translatable="yes">preferencesFetchingCachedTooltip.</property>
-+                                <property name="tooltip_text" 
translatable="yes">Number of connections to keep in case they are needed 
again.</property>
-                                 <property name="invisible_char">●</property>
-                                 <property name="width_chars">3</property>
-                                 <property 
name="primary_icon_activatable">False</property>
-@@ -2439,7 +2439,7 @@
-                       <object class="GtkLabel" id="label38">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesFetching</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Fetching&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -2460,7 +2460,7 @@
-               <object class="GtkLabel" id="label36">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="label" 
translatable="yes">preferencesNetworkTabtitle</property>
-+                <property name="label" translatable="yes">Network</property>
-               </object>
-               <packing>
-                 <property name="position">4</property>
-@@ -2491,7 +2491,7 @@
-                             <property name="spacing">6</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkSuppressImages">
--                                <property name="label" 
translatable="yes">preferencesAppearanceImages</property>
-+                                <property name="label" translatable="yes">No 
images in output</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -2507,7 +2507,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkRemoveBackgrounds">
--                                <property name="label" 
translatable="yes">preferencesAppearanceBackground</property>
-+                                <property name="label" translatable="yes">No 
background images in output</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -2523,7 +2523,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkFitPage">
--                                <property name="label" 
translatable="yes">preferencesAppearanceScalefit</property>
-+                                <property name="label" 
translatable="yes">Scale output to fit page</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -2546,7 +2546,7 @@
-                                   <object class="GtkLabel" id="label59">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesAppearanceScale</property>
-+                                    <property name="label" 
translatable="yes">Scale output</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -2605,7 +2605,7 @@
-                       <object class="GtkLabel" id="label48">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesAppearance</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Appearance&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -2643,7 +2643,7 @@
-                                   <object class="GtkLabel" id="label62">
-                                     <property name="visible">True</property>
-                                     <property 
name="can_focus">False</property>
--                                    <property name="label" 
translatable="yes">preferencesMarginsMeasurements</property>
-+                                    <property name="label" 
translatable="yes">measurements in mm</property>
-                                   </object>
-                                   <packing>
-                                     <property name="expand">False</property>
-@@ -2894,7 +2894,7 @@
-                       <object class="GtkLabel" id="label49">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesMargins</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Margins&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -2926,7 +2926,7 @@
-                             <property name="spacing">7</property>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkCompressPDF">
--                                <property name="label" 
translatable="yes">preferencesGenerationCompressed</property>
-+                                <property name="label" 
translatable="yes">Output is compressed</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -2942,7 +2942,7 @@
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" 
id="checkPasswordPDF">
--                                <property name="label" 
translatable="yes">preferencesGenerationPassword</property>
-+                                <property name="label" 
translatable="yes">Output has a password</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="receives_default">False</property>
-@@ -2964,7 +2964,7 @@
-                       <object class="GtkLabel" id="label50">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
--                        <property name="label" 
translatable="yes">preferencesGeneration</property>
-+                        <property name="label" 
translatable="yes">&lt;b>Generation&lt;/b></property>
-                         <property name="use_markup">True</property>
-                       </object>
-                     </child>
-@@ -2985,7 +2985,7 @@
-               <object class="GtkLabel" id="label47">
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
--                <property name="label" 
translatable="yes">preferencesPDFTabtitle</property>
-+                <property name="label" translatable="yes">PDF</property>
-               </object>
-               <packing>
-                 <property name="position">5</property>
Index: browser/patches/patch-test_Makefile
===================================================================
RCS file: browser/patches/patch-test_Makefile
diff -N browser/patches/patch-test_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ browser/patches/patch-test_Makefile 26 May 2020 04:29:19 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: test/Makefile
+--- test/Makefile.orig
++++ test/Makefile
+@@ -165,7 +165,7 @@ TESTLDFLAGS := -L$(TESTROOT) \
+ 
+ # malloc faliure injection generator
+ $(TESTROOT)/libmalloc_fig.so:test/malloc_fig.c
+-      $(CC) -shared -fPIC -I. -std=c99 $(TEST_WARNFLAGS) $^ -ldl -o $@
++      $(CC) -shared -fPIC -I. -std=c99 $(TEST_WARNFLAGS) $^ -o $@
+ 
+ # Source files for all tests being compiled
+ TESTSOURCES :=
Index: browser/patches/patch-test_utils_c
===================================================================
RCS file: browser/patches/patch-test_utils_c
diff -N browser/patches/patch-test_utils_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ browser/patches/patch-test_utils_c  26 May 2020 04:29:19 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: test/utils.c
+--- test/utils.c.orig
++++ test/utils.c
+@@ -30,6 +30,8 @@
+ #include <string.h>
+ #include <check.h>
+ 
++char *strcasestr(const char *, const char *little);
++
+ #include "utils/string.h"
+ #include "utils/corestrings.h"
+ 
Index: browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- browser/pkg/PLIST   27 Jun 2018 21:04:06 -0000      1.15
+++ browser/pkg/PLIST   26 May 2020 04:29:19 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.15 2018/06/27 21:04:06 espie Exp $
-@bin bin/netsurf-gtk
+@bin bin/netsurf-gtk3
 @man man/man1/netsurf-gtk.1
 share/applications/netsurf.desktop
 share/netsurf/
@@ -7,27 +7,25 @@ share/netsurf/C
 share/netsurf/Messages
 share/netsurf/SearchEngines
 share/netsurf/adblock.css
-share/netsurf/arrow_down_8x32.png
 share/netsurf/ca-bundle.txt
-share/netsurf/cookies.gtk2.ui
+share/netsurf/cookies.gtk3.ui
 share/netsurf/credits.html
 share/netsurf/de/
 share/netsurf/de/Messages
 share/netsurf/de/welcome.html
 share/netsurf/default.css
 share/netsurf/default.ico
-share/netsurf/downloads.gtk2.ui
+share/netsurf/downloads.gtk3.ui
 share/netsurf/en/
 share/netsurf/en/Messages
 share/netsurf/en/credits.html
 share/netsurf/en/licence.html
-share/netsurf/en/maps.html
 share/netsurf/en/welcome.html
 share/netsurf/favicon.png
 share/netsurf/fr/
 share/netsurf/fr/Messages
-share/netsurf/globalhistory.gtk2.ui
-share/netsurf/hotlist.gtk2.ui
+share/netsurf/globalhistory.gtk3.ui
+share/netsurf/hotlist.gtk3.ui
 share/netsurf/icons/
 share/netsurf/icons/arrow-l.png
 share/netsurf/icons/content.png
@@ -35,7 +33,9 @@ share/netsurf/icons/directory.png
 share/netsurf/icons/directory2.png
 share/netsurf/icons/hotlist-add.png
 share/netsurf/icons/hotlist-rmv.png
+share/netsurf/icons/local-history.png
 share/netsurf/icons/search.png
+share/netsurf/icons/show-cookie.png
 share/netsurf/internal.css
 share/netsurf/it/
 share/netsurf/it/Messages
@@ -46,11 +46,9 @@ share/netsurf/ja/
 share/netsurf/ja/welcome.html
 share/netsurf/languages
 share/netsurf/licence.html
-share/netsurf/localhistory.gtk2.ui
-share/netsurf/login.gtk2.ui
-share/netsurf/maps.html
+share/netsurf/localhistory.gtk3.ui
 share/netsurf/netsurf-16x16.xpm
-share/netsurf/netsurf.gtk2.ui
+share/netsurf/netsurf.gtk3.ui
 share/netsurf/netsurf.png
 share/netsurf/netsurf.xpm
 share/netsurf/nl/
@@ -58,11 +56,11 @@ share/netsurf/nl/Messages
 share/netsurf/nl/credits.html
 share/netsurf/nl/licence.html
 share/netsurf/nl/welcome.html
-share/netsurf/options.gtk2.ui
-share/netsurf/password.gtk2.ui
+share/netsurf/options.gtk3.ui
+share/netsurf/pageinfo.gtk3.ui
+share/netsurf/password.gtk3.ui
 share/netsurf/quirks.css
-share/netsurf/ssl.gtk2.ui
-share/netsurf/tabcontents.gtk2.ui
+share/netsurf/tabcontents.gtk3.ui
 share/netsurf/throbber/
 share/netsurf/throbber/throbber0.png
 share/netsurf/throbber/throbber1.png
@@ -73,8 +71,8 @@ share/netsurf/throbber/throbber5.png
 share/netsurf/throbber/throbber6.png
 share/netsurf/throbber/throbber7.png
 share/netsurf/throbber/throbber8.png
-share/netsurf/toolbar.gtk2.ui
-share/netsurf/viewdata.gtk2.ui
-share/netsurf/warning.gtk2.ui
+share/netsurf/toolbar.gtk3.ui
+share/netsurf/viewdata.gtk3.ui
+share/netsurf/warning.gtk3.ui
 share/netsurf/welcome.html
 @tag update-desktop-database
Index: buildsystem/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/buildsystem/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- buildsystem/Makefile        11 Nov 2019 03:21:55 -0000      1.14
+++ buildsystem/Makefile        26 May 2020 04:29:19 -0000
@@ -3,7 +3,7 @@
 COMMENT =              makefiles for building NetSurf
 
 NETSURF_PROJECT =      buildsystem
-NETSURF_VERSION =      1.8
+NETSURF_VERSION =      1.9
 DISTNAME =             ${NETSURF_PROJECT}-${NETSURF_VERSION}
 PKGNAME =              netsurf-${NETSURF_PROJECT}-${NETSURF_VERSION}
 
Index: buildsystem/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/buildsystem/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- buildsystem/distinfo        11 Nov 2019 02:41:05 -0000      1.9
+++ buildsystem/distinfo        26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (buildsystem-1.8.tar.gz) = 5qMk58WWXKAy0xlq3d1v2Ya19HwOY0CmRtDSPjWXzTk=
-SIZE (buildsystem-1.8.tar.gz) = 38617
+SHA256 (buildsystem-1.9.tar.gz) = k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=
+SIZE (buildsystem-1.9.tar.gz) = 38723
Index: hubbub/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- hubbub/Makefile     11 Nov 2019 03:21:55 -0000      1.22
+++ hubbub/Makefile     26 May 2020 04:29:19 -0000
@@ -3,10 +3,9 @@
 COMMENT =              HTML parser
 
 NETSURF_PROJECT =      libhubbub
-NETSURF_VERSION =      0.3.6
+NETSURF_VERSION =      0.3.7
 PKGNAME =              hubbub-${NETSURF_VERSION}
 HOMEPAGE =             https://www.netsurf-browser.org/projects/hubbub/
-REVISION =             0
 
 SHARED_LIBS =          hubbub 3.0 #0.3.4
 
Index: hubbub/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- hubbub/distinfo     9 Aug 2019 22:37:28 -0000       1.11
+++ hubbub/distinfo     26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libhubbub-0.3.6-src.tar.gz) = 
11bHlcGg4IvuxKzWg2SsRHeWDWL/+jtg2gX1p3Y/e/Q=
-SIZE (libhubbub-0.3.6-src.tar.gz) = 784692
+SHA256 (libhubbub-0.3.7-src.tar.gz) = 
nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=
+SIZE (libhubbub-0.3.7-src.tar.gz) = 784780
Index: libcss/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- libcss/Makefile     11 Nov 2019 03:21:55 -0000      1.23
+++ libcss/Makefile     26 May 2020 04:29:19 -0000
@@ -3,8 +3,7 @@
 COMMENT =              CSS parser and selection engine
 
 NETSURF_PROJECT =      libcss
-NETSURF_VERSION =      0.9.0
-REVISION =             0
+NETSURF_VERSION =      0.9.1
 
 SHARED_LIBS =          css 6.0 #0.9.0
 
Index: libcss/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- libcss/distinfo     9 Aug 2019 22:37:28 -0000       1.14
+++ libcss/distinfo     26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libcss-0.9.0-src.tar.gz) = uY+6dmS9UwfLOaYQEJjadvY1qX4Ve4f0XpzkKtqQie8=
-SIZE (libcss-0.9.0-src.tar.gz) = 522267
+SHA256 (libcss-0.9.1-src.tar.gz) = 0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=
+SIZE (libcss-0.9.1-src.tar.gz) = 522715
Index: libdom/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- libdom/Makefile     11 Nov 2019 03:21:55 -0000      1.15
+++ libdom/Makefile     26 May 2020 04:29:19 -0000
@@ -3,10 +3,9 @@
 COMMENT =              W3C DOM implementation
 
 NETSURF_PROJECT =      libdom
-NETSURF_VERSION =      0.4.0
-REVISION =             0
+NETSURF_VERSION =      0.4.1
 
-SHARED_LIBS =          dom 1.1 #0.4.0
+SHARED_LIBS =          dom 2.0 #0.4.1
 
 LIB_DEPENDS =          converters/libiconv \
                        www/netsurf/hubbub>=0.3.4 \
Index: libdom/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- libdom/distinfo     9 Aug 2019 22:37:28 -0000       1.9
+++ libdom/distinfo     26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdom-0.4.0-src.tar.gz) = nrnNMIE21QeP2aNC85HvZQcehmCg6inVDLQdN6jGs8c=
-SIZE (libdom-0.4.0-src.tar.gz) = 871499
+SHA256 (libdom-0.4.1-src.tar.gz) = mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=
+SIZE (libdom-0.4.1-src.tar.gz) = 872954
Index: libdom/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- libdom/pkg/PLIST    6 Mar 2016 20:27:24 -0000       1.4
+++ libdom/pkg/PLIST    26 May 2020 04:29:19 -0000
@@ -52,6 +52,7 @@ include/dom/html/html_basefont_element.h
 include/dom/html/html_body_element.h
 include/dom/html/html_br_element.h
 include/dom/html/html_button_element.h
+include/dom/html/html_canvas_element.h
 include/dom/html/html_collection.h
 include/dom/html/html_directory_element.h
 include/dom/html/html_div_element.h
Index: libnsbmp/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- libnsbmp/Makefile   11 Nov 2019 03:21:55 -0000      1.13
+++ libnsbmp/Makefile   26 May 2020 04:29:19 -0000
@@ -3,8 +3,7 @@
 COMMENT =              BMP/ICO decoding library
 
 NETSURF_PROJECT =      libnsbmp
-NETSURF_VERSION =      0.1.5
-REVISION =             0
+NETSURF_VERSION =      0.1.6
 
 CATEGORIES =           graphics
 SHARED_LIBS =          nsbmp 1.0 #0.1.3
Index: libnsbmp/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- libnsbmp/distinfo   25 Sep 2018 08:48:59 -0000      1.8
+++ libnsbmp/distinfo   26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsbmp-0.1.5-src.tar.gz) = 
ZcwNgXJ+Ls5Be3mXuiRRMJ8HpOWTLlIBmiCGdkAVK1I=
-SIZE (libnsbmp-0.1.5-src.tar.gz) = 463299
+SHA256 (libnsbmp-0.1.6-src.tar.gz) = 
ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=
+SIZE (libnsbmp-0.1.6-src.tar.gz) = 463348
Index: libnsfb/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsfb/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- libnsfb/Makefile    2 May 2020 09:35:17 -0000       1.10
+++ libnsfb/Makefile    26 May 2020 04:29:19 -0000
@@ -3,12 +3,11 @@
 COMMENT =              framebuffer abstraction library for netsurf
 
 NETSURF_PROJECT =      libnsfb
-NETSURF_VERSION =      0.2.1
-REVISION =             1
+NETSURF_VERSION =      0.2.2
 
 LIB_DEPENDS =          devel/sdl
 
 CATEGORIES =           graphics
-SHARED_LIBS =          nsfb 0.0 #0.1.4
+SHARED_LIBS =          nsfb 0.1 #0.2.2
 
 .include <bsd.port.mk>
Index: libnsfb/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsfb/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- libnsfb/distinfo    9 Aug 2019 22:37:28 -0000       1.5
+++ libnsfb/distinfo    26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsfb-0.2.1-src.tar.gz) = 
YC+wCGmfxeCQvR1Ry91Xu4Svq9tZOM+WVVAV+2h6Cic=
-SIZE (libnsfb-0.2.1-src.tar.gz) = 82357
+SHA256 (libnsfb-0.2.2-src.tar.gz) = 
vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=
+SIZE (libnsfb-0.2.2-src.tar.gz) = 82594
Index: libnslog/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnslog/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- libnslog/Makefile   11 Nov 2019 03:21:55 -0000      1.5
+++ libnslog/Makefile   26 May 2020 04:29:19 -0000
@@ -3,10 +3,9 @@
 COMMENT =              netsurf logging library
 
 NETSURF_PROJECT =      libnslog
-NETSURF_VERSION =      0.1.2
-REVISION =             0
+NETSURF_VERSION =      0.1.3
 
-SHARED_LIBS =          nslog 0.0 #0.1.0
+SHARED_LIBS =          nslog 0.1 #0.1.3
 
 BUILD_DEPENDS =                devel/bison
 TEST_DEPENDS =         devel/check
Index: libnslog/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnslog/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- libnslog/distinfo   25 Sep 2018 08:48:59 -0000      1.2
+++ libnslog/distinfo   26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnslog-0.1.2-src.tar.gz) = 
TRLYNu/VWofk9kKapVJ+HhVSb6TKxYt4ecuh23c3+r0=
-SIZE (libnslog-0.1.2-src.tar.gz) = 46414
+SHA256 (libnslog-0.1.3-src.tar.gz) = 
/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=
+SIZE (libnslog-0.1.3-src.tar.gz) = 46554
Index: libnspsl/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnspsl/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- libnspsl/Makefile   11 Nov 2019 03:21:56 -0000      1.6
+++ libnspsl/Makefile   26 May 2020 04:29:19 -0000
@@ -3,8 +3,7 @@
 COMMENT =              public suffix list library for netsurf
 
 NETSURF_PROJECT =      libnspsl
-NETSURF_VERSION =      0.1.5
-REVISION =             0
+NETSURF_VERSION =      0.1.6
 
 CATEGORIES =           www
 SHARED_LIBS =          nspsl 0.0 #0.1.0
Index: libnspsl/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnspsl/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- libnspsl/distinfo   9 Aug 2019 22:37:28 -0000       1.4
+++ libnspsl/distinfo   26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnspsl-0.1.5-src.tar.gz) = 
zcVNrMIM/a23mbi0qf/gobYro5qwYMNdiuXs7uRHOGo=
-SIZE (libnspsl-0.1.5-src.tar.gz) = 316104
+SHA256 (libnspsl-0.1.6-src.tar.gz) = 
08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=
+SIZE (libnspsl-0.1.6-src.tar.gz) = 320130
Index: libnsutils/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsutils/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- libnsutils/Makefile 11 Nov 2019 03:21:56 -0000      1.7
+++ libnsutils/Makefile 26 May 2020 04:29:19 -0000
@@ -3,10 +3,9 @@
 COMMENT =              miscellaneous internal functions for netsurf
 
 NETSURF_PROJECT =      libnsutils
-NETSURF_VERSION =      0.0.5
-REVISION =             0
+NETSURF_VERSION =      0.1.0
 
 CATEGORIES =           www
-SHARED_LIBS =          nsutils 1.0 #0.0.2
+SHARED_LIBS =          nsutils 1.1 #0.1.0
 
 .include <bsd.port.mk>
Index: libnsutils/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsutils/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- libnsutils/distinfo 25 Sep 2018 08:48:59 -0000      1.4
+++ libnsutils/distinfo 26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsutils-0.0.5-src.tar.gz) = 
Djt6GfQ0jyWhysUUvr/clB4ETaudyxy5wTEGfXvMgSc=
-SIZE (libnsutils-0.0.5-src.tar.gz) = 7653
+SHA256 (libnsutils-0.1.0-src.tar.gz) = 
eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=
+SIZE (libnsutils-0.1.0-src.tar.gz) = 8840
Index: libwapcaplet/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- libwapcaplet/Makefile       11 Nov 2019 03:21:56 -0000      1.17
+++ libwapcaplet/Makefile       26 May 2020 04:29:19 -0000
@@ -3,8 +3,7 @@
 COMMENT =              string internment library
 
 NETSURF_PROJECT =      libwapcaplet
-NETSURF_VERSION =      0.4.2
-REVISION =             0
+NETSURF_VERSION =      0.4.3
 
 CATEGORIES=            devel
 SHARED_LIBS =          wapcaplet 3.0 #0.3.0
Index: libwapcaplet/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- libwapcaplet/distinfo       9 Aug 2019 22:37:28 -0000       1.10
+++ libwapcaplet/distinfo       26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (libwapcaplet-0.4.2-src.tar.gz) = 
Bj0kirPyBoCMQUk0oQX2y2Qm4vC6873SCnEheez6XLo=
-SIZE (libwapcaplet-0.4.2-src.tar.gz) = 31492
+SHA256 (libwapcaplet-0.4.3-src.tar.gz) = 
myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=
+SIZE (libwapcaplet-0.4.3-src.tar.gz) = 31766
Index: nsgenbind/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/nsgenbind/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- nsgenbind/Makefile  11 Nov 2019 03:21:56 -0000      1.7
+++ nsgenbind/Makefile  26 May 2020 04:29:19 -0000
@@ -3,8 +3,7 @@
 COMMENT =              JavaScript bindings generator
 
 NETSURF_PROJECT =      nsgenbind
-NETSURF_VERSION =      0.7
-REVISION =             0
+NETSURF_VERSION =      0.8
 
 BUILD_DEPENDS +=       devel/bison
 
Index: nsgenbind/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/nsgenbind/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- nsgenbind/distinfo  9 Aug 2019 22:37:29 -0000       1.5
+++ nsgenbind/distinfo  26 May 2020 04:29:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (nsgenbind-0.7-src.tar.gz) = 
GGMuqQ/JiYR3G0mWovT8Br1fG6szvwN55FI7Rfys9GY=
-SIZE (nsgenbind-0.7-src.tar.gz) = 117110
+SHA256 (nsgenbind-0.8-src.tar.gz) = 
TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=
+SIZE (nsgenbind-0.8-src.tar.gz) = 117463

Reply via email to