Hi, NetSurf 3.3 was released a few days ago.
It has two new dependencies: libnsutils and libutfproc. On a related note, NetSurf now has IDN support. libnsutils' regression tests fail because our scanf() doesn't support POSIX %mc. Other than that I saw no test failures. libcss gets a minor bump. Works well for me on amd64. Test reports on any and all architectures appreciated. ok? -- Anthony J. Bentley
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 3 May 2013 07:32:34 -0000 1.2
+++ Makefile 16 Mar 2015 05:49:10 -0000
@@ -7,7 +7,9 @@
SUBDIR += libdom
SUBDIR += libnsbmp
SUBDIR += libnsgif
+ SUBDIR += libnsutils
SUBDIR += libparserutils
+ SUBDIR += libutf8proc
SUBDIR += libwapcaplet
.include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/netsurf/Makefile.inc,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile.inc
--- Makefile.inc 28 Apr 2014 09:02:15 -0000 1.9
+++ Makefile.inc 16 Mar 2015 05:49:10 -0000
@@ -28,7 +28,7 @@ MAKE_FLAGS += COMPONENT_TYPE=lib-shared
.endfor
.if ${NETSURF_PROJECT} != "buildsystem"
-BUILD_DEPENDS += www/netsurf/buildsystem>=1.1
+BUILD_DEPENDS += www/netsurf/buildsystem>=1.3
MAKE_FLAGS += Q= \
VQ= \
CCOPT= \
Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- browser/Makefile 6 Jan 2015 00:21:57 -0000 1.20
+++ browser/Makefile 16 Mar 2015 05:49:10 -0000
@@ -3,8 +3,7 @@
COMMENT = lightweight web browser
NETSURF_PROJECT = netsurf
-NETSURF_VERSION = 3.2
-REVISION = 1
+NETSURF_VERSION = 3.3
HOMEPAGE= http://www.netsurf-browser.org/
MASTER_SITES =
http://download.netsurf-browser.org/netsurf/releases/source/
@@ -12,11 +11,13 @@ MASTER_SITES = http://download.netsurf-
MODULES = devel/gettext
BUILD_DEPENDS = www/p5-HTML-Parser
-LIB_DEPENDS = www/netsurf/hubbub>=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.1 \
+LIB_DEPENDS = www/netsurf/hubbub>=0.3.1 \
+ www/netsurf/libcss>=0.5.0 \
+ www/netsurf/libnsgif>=0.1.2 \
+ www/netsurf/libnsbmp>=0.1.2 \
+ www/netsurf/libdom>=0.1.2 \
+ www/netsurf/libnsutils \
+ www/netsurf/libutf8proc \
graphics/libwebp \
x11/gtk+2 \
x11/gnome/librsvg \
@@ -29,7 +30,7 @@ WANTLIB += expat fontconfig freetype gdk
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 hubbub jpeg m nsbmp nsgif pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 parserutils png pthread
-WANTLIB += rsvg-2 ssl wapcaplet webp z
+WANTLIB += rsvg-2 ssl utf8proc wapcaplet webp z nsutils
MAKE_FLAGS += NETSURF_USE_HARU_PDF=NO \
NETSURF_USE_LIBICONV_PLUG=NO \
@@ -49,7 +50,7 @@ post-patch:
perl -pi -e "s#>$$c<#>$$v<#" ${WRKSRC}/gtk/res/options.gtk2.ui
; done
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${FILESDIR}/netsurf.desktop \
+ ${INSTALL_DATA} ${WRKSRC}/gtk/res/netsurf-gtk.desktop \
${PREFIX}/share/applications/netsurf.desktop
# bug in pkg_add -u prevents symlink->directory in pkg updates
rm -rf ${PREFIX}/share/netsurf/C
Index: browser/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- browser/distinfo 13 Oct 2014 09:29:20 -0000 1.8
+++ browser/distinfo 16 Mar 2015 05:49:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (netsurf-3.2-src.tar.gz) = BP/rgzXFnLwjNxt5rjsXgALm6Vw1Il72LbSxVezH4hM=
-SIZE (netsurf-3.2-src.tar.gz) = 3232987
+SHA256 (netsurf-3.3-src.tar.gz) = I/kqCUD1d7lgXy5UeG/qNSFoDTLWwA8qPbHq4/KeNoY=
+SIZE (netsurf-3.3-src.tar.gz) = 3198799
Index: browser/files/netsurf.desktop
===================================================================
RCS file: browser/files/netsurf.desktop
diff -N browser/files/netsurf.desktop
--- browser/files/netsurf.desktop 6 Jan 2015 00:21:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-# $OpenBSD: netsurf.desktop,v 1.1 2015/01/06 00:21:57 bentley Exp $
-[Desktop Entry]
-Name=NetSurf Web Browser
-Name[ca]=Navegador web NetSurf
-Name[cs]=NetSurf Webový prohlížeč
-Name[es]=Navegador web NetSurf
-Name[fa]=مرورگر اینترنتی NetSurf
-Name[fi]=NetSurf-selain
-Name[fr]=Navigateur Web NetSurf
-Name[hu]=NetSurf webböngésző
-Name[it]=NetSurf Browser Web
-Name[ja]=NetSurf ウェブ・ブラウザ
-Name[ko]=NetSurf 웹 브라우저
-Name[nb]=NetSurf Nettleser
-Name[nl]=NetSurf webbrowser
-Name[nn]=NetSurf Nettlesar
-Name[no]=NetSurf Nettleser
-Name[pl]=Przeglądarka WWW NetSurf
-Name[pt]=NetSurf Navegador Web
-Name[pt_BR]=Navegador Web NetSurf
-Name[sk]=Internetový prehliadač NetSurf
-Comment=Browse the World Wide Web
-Comment[ca]=Navegueu per el web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[de]=Im Internet surfen
-Comment[es]=Navegue por la web
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Navigue sur Internet
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[sk]=Prehliadanie internetu
-GenericName=Web Browser
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlížeč
-GenericName[es]=Navegador web
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[sk]=Internetový prehliadač
-Exec=netsurf %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=netsurf.png
-Categories=Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png
-StartupWMClass=NetSurf-bin
-StartupNotify=true
Index: browser/patches/patch-Makefile
===================================================================
RCS file: browser/patches/patch-Makefile
diff -N browser/patches/patch-Makefile
--- browser/patches/patch-Makefile 13 Oct 2014 09:29:20 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.6 2014/10/13 09:29:20 bentley Exp $
---- Makefile.orig Tue Aug 26 08:57:21 2014
-+++ Makefile Sat Oct 4 02:23:52 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 \
-- -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
-+ -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs -Wuninitialized
- ifneq ($(CC_MAJOR),2)
- WARNFLAGS += -Wno-unused-parameter
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
--- browser/patches/patch-content_fetchers_curl_c 13 Oct 2014 09:29:20
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,83 +0,0 @@
-$OpenBSD: patch-content_fetchers_curl_c,v 1.1 2014/10/13 09:29:20 bentley Exp $
-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: /cvs/ports/www/netsurf/browser/patches/patch-gtk_res_options_gtk2_ui,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-gtk_res_options_gtk2_ui
--- browser/patches/patch-gtk_res_options_gtk2_ui 22 Oct 2014 09:35:20
-0000 1.3
+++ browser/patches/patch-gtk_res_options_gtk2_ui 16 Mar 2015 05:49:11
-0000
@@ -1,12 +1,970 @@
$OpenBSD: patch-gtk_res_options_gtk2_ui,v 1.3 2014/10/22 09:35:20 landry Exp $
---- gtk/res/options.gtk2.ui.orig Tue Oct 14 21:42:16 2014
-+++ gtk/res/options.gtk2.ui Tue Oct 14 21:42:44 2014
+--- gtk/res/options.gtk2.ui.orig Tue Mar 10 08:37:37 2015
++++ gtk/res/options.gtk2.ui Wed Mar 11 16:35:45 2015
+@@ -5,7 +5,7 @@
+ <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>
+@@ -94,7 +94,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>
+@@ -138,7 +138,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>
+@@ -153,7 +153,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>
+@@ -181,7 +181,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"><b>Startup</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -213,7 +213,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>
+@@ -236,7 +236,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>
+@@ -279,7 +279,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"><b>Search</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -311,7 +311,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>
+@@ -327,7 +327,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>
+@@ -350,7 +350,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>
+@@ -387,7 +387,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"><b>Downloads</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -405,7 +405,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>
+@@ -456,7 +456,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>
+@@ -477,7 +477,7 @@
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
+@@ -509,7 +509,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>
+@@ -525,7 +525,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>
+@@ -541,7 +541,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>
+@@ -564,7 +564,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>
+@@ -607,7 +607,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"><b>Tabs</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -646,7 +646,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>
+@@ -689,7 +689,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"><b>Tools</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -721,7 +721,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>
+@@ -743,7 +743,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"><b>URLbar</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -782,7 +782,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>
+@@ -825,7 +825,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"><b>Toolbar</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -846,7 +846,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>
+@@ -878,7 +878,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>
+@@ -894,7 +894,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>
+@@ -910,7 +910,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>
+@@ -926,7 +926,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>
+@@ -942,7 +942,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>
+@@ -965,7 +965,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>
+@@ -1008,7 +1008,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"><b>Control</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1040,7 +1040,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>
+@@ -1063,7 +1063,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>
+@@ -1076,7 +1076,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>
+@@ -1111,7 +1111,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"><b>Animation</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1150,7 +1150,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>
+@@ -1194,7 +1194,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>
+@@ -1207,7 +1207,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>
+@@ -1237,7 +1237,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>
+@@ -1259,7 +1259,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"><b>Fonts</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1297,7 +1297,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>
+@@ -1310,7 +1310,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"/>
+@@ -1352,7 +1352,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"><b>Language</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1372,7 +1372,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>
+@@ -1404,7 +1404,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>
+@@ -1420,7 +1420,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>
+@@ -1442,7 +1442,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"><b>General</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1474,7 +1474,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>
+@@ -1497,7 +1497,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>
+@@ -1533,7 +1533,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>
+@@ -1556,7 +1556,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"><b>History</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1599,7 +1599,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>
+@@ -1610,7 +1610,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>
+@@ -1623,7 +1623,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>
+@@ -1734,7 +1734,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>
+@@ -1760,7 +1760,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>
+@@ -1786,7 +1786,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"><b>Cache</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -1807,7 +1807,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>
+@@ -1845,7 +1845,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>
+@@ -1856,7 +1856,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>
+@@ -1869,7 +1869,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>
+@@ -1882,7 +1882,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>
+@@ -1895,7 +1895,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"/>
+@@ -1921,7 +1921,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>
+@@ -1953,7 +1953,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>
+@@ -1987,7 +1987,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>
+@@ -2008,7 +2008,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>
+@@ -2030,7 +2030,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>
+@@ -2043,7 +2043,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>
+@@ -2067,7 +2067,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"><b>HTTP
Proxy</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -2105,7 +2105,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>
+@@ -2116,7 +2116,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>
+@@ -2129,7 +2129,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>
+@@ -2142,7 +2142,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>
+@@ -2166,7 +2166,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>
@@ -2192,7 +2192,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">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>
+@@ -2221,7 +2221,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"><b>Fetching</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -2242,7 +2242,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>
+@@ -2274,7 +2274,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>
+@@ -2290,7 +2290,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>
+@@ -2306,7 +2306,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>
+@@ -2329,7 +2329,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>
+@@ -2388,7 +2388,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"><b>Appearance</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -2426,7 +2426,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>
+@@ -2671,7 +2671,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"><b>Margins</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -2703,7 +2703,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>
+@@ -2719,7 +2719,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>
+@@ -2741,7 +2741,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"><b>Generation</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+@@ -2762,7 +2762,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>
+@@ -2861,16 +2861,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>
+@@ -2881,16 +2881,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>
+@@ -2901,16 +2901,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>
+@@ -2921,19 +2921,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>
+@@ -2950,19 +2950,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>
+@@ -3064,7 +3064,7 @@
+ </columns>
+ <data>
+ <row>
+- <col id="0" translatable="yes">preferencesThemeTypeDefault</col>
++ <col id="0" translatable="yes">Default</col>
+ </row>
+ </data>
+ </object>
+@@ -3075,13 +3075,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>
Index: browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- browser/pkg/PLIST 6 Jan 2015 00:21:57 -0000 1.8
+++ browser/pkg/PLIST 16 Mar 2015 05:49:11 -0000
@@ -20,6 +20,7 @@ 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/
@@ -46,6 +47,7 @@ share/netsurf/ja/welcome.html
share/netsurf/languages
share/netsurf/licence.html
share/netsurf/login.gtk2.ui
+share/netsurf/maps.html
share/netsurf/netsurf-16x16.xpm
share/netsurf/netsurf.gtk2.ui
share/netsurf/netsurf.png
Index: buildsystem/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/buildsystem/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- buildsystem/Makefile 13 Oct 2014 09:29:20 -0000 1.4
+++ buildsystem/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,7 +3,7 @@
COMMENT = makefiles for building NetSurf
NETSURF_PROJECT = buildsystem
-NETSURF_VERSION = 1.2
+NETSURF_VERSION = 1.3
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.3
diff -u -p -u -p -r1.3 distinfo
--- buildsystem/distinfo 13 Oct 2014 09:29:20 -0000 1.3
+++ buildsystem/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (buildsystem-1.2.tar.gz) = OQOkoVUcnCAuHSBHNExPNZjI2dbDXr+MwuGIdL0MnWE=
-SIZE (buildsystem-1.2.tar.gz) = 38914
+SHA256 (buildsystem-1.3.tar.gz) = ELvpW6B0diCNpgR708dGhbbmG6mQSXW11cmix5qErHk=
+SIZE (buildsystem-1.3.tar.gz) = 37906
Index: hubbub/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- hubbub/Makefile 28 Apr 2014 09:02:15 -0000 1.13
+++ hubbub/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,15 +3,15 @@
COMMENT = HTML parser
NETSURF_PROJECT = libhubbub
-NETSURF_VERSION = 0.3.0
+NETSURF_VERSION = 0.3.1
PKGNAME = hubbub-${NETSURF_VERSION}
HOMEPAGE = http://www.netsurf-browser.org/projects/hubbub/
-SHARED_LIBS = hubbub 2.0 #0.3.0
+SHARED_LIBS = hubbub 2.0 #0.3.1
MODULES = converters/libiconv
-LIB_DEPENDS = www/netsurf/libparserutils>=0.2.0
+LIB_DEPENDS = www/netsurf/libparserutils>=0.2.1
WANTLIB += parserutils
TEST_DEPENDS = devel/json-c>=0.10
Index: hubbub/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- hubbub/distinfo 28 Apr 2014 09:02:15 -0000 1.6
+++ hubbub/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libhubbub-0.3.0-src.tar.gz) =
2/O1W/JTHSqOcPNwqbOWzHi/1aCS+HvrELBcBP182qc=
-SIZE (libhubbub-0.3.0-src.tar.gz) = 792069
+SHA256 (libhubbub-0.3.1-src.tar.gz) =
H4sx6G0NMnNfJHwHGnreGkdWBrejWD0hMuVnoxC2IFM=
+SIZE (libhubbub-0.3.1-src.tar.gz) = 791945
Index: hubbub/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- hubbub/pkg/PLIST 3 May 2013 07:32:34 -0000 1.2
+++ hubbub/pkg/PLIST 16 Mar 2015 05:49:11 -0000
@@ -7,5 +7,4 @@ include/hubbub/parser.h
include/hubbub/tree.h
include/hubbub/types.h
@lib lib/libhubbub.so.${LIBhubbub_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libhubbub.pc
Index: libcss/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- libcss/Makefile 13 Oct 2014 09:29:20 -0000 1.13
+++ libcss/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,14 +3,14 @@
COMMENT = CSS parser and selection engine
NETSURF_PROJECT = libcss
-NETSURF_VERSION = 0.4.0
+NETSURF_VERSION = 0.5.0
-SHARED_LIBS = css 4.0 #0.4.0
+SHARED_LIBS = css 4.1 #0.5.0
MODULES = converters/libiconv
-LIB_DEPENDS = www/netsurf/libparserutils>=0.2.0 \
- www/netsurf/libwapcaplet>=0.2.1
+LIB_DEPENDS = www/netsurf/libparserutils>=0.2.1 \
+ www/netsurf/libwapcaplet>=0.2.2
WANTLIB += parserutils wapcaplet
.include <bsd.port.mk>
Index: libcss/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- libcss/distinfo 13 Oct 2014 09:29:20 -0000 1.8
+++ libcss/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libcss-0.4.0-src.tar.gz) = C+lQnZ01Kr3uyHdkwfi6E5UNncT2OsreBHcgm3/SF0g=
-SIZE (libcss-0.4.0-src.tar.gz) = 461842
+SHA256 (libcss-0.5.0-src.tar.gz) = 7KoJsH1Oz9RkQWO8DwMyuBqq/7uaNzRl4V5E4GZm+vE=
+SIZE (libcss-0.5.0-src.tar.gz) = 465574
Index: libcss/patches/patch-Makefile
===================================================================
RCS file: libcss/patches/patch-Makefile
diff -N libcss/patches/patch-Makefile
--- libcss/patches/patch-Makefile 3 May 2013 07:32:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2013/05/03 07:32:34 bentley Exp $
-
-gcc3 throws a spurious warning that a variable might be used uninitialized.
-
---- Makefile.orig Thu Apr 25 01:21:19 2013
-+++ Makefile Thu Apr 25 01:21:22 2013
-@@ -18,7 +18,9 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-a
- # BeOS/Haiku/AmigaOS4 standard library headers create warnings
- ifneq ($(TARGET),beos)
- ifneq ($(TARGET),amiga)
-- WARNFLAGS := $(WARNFLAGS) -Werror
-+ ifneq ($(TARGET),OpenBSD)
-+ WARNFLAGS := $(WARNFLAGS) -Werror
-+ endif
- endif
- endif
- CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
Index: libdom/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- libdom/Makefile 13 Oct 2014 09:29:20 -0000 1.5
+++ libdom/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,14 +3,14 @@
COMMENT = W3C DOM implementation
NETSURF_PROJECT = libdom
-NETSURF_VERSION = 0.1.1
+NETSURF_VERSION = 0.1.2
-SHARED_LIBS = dom 0.2 #0.1.1
+SHARED_LIBS = dom 0.2 #0.1.2
MODULES = converters/libiconv
-LIB_DEPENDS = www/netsurf/hubbub>=0.3.0 \
- www/netsurf/libwapcaplet>=0.2.1
+LIB_DEPENDS = www/netsurf/hubbub>=0.3.1 \
+ www/netsurf/libwapcaplet>=0.2.2
WANTLIB += expat hubbub parserutils wapcaplet
TEST_DEPENDS = devel/p5-Switch \
Index: libdom/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- libdom/distinfo 13 Oct 2014 09:29:20 -0000 1.3
+++ libdom/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdom-0.1.1-src.tar.gz) = 6GwR4xPN+76WdK0UElCTJA4jovqebwW5lta2VeQMLdQ=
-SIZE (libdom-0.1.1-src.tar.gz) = 837694
+SHA256 (libdom-0.1.2-src.tar.gz) = nNPPRIdzXDzF1jxf3uBThO7mUxhHYQVkZ2ezTW4H6eg=
+SIZE (libdom-0.1.2-src.tar.gz) = 838332
Index: libnsbmp/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- libnsbmp/Makefile 28 Apr 2014 09:02:15 -0000 1.6
+++ libnsbmp/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,9 +3,9 @@
COMMENT = BMP/ICO decoding library
NETSURF_PROJECT = libnsbmp
-NETSURF_VERSION = 0.1.1
+NETSURF_VERSION = 0.1.2
CATEGORIES = graphics
-SHARED_LIBS = nsbmp 1.0 #0.1.1
+SHARED_LIBS = nsbmp 1.0 #0.1.2
.include <bsd.port.mk>
Index: libnsbmp/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- libnsbmp/distinfo 28 Apr 2014 09:02:15 -0000 1.4
+++ libnsbmp/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsbmp-0.1.1-src.tar.gz) =
WEBGgJ0yE+WRfNJur7AwaMqUJ0Ip9ZXw4FILFfpFT5g=
-SIZE (libnsbmp-0.1.1-src.tar.gz) = 202262
+SHA256 (libnsbmp-0.1.2-src.tar.gz) =
lpuhxPd4tuzuX9g0piBsl7SYhWcziSYP7xBD38opaLE=
+SIZE (libnsbmp-0.1.2-src.tar.gz) = 202303
Index: libnsbmp/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- libnsbmp/pkg/PLIST 3 May 2013 07:32:34 -0000 1.2
+++ libnsbmp/pkg/PLIST 16 Mar 2015 05:49:11 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2013/05/03 07:32:34 bentley Exp $
include/libnsbmp.h
@lib lib/libnsbmp.so.${LIBnsbmp_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libnsbmp.pc
Index: libnsgif/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- libnsgif/Makefile 28 Apr 2014 09:02:15 -0000 1.6
+++ libnsgif/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,9 +3,9 @@
COMMENT = GIF decoding library
NETSURF_PROJECT = libnsgif
-NETSURF_VERSION = 0.1.1
+NETSURF_VERSION = 0.1.2
CATEGORIES = graphics
-SHARED_LIBS = nsgif 0.0 #0.1.1
+SHARED_LIBS = nsgif 0.0 #0.1.2
.include <bsd.port.mk>
Index: libnsgif/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- libnsgif/distinfo 28 Apr 2014 09:02:15 -0000 1.4
+++ libnsgif/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsgif-0.1.1-src.tar.gz) =
1FDqCp2iNEhumXJIswqGUk918QIcpnAXtVl0I89sChU=
-SIZE (libnsgif-0.1.1-src.tar.gz) = 202610
+SHA256 (libnsgif-0.1.2-src.tar.gz) =
3WlIr1wFQiRIm+qktMwTwsT2ldW97n5Y7CNwxTzZ+qU=
+SIZE (libnsgif-0.1.2-src.tar.gz) = 202615
Index: libnsgif/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- libnsgif/pkg/PLIST 3 May 2013 07:32:34 -0000 1.2
+++ libnsgif/pkg/PLIST 16 Mar 2015 05:49:11 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2013/05/03 07:32:34 bentley Exp $
include/libnsgif.h
@lib lib/libnsgif.so.${LIBnsgif_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libnsgif.pc
Index: libparserutils/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- libparserutils/Makefile 28 Apr 2014 09:02:15 -0000 1.6
+++ libparserutils/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,10 +3,10 @@
COMMENT = utility library for parser building
NETSURF_PROJECT = libparserutils
-NETSURF_VERSION = 0.2.0
+NETSURF_VERSION = 0.2.1
CATEGORIES = devel
-SHARED_LIBS = parserutils 2.0 #0.2.0
+SHARED_LIBS = parserutils 2.0 #0.2.1
MODULES = converters/libiconv
Index: libparserutils/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- libparserutils/distinfo 28 Apr 2014 09:02:15 -0000 1.5
+++ libparserutils/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libparserutils-0.2.0-src.tar.gz) =
VcUKu/+q6+F6y6QwCO4sQIVAHOYY5QX6+nx1uqqBPac=
-SIZE (libparserutils-0.2.0-src.tar.gz) = 74431
+SHA256 (libparserutils-0.2.1-src.tar.gz) =
MFieazrfDBS1p43h+6O5uEy9dOleItRYJ/o+CbVj9zU=
+SIZE (libparserutils-0.2.1-src.tar.gz) = 74426
Index: libparserutils/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- libparserutils/pkg/PLIST 3 May 2013 07:32:34 -0000 1.2
+++ libparserutils/pkg/PLIST 16 Mar 2015 05:49:11 -0000
@@ -16,5 +16,4 @@ include/parserutils/utils/buffer.h
include/parserutils/utils/stack.h
include/parserutils/utils/vector.h
@lib lib/libparserutils.so.${LIBparserutils_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libparserutils.pc
Index: libwapcaplet/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- libwapcaplet/Makefile 28 Apr 2014 09:02:16 -0000 1.9
+++ libwapcaplet/Makefile 16 Mar 2015 05:49:11 -0000
@@ -3,10 +3,10 @@
COMMENT = string internment library
NETSURF_PROJECT = libwapcaplet
-NETSURF_VERSION = 0.2.1
+NETSURF_VERSION = 0.2.2
CATEGORIES= devel
-SHARED_LIBS = wapcaplet 2.0 #0.2.1
+SHARED_LIBS = wapcaplet 2.0 #0.2.2
TEST_DEPENDS += devel/check
Index: libwapcaplet/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- libwapcaplet/distinfo 28 Apr 2014 09:02:16 -0000 1.5
+++ libwapcaplet/distinfo 16 Mar 2015 05:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (libwapcaplet-0.2.1-src.tar.gz) =
nkqN89/m1+G8xKPMzhjD0CIwVF9HJrBbCbnlBJRsjsg=
-SIZE (libwapcaplet-0.2.1-src.tar.gz) = 8897
+SHA256 (libwapcaplet-0.2.2-src.tar.gz) =
OAIZkuHms+xQ0NO/et0Gm+5MWxeWka+mp23VhpUgFIU=
+SIZE (libwapcaplet-0.2.2-src.tar.gz) = 8902
Index: libwapcaplet/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- libwapcaplet/pkg/PLIST 3 May 2013 07:32:34 -0000 1.2
+++ libwapcaplet/pkg/PLIST 16 Mar 2015 05:49:11 -0000
@@ -2,5 +2,4 @@
include/libwapcaplet/
include/libwapcaplet/libwapcaplet.h
@lib lib/libwapcaplet.so.${LIBwapcaplet_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libwapcaplet.pc
libnsutils.tar.gz
Description: libnsutils.tar.gz
libutf8proc.tar.gz
Description: libutf8proc.tar.gz
