Index: head/www/netsurf/Makefile =================================================================== --- head/www/netsurf/Makefile (revision 539342) +++ head/www/netsurf/Makefile (revision 539343) @@ -1,87 +1,86 @@ # Created by: Andrew Pantyukhin # $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 MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight web browser LICENSE= GPLv2 MIT LICENSE_COMB= multi BUILD_DEPENDS= duk:lang/duktape \ nsgenbind:devel/nsgenbind \ p5-HTML-Parser>=3.72:www/p5-HTML-Parser \ xxd:editors/vim-console LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libnsutils.so:devel/libnsutils \ libutf8proc.so:textproc/utf8proc \ libnsgif.so:graphics/libnsgif \ libnsbmp.so:graphics/libnsbmp \ libdom.so:www/libdom \ libcss.so:textproc/libcss \ libparserutils.so:devel/libparserutils \ libwapcaplet.so:textproc/libwapcaplet \ libhubbub.so:www/libhubbub \ libexpat.so:textproc/expat2 \ libnspsl.so:dns/libnspsl RUN_DEPENDS= duk:lang/duktape \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= bison desktop-file-utils gettext-runtime gmake gnome iconv jpeg \ localbase pkgconfig shebangfix ssl ALL_TARGET= #empty LDFLAGS+= -L${OPENSSLLIB} -lssl -lcrypto ${ICONV_LIB} CFLAGS+= -I${OPENSSLINC} MAKE_ARGS= HOST_CC="${CC}" CC="${CC}" CCOPT="" HOST="${OPSYS}" \ TARGET="gtk3" \ WARNFLAGS="" Q="" OPTCFLAGS="${CFLAGS}" MAKE_ENV+= COMPONENT_TYPE="lib-shared" \ FLEX="${LOCALBASE}/bin/flex" USE_GNOME= glib20 gtk30 cairo librsvg2 WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} SHEBANG_FILES= utils/split-messages.pl perl_CMD= ${SETENV} perl OPTIONS_DEFINE= GSTREAMER OPTIONS_EXCLUDE= GSTREAMER GSTREAMER_USE= GSTREAMER=yes, good post-patch: @${REINPLACE_CMD} '/CFLAGS/d' \ ${WRKSRC}//Makefile.defaults @${REINPLACE_CMD} 's| -O2||' \ ${WRKSRC}/frontends/gtk/Makefile.defaults @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/frontends/gtk/gui.c do-configure: @${CP} ${FILESDIR}/Makefile.config ${WRKSRC} .if empty(ICONV_LIB) @${REINPLACE_CMD} '/NETSURF_USE_LIBICONV_PLUG/ s|NO|YES|' \ ${WRKSRC}/Makefile.config .endif do-configure-GSTREAMER-on: @${REINPLACE_CMD} '/NETSURF_USE_VIDEO/ s|NO|YES|' \ ${WRKSRC}/Makefile.config post-install: cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf netsurf-gtk3 \ netsurf-gtk .for d in applications pixmaps ${MKDIR} ${STAGEDIR}${PREFIX}/share/${d} .endfor ${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps .include Index: head/www/netsurf/distinfo =================================================================== --- head/www/netsurf/distinfo (revision 539342) +++ head/www/netsurf/distinfo (revision 539343) @@ -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 Index: head/www/netsurf/files/patch-frontends_gtk_gui.c =================================================================== --- head/www/netsurf/files/patch-frontends_gtk_gui.c (revision 539342) +++ head/www/netsurf/files/patch-frontends_gtk_gui.c (nonexistent) @@ -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) || Property changes on: head/www/netsurf/files/patch-frontends_gtk_gui.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/netsurf/files/patch-Makefile =================================================================== --- head/www/netsurf/files/patch-Makefile (revision 539342) +++ head/www/netsurf/files/patch-Makefile (revision 539343) @@ -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)) Index: head/www/netsurf/files/patch-utils_idna.c =================================================================== --- head/www/netsurf/files/patch-utils_idna.c (revision 539342) +++ head/www/netsurf/files/patch-utils_idna.c (revision 539343) @@ -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 - #include - #include +--- 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 +#include - #include "netsurf/inttypes.h" - + int32_t idna_contexto[] = { + /* CONTEXTO codepoints which have a rule defined */ Index: head/www/netsurf/pkg-plist =================================================================== --- head/www/netsurf/pkg-plist (revision 539342) +++ head/www/netsurf/pkg-plist (revision 539343) @@ -1,69 +1,67 @@ bin/netsurf-gtk bin/netsurf-gtk3 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 %%DATADIR%%/de/Messages %%DATADIR%%/de/welcome.html %%DATADIR%%/default.css %%DATADIR%%/default.ico %%DATADIR%%/downloads.gtk3.ui %%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 %%DATADIR%%/globalhistory.gtk3.ui %%DATADIR%%/hotlist.gtk3.ui %%DATADIR%%/icons/arrow-l.png %%DATADIR%%/icons/content.png %%DATADIR%%/icons/directory.png %%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 %%DATADIR%%/it/licence.html %%DATADIR%%/it/welcome.html %%DATADIR%%/ja/welcome.html %%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 %%DATADIR%%/netsurf.xpm %%DATADIR%%/nl/Messages %%DATADIR%%/nl/credits.html %%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 %%DATADIR%%/throbber/throbber2.png %%DATADIR%%/throbber/throbber3.png %%DATADIR%%/throbber/throbber4.png %%DATADIR%%/throbber/throbber5.png %%DATADIR%%/throbber/throbber6.png %%DATADIR%%/throbber/throbber7.png %%DATADIR%%/throbber/throbber8.png %%DATADIR%%/toolbar.gtk3.ui %%DATADIR%%/viewdata.gtk3.ui %%DATADIR%%/warning.gtk3.ui %%DATADIR%%/welcome.html share/pixmaps/netsurf.xpm