diff --git a/x11/mesa/Portfile b/x11/mesa/Portfile
index a0193cff1dd..a885a362334 100644
--- a/x11/mesa/Portfile
+++ b/x11/mesa/Portfile
@@ -12,11 +12,11 @@ legacysupport.newest_darwin_requires_legacy 17
 name                    mesa
 conflicts               gl-headers
 epoch                   1
-version                 25.0.2
+version                 25.2.3
 revision                0
-checksums               rmd160  9cc4dc7b4e0324857dd35a3cf7818059ae5aefd5 \
-                        sha256  adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97 \
-                        size    46705776
+checksums               rmd160  fd9cd9d11e30594475f92921c2a0842a070332df \
+                        sha256  f2d6b28562f1d6cb9c17ee8e58eeade7aa5faf927ae71065eadb41e17f92b4f8 \
+                        size    43670524
 
 categories              x11 graphics
 maintainers             {jeremyhu @jeremyhu} openmaintainer
@@ -82,8 +82,7 @@ compiler.cxx_standard   2017
 # #elif HAS_CLANG_FALLTHROUGH
 compiler.blacklist-append  {clang < 800}
 
-configure.args          -Dosmesa=true \
-                        -Dgallium-drivers=softpipe
+configure.args          -Dgallium-drivers=softpipe
 
 platform darwin {
     if {${os.major} < 9} {
@@ -117,7 +116,7 @@ if {[string match *gcc* ${configure.compiler}]} {
 }
 
 variant llvm description "enable the llvmpipe driver" {
-    set llvm_ver            19
+    set llvm_ver            21
     depends_lib-append      port:llvm-${llvm_ver}
     # for llvm-config
     configure.env-append    PATH=${prefix}/libexec/llvm-${llvm_ver}/bin:$env(PATH)
diff --git a/x11/mesa/files/patch-fix-linking.diff b/x11/mesa/files/patch-fix-linking.diff
index a393b8dbdff..f96f509c538 100644
--- a/x11/mesa/files/patch-fix-linking.diff
+++ b/x11/mesa/files/patch-fix-linking.diff
@@ -8,16 +8,6 @@
  )
  
  if with_gallium_va or with_gallium_vdpau
---- src/gallium/targets/osmesa/meson.build.orig	2024-12-05 02:13:54
-+++ src/gallium/targets/osmesa/meson.build	2024-12-15 23:17:37
-@@ -45,6 +45,7 @@
-   version : '8.0.0',
-   darwin_versions : '9.0.0',
-   install : true,
-+  install_rpath : dep_llvm.found() ? dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') : '',
- )
- 
- if with_symbols_check
 --- src/glx/meson.build.orig	2024-12-05 02:13:54
 +++ src/glx/meson.build	2024-12-15 22:57:59
 @@ -144,4 +144,5 @@