5 files changed, 56 insertions, 28 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 644906398ba9..0c4835a0173f 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	firefox
-DISTVERSION=	140.1.0
+DISTVERSION=	140.2.0
 PORTEPOCH=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
@@ -9,7 +9,7 @@ DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
-WWW=		https://www.mozilla.com/firefox
+WWW=		https://www.firefox.com/
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.112:security/nss \
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 5228f07cc408..9b2d3f0fc244 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752516226
-SHA256 (firefox-140.1.0esr.source.tar.xz) = d15c65d790e0c371b5c95332141b1bdeb29fefc27f852d22a5f542b6d1bc1922
-SIZE (firefox-140.1.0esr.source.tar.xz) = 638937036
+TIMESTAMP = 1754937436
+SHA256 (firefox-140.2.0esr.source.tar.xz) = 956dce675c3b706d563caf07ed3ca9af632ab830be710dfd4351da78a0a2ef55
+SIZE (firefox-140.2.0esr.source.tar.xz) = 631022940
diff --git a/www/firefox-esr/files/patch-bug1876366 b/www/firefox-esr/files/patch-bug1876366
deleted file mode 100644
index 78483c3fbab7..000000000000
--- a/www/firefox-esr/files/patch-bug1876366
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 46a89fb0319d673b3139a068e3d89aed9f44fc16
-Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-
-    use gdk legacy cursor interface by default
-    
-    Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=1876366#c16
-    hints that we could re-test this once we have GTK 3.24.42 (with the
-    now-current gtk3-3.24.41 the original problem is still reproducable,
-    but toggling this flag does fix it for me)
-
-diff --git modules/libpref/init/StaticPrefList.yaml modules/libpref/init/StaticPrefList.yaml
-index 835450712a12..f2249006c36d 100644
---- modules/libpref/init/StaticPrefList.yaml
-+++ modules/libpref/init/StaticPrefList.yaml
-@@ -16070,7 +16070,7 @@
- # Whether to use gtk legacy cursor API.
- - name: widget.gtk.legacy-cursors.enabled
-   type: bool
--  value: false
-+  value: true
-   mirror: always
- 
- # Whether to use gtk high contrast themes to disable content styling like on
diff --git a/www/firefox-esr/files/patch-bug1876632 b/www/firefox-esr/files/patch-bug1876632
new file mode 100644
index 000000000000..3932b1deccc9
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1876632
@@ -0,0 +1,35 @@
+commit 4f531ca86d24be5d4de673f6e652ed899151d20c
+Author: Jesper Schmitz Mouridsen <jesper@schmitz.computer>
+Date:   Wed Jul 23 22:01:31 2025 +0000
+
+    Bug 1876632 Fix aslr allocations on FreeBSD r=spidermonkey-reviewers,sfink
+    
+    Without the alignment flag the desired address
+    gets randomized by aslr in a way which causes it to not
+    be aligned. Furthermore the TryToAlignChunk almost always
+    fails. With this fix it never gets to TryToAlignChunk
+    because the flag guarantees upfront alignment.
+    
+    Differential Revision: https://phabricator.services.mozilla.com/D257824
+
+diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
+index e790f1784ede..13639c9a6eb4 100644
+--- js/src/gc/Memory.cpp
++++ js/src/gc/Memory.cpp
+@@ -608,7 +608,16 @@ static void* MapAlignedPagesRandom(size_t length, size_t alignment) {
+   for (size_t i = 1; i <= 1024; ++i) {
+     if (i & 0xf) {
+       uint64_t desired = alignment * GetNumberInRange(minNum, maxNum);
++#  if defined(__FreeBSD__) && defined(__aarch64__)
++      int flags = MAP_PRIVATE | MAP_ANON |
++                  MAP_ALIGNED(mozilla::CeilingLog2Size(alignment));
++      region = MozTaggedAnonymousMmap((void*)(uintptr_t)desired, length,
++                                      int(PageAccess::ReadWrite), flags, -1, 0,
++                                      "js-gc-heap");
++#  else
+       region = MapMemoryAtFuzzy(reinterpret_cast<void*>(desired), length);
++
++#  endif
+       if (!region) {
+         continue;
+       }
diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message
index 5df4e99ac994..d12bd5033327 100644
--- a/www/firefox-esr/pkg-message
+++ b/www/firefox-esr/pkg-message
@@ -13,6 +13,22 @@ Some features found on Windows, macOS and Linux are not implemented:
 - TCP fast open
 - `about:networking#networkid` (requires link state notification)
 
+## Cursors
+
+From Firefox 140.2 on, this port defaults to using the new (themed)
+cursor selection. On the upside, this makes Firefox respect the
+desktop environment's theme, on the downside this breaks compatibility
+with the legacy X cursor names. If you experience issues (i.e. the
+mouse cursor not changing to the pointer ("hand") when hovering over
+links), your desktop environment is most likely still set to the legacy
+default/builtin "theme". To remedy this, either
+- set about:config variable "widget.gtk.legacy-cursors.enabled" to "true"
+  to re-enable the legacy cursors, or
+- use the Xcursor framework to set a cursor theme (e.g. X resource
+  item Xcursor.theme), see Xcursor(3) for details. The Adwaita theme
+  will have been installed as a dependency of gtk3 and does work.
+The latter option is only available for X environments.
+
 ## Audio backend
 
 Currently used audio backend can be inspected on `about:support` page.