Update www/netsurf to netsurf-3.6.

Changes:
3.6
---
NetSurf 3.6 is primarily a bugfix release. It contains several
fixes and clean-ups to front end code, as well as supercookie
blocking, and certificate chain handling improvements. We recommend
all users upgrade to NetSurf 3.6.

4 files changed, 14 insertions, 30 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 5b705cc0bd4..7acc702edf2 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2016/10/07 18:26:12 adam Exp $
+# $NetBSD: Makefile,v 1.56 2016/11/20 13:02:14 leot Exp $
 
-DISTNAME=	netsurf-all-3.5
+DISTNAME=	netsurf-all-3.6
 PKGNAME=	${DISTNAME:S/-all//}
-PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source-full/
 
@@ -21,9 +20,11 @@ USE_TOOLS+=	bison flex gmake perl:build pax pkg-config
 SUBST_CLASSES+=			ssl-certs
 SUBST_STAGE.ssl-certs=		pre-configure
 SUBST_MESSAGE.ssl-certs=	Fixing hardcoded paths for SSL certs
-SUBST_FILES.ssl-certs=		netsurf/beos/gui.cpp netsurf/gtk/gui.c
-SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices
-SUBST_FILES.ssl-certs+=		netsurf/test/nsoption.c
+SUBST_FILES.ssl-certs=		netsurf/frontends/beos/gui.cpp
+SUBST_FILES.ssl-certs+=		netsurf/frontends/gtk/gui.c
+SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices-all
+SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices-full
+SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices-short
 SUBST_SED.ssl-certs=		-e 's,/etc/ssl/certs,${SSLCERTS},'
 
 # Avoid possible problems with already often defined HOST
diff --git a/www/netsurf/PLIST b/www/netsurf/PLIST
index ecd3b4d37bd..48fac46444c 100644
--- a/www/netsurf/PLIST
+++ b/www/netsurf/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2016/04/18 20:58:24 leot Exp $
-bin/netsurf
+@comment $NetBSD: PLIST,v 1.6 2016/11/20 13:02:14 leot Exp $
+bin/netsurf-gtk
 share/netsurf/Messages
 share/netsurf/SearchEngines
 share/netsurf/adblock.css
@@ -61,7 +61,6 @@ 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 8ec04c4ac3d..d2c7622451c 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2016/04/18 20:58:24 leot Exp $
+$NetBSD: distinfo,v 1.7 2016/11/20 13:02:14 leot Exp $
 
-SHA1 (netsurf-all-3.5.tar.gz) = b1fddab35d910a534dcca3c9582125ad9db03e1a
-RMD160 (netsurf-all-3.5.tar.gz) = a7808cdb3b77357220598666ae033a566be76ad8
-SHA512 (netsurf-all-3.5.tar.gz) = a39eb8c11b394e4d5c1164da46d74f283f489057f70c192277d94e511a3716c86474a07a7c80ce602a53e41959f75e82312ad9f5cb365953c24445af4456e1ce
-Size (netsurf-all-3.5.tar.gz) = 7190734 bytes
-SHA1 (patch-netsurf_gtk_Makefile.defaults) = f6fe40057e54f0cb2eb3b0dfdc8dee8b1dd5df1b
+SHA1 (netsurf-all-3.6.tar.gz) = d25345415b9b26343c22929280c48066302da916
+RMD160 (netsurf-all-3.6.tar.gz) = 73b7768434b5365c912761837f7d6003c28fb84c
+SHA512 (netsurf-all-3.6.tar.gz) = 1b7dcc80efe8e3944e5db7d74da749821adb3ae39700df3efa6ecb347a00e33350e1d56d4139654d50ac41563edf3de52f0eb25bff6490d74144a7970fb6c3b4
+Size (netsurf-all-3.6.tar.gz) = 8403623 bytes
 SHA1 (patch-netsurf_utils_config.h) = de48304e3484a883509ea3ad92658788f7869041
 SHA1 (patch-nsgenbind_src_Makefile) = 1798b84c28fbb9bbdaafe3f182fbd301f5438df1
diff --git a/www/netsurf/patches/patch-netsurf_gtk_Makefile.defaults b/www/netsurf/patches/patch-netsurf_gtk_Makefile.defaults
deleted file mode 100644
index 9d81782bf29..00000000000
--- a/www/netsurf/patches/patch-netsurf_gtk_Makefile.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-netsurf_gtk_Makefile.defaults,v 1.1 2016/04/18 20:58:24 leot Exp $
-
-Fix installation path for share files.
-
---- netsurf/gtk/Makefile.defaults.orig	2016-04-13 12:58:34.000000000 +0000
-+++ netsurf/gtk/Makefile.defaults
-@@ -4,7 +4,7 @@
- 
- # Where to search for NetSurf's resources after looking in ~/.netsurf and
- # $NETSURFRES.  It must have a trailing /
--NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/:./gtk/res/
-+NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/
- 
- # Where to install the netsurf binary
- NETSURF_GTK_BIN := $(PREFIX)/bin/