On Sun, Apr 27, 2014 at 01:06:03AM -0600, Anthony J. Bentley wrote:
> Hi,
>
> Here is an update to netsurf-3.1, along with associated libs.
>
> "NetSurf 3.1 contains many improvements over the previous release. The
> highlights include much faster CSS selection performance, faster start
> up time, new look and feel to the treeviews (hotlist/bookmarks, global
> history and cookie manager), improved options handling, undo/redo
> support in textareas, and general improvement of forms. Also included
> are many other additions, optimisations and bug fixes. We recommend that
> all users upgrade."
>
> MNG support was removed by upstream.
>
> Seems to work fine on i386/amd64. Looking for tests on multiple
> architectures.
>
> ok?
>
>
So far so good on amd64. Loongson is compiling as we speak. I did need
to add:
BUILD_DEPENDS = www/p5-HTML-Parser
to netsurf/browser/Makefile to fix the following during make fake. Even
tho the locales are still not handled correctly (ie our gtk2 ui patch is
still needed).
MSGSPLIT: gtk/en to
/usr/ports/pobj/netsurf-3.1/fake-amd64/usr/local/share/netsurf/
mkdir -p
/usr/ports/pobj/netsurf-3.1/fake-amd64/usr/local/share/netsurf//en
perl utils/split-messages.pl -l en -p gtk -f messages
resources/FatMessages | gzip -9n >
/usr/ports/pobj/netsurf-3.1/fake-amd64/usr/local/share/netsurf//en/Messages
Can't locate HTML/Entities.pm in @INC (you may need to install the
HTML::Entities module) (@INC contains:
/usr/local/libdata/perl5/site_perl/amd64-openbsd
/usr/libdata/perl5/site_perl/amd64-openbsd
/usr/local/libdata/perl5/site_perl /usr/libdata/perl5/site_perl
/usr/libdata/perl5/amd64-openbsd/5.18.2
/usr/local/libdata/perl5/amd64-openbsd/5.18.2 /usr/libdata/perl5
/usr/local/libdata/perl5 .) at utils/split-messages.pl line 235.
BEGIN failed--compilation aborted at utils/split-messages.pl line 235.
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/Makefile.inc,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile.inc
> --- Makefile.inc 16 May 2013 20:48:53 -0000 1.8
> +++ Makefile.inc 27 Apr 2014 05:41:53 -0000
> @@ -28,7 +28,7 @@ MAKE_FLAGS += COMPONENT_TYPE=lib-shared
> .endfor
>
> .if ${NETSURF_PROJECT} != "buildsystem"
> -BUILD_DEPENDS += www/netsurf/buildsystem
> +BUILD_DEPENDS += www/netsurf/buildsystem>=1.1
> MAKE_FLAGS += Q= \
> VQ= \
> CCOPT= \
> Index: browser/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- browser/Makefile 31 May 2013 16:18:40 -0000 1.15
> +++ browser/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,20 +3,18 @@
> COMMENT = lightweight web browser
>
> NETSURF_PROJECT = netsurf
> -NETSURF_VERSION = 3.0
> -REVISION = 0
> +NETSURF_VERSION = 3.1
>
> HOMEPAGE= http://www.netsurf-browser.org/
> MASTER_SITES =
> http://download.netsurf-browser.org/netsurf/releases/source/
>
> MODULES = devel/gettext
>
> -LIB_DEPENDS = www/netsurf/hubbub>=0.2.0 \
> - www/netsurf/libcss>=0.2.0 \
> - www/netsurf/libnsgif>=0.1.0 \
> - www/netsurf/libnsbmp>=0.1.0 \
> - www/netsurf/libdom \
> - graphics/libmng \
> +LIB_DEPENDS = www/netsurf/hubbub>=0.3.0 \
> + www/netsurf/libcss>=0.3.0 \
> + www/netsurf/libnsgif>=0.1.1 \
> + www/netsurf/libnsbmp>=0.1.1 \
> + www/netsurf/libdom>=0.1.0 \
> graphics/libwebp \
> x11/gtk+2 \
> x11/gnome/librsvg \
> @@ -26,7 +24,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamag
> WANTLIB += Xrandr Xrender atk-1.0 c cairo crypto css curl dom
> WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
> WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
> -WANTLIB += gtk-x11-2.0 hubbub jpeg lcms m mng nsbmp nsgif pango-1.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
>
> @@ -37,7 +35,7 @@ MAKE_FLAGS += NETSURF_USE_HARU_PDF=NO \
> NETSURF_USE_ROSPRITE=NO \
> NETSURF_USE_WEBP=YES
>
> -post-install:
> - ln -s en ${PREFIX}/share/netsurf/C
> +#post-install:
> +# ln -s en ${PREFIX}/share/netsurf/C
>
> .include <bsd.port.mk>
> Index: browser/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- browser/distinfo 3 May 2013 07:32:34 -0000 1.6
> +++ browser/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (netsurf-3.0-src.tar.gz) =
> fGpI08w+mj46UbUy3fYPdpfpe/i2Gm07LO0aLon7zMY=
> -SIZE (netsurf-3.0-src.tar.gz) = 2950260
> +SHA256 (netsurf-3.1-src.tar.gz) =
> HvErLivGj57/hGVka3NZ48tIPhBCrtdQzCg6cN1MVAw=
> +SIZE (netsurf-3.1-src.tar.gz) = 2996436
> Index: browser/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- browser/pkg/PLIST 3 May 2013 07:32:34 -0000 1.5
> +++ browser/pkg/PLIST 27 Apr 2014 05:41:53 -0000
> @@ -1,7 +1,11 @@
> @comment $OpenBSD: PLIST,v 1.5 2013/05/03 07:32:34 bentley Exp $
> @bin bin/netsurf
> share/netsurf/
> -share/netsurf/C
> +share/netsurf/C/
> +share/netsurf/C/Messages
> +share/netsurf/C/credits.html
> +share/netsurf/C/licence.html
> +share/netsurf/C/welcome.html
> share/netsurf/SearchEngines
> share/netsurf/adblock.css
> share/netsurf/arrow_down_8x32.png
> @@ -29,8 +33,12 @@ 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
> share/netsurf/icons/directory.png
> +share/netsurf/icons/directory2.png
> +share/netsurf/icons/hotlist-add.png
> +share/netsurf/icons/hotlist-rmv.png
> share/netsurf/icons/search.png
> share/netsurf/internal.css
> share/netsurf/it/
> Index: buildsystem/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/buildsystem/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- buildsystem/Makefile 16 May 2013 20:48:53 -0000 1.2
> +++ buildsystem/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,7 +3,7 @@
> COMMENT = makefiles for building NetSurf
>
> NETSURF_PROJECT = buildsystem
> -NETSURF_VERSION = 1.0
> +NETSURF_VERSION = 1.1
> 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.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- buildsystem/distinfo 3 May 2013 07:29:04 -0000 1.1.1.1
> +++ buildsystem/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (buildsystem-1.0.tar.gz) =
> RJXo4S+vCs5mirgEAQZM5/ZaGV7+Y8kkwGahCWSf8UY=
> -SIZE (buildsystem-1.0.tar.gz) = 37026
> +SHA256 (buildsystem-1.1.tar.gz) =
> XAkq/mU9HGwPrbOcxHZZRx5HQf3SgDEnvkLbQmTjrEQ=
> +SIZE (buildsystem-1.1.tar.gz) = 38814
> Index: buildsystem/patches/patch-makefiles_Makefile_top
> ===================================================================
> RCS file:
> /cvs/ports/www/netsurf/buildsystem/patches/patch-makefiles_Makefile_top,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-makefiles_Makefile_top
> --- buildsystem/patches/patch-makefiles_Makefile_top 3 May 2013 07:29:04
> -0000 1.1.1.1
> +++ buildsystem/patches/patch-makefiles_Makefile_top 27 Apr 2014 05:41:53
> -0000
> @@ -1,6 +1,6 @@
> -$OpenBSD: patch-makefiles_Makefile_top,v 1.1.1.1 2013/05/03 07:29:04 bentley
> Exp $
> ---- makefiles/Makefile.top.orig Fri Apr 19 07:27:32 2013
> -+++ makefiles/Makefile.top Tue Apr 23 16:57:19 2013
> +$OpenBSD$
> +--- makefiles/Makefile.top.orig Sat Apr 26 21:37:19 2014
> ++++ makefiles/Makefile.top Sat Apr 26 21:38:30 2014
> @@ -186,8 +186,8 @@ endif
> ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
> ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
> @@ -33,10 +33,10 @@ $OpenBSD: patch-makefiles_Makefile_top,v
> $(Q)$(SED) \
> - -e 's#PREFIX#$(PREFIX)#' \
> + -e 's#PREFIX#$(TRUEPREFIX)#' \
> + -e 's#LIBDIR#$(LIBDIR)#' \
> -e 's#MAJOR#$(major-version)#' \
> -e 's#MINOR#$(minor-version)#' \
> - -e 's#PATCH#$(patch-version)#' \
> -@@ -301,8 +293,6 @@ endef
> +@@ -302,8 +294,6 @@ endef
> # TODO: Is this scheme portable?
> define install_shared_lib
> $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
> Index: buildsystem/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/buildsystem/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- buildsystem/pkg/PLIST 3 May 2013 07:29:04 -0000 1.1.1.1
> +++ buildsystem/pkg/PLIST 27 Apr 2014 05:41:53 -0000
> @@ -1,5 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2013/05/03 07:29:04 bentley Exp $
> share/netsurf-buildsystem/
> +share/netsurf-buildsystem/citools/
> +share/netsurf-buildsystem/citools/jenkins-build.sh
> share/netsurf-buildsystem/makefiles/
> share/netsurf-buildsystem/makefiles/Makefile.clang
> share/netsurf-buildsystem/makefiles/Makefile.gcc
> Index: hubbub/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- hubbub/Makefile 16 May 2013 20:48:53 -0000 1.12
> +++ hubbub/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,16 +3,15 @@
> COMMENT = HTML parser
>
> NETSURF_PROJECT = libhubbub
> -NETSURF_VERSION = 0.2.0
> +NETSURF_VERSION = 0.3.0
> PKGNAME = hubbub-${NETSURF_VERSION}
> HOMEPAGE = http://www.netsurf-browser.org/projects/hubbub/
> -REVISION = 0
>
> -SHARED_LIBS = hubbub 1.1 #0.2.0
> +SHARED_LIBS = hubbub 2.0 #0.3.0
>
> MODULES = converters/libiconv
>
> -LIB_DEPENDS = www/netsurf/libparserutils>=0.1.2
> +LIB_DEPENDS = www/netsurf/libparserutils>=0.2.0
> WANTLIB += parserutils
>
> TEST_DEPENDS = devel/json-c>=0.10
> Index: hubbub/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- hubbub/distinfo 3 May 2013 07:32:34 -0000 1.5
> +++ hubbub/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libhubbub-0.2.0-src.tar.gz) =
> kckJZf27+5E3x4gbM3NqA/yAvRb1zXgI4e//PWMADq8=
> -SIZE (libhubbub-0.2.0-src.tar.gz) = 792718
> +SHA256 (libhubbub-0.3.0-src.tar.gz) =
> 2/O1W/JTHSqOcPNwqbOWzHi/1aCS+HvrELBcBP182qc=
> +SIZE (libhubbub-0.3.0-src.tar.gz) = 792069
> Index: hubbub/patches/patch-test_parser_c
> ===================================================================
> RCS file: hubbub/patches/patch-test_parser_c
> diff -N hubbub/patches/patch-test_parser_c
> --- hubbub/patches/patch-test_parser_c 3 May 2013 07:32:34 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-test_parser_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/parser.c.orig Thu Apr 25 14:30:21 2013
> -+++ test/parser.c Thu Apr 25 14:33:04 2013
> -@@ -25,7 +25,7 @@ static int run_test(int argc, char **argv, unsigned in
> - hubbub_parser_optparams params;
> - FILE *fp;
> - size_t len, origlen;
> -- uint8_t *buf = alloca(CHUNK_SIZE);
> -+ uint8_t *buf = malloc(CHUNK_SIZE);
> - const char *charset;
> - hubbub_charset_source cssource;
> -
> -@@ -64,6 +64,8 @@ static int run_test(int argc, char **argv, unsigned in
> - assert(len == 0);
> -
> - fclose(fp);
> -+
> -+ free(buf);
> -
> - charset = hubbub_parser_read_charset(parser, &cssource);
> -
> Index: hubbub/patches/patch-test_tokeniser2_c
> ===================================================================
> RCS file: hubbub/patches/patch-test_tokeniser2_c
> diff -N hubbub/patches/patch-test_tokeniser2_c
> --- hubbub/patches/patch-test_tokeniser2_c 3 May 2013 07:32:34 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-test_tokeniser2_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/tokeniser2.c.orig Thu Apr 25 14:31:15 2013
> -+++ test/tokeniser2.c Thu Apr 25 14:31:39 2013
> -@@ -143,7 +143,7 @@ void run_test(context *ctx)
> - if (ctx->last_start_tag != NULL) {
> - /* Fake up a start tag, in PCDATA state */
> - size_t len = strlen(ctx->last_start_tag) + 3;
> -- uint8_t *buf = alloca(len);
> -+ uint8_t *buf = malloc(len);
> -
> - snprintf((char *) buf, len, "<%s>",
> - ctx->last_start_tag);
> -@@ -152,6 +152,8 @@ void run_test(context *ctx)
> - buf, len - 1) == HUBBUB_OK);
> -
> - assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
> -+
> -+ free(buf);
> - }
> -
> - if (ctx->process_cdata) {
> Index: hubbub/patches/patch-test_tokeniser3_c
> ===================================================================
> RCS file: hubbub/patches/patch-test_tokeniser3_c
> diff -N hubbub/patches/patch-test_tokeniser3_c
> --- hubbub/patches/patch-test_tokeniser3_c 3 May 2013 07:32:34 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-test_tokeniser3_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/tokeniser3.c.orig Thu Apr 25 14:31:47 2013
> -+++ test/tokeniser3.c Thu Apr 25 14:32:25 2013
> -@@ -141,7 +141,7 @@ void run_test(context *ctx)
> - if (ctx->last_start_tag != NULL) {
> - /* Fake up a start tag, in PCDATA state */
> - size_t len = strlen(ctx->last_start_tag) + 3;
> -- uint8_t *buf = alloca(len);
> -+ uint8_t *buf = malloc(len);
> -
> - snprintf((char *) buf, len, "<%s>",
> - ctx->last_start_tag);
> -@@ -150,6 +150,8 @@ void run_test(context *ctx)
> - buf, len - 1) == HUBBUB_OK);
> -
> - assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
> -+
> -+ free(buf);
> - }
> -
> - if (ctx->process_cdata) {
> Index: hubbub/patches/patch-test_tree_c
> ===================================================================
> RCS file: hubbub/patches/patch-test_tree_c
> diff -N hubbub/patches/patch-test_tree_c
> --- hubbub/patches/patch-test_tree_c 3 May 2013 07:32:34 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-test_tree_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/tree.c.orig Thu Apr 25 14:32:39 2013
> -+++ test/tree.c Thu Apr 25 14:33:36 2013
> -@@ -91,7 +91,7 @@ static int run_test(int argc, char **argv, unsigned in
> - hubbub_parser_optparams params;
> - FILE *fp;
> - size_t len, origlen;
> -- uint8_t *buf = alloca(CHUNK_SIZE);
> -+ uint8_t *buf = malloc(CHUNK_SIZE);
> - const char *charset;
> - hubbub_charset_source cssource;
> - bool passed = true;
> -@@ -143,6 +143,8 @@ static int run_test(int argc, char **argv, unsigned in
> - assert(len == 0);
> -
> - fclose(fp);
> -+
> -+ free(buf);
> -
> - charset = hubbub_parser_read_charset(parser, &cssource);
> -
> Index: libcss/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 Makefile
> --- libcss/Makefile 16 May 2013 20:48:53 -0000 1.11
> +++ libcss/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,15 +3,14 @@
> COMMENT = CSS parser and selection engine
>
> NETSURF_PROJECT = libcss
> -NETSURF_VERSION = 0.2.0
> -REVISION = 0
> +NETSURF_VERSION = 0.3.0
>
> -SHARED_LIBS = css 2.2 #0.2.0
> +SHARED_LIBS = css 3.0 #0.3.0
>
> MODULES = converters/libiconv
>
> -LIB_DEPENDS = www/netsurf/libparserutils>=0.1.2 \
> - www/netsurf/libwapcaplet>=0.2.0
> +LIB_DEPENDS = www/netsurf/libparserutils>=0.2.0 \
> + www/netsurf/libwapcaplet>=0.2.1
> WANTLIB += parserutils wapcaplet
>
> .include <bsd.port.mk>
> Index: libcss/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- libcss/distinfo 3 May 2013 07:32:34 -0000 1.6
> +++ libcss/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libcss-0.2.0-src.tar.gz) =
> MbCPbyJZNmzK2LRVRA82TcM+fceM2wz0kF2lbVNy9hM=
> -SIZE (libcss-0.2.0-src.tar.gz) = 460004
> +SHA256 (libcss-0.3.0-src.tar.gz) =
> QGXb/fyZJuFKLw8sYA/HKrrJe9IHaaxqkIrFAibpXho=
> +SIZE (libcss-0.3.0-src.tar.gz) = 460316
> Index: libcss/patches/patch-test_css21_c
> ===================================================================
> RCS file: libcss/patches/patch-test_css21_c
> diff -N libcss/patches/patch-test_css21_c
> --- libcss/patches/patch-test_css21_c 3 May 2013 07:32:34 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-test_css21_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/css21.c.orig Thu Apr 25 14:35:19 2013
> -+++ test/css21.c Thu Apr 25 14:36:04 2013
> -@@ -115,7 +115,7 @@ int main(int argc, char **argv)
> -
> - if (error == CSS_OK) {
> - css_stylesheet *import;
> -- char *buf = alloca(lwc_string_length(url) + 1);
> -+ char *buf = malloc(lwc_string_length(url) + 1);
> -
> - memcpy(buf, lwc_string_data(url),
> - lwc_string_length(url));
> -@@ -135,6 +135,8 @@ int main(int argc, char **argv)
> - css_stylesheet_destroy(import);
> -
> - error = CSS_IMPORTS_PENDING;
> -+
> -+ free(buf);
> - }
> - }
> -
> Index: libcss/patches/patch-test_parse-auto_c
> ===================================================================
> RCS file: libcss/patches/patch-test_parse-auto_c
> diff -N libcss/patches/patch-test_parse-auto_c
> --- libcss/patches/patch-test_parse-auto_c 3 May 2013 07:32:34 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-test_parse-auto_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/parse-auto.c.orig Thu Apr 25 14:36:19 2013
> -+++ test/parse-auto.c Thu Apr 25 14:36:43 2013
> -@@ -409,7 +409,7 @@ void run_test(const uint8_t *data, size_t len, exp_ent
> -
> - if (error == CSS_OK) {
> - css_stylesheet *import;
> -- char *buf = alloca(lwc_string_length(url) + 1);
> -+ char *buf = malloc(lwc_string_length(url) + 1);
> -
> - memcpy(buf, lwc_string_data(url),
> - lwc_string_length(url));
> -@@ -425,6 +425,8 @@ void run_test(const uint8_t *data, size_t len, exp_ent
> -
> - error = CSS_IMPORTS_PENDING;
> - lwc_string_unref(url);
> -+
> -+ free(buf);
> - }
> - }
> -
> Index: libdom/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libdom/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- libdom/Makefile 16 May 2013 20:48:53 -0000 1.3
> +++ libdom/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,15 +3,14 @@
> COMMENT = W3C DOM implementation
>
> NETSURF_PROJECT = libdom
> -NETSURF_VERSION = 0.0.1
> -REVISION = 0
> +NETSURF_VERSION = 0.1.0
>
> -SHARED_LIBS = dom 0.0 #0.0.1
> +SHARED_LIBS = dom 0.1 #0.1.0
>
> MODULES = converters/libiconv
>
> -LIB_DEPENDS = www/netsurf/hubbub>=0.2.0 \
> - www/netsurf/libwapcaplet>=0.2.0
> +LIB_DEPENDS = www/netsurf/hubbub>=0.3.0 \
> + www/netsurf/libwapcaplet>=0.2.1
> 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.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- libdom/distinfo 3 May 2013 07:30:10 -0000 1.1.1.1
> +++ libdom/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libdom-0.0.1-src.tar.gz) =
> KqdYYcioKRtrPRo4VsZcphVnev7sZMz981oROiksNrE=
> -SIZE (libdom-0.0.1-src.tar.gz) = 804517
> +SHA256 (libdom-0.1.0-src.tar.gz) =
> I1/ei8/PceMlwTRKz7mV1dWeHY6/y5yHwa79GgjI+uY=
> +SIZE (libdom-0.1.0-src.tar.gz) = 806688
> Index: libdom/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libdom/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- libdom/pkg/PLIST 3 May 2013 07:30:10 -0000 1.1.1.1
> +++ libdom/pkg/PLIST 27 Apr 2014 05:41:53 -0000
> @@ -51,6 +51,7 @@ include/dom/html/html_document.h
> include/dom/html/html_element.h
> include/dom/html/html_form_element.h
> include/dom/html/html_head_element.h
> +include/dom/html/html_hr_element.h
> include/dom/html/html_html_element.h
> include/dom/html/html_input_element.h
> include/dom/html/html_link_element.h
> Index: libnsbmp/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libnsbmp/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- libnsbmp/Makefile 3 May 2013 07:32:34 -0000 1.5
> +++ libnsbmp/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,9 +3,9 @@
> COMMENT = BMP/ICO decoding library
>
> NETSURF_PROJECT = libnsbmp
> -NETSURF_VERSION = 0.1.0
> +NETSURF_VERSION = 0.1.1
>
> CATEGORIES = graphics
> -SHARED_LIBS = nsbmp 1.0 #0.1.0
> +SHARED_LIBS = nsbmp 1.0 #0.1.1
>
> .include <bsd.port.mk>
> Index: libnsbmp/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libnsbmp/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- libnsbmp/distinfo 3 May 2013 07:32:34 -0000 1.3
> +++ libnsbmp/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libnsbmp-0.1.0-src.tar.gz) =
> +1dq9r1NAtNibVwgkrwGyAsqgAiaFN7PQMgT2eyA3cA=
> -SIZE (libnsbmp-0.1.0-src.tar.gz) = 202252
> +SHA256 (libnsbmp-0.1.1-src.tar.gz) =
> WEBGgJ0yE+WRfNJur7AwaMqUJ0Ip9ZXw4FILFfpFT5g=
> +SIZE (libnsbmp-0.1.1-src.tar.gz) = 202262
> Index: libnsgif/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libnsgif/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- libnsgif/Makefile 3 May 2013 07:32:34 -0000 1.5
> +++ libnsgif/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,9 +3,9 @@
> COMMENT = GIF decoding library
>
> NETSURF_PROJECT = libnsgif
> -NETSURF_VERSION = 0.1.0
> +NETSURF_VERSION = 0.1.1
>
> CATEGORIES = graphics
> -SHARED_LIBS = nsgif 0.0 #0.1.0
> +SHARED_LIBS = nsgif 0.0 #0.1.1
>
> .include <bsd.port.mk>
> Index: libnsgif/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libnsgif/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- libnsgif/distinfo 3 May 2013 07:32:34 -0000 1.3
> +++ libnsgif/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libnsgif-0.1.0-src.tar.gz) =
> 59x+6If+/Bnnx5hcWisFeHDg+j3Q3Pwf206Y2h82WTw=
> -SIZE (libnsgif-0.1.0-src.tar.gz) = 202604
> +SHA256 (libnsgif-0.1.1-src.tar.gz) =
> 1FDqCp2iNEhumXJIswqGUk918QIcpnAXtVl0I89sChU=
> +SIZE (libnsgif-0.1.1-src.tar.gz) = 202610
> Index: libparserutils/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libparserutils/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- libparserutils/Makefile 3 May 2013 07:32:34 -0000 1.5
> +++ libparserutils/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,10 +3,10 @@
> COMMENT = utility library for parser building
>
> NETSURF_PROJECT = libparserutils
> -NETSURF_VERSION = 0.1.2
> +NETSURF_VERSION = 0.2.0
>
> CATEGORIES = devel
> -SHARED_LIBS = parserutils 1.0 #0.1.2
> +SHARED_LIBS = parserutils 2.0 #0.2.0
>
> MODULES = converters/libiconv
>
> Index: libparserutils/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libparserutils/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- libparserutils/distinfo 3 May 2013 07:32:34 -0000 1.4
> +++ libparserutils/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libparserutils-0.1.2-src.tar.gz) =
> CiHv04gsGZZfVxYcTs2oWjY6cdvgkAMN+mn5rs0hYKo=
> -SIZE (libparserutils-0.1.2-src.tar.gz) = 74663
> +SHA256 (libparserutils-0.2.0-src.tar.gz) =
> VcUKu/+q6+F6y6QwCO4sQIVAHOYY5QX6+nx1uqqBPac=
> +SIZE (libparserutils-0.2.0-src.tar.gz) = 74431
> Index: libparserutils/patches/patch-test_cscodec-8859_c
> ===================================================================
> RCS file: libparserutils/patches/patch-test_cscodec-8859_c
> diff -N libparserutils/patches/patch-test_cscodec-8859_c
> --- libparserutils/patches/patch-test_cscodec-8859_c 3 May 2013 07:32:34
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,56 +0,0 @@
> -$OpenBSD: patch-test_cscodec-8859_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/cscodec-8859.c.orig Fri Apr 19 12:06:57 2013
> -+++ test/cscodec-8859.c Thu Apr 25 16:51:19 2013
> -@@ -169,7 +169,7 @@ bool handle_line(const char *data, size_t datalen, voi
> - for (end = enc; !isspace(*end); end++)
> - ;
> -
> -- enc_name = alloca(end - enc + 1);
> -+ enc_name = malloc(end - enc + 1);
> - memcpy(enc_name, enc, end - enc);
> - enc_name[end - enc] = 0;
> -
> -@@ -178,6 +178,8 @@ bool handle_line(const char *data, size_t datalen, voi
> - PARSERUTILS_OK);
> -
> - ctx->hadenc = true;
> -+
> -+ free(enc_name);
> - }
> - } else {
> - if (ctx->indata) {
> -@@ -197,7 +199,7 @@ void run_test(line_ctx *ctx)
> - {
> - static int testnum;
> - size_t destlen = ctx->bufused * 4;
> -- uint8_t *dest = alloca(destlen);
> -+ uint8_t *dest = malloc(destlen);
> - uint8_t *pdest = dest;
> - const uint8_t *psrc = ctx->buf;
> - size_t srclen = ctx->bufused;
> -@@ -213,7 +215,7 @@ void run_test(line_ctx *ctx)
> - &pdest, &destlen) == ctx->exp_ret);
> - } else {
> - size_t templen = ctx->bufused * 4;
> -- uint8_t *temp = alloca(templen);
> -+ uint8_t *temp = malloc(templen);
> - uint8_t *ptemp = temp;
> - const uint8_t *ptemp2;
> - size_t templen2;
> -@@ -237,6 +239,8 @@ void run_test(line_ctx *ctx)
> - assert(templen2 == 0);
> - assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
> - }
> -+
> -+ free(temp);
> - }
> - if (ctx->exp_ret == PARSERUTILS_OK) {
> - assert(srclen == 0);
> -@@ -259,5 +263,7 @@ void run_test(line_ctx *ctx)
> -
> - assert(pdest == dest + ctx->expused);
> - assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
> -+
> -+ free(dest);
> - }
> -
> Index: libparserutils/patches/patch-test_cscodec-ext8_c
> ===================================================================
> RCS file: libparserutils/patches/patch-test_cscodec-ext8_c
> diff -N libparserutils/patches/patch-test_cscodec-ext8_c
> --- libparserutils/patches/patch-test_cscodec-ext8_c 3 May 2013 07:32:34
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,56 +0,0 @@
> -$OpenBSD: patch-test_cscodec-ext8_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/cscodec-ext8.c.orig Thu Apr 25 14:37:59 2013
> -+++ test/cscodec-ext8.c Thu Apr 25 14:41:06 2013
> -@@ -169,7 +169,7 @@ bool handle_line(const char *data, size_t datalen, voi
> - for (end = enc; !isspace(*end); end++)
> - ;
> -
> -- enc_name = alloca(end - enc + 1);
> -+ enc_name = malloc(end - enc + 1);
> - memcpy(enc_name, enc, end - enc);
> - enc_name[end - enc] = 0;
> -
> -@@ -178,6 +178,8 @@ bool handle_line(const char *data, size_t datalen, voi
> - PARSERUTILS_OK);
> -
> - ctx->hadenc = true;
> -+
> -+ free(enc_name);
> - }
> - } else {
> - if (ctx->indata) {
> -@@ -197,7 +199,7 @@ void run_test(line_ctx *ctx)
> - {
> - static int testnum;
> - size_t destlen = ctx->bufused * 4;
> -- uint8_t *dest = alloca(destlen);
> -+ uint8_t *dest = malloc(destlen);
> - uint8_t *pdest = dest;
> - const uint8_t *psrc = ctx->buf;
> - size_t srclen = ctx->bufused;
> -@@ -213,7 +215,7 @@ void run_test(line_ctx *ctx)
> - &pdest, &destlen) == ctx->exp_ret);
> - } else {
> - size_t templen = ctx->bufused * 4;
> -- uint8_t *temp = alloca(templen);
> -+ uint8_t *temp = malloc(templen);
> - uint8_t *ptemp = temp;
> - const uint8_t *ptemp2;
> - size_t templen2;
> -@@ -237,6 +239,8 @@ void run_test(line_ctx *ctx)
> - assert(templen2 == 0);
> - assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
> - }
> -+
> -+ free(temp);
> - }
> - if (ctx->exp_ret == PARSERUTILS_OK) {
> - assert(srclen == 0);
> -@@ -259,5 +263,7 @@ void run_test(line_ctx *ctx)
> -
> - assert(pdest == dest + ctx->expused);
> - assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
> -+
> -+ free(dest);
> - }
> -
> Index: libparserutils/patches/patch-test_cscodec-utf16_c
> ===================================================================
> RCS file: libparserutils/patches/patch-test_cscodec-utf16_c
> diff -N libparserutils/patches/patch-test_cscodec-utf16_c
> --- libparserutils/patches/patch-test_cscodec-utf16_c 3 May 2013 07:32:34
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,38 +0,0 @@
> -$OpenBSD: patch-test_cscodec-utf16_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/cscodec-utf16.c.orig Thu Apr 25 14:42:49 2013
> -+++ test/cscodec-utf16.c Thu Apr 25 14:43:14 2013
> -@@ -255,7 +255,7 @@ void run_test(line_ctx *ctx)
> - {
> - static int testnum;
> - size_t destlen = ctx->bufused * 4;
> -- uint8_t *dest = alloca(destlen);
> -+ uint8_t *dest = malloc(destlen);
> - uint8_t *pdest = dest;
> - const uint8_t *psrc = ctx->buf;
> - size_t srclen = ctx->bufused;
> -@@ -271,7 +271,7 @@ void run_test(line_ctx *ctx)
> - &pdest, &destlen) == ctx->exp_ret);
> - } else {
> - size_t templen = ctx->bufused * 4;
> -- uint8_t *temp = alloca(templen);
> -+ uint8_t *temp = malloc(templen);
> - uint8_t *ptemp = temp;
> - const uint8_t *ptemp2;
> - size_t templen2;
> -@@ -295,6 +295,8 @@ void run_test(line_ctx *ctx)
> - assert(templen2 == 0);
> - assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
> - }
> -+
> -+ free(temp);
> - }
> - if (ctx->exp_ret == PARSERUTILS_OK) {
> - assert(srclen == 0);
> -@@ -317,5 +319,7 @@ void run_test(line_ctx *ctx)
> -
> - assert(pdest == dest + ctx->expused);
> - assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
> -+
> -+ free(dest);
> - }
> -
> Index: libparserutils/patches/patch-test_cscodec-utf8_c
> ===================================================================
> RCS file: libparserutils/patches/patch-test_cscodec-utf8_c
> diff -N libparserutils/patches/patch-test_cscodec-utf8_c
> --- libparserutils/patches/patch-test_cscodec-utf8_c 3 May 2013 07:32:34
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,38 +0,0 @@
> -$OpenBSD: patch-test_cscodec-utf8_c,v 1.1 2013/05/03 07:32:34 bentley Exp $
> ---- test/cscodec-utf8.c.orig Thu Apr 25 14:41:15 2013
> -+++ test/cscodec-utf8.c Thu Apr 25 14:42:29 2013
> -@@ -180,7 +180,7 @@ void run_test(line_ctx *ctx)
> - {
> - static int testnum;
> - size_t destlen = ctx->bufused * 4;
> -- uint8_t *dest = alloca(destlen);
> -+ uint8_t *dest = malloc(destlen);
> - uint8_t *pdest = dest;
> - const uint8_t *psrc = ctx->buf;
> - size_t srclen = ctx->bufused;
> -@@ -196,7 +196,7 @@ void run_test(line_ctx *ctx)
> - &pdest, &destlen) == ctx->exp_ret);
> - } else {
> - size_t templen = ctx->bufused * 4;
> -- uint8_t *temp = alloca(templen);
> -+ uint8_t *temp = malloc(templen);
> - uint8_t *ptemp = temp;
> - const uint8_t *ptemp2;
> - size_t templen2;
> -@@ -220,6 +220,8 @@ void run_test(line_ctx *ctx)
> - assert(templen2 == 0);
> - assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
> - }
> -+
> -+ free(temp);
> - }
> - if (ctx->exp_ret == PARSERUTILS_OK) {
> - assert(srclen == 0);
> -@@ -242,5 +244,7 @@ void run_test(line_ctx *ctx)
> -
> - assert(pdest == dest + ctx->expused);
> - assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
> -+
> -+ free(dest);
> - }
> -
> Index: libwapcaplet/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libwapcaplet/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- libwapcaplet/Makefile 3 May 2013 07:32:34 -0000 1.8
> +++ libwapcaplet/Makefile 27 Apr 2014 05:41:53 -0000
> @@ -3,10 +3,10 @@
> COMMENT = string internment library
>
> NETSURF_PROJECT = libwapcaplet
> -NETSURF_VERSION = 0.2.0
> +NETSURF_VERSION = 0.2.1
>
> CATEGORIES= devel
> -SHARED_LIBS = wapcaplet 2.0 #0.2.0
> +SHARED_LIBS = wapcaplet 2.0 #0.2.1
>
> TEST_DEPENDS += devel/check
>
> Index: libwapcaplet/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/netsurf/libwapcaplet/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- libwapcaplet/distinfo 3 May 2013 07:32:34 -0000 1.4
> +++ libwapcaplet/distinfo 27 Apr 2014 05:41:53 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libwapcaplet-0.2.0-src.tar.gz) =
> X7SYQbozWwx6FCDZLDpgSA32NpbFA1PAJySqjGtFyyQ=
> -SIZE (libwapcaplet-0.2.0-src.tar.gz) = 8894
> +SHA256 (libwapcaplet-0.2.1-src.tar.gz) =
> nkqN89/m1+G8xKPMzhjD0CIwVF9HJrBbCbnlBJRsjsg=
> +SIZE (libwapcaplet-0.2.1-src.tar.gz) = 8897
--
James Turner
