From nobody Sat Jul 19 13:02:09 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bkmyn4CkHz61n30; Sat, 19 Jul 2025 13:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkmyn2yhJz3x3q; Sat, 19 Jul 2025 13:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752930129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJ9zhT8TeXh++FqfTxp4kki6wXCYaTawmB/N1DuqJJA=; b=GFdjoQUEtqDZ6LoaCfa+D13BTxSuFGTSf4adlTKwGXgoPomt7TM79R67PMYz1Ygq5WXai8 Rh9fyksBN67crXD2NP6uknds+DlU/kVkOH4Q1Ck2ssP5cZm8GV1g+s6hXTUL62peTiojQh c1coumC0lxR/w2rxtefygS6aJN0s8zn/MNVvptNehxUV3xGx3rZBYqo2s7P7iTveNIRoqY S3Y0R+xlJIvBraKmYeM5TyA8R+IITxp3SvALQeFYOHAqrvjFZMd3nABlQEQeAK1oDNJ6qJ G7kpsou7gc2u2ia82j8FN9M6kAC/wSfsSjUmzWIMRCBrL6O1b004aS5raz2ijQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752930129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJ9zhT8TeXh++FqfTxp4kki6wXCYaTawmB/N1DuqJJA=; b=Pex+pc+y/We5cHXY2h1uDrrSNhid9Ya8q0GRSuOlxkXCTwS1S5iLL/8jH/sZDw8CyXvGqA 4giZ3VJ+j+W++V1+mjJlFAKFL2zIo4rd/PZ7KEolBudBsCsItf2ceKnNKAYqoupH7mrNaP Gl3tc6MUO2peEbv9zfCLI25V8/1JHlHO9XGuhF/zMWN51Cr+/0/OKrn+N/SFWJbfTDXvpb Byokzbq94uN6EajBDqJReNyh0RJbOeqtHkV5ebddhBL43cTorPwwHdKy+wU94Tds9U1GAc rteuWAz+NLsBvevy3000SoY2HG1coRJMtVAYNtV9SP8P9AXQ2btPmxV1W0gJwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752930129; a=rsa-sha256; cv=none; b=QrgZAetbFtSsq5QuI4Y60syYva2iRAX/TObosLFLan4QK3ab/ZG/02QW2+MJz9BRoYh7XR ep18/Jj/N6X7f9DbDH6FeEsLRgpIqMeTAlvpSWMo+FzNyhODTuwM4X30neoFZbe1sR4RvC BzkOViIm5IpTiiNZ45HWhvUYp9ZQ9G3tdgpV4AN3uL5G12jkXBi0oQ8qYz1ig2F15PSLye lioZZ9g5bzExsVKkmEBy6UN37fncYQsU5nsJmFZyDpVS9/PXhr9bHf+fS7oz9Sg94rWlr3 HQoWqpFVi2cnfambVIvZHhjVOv1MZmFT8Edu0WIpAfVXjENWseFq0epTq8h6Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bkmyn2Mv3zC7H; Sat, 19 Jul 2025 13:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56JD29BY008680; Sat, 19 Jul 2025 13:02:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56JD295N008661; Sat, 19 Jul 2025 13:02:09 GMT (envelope-from git) Date: Sat, 19 Jul 2025 13:02:09 GMT Message-Id: <202507191302.56JD295N008661@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: ae901b28927d - main - www/tor-browser: Improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae901b28927d8fe55e1cb2af1bf748408dfee5af Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae901b28927d8fe55e1cb2af1bf748408dfee5af commit ae901b28927d8fe55e1cb2af1bf748408dfee5af Author: Vladimir Druzenko AuthorDate: 2025-07-19 12:58:14 +0000 Commit: Vladimir Druzenko CommitDate: 2025-07-19 12:58:14 +0000 www/tor-browser: Improve port - Improve "fix build on i386" - use www/node24 for i386 only. - Unification of Makefile with Firefox - make it more similar. - Use ${DESKTOPDIR} instead of ${PREFIX}/share/applications. - Reduce the number of mkdir calls. PR: 288108 Approved by: Martin Filla (maintainer) MFH: 2025Q3 --- www/tor-browser/Makefile | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index 5ef11b7e4cdf..6d87f46cd1f9 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -48,14 +48,13 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ v4l_compat>0:multimedia/v4l_compat \ autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ - node${NODEJS_VERSION}>=24:www/node${NODEJS_VERSION} \ yasm:devel/yasm RUN_DEPENDS= tor:security/tor \ obfs4proxy:security/obfs4proxy-tor \ snowflake-client:security/snowflake-tor -USES= compiler:c++11-lib libtool localbase:ldflags nodejs:24,build,env \ - perl5 pkgconfig python shebangfix tar:xz +USES= compiler:c++11-lib libtool localbase:ldflags perl5 pkgconfig \ + python shebangfix tar:xz USE_GECKO= gecko USE_GITHUB= nodefault TAG_L10N= fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3 @@ -67,8 +66,8 @@ LOCALES= af ar az be bg bs ca cs da de el es-ES et fa fi fr ga-IE gu-IN \ nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sq sr sv-SE ta \ te th tl tr uk ur vi zh-CN zh-TW -CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \ - MOZ_CHROME_MULTILOCALE="${LOCALES}" +CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV+= MOZ_CHROME_MULTILOCALE="${LOCALES}" MAKE_ENV+= LOCALES="${LOCALES}" @@ -80,7 +79,7 @@ SUB_FILES= fonts.conf tor-browser.desktop torrc-defaults WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} -MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ +MOZ_EXPORT= MOZ_TELEMETRY_REPORTING="" \ MOZILLA_OFFICIAL="1" \ MOZ_OFFICIAL_BRANDING="1" \ MOZ_APP_DISPLAYNAME="Tor Browser" \ @@ -106,10 +105,14 @@ MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \ .include -.if ${ARCH} == i386 && ${MACHINE_CPU:Msse2} +.if ${ARCH} == i386 +BUILD_DEPENDS+= node${NODEJS_VERSION}>=24:www/node${NODEJS_VERSION} +USES+= nodejs:24,build,env +. if ${MACHINE_CPU:Msse2} # is not enabled on i386 by default # Fix for error: always_inline function '_mm_setzero_si64' requires target feature 'sse2' CFLAGS_i386+= -msse2 +. endif .endif .if ${ARCH} == amd64 @@ -148,11 +151,11 @@ post-configure: ${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/ ${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/tor-browser.ftl \ ${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/ - ${MKDIR} ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/branding/tb-release + ${MKDIR} ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/branding/tb-release \ + ${WRKSRC}/toolkit/torbutton/chrome/locale/${i} ${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/brand.properties \ ${WRKDIR}/translation-${TAG_TOR}/${i}/branding/brand.ftl \ ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/branding/tb-release - ${MKDIR} ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/ . for j in onionLocation.properties settings.properties torConnect.properties \ torlauncher.properties ${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/${j} \ @@ -168,18 +171,17 @@ post-build: ${WRKSRC}/mach package-multi-locale --locales ${LOCALES} post-install: - @${MKDIR} ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} \ + ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig \ + ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts \ + ${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions ${INSTALL_DATA} ${WRKDIR}/torrc-defaults \ ${STAGEDIR}${DATADIR}/torrc-defaults - ${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop \ - ${STAGEDIR}${PREFIX}/share/applications/tor-browser.desktop - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts + ${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/fonts.conf \ ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig/fonts.conf (cd ${WRKDIR}/fonts && \ ${COPYTREE_SHARE} "*.otf *.ttf" ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts) - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions ${INSTALL_DATA} ${DISTDIR}/${NOSCRIPT} \ "${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"