On Mon, Sep 22, 2025 at 08:38:39AM +0200, Landry Breuil wrote:
> Le Sun, Sep 21, 2025 at 09:43:41PM +0200, Caspar Schutijser a écrit :
> > Hi,
> > 
> > In a couple of weeks, Tor Browser version 15.0 will be released.
> > I'm already testing the alpha releases. While running the first alpha
> > release, I noticed that it didn't "look" like Tor Browser but like
> > Mozilla Firefox (in terms of the browser name, logo and some other
> > things).
> 
> I'm fine with 1,2 & 4, with a preference for 1, but as long as you do
> the work whichever you prefer :P

Hi Stuart and Landry,

Thanks you both for your input. Since Stuart prefers 2 and Landry is
okay with that too, I implemented that. The diff is below. I have built
and run all mozilla.port.mk ports, and I have verified the output of
"make show=CONFIGURE_ARGS".

Comments or OKs?

Caspar

--

Move CONFIGURE+=--enable-official-branding from mozilla.port.mk
to Mozilla ports that really need it. Tor Browser uses mozilla.port.mk
but for a future release, it is important that this configure flag is
not specified.

Index: www/mozilla/mozilla.port.mk
===================================================================
RCS file: /cvs/ports/www/mozilla/mozilla.port.mk,v
diff -u -p -r1.178 mozilla.port.mk
--- www/mozilla/mozilla.port.mk	20 Sep 2025 09:12:46 -0000	1.178
+++ www/mozilla/mozilla.port.mk	23 Sep 2025 08:41:53 -0000
@@ -150,7 +150,6 @@ USE_NOBTCFI ?=	Yes
 
 AUTOCONF_VERSION =	2.13
 CONFIGURE_ARGS +=	--with-system-zlib	\
-		--enable-official-branding	\
 		--enable-optimize="${CFLAGS}"	\
 		--disable-updater
 
Index: mail/mozilla-thunderbird/Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
diff -u -p -r1.511 Makefile
--- mail/mozilla-thunderbird/Makefile	20 Sep 2025 07:11:18 -0000	1.511
+++ mail/mozilla-thunderbird/Makefile	23 Sep 2025 08:41:53 -0000
@@ -55,6 +55,7 @@ NO_TEST =	Yes
 CONFIGURE_STYLE =	simple
 CONFIGURE_SCRIPT =	${MODPY_BIN} ${WRKSRC}/configure.py
 CONFIGURE_ARGS +=	--prefix=${PREFIX}
+CONFIGURE_ARGS +=	--enable-official-branding
 # pledge strings to be defined, and no multiprocess anyway..
 CONFIGURE_ARGS +=	--disable-sandbox
 CONFIGURE_ARGS +=	--with-libclang-path=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
Index: www/firefox-esr/Makefile
===================================================================
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
diff -u -p -r1.256 Makefile
--- www/firefox-esr/Makefile	20 Sep 2025 07:09:45 -0000	1.256
+++ www/firefox-esr/Makefile	23 Sep 2025 08:41:53 -0000
@@ -46,6 +46,7 @@ NO_TEST =	Yes
 CONFIGURE_STYLE =	simple
 CONFIGURE_SCRIPT =	${MODPY_BIN} ${WRKSRC}/configure.py
 CONFIGURE_ARGS +=	--prefix=${PREFIX}
+CONFIGURE_ARGS +=	--enable-official-branding
 MAKE_ENV +=		BUILD_VERBOSE_LOG="1" CARGOFLAGS="-j${MAKE_JOBS}"
 .if ${MACHINE_ARCH} == aarch64
 # retguard leads to segfault at startup on arm64, cf #1973016
Index: www/mozilla-firefox/Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
diff -u -p -r1.649 Makefile
--- www/mozilla-firefox/Makefile	20 Sep 2025 07:03:06 -0000	1.649
+++ www/mozilla-firefox/Makefile	23 Sep 2025 08:41:53 -0000
@@ -45,6 +45,7 @@ WANTLIB += Xrandr Xtst
 CONFIGURE_STYLE =	simple
 CONFIGURE_SCRIPT =	${MODPY_BIN} ${WRKSRC}/configure.py
 CONFIGURE_ARGS +=	--prefix=${PREFIX}
+CONFIGURE_ARGS +=	--enable-official-branding
 MAKE_ENV +=		BUILD_VERBOSE_LOG="1" CARGOFLAGS="-j${MAKE_JOBS}"
 .if ${MACHINE_ARCH} == aarch64
 # retguard leads to segfault at startup on arm64, cf #1973016
Index: www/seamonkey/Makefile
===================================================================
RCS file: /cvs/ports/www/seamonkey/Makefile,v
diff -u -p -r1.314 Makefile
--- www/seamonkey/Makefile	21 Sep 2025 15:13:07 -0000	1.314
+++ www/seamonkey/Makefile	23 Sep 2025 08:41:53 -0000
@@ -59,6 +59,7 @@ NO_TEST=	Yes
 CONFIGURE_SCRIPT =	configure.in
 CONFIGURE_STYLE =	simple
 CONFIGURE_ARGS +=	--prefix=${PREFIX}
+CONFIGURE_ARGS +=	--enable-official-branding
 CONFIGURE_ARGS +=	--enable-linker=lld
 
 BUILD_DEPENDS +=	devel/cbindgen>=0.6.1