diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/netsurf/Makefile | 4 | ||||
-rw-r--r-- | www/netsurf/distinfo | 4 | ||||
-rw-r--r-- | www/netsurf/files/patch-gtk_Makefile.defaults | 13 | ||||
-rw-r--r-- | www/netsurf/files/patch-gtk_gui.c | 11 | ||||
-rw-r--r-- | www/netsurf/pkg-plist | 31 |
5 files changed, 29 insertions, 34 deletions
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index 63b2cdb11679..05599c4d3bfc 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -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} diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo index 68f30f2c0a5d..a109e0804fc1 100644 --- a/www/netsurf/distinfo +++ b/www/netsurf/distinfo @@ -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 diff --git a/www/netsurf/files/patch-gtk_Makefile.defaults b/www/netsurf/files/patch-gtk_Makefile.defaults new file mode 100644 index 000000000000..9f3f883b4c85 --- /dev/null +++ b/www/netsurf/files/patch-gtk_Makefile.defaults @@ -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/ diff --git a/www/netsurf/files/patch-gtk_gui.c b/www/netsurf/files/patch-gtk_gui.c new file mode 100644 index 000000000000..2b95803bc50c --- /dev/null +++ b/www/netsurf/files/patch-gtk_gui.c @@ -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) || diff --git a/www/netsurf/pkg-plist b/www/netsurf/pkg-plist index a80972737279..62bd9d983fff 100644 --- a/www/netsurf/pkg-plist +++ b/www/netsurf/pkg-plist @@ -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 |