Attachment #253418 for bug #281330




PORTNAME=	waterfox
DISTVERSIONPREFIX=	G
DISTVERSION=	6.0.19
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	www


		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/^.//}

		MOZ_REQUIRE_SIGNING=""
MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
		MOZILLA_OFFICIAL="1" \
		MOZ_OFFICIAL_BRANDING="1" \

		MOZ_CRASHREPORTER=0 \
		MOZ_DATA_REPORTING=0

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

.include "${.CURDIR}/../../www/firefox/Makefile.options"

.include <bsd.port.options.mk>
WATERFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
WATERFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop

.if ${ARCH} == amd64
MOZ_OPTIONS+=	--enable-rust-simd

	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
		-e 's/firefox/${MOZILLA}/' \
		-e 's/Firefox/${MOZILLA_CAP}/' \
		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
		${FIREFOX_DESKTOP}
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
		${WRKSRC}/browser/app/nsBrowserApp.cpp

post-install:
	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/www/waterfox/distinfo (-4 / +3 lines)
1	TIMESTAMP = 1723533515	1	TIMESTAMP = 1725694141
2	SHA256 (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 5d2b4cabca1dd9111428d6ce64df69f93c207f1e5fc630b3e2581f4bf48b438c	2	SHA256 (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = bf8eeab7720c7ca14ceab4f1efbd884a4369b428048955bd8d76b47151478a3c
3	SIZE (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 762540446	3	SIZE (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = 762556046
4	-

Return to bug 281330

Lines 1-7 Link Here

(-)b/www/waterfox/Makefile (-25 / +19 lines)
1	PORTNAME= waterfox	1	PORTNAME= waterfox
2	DISTVERSIONPREFIX= G	2	DISTVERSIONPREFIX= G
3	DISTVERSION= 6.0.18	3	DISTVERSION= 6.0.19
4	PORTREVISION= 1
5	PORTEPOCH= 1	4	PORTEPOCH= 1
6	CATEGORIES= www	5	CATEGORIES= www
7		6
Lines 28-55 BUILD_DEPENDS= nspr>=4.32:devel/nspr \ Link Here
28	yasm:devel/yasm \	27	yasm:devel/yasm \
29	zip:archivers/zip	28	zip:archivers/zip
30		29
		30	USE_GECKO= gecko
31	USE_GITHUB= yes	31	USE_GITHUB= yes
32	GH_ACCOUNT= BrowserWorks	32	GH_ACCOUNT= BrowserWorks
33	GH_PROJECT= Waterfox	33	GH_PROJECT= Waterfox
34
35	.include "${.CURDIR}/../../www/firefox/Makefile.options"
36	.include <bsd.port.options.mk>
37
38	.if ${ARCH} != powerpc64
39	BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
40	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
41	wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
42	.endif
43
44	USE_GECKO= gecko
45	USE_MOZILLA= -sqlite	34	USE_MOZILLA= -sqlite
46		35
47	CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234
48	# work around bindgen not finding ICU, e.g.	36	# work around bindgen not finding ICU, e.g.
49	# dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true	37	# dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
		38	CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
		39	MOZ_REQUIRE_SIGNING=""
		40
		41	CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234
		42
		43	BINARY_ALIAS+= python3=${PYTHON_CMD}
		44
50	MOZILLA_CAP= ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}	45	MOZILLA_CAP= ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
51	CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \	46
52	MOZ_REQUIRE_SIGNING=""
53	MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \	47	MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \
54	MOZILLA_OFFICIAL="1" \	48	MOZILLA_OFFICIAL="1" \
55	MOZ_OFFICIAL_BRANDING="1" \	49	MOZ_OFFICIAL_BRANDING="1" \
Lines 72-84 MOZ_OPTIONS+= --enable-application=browser \ Link Here
72	MOZ_CRASHREPORTER=0 \	66	MOZ_CRASHREPORTER=0 \
73	MOZ_DATA_REPORTING=0	67	MOZ_DATA_REPORTING=0
74		68
75	BINARY_ALIAS+= python3=${PYTHON_CMD}	69	FIREFOX_ICON= ${MOZILLA}.png
		70	FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
		71	FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
76		72
77	USE_GECKO= gecko	73	.include "${.CURDIR}/../../www/firefox/Makefile.options"
78		74
79	WATERFOX_ICON= ${MOZILLA}.png	75	.include <bsd.port.options.mk>
80	WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
81	WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
82		76
83	.if ${ARCH} == amd64	77	.if ${ARCH} == amd64
84	MOZ_OPTIONS+= --enable-rust-simd	78	MOZ_OPTIONS+= --enable-rust-simd
Lines 98-111 post-patch: Link Here
98	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \	92	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
99	-e 's/firefox/${MOZILLA}/' \	93	-e 's/firefox/${MOZILLA}/' \
100	-e 's/Firefox/${MOZILLA_CAP}/' \	94	-e 's/Firefox/${MOZILLA_CAP}/' \
101	-e '/^Icon/s/=.*/=${WATERFOX_ICON:R}/' \	95	-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
102	${WATERFOX_DESKTOP}	96	${FIREFOX_DESKTOP}
103	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \	97	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
104	${WRKSRC}/browser/app/nsBrowserApp.cpp	98	${WRKSRC}/browser/app/nsBrowserApp.cpp
105		99
106	post-install:	100	post-install:
107	${INSTALL_DATA} ${WATERFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop	101	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
108	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps	102	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
109	${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON}	103	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
110		104
111	.include <bsd.port.mk>	105	.include <bsd.port.mk>