git: 199ee8201c79 - main - www/waterfox: Update 6.0.18 → 6.0.19, improve port

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=199ee8201c798f1f5edb8fc0fbc32e145a1483d6

commit 199ee8201c798f1f5edb8fc0fbc32e145a1483d6
Author:     Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2024-09-08 09:01:00 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-09-08 09:01:00 +0000

    www/waterfox: Update 6.0.18 → 6.0.19, improve port
    
    Update 6.0.18 → 6.0.19 are trivial - just change version.
    
    Improve port:
     - Make Makefile more look like www/librewolf/Makefile and
       www/firefox-esr/Makefile
     - Remove doubles of USE_GECKO and BUILD_DEPENDS+=devel/wasi-*
     - Fix warnings from portclippy
    
    Changelog:
    https://github.com/BrowserWorks/Waterfox/releases/tag/G6.0.19
    
    PR:     281330
---
 www/waterfox/Makefile | 44 +++++++++++++++++++-------------------------
 www/waterfox/distinfo |  6 +++---
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index 186ad9941d5f..55d66706eed4 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	waterfox
 DISTVERSIONPREFIX=	G
-DISTVERSION=	6.0.18
-PORTREVISION=	1
+DISTVERSION=	6.0.19
 PORTEPOCH=	1
 CATEGORIES=	www
 
@@ -28,28 +27,23 @@ BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
+USE_GECKO=	gecko
 USE_GITHUB=	yes
 GH_ACCOUNT=	BrowserWorks
 GH_PROJECT=	Waterfox
-
-.include "${.CURDIR}/../../www/firefox/Makefile.options"
-.include <bsd.port.options.mk>
-
-.if ${ARCH} != powerpc64
-BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
-		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
-		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
-.endif
-
-USE_GECKO=	gecko
 USE_MOZILLA=	-sqlite
 
-CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
+CONFIGURE_ENV+=		BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
+			MOZ_REQUIRE_SIGNING=""
+
+CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
+
+BINARY_ALIAS+=		python3=${PYTHON_CMD}
+
 MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
-CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
-		MOZ_REQUIRE_SIGNING=""
+
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
@@ -72,13 +66,13 @@ MOZ_OPTIONS+=	--enable-application=browser \
 		MOZ_CRASHREPORTER=0 \
 		MOZ_DATA_REPORTING=0
 
-BINARY_ALIAS+=	python3=${PYTHON_CMD}
+FIREFOX_ICON=		${MOZILLA}.png
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
+FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
 
-USE_GECKO=	gecko
+.include "${.CURDIR}/../../www/firefox/Makefile.options"
 
-WATERFOX_ICON=		${MOZILLA}.png
-WATERFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
-WATERFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 MOZ_OPTIONS+=	--enable-rust-simd
@@ -98,14 +92,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e 's/firefox/${MOZILLA}/' \
 		-e 's/Firefox/${MOZILLA_CAP}/' \
-		-e '/^Icon/s/=.*/=${WATERFOX_ICON:R}/' \
-		${WATERFOX_DESKTOP}
+		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
+		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 post-install:
-	${INSTALL_DATA} ${WATERFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
+	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
-	${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON}
+	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo
index 686b2653ad3e..0186c2eb62bf 100644
--- a/www/waterfox/distinfo
+++ b/www/waterfox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723533515
-SHA256 (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 5d2b4cabca1dd9111428d6ce64df69f93c207f1e5fc630b3e2581f4bf48b438c
-SIZE (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 762540446
+TIMESTAMP = 1725694141
+SHA256 (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = bf8eeab7720c7ca14ceab4f1efbd884a4369b428048955bd8d76b47151478a3c
+SIZE (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = 762556046