Update www/netsurf to netsurf-3.3, based on work done in pkgsrc-wip.

Changes:
NetSurf 3.3 released 15 Mar 2015
    NetSurf 3.3 is primarily a bug-fix release. Several of the front ends have
    received quite a bit of attention, with new features and improvements;
    notably the AmigaOS front ends has gained the beginnings of support for
    AmigaOS 3. We recommend all users upgrade.

NetSurf 3.2 released 30 Aug 2014
    NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc
    cache feature has been added, and a little work has been done to improve
    CSS3 support. Several of the front ends have received quite a bit of
    attention, with new features and improvements; notably the GTK, AmigaOS and
    Framebuffer front ends. We recommend all users upgrade.

NetSurf 3.1 released 26 Apr 2014
    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.

NetSurf 3.0 released 20 Apr 2013
    NetSurf 3.0 contains many changes over the 2.x release series. The biggest
    difference is the use of our new Document Object Model library, LibDOM.
    This new library is a foundation that paves the way for us to implement a
    fully dynamic layout engine in the future. Other improvements in NetSurf
    3.0 include completely new textarea support, ability to fetch and parse CSS
    in parallel with HTML documents, extensive behind-the-scenes refactoring,
    and a host of smaller changes and fixes. A more complete listing is
    available in the Change Log.

NetSurf 2.9 released 28 Apr 2012
    NetSurf 2.9 contains many improvements over the previous release. The most
    significant changes are new multi-tasking behaviour, optimised URL
    handling, fetcher optimisations, cache optimisations, and faster CSS
    selection. Full details in the change log. We recommend all users upgrade.

NetSurf 2.8 released 21 Sep 2011
    NetSurf 2.8 adds support for frames and iframes on all platforms, MIME type
    sniffing, and a new image cache. Image decoding can now be deferred until
    images are required for more optimal resource use and faster page load
    times. The release also incorporates many other new features,
    optimisations, improvements and bug fixes. Full details in the change log.
    We recommend all users upgrade.

NetSurf 2.7 released 16 Apr 2011
    NetSurf 2.7 contains many improvements over the previous release. The most
    significant change is the addition of core global history, bookmarks and
    cookie management features. Full details in the change log. We recommend
    all users upgrade.

NetSurf 2.6 released 21 Sep 2010
    NetSurf 2.6 is primarily a bug fix release. It contains some improvements
    to page rendering, fetching & caching, memory usage, as well as some
    front-end specific fixes. Full details in the change log. We recommend all
    users upgrade.

NetSurf 2.5 released 24 Apr 2010
    NetSurf 2.5 contains many improvements over the previous release. The major
    changes are the use of our brand new CSS parser and selection engine
    (LibCSS), and a newly designed cache for fetched content. Full details in
    the change log. We recommend all users upgrade.

NetSurf 2.1 released 23 May 2009
    NetSurf 2.1 is a bug fix release. It contains some improvements to page
    rendering as well as some front-end specific fixes. Full details in the
    change log. We recommend all users upgrade.

NetSurf 2.0 released 25 Apr 2009
    NetSurf 2 is a major update over the 1.x release series, and represents
    almost two years of development. New features include a new HTML parser,
    SVG support, PDF export, improved page layout and a more complete GTK
    interface. This is also the first release for our new framebuffer target
    and the native ports to AmigaOS, BeOS and Haiku.

5 files changed, 123 insertions, 95 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 2c47ff10b8a..c02866fa183 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,42 +1,25 @@
-# $NetBSD: Makefile,v 1.42 2015/06/12 10:51:50 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2015/09/03 20:56:09 leot Exp $
 #
 
-DISTNAME=	netsurf-1.2-src
-PKGNAME=	${DISTNAME:S/-src$//}
-PKGREVISION=	34
+DISTNAME=	netsurf-all-3.3
+PKGNAME=	${DISTNAME:S/-all//}
 CATEGORIES=	www
-MASTER_SITES=	http://www.netsurf-browser.org/downloads/releases/
+MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source-full/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.netsurf-browser.org/
 COMMENT=	Web browser for RISC OS and UNIX-like platforms
+LICENSE=	gnu-gpl-v2 AND mit
 
 BUILD_DEPENDS+=	lemon>=1.0:../../devel/lemon
 BUILD_DEPENDS+=	re2c>=0.12:../../devel/re2c
 
-# current codebase needs strndup
-NOT_FOR_PLATFORM=	NetBSD-[0-3]*-*
-
-WRKSRC=		${WRKDIR}/netsurf
-
-USE_TOOLS+=	gmake perl:build pax pkg-config
+BUILD_TARGET=	build
+USE_TOOLS+=	bison flex gmake perl:build pax pkg-config
 
 INSTALLATION_DIRS+=	share/netsurf bin
 
-# needed for netsurf-1.2 and gtk2-2.20 -- remove on next update!
-BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
-
-post-extract:
-	find ${WRKSRC}/!NetSurf -type f | xargs chmod a-x
-
-do-install:
-	cd ${WRKSRC} && pax -rw !NetSurf ${DESTDIR}${PREFIX}/share/netsurf/
-	cd ${WRKSRC} && pax -rw gtk/res ${DESTDIR}${PREFIX}/share/netsurf/
-	${INSTALL_PROGRAM} ${WRKSRC}/nsgtk ${DESTDIR}${PREFIX}/share/netsurf/nsgtk
-	${INSTALL_SCRIPT} ${WRKSRC}/netsurf ${DESTDIR}${PREFIX}/bin/netsurf
+BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/www/netsurf/PLIST b/www/netsurf/PLIST
index 56b1ffb3f22..373c43bdae1 100644
--- a/www/netsurf/PLIST
+++ b/www/netsurf/PLIST
@@ -1,51 +1,96 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/09/03 20:56:09 leot Exp $
 bin/netsurf
-share/netsurf/!NetSurf/!Boot,feb
-share/netsurf/!NetSurf/!Help
-share/netsurf/!NetSurf/!Run,feb
-share/netsurf/!NetSurf/!Sprites,ff9
-share/netsurf/!NetSurf/!Sprites22,ff9
-share/netsurf/!NetSurf/5Sprites,ff9
-share/netsurf/!NetSurf/5Sprites11,ff9
-share/netsurf/!NetSurf/5Sprites22,ff9
-share/netsurf/!NetSurf/ASprites,ff9
-share/netsurf/!NetSurf/ASprites11,ff9
-share/netsurf/!NetSurf/ASprites22,ff9
-share/netsurf/!NetSurf/Docs/about/index_en,faf
-share/netsurf/!NetSurf/Docs/about/libcurl,b60
-share/netsurf/!NetSurf/Docs/about/libmng,b60
-share/netsurf/!NetSurf/Docs/about/libxml2,b60
-share/netsurf/!NetSurf/Docs/about/openssl,695
-share/netsurf/!NetSurf/Docs/online,b60
-share/netsurf/!NetSurf/FixFonts,ffb
-share/netsurf/!NetSurf/KickNS,ffb
-share/netsurf/!NetSurf/ReadMe
-share/netsurf/!NetSurf/Resources/AdBlock,f79
-share/netsurf/!NetSurf/Resources/Aletheia,ffd
-share/netsurf/!NetSurf/Resources/CSS,f79
-share/netsurf/!NetSurf/Resources/Fonts/NSSymbol/Encoding
-share/netsurf/!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6
-share/netsurf/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6
-share/netsurf/!NetSurf/Resources/Image,ff9
-share/netsurf/!NetSurf/Resources/LangNames
-share/netsurf/!NetSurf/Resources/Sprites,ff9
-share/netsurf/!NetSurf/Resources/ca-bundle
-share/netsurf/!NetSurf/Resources/de/Messages
-share/netsurf/!NetSurf/Resources/de/Templates,fec
-share/netsurf/!NetSurf/Resources/en/Messages
-share/netsurf/!NetSurf/Resources/en/Templates,fec
-share/netsurf/!NetSurf/Resources/fr/Messages
-share/netsurf/!NetSurf/Resources/fr/Templates,fec
-share/netsurf/!NetSurf/Resources/nl/Messages
-share/netsurf/!NetSurf/Resources/nl/Templates,fec
-share/netsurf/gtk/res/adblock.css
-share/netsurf/gtk/res/ca-bundle.txt
-share/netsurf/gtk/res/default.css
-share/netsurf/gtk/res/docs/about
-share/netsurf/gtk/res/gtkdefault.css
-share/netsurf/gtk/res/messages
-share/netsurf/gtk/res/netsurf-logo.png
-share/netsurf/gtk/res/netsurf.glade
-share/netsurf/gtk/res/netsurf.xpm
-share/netsurf/gtk/res/throbber.gif
-share/netsurf/nsgtk
+share/netsurf/Messages
+share/netsurf/SearchEngines
+share/netsurf/adblock.css
+share/netsurf/arrow_down_8x32.png
+share/netsurf/ca-bundle.txt
+share/netsurf/cookies.gtk2.ui
+share/netsurf/credits.html
+share/netsurf/de/Messages
+share/netsurf/de/welcome.html
+share/netsurf/default.css
+share/netsurf/default.ico
+share/netsurf/downloads.gtk2.ui
+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/Messages
+share/netsurf/gtkdefault.css
+share/netsurf/history.gtk2.ui
+share/netsurf/hotlist.gtk2.ui
+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/Messages
+share/netsurf/it/credits.html
+share/netsurf/it/licence.html
+share/netsurf/it/welcome.html
+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
+share/netsurf/netsurf.xpm
+share/netsurf/nl/Messages
+share/netsurf/options.gtk2.ui
+share/netsurf/password.gtk2.ui
+share/netsurf/quirks.css
+share/netsurf/ssl.gtk2.ui
+share/netsurf/tabcontents.gtk2.ui
+share/netsurf/themelist
+share/netsurf/themes/Alpha.png
+share/netsurf/themes/gtk+/back.png
+share/netsurf/themes/gtk+/closetab.png
+share/netsurf/themes/gtk+/closewindow.png
+share/netsurf/themes/gtk+/copy.png
+share/netsurf/themes/gtk+/cut.png
+share/netsurf/themes/gtk+/delete.png
+share/netsurf/themes/gtk+/forward.png
+share/netsurf/themes/gtk+/fullscreen.png
+share/netsurf/themes/gtk+/helpabout.png
+share/netsurf/themes/gtk+/helpcontents.png
+share/netsurf/themes/gtk+/history.png
+share/netsurf/themes/gtk+/home.png
+share/netsurf/themes/gtk+/info
+share/netsurf/themes/gtk+/newtab.png
+share/netsurf/themes/gtk+/newwindow.png
+share/netsurf/themes/gtk+/openfile.png
+share/netsurf/themes/gtk+/paste.png
+share/netsurf/themes/gtk+/preferences.png
+share/netsurf/themes/gtk+/print.png
+share/netsurf/themes/gtk+/printpreview.png
+share/netsurf/themes/gtk+/quit.png
+share/netsurf/themes/gtk+/reload.png
+share/netsurf/themes/gtk+/savepage.png
+share/netsurf/themes/gtk+/selectall.png
+share/netsurf/themes/gtk+/stop.png
+share/netsurf/themes/gtk+/viewsource.png
+share/netsurf/themes/gtk+/zoomminus.png
+share/netsurf/themes/gtk+/zoomnormal.png
+share/netsurf/themes/gtk+/zoomplus.png
+share/netsurf/throbber/throbber0.png
+share/netsurf/throbber/throbber1.png
+share/netsurf/throbber/throbber2.png
+share/netsurf/throbber/throbber3.png
+share/netsurf/throbber/throbber4.png
+share/netsurf/throbber/throbber5.png
+share/netsurf/throbber/throbber6.png
+share/netsurf/throbber/throbber7.png
+share/netsurf/throbber/throbber8.png
+share/netsurf/toolbar.gtk2.ui
+share/netsurf/toolbarIndices
+share/netsurf/viewdata.gtk2.ui
+share/netsurf/warning.gtk2.ui
+share/netsurf/welcome.html
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index e359787ca9d..99952335278 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/11/21 11:39:37 obache Exp $
+$NetBSD: distinfo,v 1.3 2015/09/03 20:56:09 leot Exp $
 
-SHA1 (netsurf-1.2-src.tar.gz) = 705c721e24847501ede7d32766be28135e8f2cf9
-RMD160 (netsurf-1.2-src.tar.gz) = 0e30e117517ee4833c378ec9e1e4b38e8bc69e5d
-Size (netsurf-1.2-src.tar.gz) = 1025947 bytes
-SHA1 (patch-netsurf) = 07dd275051923e64bddcb6936dda46b57eecdf7a
+SHA1 (netsurf-all-3.3.tar.gz) = ec52ff9c8f43140d403cc2a434de6c919d9d6079
+RMD160 (netsurf-all-3.3.tar.gz) = 74da2b99bcce4857f5975d4bc2caa4b9a0a6f5eb
+Size (netsurf-all-3.3.tar.gz) = 6088708 bytes
+SHA1 (patch-netsurf_utils_config.h) = de48304e3484a883509ea3ad92658788f7869041
diff --git a/www/netsurf/patches/patch-netsurf b/www/netsurf/patches/patch-netsurf
deleted file mode 100644
index f57642630c3..00000000000
--- a/www/netsurf/patches/patch-netsurf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-netsurf,v 1.1.1.1 2008/06/23 15:05:09 joerg Exp $
-
---- netsurf.orig	2007-02-06 17:52:47.000000000 +0100
-+++ netsurf
-@@ -12,6 +12,8 @@ else
-   LOG=netsurf-log.txt
- fi
- 
--NETSURFRES=`dirname $0`/gtk/res/
-+NETBASEDIR=`dirname $0`/../share/netsurf
-+
-+NETSURFRES=$NETBASEDIR/gtk/res/
- export NETSURFRES
--exec `dirname $0`/nsgtk "$@" 2>$LOG
-+cd $NETBASEDIR && exec $NETBASEDIR/nsgtk "$@" 2>$LOG
diff --git a/www/netsurf/patches/patch-netsurf_utils_config.h b/www/netsurf/patches/patch-netsurf_utils_config.h
new file mode 100644
index 00000000000..1d4941c1a36
--- /dev/null
+++ b/www/netsurf/patches/patch-netsurf_utils_config.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-netsurf_utils_config.h,v 1.1 2015/09/03 20:56:10 leot Exp $
+
+NetBSD has strcasestr(3).
+
+--- netsurf/utils/config.h.orig	2015-03-11 07:34:53.000000000 +0000
++++ netsurf/utils/config.h
+@@ -31,7 +31,7 @@
+ char *strndup(const char *s, size_t n);
+ #endif
+ 
+-#if (defined(_GNU_SOURCE) || defined(__APPLE__) || defined(__HAIKU__) || defined(__OpenBSD__))
++#if (defined(_GNU_SOURCE) || defined(__APPLE__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__OpenBSD__))
+ #define HAVE_STRCASESTR
+ #else
+ #undef HAVE_STRCASESTR