Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Apr 2016 20:21:18 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413377 - in head/www/netsurf: . files
Message-ID:  <201604152021.u3FKLIRK071471@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olivierd
Date: Fri Apr 15 20:21:18 2016
New Revision: 413377
URL: https://svnweb.freebsd.org/changeset/ports/413377

Log:
  Update to 3.5

Added:
  head/www/netsurf/files/patch-gtk_Makefile.defaults   (contents, props changed)
  head/www/netsurf/files/patch-gtk_gui.c   (contents, props changed)
Modified:
  head/www/netsurf/Makefile
  head/www/netsurf/distinfo
  head/www/netsurf/pkg-plist

Modified: head/www/netsurf/Makefile
==============================================================================
--- head/www/netsurf/Makefile	Fri Apr 15 20:18:35 2016	(r413376)
+++ head/www/netsurf/Makefile	Fri Apr 15 20:21:18 2016	(r413377)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netsurf
-PORTVERSION=	3.4
+PORTVERSION=	3.5
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -54,6 +54,8 @@ post-patch:
 		-e '/OpenSSL/d' -e 's| -g||' \
 		-e 's/-DG_DISABLE_DEPRECATED//' \
 		${WRKSRC}/gtk/Makefile.target
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/gtk/gui.c
 
 do-configure:
 	@${CP} ${FILESDIR}/Makefile.config  ${WRKSRC}

Modified: head/www/netsurf/distinfo
==============================================================================
--- head/www/netsurf/distinfo	Fri Apr 15 20:18:35 2016	(r413376)
+++ head/www/netsurf/distinfo	Fri Apr 15 20:21:18 2016	(r413377)
@@ -1,2 +1,2 @@
-SHA256 (netsurf-3.4-src.tar.gz) = 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6
-SIZE (netsurf-3.4-src.tar.gz) = 4133201
+SHA256 (netsurf-3.5-src.tar.gz) = 98f3a66d3ae24ab34becdab2ea690f8f20c0f49f86723f133ede6df57e451dcc
+SIZE (netsurf-3.5-src.tar.gz) = 4094532

Added: head/www/netsurf/files/patch-gtk_Makefile.defaults
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/netsurf/files/patch-gtk_Makefile.defaults	Fri Apr 15 20:21:18 2016	(r413377)
@@ -0,0 +1,13 @@
+Revert: Update gtk resource path setting to use makefile variable.
+
+--- gtk/Makefile.defaults.orig	2016-04-06 10:39:35 UTC
++++ 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/

Added: head/www/netsurf/files/patch-gtk_gui.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/netsurf/files/patch-gtk_gui.c	Fri Apr 15 20:21:18 2016	(r413377)
@@ -0,0 +1,11 @@
+--- gtk/gui.c.orig	2016-04-06 10:39:35 UTC
++++ gtk/gui.c
+@@ -199,7 +199,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) ||

Modified: head/www/netsurf/pkg-plist
==============================================================================
--- head/www/netsurf/pkg-plist	Fri Apr 15 20:18:35 2016	(r413376)
+++ head/www/netsurf/pkg-plist	Fri Apr 15 20:21:18 2016	(r413377)
@@ -51,37 +51,6 @@ share/applications/netsurf.desktop
 %%DATADIR%%/quirks.css
 %%DATADIR%%/ssl.gtk2.ui
 %%DATADIR%%/tabcontents.gtk2.ui
-%%DATADIR%%/themelist
-%%DATADIR%%/themes/Alpha.png
-%%DATADIR%%/themes/gtk+/back.png
-%%DATADIR%%/themes/gtk+/closetab.png
-%%DATADIR%%/themes/gtk+/closewindow.png
-%%DATADIR%%/themes/gtk+/copy.png
-%%DATADIR%%/themes/gtk+/cut.png
-%%DATADIR%%/themes/gtk+/delete.png
-%%DATADIR%%/themes/gtk+/forward.png
-%%DATADIR%%/themes/gtk+/fullscreen.png
-%%DATADIR%%/themes/gtk+/helpabout.png
-%%DATADIR%%/themes/gtk+/helpcontents.png
-%%DATADIR%%/themes/gtk+/history.png
-%%DATADIR%%/themes/gtk+/home.png
-%%DATADIR%%/themes/gtk+/info
-%%DATADIR%%/themes/gtk+/newtab.png
-%%DATADIR%%/themes/gtk+/newwindow.png
-%%DATADIR%%/themes/gtk+/openfile.png
-%%DATADIR%%/themes/gtk+/paste.png
-%%DATADIR%%/themes/gtk+/preferences.png
-%%DATADIR%%/themes/gtk+/print.png
-%%DATADIR%%/themes/gtk+/printpreview.png
-%%DATADIR%%/themes/gtk+/quit.png
-%%DATADIR%%/themes/gtk+/reload.png
-%%DATADIR%%/themes/gtk+/savepage.png
-%%DATADIR%%/themes/gtk+/selectall.png
-%%DATADIR%%/themes/gtk+/stop.png
-%%DATADIR%%/themes/gtk+/viewsource.png
-%%DATADIR%%/themes/gtk+/zoomminus.png
-%%DATADIR%%/themes/gtk+/zoomnormal.png
-%%DATADIR%%/themes/gtk+/zoomplus.png
 %%DATADIR%%/throbber/throbber0.png
 %%DATADIR%%/throbber/throbber1.png
 %%DATADIR%%/throbber/throbber2.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604152021.u3FKLIRK071471>