Pullup ticket #4943 - requested by bsiegert

www/netsurf: security update

Revisions pulled up:
- www/netsurf/Makefile                                          1.49
- www/netsurf/PLIST                                             1.4
- www/netsurf/distinfo                                          1.5
- www/netsurf/patches/patch-nsgenbind_src_Makefile              1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   leot
   Date:           Fri Mar  4 01:28:02 UTC 2016

   Modified Files:
           pkgsrc/www/netsurf: Makefile PLIST distinfo
   Added Files:
           pkgsrc/www/netsurf/patches: patch-nsgenbind_src_Makefile

   Log Message:
   Update www/netsurf to 3.4.

   Changes:
   NetSurf 3.4
   -----------
   NetSurf 3.4 features many optimisations to improve performance over
   previous releases. It also contains many bug fixes, including
   improvements to page layout. This is also the first release to
   contain the Duktape JavaScript engine.  While our JavaScript bindings
   have seen a lot of development for this release, JavaScript remains
   disabled by default as the support is incomplete. We recommend all
   users upgrade to NetSurf 3.4.


   To generate a diff of this commit:
   cvs rdiff -u -r1.48 -r1.49 pkgsrc/www/netsurf/Makefile
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/netsurf/PLIST
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/netsurf/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/www/netsurf/patches/patch-nsgenbind_src_Makefile

4 files changed, 25 insertions, 10 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index c58790d3e40..24a7722f61d 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2015/11/22 20:21:11 leot Exp $
+# $NetBSD: Makefile,v 1.48.2.1 2016/03/06 12:26:31 spz Exp $
 
-DISTNAME=	netsurf-all-3.3
+DISTNAME=	netsurf-all-3.4
 PKGNAME=	${DISTNAME:S/-all//}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source-full/
 
@@ -25,6 +24,7 @@ MAKE_ENV+=	HOST="${MACHINE_GNU_ARCH}--${LOWER_OPSYS}"
 INSTALLATION_DIRS+=	share/netsurf bin
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE	# needed for strcasestr(3) and strndup(3)
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
diff --git a/www/netsurf/PLIST b/www/netsurf/PLIST
index 373c43bdae1..49d00ac46aa 100644
--- a/www/netsurf/PLIST
+++ b/www/netsurf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/03 20:56:09 leot Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2016/03/06 12:26:31 spz Exp $
 bin/netsurf
 share/netsurf/Messages
 share/netsurf/SearchEngines
@@ -19,7 +19,6 @@ 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
@@ -44,6 +43,9 @@ share/netsurf/netsurf.gtk2.ui
 share/netsurf/netsurf.png
 share/netsurf/netsurf.xpm
 share/netsurf/nl/Messages
+share/netsurf/nl/credits.html
+share/netsurf/nl/licence.html
+share/netsurf/nl/welcome.html
 share/netsurf/options.gtk2.ui
 share/netsurf/password.gtk2.ui
 share/netsurf/quirks.css
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index 3a94fac6e57..82002539abb 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 02:46:59 agc Exp $
+$NetBSD: distinfo,v 1.4.2.1 2016/03/06 12:26:31 spz Exp $
 
-SHA1 (netsurf-all-3.3.tar.gz) = ec52ff9c8f43140d403cc2a434de6c919d9d6079
-RMD160 (netsurf-all-3.3.tar.gz) = 74da2b99bcce4857f5975d4bc2caa4b9a0a6f5eb
-SHA512 (netsurf-all-3.3.tar.gz) = 1e748be448149f0bc94a98a99118971ad887595a77441e252d7aa0c56264e39712384f25cbd8ea4c3ce6a2111494a55e6925e7a635ff13829a66a1745ff9beee
-Size (netsurf-all-3.3.tar.gz) = 6088708 bytes
+SHA1 (netsurf-all-3.4.tar.gz) = 91e3dd04c57da2246e1fd6d47951d7f0e41dbbda
+RMD160 (netsurf-all-3.4.tar.gz) = b07360d67b87a5c82ab9cd012d7ca463a86c31ff
+SHA512 (netsurf-all-3.4.tar.gz) = 89af66021ad10a437be085c0ee40e7ac3df44f68660bb582017569d5982974ba68777cfb924cb2de585b972ea8112bc033b8905906f9be18c6b8a154a9ae0a46
+Size (netsurf-all-3.4.tar.gz) = 7227428 bytes
 SHA1 (patch-netsurf_utils_config.h) = de48304e3484a883509ea3ad92658788f7869041
+SHA1 (patch-nsgenbind_src_Makefile) = 1798b84c28fbb9bbdaafe3f182fbd301f5438df1
diff --git a/www/netsurf/patches/patch-nsgenbind_src_Makefile b/www/netsurf/patches/patch-nsgenbind_src_Makefile
new file mode 100644
index 00000000000..80e71302272
--- /dev/null
+++ b/www/netsurf/patches/patch-nsgenbind_src_Makefile
@@ -0,0 +1,12 @@
+$NetBSD: patch-nsgenbind_src_Makefile,v 1.1.2.2 2016/03/06 12:26:31 spz Exp $
+
+Define _XOPEN_SOURCE needed for strdup(3) and strndup(3).
+
+--- nsgenbind/src/Makefile.orig	2016-02-16 18:10:55.000000000 +0000
++++ nsgenbind/src/Makefile
+@@ -1,4 +1,5 @@
+ CFLAGS := $(CFLAGS) -I$(BUILDDIR) -Isrc/ -g -DYYENABLE_NLS=0
++CFLAGS += -D_XOPEN_SOURCE=700
+ 
+ # Sources in this directory
+ DIR_SOURCES := nsgenbind.c utils.c webidl-ast.c nsgenbind-ast.c ir.c \