[Bug 281330] www/waterfox: update to 6.0.19

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281330

Vladimir Druzenko <vvd@FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |vvd@FreeBSD.org
           Severity|Affects Only Me             |Affects Some People
             Status|New                         |In Progress
           Assignee|ports-bugs@FreeBSD.org      |vvd@FreeBSD.org

--- Comment #2 from Vladimir Druzenko <vvd@FreeBSD.org> ---
I suggest to make Makefile more look like www/librewolf/Makefile and
www/firefox-esr/Makefile, remove doubles USE_GECKO and
BUILD_DEPENDS+=devel/wasi-*, fix warnings from portclippy:
--- www/waterfox/Makefile.orig
+++ 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 @@
                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_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 @@
        @${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>

-- 
You are receiving this mail because:
You are the assignee for the bug.