diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index d24fdea64334..0556599d16b0 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -1,48 +1,50 @@
 PORTNAME=	frei0r
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${FREI0R_VERSION}
 PORTREVISION?=	0
 CATEGORIES=	graphics
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT?=	Minimalistic plugin API for video effects
 WWW=		https://frei0r.dyne.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lang pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	dyne
 
+CMAKE_OFF=	BUILD_TESTING
+
 .if defined(EXTRA_PLUGINS)
 RUN_DEPENDS=	frei0r>=${FREI0R_VERSION}:graphics/frei0r
 .  if ${EXTRA_PLUGINS:tl} == "cairo"
 USES+=		gnome
 USE_GNOME+=	cairo
 
-CMAKE_ON=	WITHOUT_GAVL \
+CMAKE_ON+=	WITHOUT_GAVL \
 		WITHOUT_OPENCV
-CMAKE_OFF=	WITHOUT_CAIRO
+CMAKE_OFF+=	WITHOUT_CAIRO
 .  elif ${EXTRA_PLUGINS:tl} == "gavl"
 LIB_DEPENDS+=	libgavl.so:multimedia/gavl
 
-CMAKE_ON=	WITHOUT_CAIRO \
+CMAKE_ON+=	WITHOUT_CAIRO \
 		WITHOUT_OPENCV
-CMAKE_OFF=	WITHOUT_GAVL
+CMAKE_OFF+=	WITHOUT_GAVL
 .  elif ${EXTRA_PLUGINS:tl} == "opencv"
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv
 
-CMAKE_ON=	WITHOUT_CAIRO \
+CMAKE_ON+=	WITHOUT_CAIRO \
 		WITHOUT_GAVL
-CMAKE_OFF=	WITHOUT_OPENCV
+CMAKE_OFF+=	WITHOUT_OPENCV
 .  endif
 .else
-CMAKE_ON=	WITHOUT_CAIRO \
+CMAKE_ON+=	WITHOUT_CAIRO \
 		WITHOUT_GAVL \
 		WITHOUT_OPENCV
-CMAKE_OFF=	BUILD_EXTRA_PLUGINS
+CMAKE_OFF+=	BUILD_EXTRA_PLUGINS
 .endif
 
 .include "version.mk"
 .include <bsd.port.mk>
diff --git a/graphics/frei0r/distinfo b/graphics/frei0r/distinfo
index 0743cb4c9cce..09f47d90f7d0 100644
--- a/graphics/frei0r/distinfo
+++ b/graphics/frei0r/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767253601
-SHA256 (dyne-frei0r-v2.5.1_GH0.tar.gz) = 318ec4a3042c94a00a58fccdc1eb0d911f36a22beb3504d27aefcca4598f40b0
-SIZE (dyne-frei0r-v2.5.1_GH0.tar.gz) = 942271
+TIMESTAMP = 1781300073
+SHA256 (dyne-frei0r-v3.2.1_GH0.tar.gz) = b44e7862574f130c35659ea84a5504c501d7ed0fe296b2d66d7167f080b9c0a2
+SIZE (dyne-frei0r-v3.2.1_GH0.tar.gz) = 4189779
diff --git a/graphics/frei0r/files/patch-CMakeLists.txt b/graphics/frei0r/files/patch-CMakeLists.txt
index 66509e8b3364..5769085041ba 100644
--- a/graphics/frei0r/files/patch-CMakeLists.txt
+++ b/graphics/frei0r/files/patch-CMakeLists.txt
@@ -1,56 +1,53 @@
 - Fix VERSION.
 - Make plugins that depend upon cairo optional.
 - Add logic so extra plugins can build without installing base components.
 
---- CMakeLists.txt.orig	2025-12-02 16:23:47 UTC
+--- CMakeLists.txt.orig	2026-06-08 12:51:55 UTC
 +++ CMakeLists.txt
-@@ -7,6 +7,8 @@ include(GNUInstallDirs)
- 
- include(GNUInstallDirs)
+@@ -20,6 +20,8 @@ include(CTest)
+ set(CMAKE_CTEST_ARGUMENTS "--verbose")
+ include(CTest)
  
 +option (BUILD_EXTRA_PLUGINS "Build plugins with optional dependencies" ON)
 +
  option (WITHOUT_OPENCV "Disable plugins dependent upon OpenCV" OFF)
  option (WITHOUT_FACERECOGNITION "Disable facedetect plugin to avoid protobuf conflicts" OFF)
  
-@@ -14,7 +16,10 @@ endif ()
-   find_package (OpenCV)
- endif ()
- 
--find_package (Cairo)
-+option (WITHOUT_CAIRO "Disable plugins dependent upon cairo" OFF)
-+if (NOT WITHOUT_CAIRO)
-+  find_package (Cairo)
-+endif ()
- 
- include(FindPkgConfig)
- option (WITHOUT_GAVL "Disable plugins dependent upon gavl" OFF)
-@@ -37,17 +42,24 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
+@@ -54,20 +56,28 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
  # --- custom targets: ---
  INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
  
 -install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +if (NOT BUILD_EXTRA_PLUGINS)
 +  install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  
  # For code documentation run: doxygen doc/Doxyfile
  # add_subdirectory (doc)
  
 -add_subdirectory (src)
 +  add_subdirectory (src)
 +else ()
 +  add_subdirectory (src/filter)
 +  add_subdirectory (src/mixer2)
 +endif ()
++
+ if (BUILD_TESTING)
+   add_subdirectory (test)
+ endif ()
  
- # Generate frei0r.pc and install it.
- set (prefix "${CMAKE_INSTALL_PREFIX}")
- set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
- set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- set (includedir "${CMAKE_INSTALL_PREFIX}/include")
+-# Generate frei0r.pc and install it.
+-set (prefix "${CMAKE_INSTALL_PREFIX}")
+-set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
+-set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+-set (includedir "${CMAKE_INSTALL_PREFIX}/include")
 -configure_file ("frei0r.pc.in" "frei0r.pc" @ONLY)
 -install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 +if (NOT BUILD_EXTRA_PLUGINS)
++  # Generate frei0r.pc and install it.
++  set (prefix "${CMAKE_INSTALL_PREFIX}")
++  set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
++  set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
++  set (includedir "${CMAKE_INSTALL_PREFIX}/include")
 +  configure_file ("frei0r.pc.in" "frei0r.pc" @ONLY)
-+  install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "libdata/pkgconfig")
-+endif ()
++  install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++endif()
diff --git a/graphics/frei0r/files/patch-src_filter_CMakeLists.txt b/graphics/frei0r/files/patch-src_filter_CMakeLists.txt
index a0a796ae6499..8c599d179309 100644
--- a/graphics/frei0r/files/patch-src_filter_CMakeLists.txt
+++ b/graphics/frei0r/files/patch-src_filter_CMakeLists.txt
@@ -1,17 +1,17 @@
 - Add logic so extra plugins can build without installing base components.
 
---- src/filter/CMakeLists.txt.orig	2025-12-02 16:23:47 UTC
+--- src/filter/CMakeLists.txt.orig	2026-06-08 12:51:55 UTC
 +++ src/filter/CMakeLists.txt
 @@ -15,6 +15,7 @@ endif (${Cairo_FOUND})
    add_subdirectory (mirr0r)
  endif (${Cairo_FOUND})
  
 +if (NOT BUILD_EXTRA_PLUGINS)
  add_subdirectory (3dflippo)
  add_subdirectory (aech0r)
  add_subdirectory (alpha0ps)
-@@ -103,3 +104,4 @@ add_subdirectory (vignette)
- add_subdirectory (twolay0r)
+@@ -106,3 +107,4 @@ add_subdirectory (water)
  add_subdirectory (vertigo)
  add_subdirectory (vignette)
-+endif ()
+ add_subdirectory (water)
++endif()
diff --git a/graphics/frei0r/pkg-plist b/graphics/frei0r/pkg-plist
index 57124bae10c0..3bf79d96c88a 100644
--- a/graphics/frei0r/pkg-plist
+++ b/graphics/frei0r/pkg-plist
@@ -1,158 +1,161 @@
 include/frei0r.h
 include/frei0r.hpp
 include/frei0r/blur.h
 include/frei0r/cairo.h
 include/frei0r/cfc.h
 include/frei0r/colorspace.h
 include/frei0r/math.h
 lib/frei0r-1/3dflippo.so
 lib/frei0r-1/B.so
 lib/frei0r-1/G.so
 lib/frei0r-1/IIRblur.so
 lib/frei0r-1/R.so
 lib/frei0r-1/RGB.so
 lib/frei0r-1/addition.so
 lib/frei0r-1/addition_alpha.so
 lib/frei0r-1/aech0r.so
 lib/frei0r-1/alpha0ps_alpha0ps.so
 lib/frei0r-1/alpha0ps_alphagrad.so
 lib/frei0r-1/alpha0ps_alphaspot.so
 lib/frei0r-1/alphaatop.so
 lib/frei0r-1/alphain.so
 lib/frei0r-1/alphainjection.so
 lib/frei0r-1/alphaout.so
 lib/frei0r-1/alphaover.so
 lib/frei0r-1/alphaxor.so
 lib/frei0r-1/balanc0r.so
 lib/frei0r-1/baltan.so
 lib/frei0r-1/bgsubtract0r.so
 lib/frei0r-1/blend.so
 lib/frei0r-1/bluescreen0r.so
 lib/frei0r-1/brightness.so
 lib/frei0r-1/burn.so
 lib/frei0r-1/bw0r.so
 lib/frei0r-1/c0rners.so
+lib/frei0r-1/camerashake.so
 lib/frei0r-1/cartoon.so
 lib/frei0r-1/cluster.so
 lib/frei0r-1/colgate.so
 lib/frei0r-1/color_only.so
 lib/frei0r-1/coloradj_RGB.so
 lib/frei0r-1/colordistance.so
+lib/frei0r-1/colorenhance.so
 lib/frei0r-1/colorhalftone.so
 lib/frei0r-1/colorize.so
 lib/frei0r-1/colortap.so
 lib/frei0r-1/composition.so
 lib/frei0r-1/contrast0r.so
 lib/frei0r-1/curves.so
 lib/frei0r-1/d90stairsteppingfix.so
 lib/frei0r-1/darken.so
 lib/frei0r-1/defish0r.so
 lib/frei0r-1/delay0r.so
 lib/frei0r-1/delaygrab.so
 lib/frei0r-1/denoise_hqdn3d.so
 lib/frei0r-1/difference.so
 lib/frei0r-1/distort0r.so
 lib/frei0r-1/dither.so
 lib/frei0r-1/divide.so
 lib/frei0r-1/dodge.so
 lib/frei0r-1/edgeglow.so
 lib/frei0r-1/elastic_scale.so
 lib/frei0r-1/emboss.so
 lib/frei0r-1/equaliz0r.so
 lib/frei0r-1/euclid_eraser.so
 lib/frei0r-1/filmgrain.so
 lib/frei0r-1/flippo.so
 lib/frei0r-1/gamma.so
 lib/frei0r-1/gateweave.so
 lib/frei0r-1/glitch0r.so
 lib/frei0r-1/glow.so
 lib/frei0r-1/grain_extract.so
 lib/frei0r-1/grain_merge.so
 lib/frei0r-1/hardlight.so
 lib/frei0r-1/heatmap0r.so
 lib/frei0r-1/hue.so
 lib/frei0r-1/hueshift0r.so
 lib/frei0r-1/invert0r.so
 lib/frei0r-1/ising0r.so
 lib/frei0r-1/kaleid0sc0pe.so
 lib/frei0r-1/keyspillm0pup.so
 lib/frei0r-1/lenscorrection.so
 lib/frei0r-1/letterb0xed.so
 lib/frei0r-1/levels.so
 lib/frei0r-1/lighten.so
 lib/frei0r-1/lightgraffiti.so
 lib/frei0r-1/lissajous0r.so
 lib/frei0r-1/luminance.so
 lib/frei0r-1/mask0mate.so
 lib/frei0r-1/measure_pr0be.so
 lib/frei0r-1/measure_pr0file.so
 lib/frei0r-1/medians.so
 lib/frei0r-1/multiply.so
 lib/frei0r-1/ndvi.so
 lib/frei0r-1/nervous.so
 lib/frei0r-1/nois0r.so
 lib/frei0r-1/normaliz0r.so
 lib/frei0r-1/nosync0r.so
 lib/frei0r-1/ntsc.so
 lib/frei0r-1/onecol0r.so
 lib/frei0r-1/overlay.so
 lib/frei0r-1/partik0l.so
 lib/frei0r-1/perspective.so
 lib/frei0r-1/pixeliz0r.so
 lib/frei0r-1/pixs0r.so
 lib/frei0r-1/plasma.so
 lib/frei0r-1/posterize.so
 lib/frei0r-1/premultiply.so
 lib/frei0r-1/primaries.so
 lib/frei0r-1/rgbnoise.so
 lib/frei0r-1/rgbsplit0r.so
 lib/frei0r-1/saturat0r.so
 lib/frei0r-1/saturation.so
 lib/frei0r-1/scanline0r.so
 lib/frei0r-1/screen.so
 lib/frei0r-1/select0r.so
 lib/frei0r-1/sharpness.so
 lib/frei0r-1/sigmoidaltransfer.so
 lib/frei0r-1/sleid0r_push-down.so
 lib/frei0r-1/sleid0r_push-left.so
 lib/frei0r-1/sleid0r_push-right.so
 lib/frei0r-1/sleid0r_push-up.so
 lib/frei0r-1/sleid0r_slide-down.so
 lib/frei0r-1/sleid0r_slide-left.so
 lib/frei0r-1/sleid0r_slide-right.so
 lib/frei0r-1/sleid0r_slide-up.so
 lib/frei0r-1/sleid0r_wipe-barn-door-h.so
 lib/frei0r-1/sleid0r_wipe-barn-door-v.so
 lib/frei0r-1/sleid0r_wipe-circle.so
 lib/frei0r-1/sleid0r_wipe-down.so
 lib/frei0r-1/sleid0r_wipe-left.so
 lib/frei0r-1/sleid0r_wipe-rect.so
 lib/frei0r-1/sleid0r_wipe-right.so
 lib/frei0r-1/sleid0r_wipe-up.so
 lib/frei0r-1/sobel.so
 lib/frei0r-1/softglow.so
 lib/frei0r-1/softlight.so
 lib/frei0r-1/sopsat.so
 lib/frei0r-1/spillsupress.so
 lib/frei0r-1/squareblur.so
 lib/frei0r-1/subtract.so
 lib/frei0r-1/tehroxx0r.so
 lib/frei0r-1/test_pat_B.so
 lib/frei0r-1/test_pat_C.so
 lib/frei0r-1/test_pat_G.so
 lib/frei0r-1/test_pat_I.so
 lib/frei0r-1/test_pat_L.so
 lib/frei0r-1/test_pat_R.so
 lib/frei0r-1/three_point_balance.so
 lib/frei0r-1/threelay0r.so
 lib/frei0r-1/threshold0r.so
 lib/frei0r-1/timeout.so
 lib/frei0r-1/tint0r.so
 lib/frei0r-1/transparency.so
 lib/frei0r-1/twolay0r.so
 lib/frei0r-1/uvmap.so
 lib/frei0r-1/value.so
 lib/frei0r-1/vertigo.so
 lib/frei0r-1/vignette.so
+lib/frei0r-1/water.so
 lib/frei0r-1/xfade0r.so
 libdata/pkgconfig/frei0r.pc
diff --git a/graphics/frei0r/version.mk b/graphics/frei0r/version.mk
index 7d58d6721389..fd202a34463a 100644
--- a/graphics/frei0r/version.mk
+++ b/graphics/frei0r/version.mk
@@ -1 +1 @@
-FREI0R_VERSION=	2.5.1
+FREI0R_VERSION=	3.2.1