6 files changed, 19 insertions, 33 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 139e09c8cbd7..2bd8af2d5afe 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netsurf
-PORTVERSION=	3.9
-PORTREVISION=	1
+PORTVERSION=	3.10
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index d44180c63caa..7f6058cb2772 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567621226
-SHA256 (netsurf-3.9-src.tar.gz) = d72f1c6f6113a01e541f8476a93c347235068779140090df55ba402eb4a8ecc3
-SIZE (netsurf-3.9-src.tar.gz) = 3989742
+TIMESTAMP = 1591232159
+SHA256 (netsurf-3.10-src.tar.gz) = 36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e
+SIZE (netsurf-3.10-src.tar.gz) = 4084480
diff --git a/www/netsurf/files/patch-Makefile b/www/netsurf/files/patch-Makefile
index 0a924cd51373..2ce2a9a724f5 100644
--- a/www/netsurf/files/patch-Makefile
+++ b/www/netsurf/files/patch-Makefile
@@ -1,10 +1,10 @@
---- Makefile.orig	2016-11-19 13:37:41 UTC
+--- Makefile.orig	2020-05-24 20:55:29 UTC
 +++ Makefile
-@@ -555,7 +555,6 @@ ifeq ($(HOST),mint)
+@@ -547,7 +547,6 @@ ifeq ($(HOST),mint)
  else
      $(eval $(call pkg_config_find_and_add_enabled,CURL,libcurl,Curl))
  endif
 -$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL))
  
- $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
- $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
+ $(eval $(call pkg_config_find_and_add_enabled,UTF8PROC,libutf8proc,utf8))
+ $(eval $(call pkg_config_find_and_add_enabled,WEBP,libwebp,WEBP))
diff --git a/www/netsurf/files/patch-frontends_gtk_gui.c b/www/netsurf/files/patch-frontends_gtk_gui.c
deleted file mode 100644
index f1d31d19927d..000000000000
--- a/www/netsurf/files/patch-frontends_gtk_gui.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- frontends/gtk/gui.c.orig	2016-11-19 13:37:41 UTC
-+++ frontends/gtk/gui.c
-@@ -198,7 +198,7 @@ static nserror set_defaults(struct nsopt
- 	}
- 
- 	/* default path to certificates */
--	nsoption_setnull_charp(ca_path, strdup("/etc/ssl/certs"));
-+	nsoption_setnull_charp(ca_path, strdup("%%PREFIX%%/share/certs"));
- 
- 	if ((nsoption_charp(cookie_file) == NULL) ||
- 	    (nsoption_charp(cookie_jar) == NULL) ||
diff --git a/www/netsurf/files/patch-utils_idna.c b/www/netsurf/files/patch-utils_idna.c
index 4e628c279dd3..a12594480cb4 100644
--- a/www/netsurf/files/patch-utils_idna.c
+++ b/www/netsurf/files/patch-utils_idna.c
@@ -1,11 +1,11 @@
---- utils/idna.c.orig	2019-09-15 12:06:06.236299000 +0200
-+++ utils/idna.c	2019-09-15 12:06:07.393935000 +0200
-@@ -27,7 +27,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
+--- utils/idna.c.orig	2020-05-24 20:55:29 UTC
++++ utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
+ 
+ #ifdef WITH_UTF8PROC
+ 
 -#include <libutf8proc/utf8proc.h>
 +#include <utf8proc.h>
  
- #include "netsurf/inttypes.h"
- 
+ int32_t idna_contexto[] = {
+ 	/* CONTEXTO codepoints which have a rule defined */
diff --git a/www/netsurf/pkg-plist b/www/netsurf/pkg-plist
index ad8a064ebe8f..5b73aae723c5 100644
--- a/www/netsurf/pkg-plist
+++ b/www/netsurf/pkg-plist
@@ -4,7 +4,6 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/Messages
 %%DATADIR%%/SearchEngines
 %%DATADIR%%/adblock.css
-%%DATADIR%%/arrow_down_8x32.png
 %%DATADIR%%/ca-bundle.txt
 %%DATADIR%%/cookies.gtk3.ui
 %%DATADIR%%/credits.html
@@ -16,7 +15,6 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/en/Messages
 %%DATADIR%%/en/credits.html
 %%DATADIR%%/en/licence.html
-%%DATADIR%%/en/maps.html
 %%DATADIR%%/en/welcome.html
 %%DATADIR%%/favicon.png
 %%DATADIR%%/fr/Messages
@@ -28,7 +26,9 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/icons/directory2.png
 %%DATADIR%%/icons/hotlist-add.png
 %%DATADIR%%/icons/hotlist-rmv.png
+%%DATADIR%%/icons/local-history.png
 %%DATADIR%%/icons/search.png
+%%DATADIR%%/icons/show-cookie.png
 %%DATADIR%%/internal.css
 %%DATADIR%%/it/Messages
 %%DATADIR%%/it/credits.html
@@ -38,8 +38,6 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/languages
 %%DATADIR%%/licence.html
 %%DATADIR%%/localhistory.gtk3.ui
-%%DATADIR%%/login.gtk3.ui
-%%DATADIR%%/maps.html
 %%DATADIR%%/netsurf-16x16.xpm
 %%DATADIR%%/netsurf.gtk3.ui
 %%DATADIR%%/netsurf.png
@@ -49,9 +47,9 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/nl/licence.html
 %%DATADIR%%/nl/welcome.html
 %%DATADIR%%/options.gtk3.ui
+%%DATADIR%%/pageinfo.gtk3.ui
 %%DATADIR%%/password.gtk3.ui
 %%DATADIR%%/quirks.css
-%%DATADIR%%/ssl.gtk3.ui
 %%DATADIR%%/tabcontents.gtk3.ui
 %%DATADIR%%/throbber/throbber0.png
 %%DATADIR%%/throbber/throbber1.png