Hi, Here is an update to netsurf-3.2, a bugfix release, along wiht its associated libraries.
The patch also fixes a crash bug when encountering certain SSL certs. While here, fix regression tests for hubbub (a library otherwise not updated in this diff), which broke with the json-c update in May. Tested on amd64; tests on other platforms greatly appreciated. Index: browser/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/browser/Makefile,v retrieving revision 1.17 diff -u -p -u -p -r1.17 Makefile --- browser/Makefile 24 Jun 2014 00:03:21 -0000 1.17 +++ browser/Makefile 4 Sep 2014 06:52:55 -0000 @@ -3,7 +3,7 @@ COMMENT = lightweight web browser NETSURF_PROJECT = netsurf -NETSURF_VERSION = 3.1 +NETSURF_VERSION = 3.2 HOMEPAGE= http://www.netsurf-browser.org/ MASTER_SITES = http://download.netsurf-browser.org/netsurf/releases/source/ @@ -12,10 +12,10 @@ MODULES = devel/gettext BUILD_DEPENDS = www/p5-HTML-Parser LIB_DEPENDS = www/netsurf/hubbub>=0.3.0 \ - www/netsurf/libcss>=0.3.0 \ + www/netsurf/libcss>=0.4.0 \ www/netsurf/libnsgif>=0.1.1 \ www/netsurf/libnsbmp>=0.1.1 \ - www/netsurf/libdom>=0.1.0 \ + www/netsurf/libdom>=0.1.1 \ graphics/libwebp \ x11/gtk+2 \ x11/gnome/librsvg \ Index: browser/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/browser/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- browser/distinfo 28 Apr 2014 09:02:15 -0000 1.7 +++ browser/distinfo 4 Sep 2014 06:52:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (netsurf-3.1-src.tar.gz) = HvErLivGj57/hGVka3NZ48tIPhBCrtdQzCg6cN1MVAw= -SIZE (netsurf-3.1-src.tar.gz) = 2996436 +SHA256 (netsurf-3.2-src.tar.gz) = BP/rgzXFnLwjNxt5rjsXgALm6Vw1Il72LbSxVezH4hM= +SIZE (netsurf-3.2-src.tar.gz) = 3232987 Index: browser/patches/patch-Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/browser/patches/patch-Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-Makefile --- browser/patches/patch-Makefile 3 May 2013 07:32:34 -0000 1.5 +++ browser/patches/patch-Makefile 4 Sep 2014 06:52:55 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile,v 1.5 2013/05/03 07:32:34 bentley Exp $ ---- Makefile.orig Fri Apr 19 14:27:45 2013 -+++ Makefile Thu Apr 25 01:11:09 2013 -@@ -404,7 +404,7 @@ endef +--- Makefile.orig Tue Aug 26 08:57:21 2014 ++++ Makefile Sat Aug 30 19:00:07 2014 +@@ -447,7 +447,7 @@ endef # Set up the WARNFLAGS here so that they can be overridden in the Makefile.config WARNFLAGS = -W -Wall -Wundef -Wpointer-arith \ -Wcast-align -Wwrite-strings -Wstrict-prototypes \ Index: browser/patches/patch-content_fetchers_curl_c =================================================================== RCS file: browser/patches/patch-content_fetchers_curl_c diff -N browser/patches/patch-content_fetchers_curl_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ browser/patches/patch-content_fetchers_curl_c 4 Sep 2014 06:52:55 -0000 @@ -0,0 +1,83 @@ +$OpenBSD$ +memcpy and terminate from openssl buffers. +Fixes crash on certain invalid SSL certificates. + +From upstream commit c695d3d0074687e767b68ca9d1412a5bc5303178 +--- content/fetchers/curl.c.orig Tue Aug 26 08:57:21 2014 ++++ content/fetchers/curl.c Thu Sep 4 00:03:08 2014 +@@ -921,10 +921,12 @@ void fetch_curl_done(CURL *curl_handle, CURLcode resul + BIO_get_mem_ptr(mem, &buf); + (void) BIO_set_close(mem, BIO_NOCLOSE); + BIO_free(mem); +- snprintf(ssl_certs[i].not_before, +- min(sizeof ssl_certs[i].not_before, +- (unsigned) buf->length + 1), +- "%s", buf->data); ++ memcpy(ssl_certs[i].not_before, ++ buf->data, ++ min(sizeof(ssl_certs[i].not_before) - 1, ++ (unsigned)buf->length)); ++ ssl_certs[i].not_before[min(sizeof(ssl_certs[i].not_before) - 1, ++ (unsigned)buf->length)] = 0; + BUF_MEM_free(buf); + + mem = BIO_new(BIO_s_mem()); +@@ -933,10 +935,13 @@ void fetch_curl_done(CURL *curl_handle, CURLcode resul + BIO_get_mem_ptr(mem, &buf); + (void) BIO_set_close(mem, BIO_NOCLOSE); + BIO_free(mem); +- snprintf(ssl_certs[i].not_after, +- min(sizeof ssl_certs[i].not_after, +- (unsigned) buf->length + 1), +- "%s", buf->data); ++ memcpy(ssl_certs[i].not_after, ++ buf->data, ++ min(sizeof(ssl_certs[i].not_after) - 1, ++ (unsigned)buf->length)); ++ ssl_certs[i].not_after[min(sizeof(ssl_certs[i].not_after) - 1, ++ (unsigned)buf->length)] = 0; ++ + BUF_MEM_free(buf); + + ssl_certs[i].sig_type = +@@ -952,24 +957,30 @@ void fetch_curl_done(CURL *curl_handle, CURLcode resul + BIO_get_mem_ptr(mem, &buf); + (void) BIO_set_close(mem, BIO_NOCLOSE); + BIO_free(mem); +- snprintf(ssl_certs[i].issuer, +- min(sizeof ssl_certs[i].issuer, +- (unsigned) buf->length + 1), +- "%s", buf->data); ++ memcpy(ssl_certs[i].issuer, ++ buf->data, ++ min(sizeof(ssl_certs[i].issuer) - 1, ++ (unsigned) buf->length)); ++ ssl_certs[i].issuer[min(sizeof(ssl_certs[i].issuer) - 1, ++ (unsigned) buf->length)] = 0; + BUF_MEM_free(buf); + + mem = BIO_new(BIO_s_mem()); + X509_NAME_print_ex(mem, + X509_get_subject_name(certs[i].cert), +- 0, XN_FLAG_SEP_CPLUS_SPC | +- XN_FLAG_DN_REV | XN_FLAG_FN_NONE); ++ 0, ++ XN_FLAG_SEP_CPLUS_SPC | ++ XN_FLAG_DN_REV | ++ XN_FLAG_FN_NONE); + BIO_get_mem_ptr(mem, &buf); + (void) BIO_set_close(mem, BIO_NOCLOSE); + BIO_free(mem); +- snprintf(ssl_certs[i].subject, +- min(sizeof ssl_certs[i].subject, +- (unsigned) buf->length + 1), +- "%s", buf->data); ++ memcpy(ssl_certs[i].subject, ++ buf->data, ++ min(sizeof(ssl_certs[i].subject) - 1, ++ (unsigned)buf->length)); ++ ssl_certs[i].subject[min(sizeof(ssl_certs[i].subject) - 1, ++ (unsigned) buf->length)] = 0; + BUF_MEM_free(buf); + + ssl_certs[i].cert_type = Index: browser/patches/patch-gtk_res_options_gtk2_ui =================================================================== RCS file: browser/patches/patch-gtk_res_options_gtk2_ui diff -N browser/patches/patch-gtk_res_options_gtk2_ui --- browser/patches/patch-gtk_res_options_gtk2_ui 31 May 2013 16:18:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,1078 +0,0 @@ -$OpenBSD: patch-gtk_res_options_gtk2_ui,v 1.1 2013/05/31 16:18:41 jturner Exp $ ---- gtk/res/options.gtk2.ui.orig Thu May 30 11:43:15 2013 -+++ gtk/res/options.gtk2.ui Thu May 30 11:43:21 2013 -@@ -4,7 +4,7 @@ - <!-- interface-naming-policy project-wide --> - <object class="GtkDialog" id="dialogPreferences"> - <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> -@@ -49,7 +49,7 @@ - <child> - <object class="GtkLabel" id="label_startup_page"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesStartupPage</property> -+ <property name="label" translatable="yes">Page:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -84,7 +84,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> -@@ -99,7 +99,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> -@@ -125,7 +125,7 @@ - <child type="label"> - <object class="GtkLabel" id="label_main_startup"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesStartup</property> -+ <property name="label" translatable="yes"><b>Startup</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -154,7 +154,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> -@@ -173,7 +173,7 @@ - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesSearchProvider</property> -+ <property name="label" translatable="yes">Provider:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -210,7 +210,7 @@ - <child type="label"> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesSearch</property> -+ <property name="label" translatable="yes"><b>Search</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -239,7 +239,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> -@@ -254,7 +254,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> -@@ -274,7 +274,7 @@ - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesDownloadsLocation</property> -+ <property name="label" translatable="yes">Location:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -305,7 +305,7 @@ - <child type="label"> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesDownloads</property> -+ <property name="label" translatable="yes"><b>Downloads</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -321,7 +321,7 @@ - <child type="tab"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesMainTabtitle</property> -+ <property name="label" translatable="yes">Main</property> - </object> - <packing> - <property name="tab_fill">False</property> -@@ -366,7 +366,7 @@ - </child> - <child> - <object class="GtkButton" id="buttonAddTheme"> -- <property name="label" translatable="yes">preferencesThemesAdd</property> -+ <property name="label" translatable="yes">Add Theme...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> -@@ -385,7 +385,7 @@ - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesThemes</property> -+ <property name="label" translatable="yes"><b>Themes</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -414,7 +414,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> -@@ -428,7 +428,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> -@@ -442,7 +442,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> -@@ -461,7 +461,7 @@ - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesTabsPosition</property> -+ <property name="label" translatable="yes">Position:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -498,7 +498,7 @@ - <child type="label"> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesTabs</property> -+ <property name="label" translatable="yes"><b>Tabs</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -529,7 +529,7 @@ - <object class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="xalign">0</property> -- <property name="label" translatable="yes">preferencesSourceOpen</property> -+ <property name="label" translatable="yes">Open source view in new:</property> - </object> - <packing> - <property name="position">0</property> -@@ -540,7 +540,7 @@ - <property name="visible">True</property> - <child> - <object class="GtkRadioButton" id="sourceButtonWindow"> -- <property name="label" translatable="yes">preferencesSourceWindow</property> -+ <property name="label" translatable="yes">window</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> -@@ -556,7 +556,7 @@ - </child> - <child> - <object class="GtkRadioButton" id="sourceButtonTab"> -- <property name="label" translatable="yes">preferencesSourceTab</property> -+ <property name="label" translatable="yes">tab</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> -@@ -581,7 +581,7 @@ - <child type="label"> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesSource</property> -+ <property name="label" translatable="yes"><b>Source</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -610,7 +610,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> -@@ -629,7 +629,7 @@ - <child type="label"> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesURLbar</property> -+ <property name="label" translatable="yes"><b>URLbar</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -663,7 +663,7 @@ - <child> - <object class="GtkLabel" id="label16"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesToolbarButtons</property> -+ <property name="label" translatable="yes">Buttons:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -699,7 +699,7 @@ - <child type="label"> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesToolbar</property> -+ <property name="label" translatable="yes"><b>Toolbar</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -718,7 +718,7 @@ - <child type="tab"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesAppearanceTabtitle</property> -+ <property name="label" translatable="yes">Appearance</property> - </object> - <packing> - <property name="position">1</property> -@@ -748,7 +748,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> -@@ -764,7 +764,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> -@@ -780,7 +780,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> -@@ -796,7 +796,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> -@@ -812,7 +812,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> -@@ -831,7 +831,7 @@ - <child> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesControlLoad</property> -+ <property name="label" translatable="yes">Load and display</property> - </object> - <packing> - <property name="expand">False</property> -@@ -867,7 +867,7 @@ - <child type="label"> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesControl</property> -+ <property name="label" translatable="yes"><b>Control</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -896,7 +896,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> -@@ -915,7 +915,7 @@ - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</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> -@@ -927,7 +927,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="adjustment">adjustment_animation_time</property> - <property name="climb_rate">1</property> -@@ -954,7 +954,7 @@ - <child type="label"> - <object class="GtkLabel" id="label18"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesAnimation</property> -+ <property name="label" translatable="yes"><b>Animation</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -987,7 +987,7 @@ - <child> - <object class="GtkLabel" id="label26"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesFontsDefault</property> -+ <property name="label" translatable="yes">Default</property> - </object> - <packing> - <property name="expand">False</property> -@@ -1023,7 +1023,7 @@ - <child> - <object class="GtkLabel" id="label27"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesFontsSize</property> -+ <property name="label" translatable="yes">Size</property> - </object> - <packing> - <property name="expand">False</property> -@@ -1035,7 +1035,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> -@@ -1059,7 +1059,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> -@@ -1079,7 +1079,7 @@ - <child type="label"> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesFonts</property> -+ <property name="label" translatable="yes"><b>Fonts</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1112,7 +1112,7 @@ - <child> - <object class="GtkLabel" id="label21"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesLanguagePreferred</property> -+ <property name="label" translatable="yes">Preferred language:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -1123,7 +1123,7 @@ - <object class="GtkComboBox" id="comboboxLanguage"> - <property name="visible">True</property> - <property name="has_tooltip">True</property> -- <property name="tooltip_text" translatable="yes">preferencesLanguagePreferredTooltip</property> -+ <property name="tooltip_text" translatable="yes">set preferred language for web pages</property> - <property name="model">liststore_content_language</property> - <signal name="changed" handler="nsgtk_preferences_comboboxLanguage_changed"/> - <signal name="realize" handler="nsgtk_preferences_comboboxLanguage_realize"/> -@@ -1160,7 +1160,7 @@ - <child type="label"> - <object class="GtkLabel" id="label25"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesLanguage</property> -+ <property name="label" translatable="yes"><b>Language</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1178,7 +1178,7 @@ - <child type="tab"> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesContentTabtitle</property> -+ <property name="label" translatable="yes">Content</property> - </object> - <packing> - <property name="position">2</property> -@@ -1208,7 +1208,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> -@@ -1222,7 +1222,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> -@@ -1241,7 +1241,7 @@ - <child type="label"> - <object class="GtkLabel" id="label61"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesGeneral</property> -+ <property name="label" translatable="yes"><b>General</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1270,7 +1270,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> -@@ -1289,7 +1289,7 @@ - <child> - <object class="GtkLabel" id="label28"> - <property name="visible">True</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> -@@ -1318,7 +1318,7 @@ - <child> - <object class="GtkLabel" id="label29"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesHistoryDays</property> -+ <property name="label" translatable="yes">days</property> - </object> - <packing> - <property name="expand">False</property> -@@ -1337,7 +1337,7 @@ - <child type="label"> - <object class="GtkLabel" id="label23"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesHistory</property> -+ <property name="label" translatable="yes"><b>History</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1375,7 +1375,7 @@ - <object class="GtkLabel" id="label30"> - <property name="visible">True</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> -@@ -1385,7 +1385,7 @@ - <object class="GtkLabel" id="label31"> - <property name="visible">True</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> -@@ -1397,7 +1397,7 @@ - <object class="GtkLabel" id="label34"> - <property name="visible">True</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> -@@ -1467,7 +1467,7 @@ - <object class="GtkLabel" id="label32"> - <property name="visible">True</property> - <property name="xalign">0</property> -- <property name="label" translatable="no">MB</property> -+ <property name="label" translatable="yes">MB</property> - </object> - <packing> - <property name="left_attach">2</property> -@@ -1479,7 +1479,7 @@ - <object class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="xalign">0</property> -- <property name="label" translatable="no">MB</property> -+ <property name="label" translatable="yes">MB</property> - </object> - <packing> - <property name="left_attach">2</property> -@@ -1493,7 +1493,7 @@ - <object class="GtkLabel" id="label35"> - <property name="visible">True</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> -@@ -1516,7 +1516,7 @@ - </child> - <child> - <object class="GtkButton" id="buttonCacheMaintinance"> -- <property name="label" translatable="yes">preferencesCacheMaintinance</property> -+ <property name="label" translatable="yes">Maintinance</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> -@@ -1538,7 +1538,7 @@ - <child type="label"> - <object class="GtkLabel" id="label24"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesCache</property> -+ <property name="label" translatable="yes"><b>Cache</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1557,7 +1557,7 @@ - <child type="tab"> - <object class="GtkLabel" id="label22"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesPrivacyTabtitle</property> -+ <property name="label" translatable="yes">Privacy</property> - </object> - <packing> - <property name="position">3</property> -@@ -1591,7 +1591,7 @@ - <object class="GtkLabel" id="label42"> - <property name="visible">True</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> -@@ -1601,7 +1601,7 @@ - <object class="GtkLabel" id="label43"> - <property name="visible">True</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> -@@ -1613,7 +1613,7 @@ - <object class="GtkLabel" id="label44"> - <property name="visible">True</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> -@@ -1625,7 +1625,7 @@ - <object class="GtkLabel" id="label45"> - <property name="visible">True</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> -@@ -1637,7 +1637,7 @@ - <object class="GtkComboBox" id="comboProxyType"> - <property name="visible">True</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"/> - <signal name="realize" handler="nsgtk_preferences_comboProxyType_realize"/> -@@ -1662,7 +1662,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> - <signal name="changed" handler="nsgtk_preferences_entryProxyHost_changed"/> - <signal name="realize" handler="nsgtk_preferences_entryProxyHost_realize"/> -@@ -1674,7 +1674,7 @@ - <child> - <object class="GtkLabel" id="label46"> - <property name="visible">True</property> -- <property name="label" translatable="no">:</property> -+ <property name="label" translatable="yes">:</property> - </object> - <packing> - <property name="expand">False</property> -@@ -1686,7 +1686,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> -@@ -1715,7 +1715,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> - <signal name="changed" handler="nsgtk_preferences_entryProxyUser_changed"/> - <signal name="realize" handler="nsgtk_preferences_entryProxyUser_realize"/> -@@ -1732,7 +1732,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">Password to access the proxy</property> - <property name="visibility">False</property> - <property name="invisible_char">●</property> - <signal name="changed" handler="nsgtk_preferences_entryProxyPassword_changed"/> -@@ -1752,7 +1752,7 @@ - <child type="label"> - <object class="GtkLabel" id="label37"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesProxy</property> -+ <property name="label" translatable="yes"><b>HTTP Proxy</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1785,7 +1785,7 @@ - <object class="GtkLabel" id="label39"> - <property name="visible">True</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> -@@ -1795,7 +1795,7 @@ - <object class="GtkLabel" id="label40"> - <property name="visible">True</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> -@@ -1807,7 +1807,7 @@ - <object class="GtkLabel" id="label41"> - <property name="visible">True</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> -@@ -1820,7 +1820,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="adjustment">adjustment_fetching_max</property> -@@ -1840,7 +1840,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="adjustment">adjustment_fetching_perhost</property> -@@ -1862,7 +1862,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="adjustment">adjustment_fetching_cached</property> -@@ -1886,7 +1886,7 @@ - <child type="label"> - <object class="GtkLabel" id="label38"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesFetching</property> -+ <property name="label" translatable="yes"><b>Fetching</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -1905,7 +1905,7 @@ - <child type="tab"> - <object class="GtkLabel" id="label36"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesNetworkTabtitle</property> -+ <property name="label" translatable="yes">Network</property> - </object> - <packing> - <property name="position">4</property> -@@ -1935,7 +1935,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> -@@ -1949,7 +1949,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> -@@ -1963,7 +1963,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> -@@ -1982,7 +1982,7 @@ - <child> - <object class="GtkLabel" id="label59"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesAppearanceScale</property> -+ <property name="label" translatable="yes">Scale output</property> - </object> - <packing> - <property name="expand">False</property> -@@ -2011,7 +2011,7 @@ - <child> - <object class="GtkLabel" id="label60"> - <property name="visible">True</property> -- <property name="label" translatable="no">%</property> -+ <property name="label" translatable="yes">%</property> - </object> - <packing> - <property name="expand">False</property> -@@ -2030,7 +2030,7 @@ - <child type="label"> - <object class="GtkLabel" id="label48"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesAppearance</property> -+ <property name="label" translatable="yes"><b>Appearance</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -2063,7 +2063,7 @@ - <child> - <object class="GtkLabel" id="label62"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesMarginsMeasurements</property> -+ <property name="label" translatable="yes">measurements in mm</property> - </object> - <packing> - <property name="expand">False</property> -@@ -2275,7 +2275,7 @@ - <child type="label"> - <object class="GtkLabel" id="label49"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesMargins</property> -+ <property name="label" translatable="yes"><b>Margins</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -2304,7 +2304,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> -@@ -2318,7 +2318,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> -@@ -2337,7 +2337,7 @@ - <child type="label"> - <object class="GtkLabel" id="label50"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesGeneration</property> -+ <property name="label" translatable="yes"><b>Generation</b></property> - <property name="use_markup">True</property> - </object> - </child> -@@ -2356,7 +2356,7 @@ - <child type="tab"> - <object class="GtkLabel" id="label47"> - <property name="visible">True</property> -- <property name="label" translatable="yes">preferencesPDFTabtitle</property> -+ <property name="label" translatable="yes">PDF</property> - </object> - <packing> - <property name="position">5</property> -@@ -2421,67 +2421,67 @@ - </columns> - <data> - <row> -- <col id="0" translatable="no">Google</col> -+ <col id="0" translatable="yes">Google</col> - </row> - <row> -- <col id="0" translatable="no">Yahoo!</col> -+ <col id="0" translatable="yes">Yahoo!</col> - </row> - <row> -- <col id="0" translatable="no">Microsoft Live</col> -+ <col id="0" translatable="yes">Microsoft Live</col> - </row> - <row> -- <col id="0" translatable="no">Buisiness.com</col> -+ <col id="0" translatable="yes">Buisiness.com</col> - </row> - <row> -- <col id="0" translatable="no">Omgili</col> -+ <col id="0" translatable="yes">Omgili</col> - </row> - <row> -- <col id="0" translatable="no">BBC News</col> -+ <col id="0" translatable="yes">BBC News</col> - </row> - <row> -- <col id="0" translatable="no">Ubuntu Packages</col> -+ <col id="0" translatable="yes">Ubuntu Packages</col> - </row> - <row> -- <col id="0" translatable="no">Creative Commons</col> -+ <col id="0" translatable="yes">Creative Commons</col> - </row> - <row> -- <col id="0" translatable="no">Ask</col> -+ <col id="0" translatable="yes">Ask</col> - </row> - <row> -- <col id="0" translatable="no">Answers</col> -+ <col id="0" translatable="yes">Answers</col> - </row> - <row> -- <col id="0" translatable="no">Dictionary.com</col> -+ <col id="0" translatable="yes">Dictionary.com</col> - </row> - <row> -- <col id="0" translatable="no">YouTube</col> -+ <col id="0" translatable="yes">YouTube</col> - </row> - <row> -- <col id="0" translatable="no">AeroMP3</col> -+ <col id="0" translatable="yes">AeroMP3</col> - </row> - <row> -- <col id="0" translatable="no">AOL</col> -+ <col id="0" translatable="yes">AOL</col> - </row> - <row> -- <col id="0" translatable="no">Baidu</col> -+ <col id="0" translatable="yes">Baidu</col> - </row> - <row> -- <col id="0" translatable="no">Amazon</col> -+ <col id="0" translatable="yes">Amazon</col> - </row> - <row> -- <col id="0" translatable="no">Ebay</col> -+ <col id="0" translatable="yes">Ebay</col> - </row> - <row> -- <col id="0" translatable="no">IMBD</col> -+ <col id="0" translatable="yes">IMBD</col> - </row> - <row> -- <col id="0" translatable="no">ESPN</col> -+ <col id="0" translatable="yes">ESPN</col> - </row> - <row> -- <col id="0" translatable="no">Wikipedia</col> -+ <col id="0" translatable="yes">Wikipedia</col> - </row> - <row> -- <col id="0" translatable="no">DuckDuckGo</col> -+ <col id="0" translatable="yes">DuckDuckGo</col> - </row> - </data> - </object> -@@ -2492,16 +2492,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> -@@ -2512,16 +2512,16 @@ - </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> -@@ -2532,16 +2532,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> -@@ -2552,19 +2552,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> -@@ -2580,19 +2580,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> -@@ -2694,7 +2694,7 @@ - </columns> - <data> - <row> -- <col id="0" translatable="yes">preferencesThemeTypeDefault</col> -+ <col id="0" translatable="yes">Default</col> - </row> - </data> - </object> Index: browser/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v retrieving revision 1.6 diff -u -p -u -p -r1.6 PLIST --- browser/pkg/PLIST 28 Apr 2014 09:02:15 -0000 1.6 +++ browser/pkg/PLIST 4 Sep 2014 06:52:55 -0000 @@ -2,19 +2,19 @@ @bin bin/netsurf share/netsurf/ 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 @@ -25,9 +25,7 @@ share/netsurf/fr/ share/netsurf/fr/Messages share/netsurf/gtkdefault.css share/netsurf/history.gtk2.ui -share/netsurf/history.gtk3.ui share/netsurf/hotlist.gtk2.ui -share/netsurf/hotlist.gtk3.ui share/netsurf/icons/ share/netsurf/icons/arrow-l.png share/netsurf/icons/content.png @@ -45,27 +43,19 @@ share/netsurf/it/welcome.html share/netsurf/ja/ share/netsurf/ja/welcome.html share/netsurf/languages -share/netsurf/license +share/netsurf/licence.html share/netsurf/login.gtk2.ui -share/netsurf/login.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/ share/netsurf/nl/Messages share/netsurf/options.gtk2.ui -share/netsurf/options.gtk3.ui share/netsurf/password.gtk2.ui -share/netsurf/password.gtk3.ui share/netsurf/quirks.css -share/netsurf/source.gtk2.ui -share/netsurf/source.gtk3.ui share/netsurf/ssl.gtk2.ui -share/netsurf/ssl.gtk3.ui share/netsurf/tabcontents.gtk2.ui -share/netsurf/tabcontents.gtk3.ui share/netsurf/themelist share/netsurf/themes/ share/netsurf/themes/Alpha.png @@ -110,7 +100,7 @@ share/netsurf/throbber/throbber6.png share/netsurf/throbber/throbber7.png share/netsurf/throbber/throbber8.png share/netsurf/toolbar.gtk2.ui -share/netsurf/toolbar.gtk3.ui share/netsurf/toolbarIndices +share/netsurf/viewdata.gtk2.ui share/netsurf/warning.gtk2.ui -share/netsurf/warning.gtk3.ui +share/netsurf/welcome.html Index: buildsystem/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/buildsystem/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- buildsystem/Makefile 28 Apr 2014 09:02:15 -0000 1.3 +++ buildsystem/Makefile 4 Sep 2014 06:52:55 -0000 @@ -3,7 +3,7 @@ COMMENT = makefiles for building NetSurf NETSURF_PROJECT = buildsystem -NETSURF_VERSION = 1.1 +NETSURF_VERSION = 1.2 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.2 diff -u -p -u -p -r1.2 distinfo --- buildsystem/distinfo 28 Apr 2014 09:02:15 -0000 1.2 +++ buildsystem/distinfo 4 Sep 2014 06:52:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (buildsystem-1.1.tar.gz) = XAkq/mU9HGwPrbOcxHZZRx5HQf3SgDEnvkLbQmTjrEQ= -SIZE (buildsystem-1.1.tar.gz) = 38814 +SHA256 (buildsystem-1.2.tar.gz) = OQOkoVUcnCAuHSBHNExPNZjI2dbDXr+MwuGIdL0MnWE= +SIZE (buildsystem-1.2.tar.gz) = 38914 Index: hubbub/patches/patch-Makefile =================================================================== RCS file: hubbub/patches/patch-Makefile diff -N hubbub/patches/patch-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ hubbub/patches/patch-Makefile 4 Sep 2014 06:52:55 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ +--- Makefile.orig Thu Sep 4 00:19:34 2014 ++++ Makefile Thu Sep 4 00:20:49 2014 +@@ -47,12 +47,12 @@ ifeq ($(WANT_TEST),yes) + # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/ + ifneq ($(PKGCONFIG),) + TESTCFLAGS := $(TESTCFLAGS) \ +- $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json) ++ $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json-c) + TESTLDFLAGS := $(TESTLDFLAGS) \ +- $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json) ++ $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json-c) + else +- TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json +- TESTLDFLAGS := $(TESTLDFLAGS) -ljson ++ TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json-c ++ TESTLDFLAGS := $(TESTLDFLAGS) -ljson-c + endif + + ifneq ($(GCCVER),2) Index: libcss/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 Makefile --- libcss/Makefile 28 Apr 2014 09:02:15 -0000 1.12 +++ libcss/Makefile 4 Sep 2014 06:52:55 -0000 @@ -3,9 +3,9 @@ COMMENT = CSS parser and selection engine NETSURF_PROJECT = libcss -NETSURF_VERSION = 0.3.0 +NETSURF_VERSION = 0.4.0 -SHARED_LIBS = css 3.0 #0.3.0 +SHARED_LIBS = css 4.0 #0.4.0 MODULES = converters/libiconv Index: libcss/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- libcss/distinfo 28 Apr 2014 09:02:15 -0000 1.7 +++ libcss/distinfo 4 Sep 2014 06:52:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (libcss-0.3.0-src.tar.gz) = QGXb/fyZJuFKLw8sYA/HKrrJe9IHaaxqkIrFAibpXho= -SIZE (libcss-0.3.0-src.tar.gz) = 460316 +SHA256 (libcss-0.4.0-src.tar.gz) = C+lQnZ01Kr3uyHdkwfi6E5UNncT2OsreBHcgm3/SF0g= +SIZE (libcss-0.4.0-src.tar.gz) = 461842 Index: libcss/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/netsurf/libcss/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- libcss/pkg/PLIST 3 May 2013 07:32:34 -0000 1.3 +++ libcss/pkg/PLIST 4 Sep 2014 06:52:55 -0000 @@ -12,5 +12,4 @@ include/libcss/select.h include/libcss/stylesheet.h include/libcss/types.h @lib lib/libcss.so.${LIBcss_VERSION} -lib/pkgconfig/ lib/pkgconfig/libcss.pc Index: libdom/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libdom/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- libdom/Makefile 28 Apr 2014 09:02:15 -0000 1.4 +++ libdom/Makefile 4 Sep 2014 06:52:55 -0000 @@ -3,9 +3,9 @@ COMMENT = W3C DOM implementation NETSURF_PROJECT = libdom -NETSURF_VERSION = 0.1.0 +NETSURF_VERSION = 0.1.1 -SHARED_LIBS = dom 0.1 #0.1.0 +SHARED_LIBS = dom 0.2 #0.1.1 MODULES = converters/libiconv Index: libdom/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libdom/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- libdom/distinfo 28 Apr 2014 09:02:15 -0000 1.2 +++ libdom/distinfo 4 Sep 2014 06:52:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (libdom-0.1.0-src.tar.gz) = I1/ei8/PceMlwTRKz7mV1dWeHY6/y5yHwa79GgjI+uY= -SIZE (libdom-0.1.0-src.tar.gz) = 806688 +SHA256 (libdom-0.1.1-src.tar.gz) = 6GwR4xPN+76WdK0UElCTJA4jovqebwW5lta2VeQMLdQ= +SIZE (libdom-0.1.1-src.tar.gz) = 837694 Index: libdom/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/netsurf/libdom/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- libdom/pkg/PLIST 28 Apr 2014 09:02:15 -0000 1.2 +++ libdom/pkg/PLIST 4 Sep 2014 06:52:55 -0000 @@ -44,24 +44,61 @@ include/dom/events/text_event.h include/dom/events/ui_event.h include/dom/functypes.h include/dom/html/ +include/dom/html/html_anchor_element.h +include/dom/html/html_applet_element.h +include/dom/html/html_area_element.h +include/dom/html/html_base_element.h +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_collection.h +include/dom/html/html_directory_element.h +include/dom/html/html_div_element.h +include/dom/html/html_dlist_element.h include/dom/html/html_document.h include/dom/html/html_element.h +include/dom/html/html_fieldset_element.h +include/dom/html/html_font_element.h include/dom/html/html_form_element.h +include/dom/html/html_frame_element.h +include/dom/html/html_frameset_element.h include/dom/html/html_head_element.h +include/dom/html/html_heading_element.h include/dom/html/html_hr_element.h include/dom/html/html_html_element.h +include/dom/html/html_iframe_element.h +include/dom/html/html_image_element.h include/dom/html/html_input_element.h +include/dom/html/html_isindex_element.h +include/dom/html/html_label_element.h +include/dom/html/html_legend_element.h +include/dom/html/html_li_element.h include/dom/html/html_link_element.h +include/dom/html/html_map_element.h +include/dom/html/html_menu_element.h include/dom/html/html_meta_element.h +include/dom/html/html_mod_element.h +include/dom/html/html_object_element.h +include/dom/html/html_olist_element.h include/dom/html/html_opt_group_element.h include/dom/html/html_option_element.h include/dom/html/html_options_collection.h +include/dom/html/html_paragraph_element.h +include/dom/html/html_param_element.h +include/dom/html/html_pre_element.h +include/dom/html/html_quote_element.h +include/dom/html/html_script_element.h include/dom/html/html_select_element.h +include/dom/html/html_style_element.h +include/dom/html/html_table_element.h +include/dom/html/html_tablecaption_element.h +include/dom/html/html_tablecell_element.h +include/dom/html/html_tablecol_element.h +include/dom/html/html_tablerow_element.h +include/dom/html/html_tablesection_element.h include/dom/html/html_text_area_element.h include/dom/html/html_title_element.h +include/dom/html/html_ulist_element.h @lib lib/libdom.so.${LIBdom_VERSION} -lib/pkgconfig/ lib/pkgconfig/libdom.pc
