4 files changed, 25 insertions, 71 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 935e86570321..aef7f162489d 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	netsurf
-PORTVERSION=	3.10
-PORTREVISION=	10
+PORTVERSION=	3.11
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -38,9 +37,6 @@ USES=		bison cpe desktop-file-utils gmake gnome iconv:translit jpeg \
 CPE_VENDOR=	${PORTNAME}-browser
 USE_GNOME=	cairo glib20 gtk30 librsvg2
 
-SHEBANG_FILES=	utils/split-messages.pl
-perl_CMD=	${PERL}
-
 MAKE_ARGS=	CC="${CC}" \
 		CCOPT="" \
 		HOST="${OPSYS}" \
@@ -74,16 +70,6 @@ post-install:
 .for d in applications pixmaps
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/${d}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/deoptions.gtk3.ui \
-		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/enoptions.gtk3.ui \
-		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/froptions.gtk3.ui \
-		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/itoptions.gtk3.ui \
-		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/nloptions.gtk3.ui \
-		${STAGEDIR}${PREFIX}/share/netsurf
 	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf.xpm \
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index 7f6058cb2772..194707db146e 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591232159
-SHA256 (netsurf-3.10-src.tar.gz) = 36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e
-SIZE (netsurf-3.10-src.tar.gz) = 4084480
+TIMESTAMP = 1708105641
+SHA256 (netsurf-3.11-src.tar.gz) = c28a626aefee428d053b13f88b5c440922245976522d12eaf137cfd32d201cb2
+SIZE (netsurf-3.11-src.tar.gz) = 4311767
diff --git a/www/netsurf/files/patch-Makefile b/www/netsurf/files/patch-Makefile
index e976dd322efd..ded7e96b245e 100644
--- a/www/netsurf/files/patch-Makefile
+++ b/www/netsurf/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-05-24 20:55:29 UTC
+--- Makefile.orig	2023-12-28 00:26:04 UTC
 +++ Makefile
-@@ -484,16 +484,6 @@ ifneq ($(CC_MAJOR),2)
+@@ -105,16 +105,6 @@ endif
    COMMON_WARNFLAGS += -Wno-unused-parameter
  endif
  
@@ -17,42 +17,11 @@
  # deal with chaging warning flags for different platforms
  ifeq ($(HOST),OpenBSD)
    # OpenBSD headers are not compatible with redundant declaration warning
-@@ -547,7 +537,6 @@ ifeq ($(HOST),mint)
+@@ -168,7 +158,6 @@ endif
  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,UTF8PROC,libutf8proc,utf8))
- $(eval $(call pkg_config_find_and_add_enabled,WEBP,libwebp,WEBP))
-@@ -680,14 +669,21 @@ $$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessag
- 	$$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$<
- 
- CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
-+CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)options.gtk3.ui
- MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
- 
- endef
- 
-+buildui: 
-+	@echo "BUILDUI: options ui for each language in resources/FatMessages"
-+	@$(PERL) utils/buildui.pl resources/FatMessages frontends/gtk/res/options.gtk3.ui $(MESSAGES_TARGET) options.gtk3.ui
-+
- # generate the message file rules
- $(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \
- 	$(call split_messages,$(LANG))))
- 
-+MESSAGES += buildui
-+
- clean-messages:
- 	$(VQ)echo "   CLEAN: $(CLEAN_MESSAGES)"
- 	$(Q)$(RM) $(CLEAN_MESSAGES)
-@@ -710,7 +706,7 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,
- # Include directory flags
- IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
- 
--$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
-+$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES) 
- 	$(VQ)echo "    LINK: $(EXETARGET)"
- ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
- 	$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
+ $(eval $(call pkg_config_find_and_add_enabled,JPEGXL,libjxl,JPEGXL))
diff --git a/www/netsurf/pkg-plist b/www/netsurf/pkg-plist
index 53d10f0688f5..ecb67d4920a5 100644
--- a/www/netsurf/pkg-plist
+++ b/www/netsurf/pkg-plist
@@ -5,21 +5,21 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/SearchEngines
 %%DATADIR%%/adblock.css
 %%DATADIR%%/ca-bundle.txt
-%%DATADIR%%/cookies.gtk3.ui
+%%DATADIR%%/cookies.ui
 %%DATADIR%%/credits.html
 %%DATADIR%%/de/Messages
 %%DATADIR%%/de/welcome.html
 %%DATADIR%%/default.css
 %%DATADIR%%/default.ico
-%%DATADIR%%/downloads.gtk3.ui
+%%DATADIR%%/downloads.ui
 %%DATADIR%%/en/Messages
 %%DATADIR%%/en/credits.html
 %%DATADIR%%/en/licence.html
 %%DATADIR%%/en/welcome.html
 %%DATADIR%%/favicon.png
 %%DATADIR%%/fr/Messages
-%%DATADIR%%/globalhistory.gtk3.ui
-%%DATADIR%%/hotlist.gtk3.ui
+%%DATADIR%%/globalhistory.ui
+%%DATADIR%%/hotlist.ui
 %%DATADIR%%/icons/arrow-l.png
 %%DATADIR%%/icons/content.png
 %%DATADIR%%/icons/directory.png
@@ -37,25 +37,20 @@ share/applications/netsurf-gtk.desktop
 %%DATADIR%%/ja/welcome.html
 %%DATADIR%%/languages
 %%DATADIR%%/licence.html
-%%DATADIR%%/localhistory.gtk3.ui
+%%DATADIR%%/localhistory.ui
 %%DATADIR%%/netsurf-16x16.xpm
-%%DATADIR%%/netsurf.gtk3.ui
 %%DATADIR%%/netsurf.png
+%%DATADIR%%/netsurf.ui
 %%DATADIR%%/netsurf.xpm
 %%DATADIR%%/nl/Messages
 %%DATADIR%%/nl/credits.html
 %%DATADIR%%/nl/licence.html
 %%DATADIR%%/nl/welcome.html
-%%DATADIR%%/options.gtk3.ui
-%%DATADIR%%/deoptions.gtk3.ui
-%%DATADIR%%/enoptions.gtk3.ui
-%%DATADIR%%/froptions.gtk3.ui
-%%DATADIR%%/itoptions.gtk3.ui
-%%DATADIR%%/nloptions.gtk3.ui
-%%DATADIR%%/pageinfo.gtk3.ui
-%%DATADIR%%/password.gtk3.ui
+%%DATADIR%%/options.ui
+%%DATADIR%%/pageinfo.ui
+%%DATADIR%%/password.ui
 %%DATADIR%%/quirks.css
-%%DATADIR%%/tabcontents.gtk3.ui
+%%DATADIR%%/tabcontents.ui
 %%DATADIR%%/throbber/throbber0.png
 %%DATADIR%%/throbber/throbber1.png
 %%DATADIR%%/throbber/throbber2.png
@@ -65,8 +60,12 @@ share/applications/netsurf-gtk.desktop
 %%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%%/toolbar.ui
+%%DATADIR%%/viewdata.ui
+%%DATADIR%%/warning.ui
 %%DATADIR%%/welcome.html
+%%DATADIR%%/zh_CN/Messages
+%%DATADIR%%/zh_CN/credits.html
+%%DATADIR%%/zh_CN/licence.html
+%%DATADIR%%/zh_CN/welcome.html
 share/pixmaps/netsurf.xpm