diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index a06e69bc8721..c25dd21e17a8 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	cgal
 PORTVERSION=	5.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/${PORTNAME:tu}/${PORTNAME}/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Computational geometry library
 WWW=		https://www.cgal.org/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libntl.a:math/ntl
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp
 
 #TODO math/mpfi, math/rs, graphics/qglviewer
 #Not yet in ports
 USES=		cmake eigen:3 shebangfix tar:xz
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	scripts/cgal_create_CMakeLists \
 		scripts/cgal_create_cmake_script
 
 OPTIONS_DEFINE=		VISUALIZATION QT5
 VISUALIZATION_IMPLIES=	QT5
 OPTIONS_SUB=		yes
 
 VISUALIZATION_DESC=		Visualization Required for most demos (Qt5 Geomview)
 VISUALIZATION_LIB_DEPENDS=	libgeomview.so:graphics/geomview
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT5}
 USES+=		gl qt:5
 CMAKE_ARGS+=	-DWITH_CGAL_Qt5=ON
 USE_QT+=	core gui opengl widgets svg buildtools:build qmake:build xml
 USE_GL+=	gl glu
 .else
 CMAKE_ARGS+=	-DWITH_CGAL_Qt5=OFF
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/cgal/files/patch-include_CGAL_boost_graph_iterator.h b/math/cgal/files/patch-include_CGAL_boost_graph_iterator.h
new file mode 100644
index 000000000000..20f360c1f045
--- /dev/null
+++ b/math/cgal/files/patch-include_CGAL_boost_graph_iterator.h
@@ -0,0 +1,59 @@
+--- include/CGAL/boost/graph/iterator.h.orig	2022-10-07 19:04:41 UTC
++++ include/CGAL/boost/graph/iterator.h
+@@ -213,18 +213,7 @@ class Halfedge_around_source_iterator { (public)
+   {}
+ 
+ #ifndef DOXYGEN_RUNNING
+-  // design patter: "safe bool"
+-  // will be replaced by explicit operator bool with C++11
+-  typedef void (Halfedge_around_source_iterator::*bool_type)() const;
+ 
+-  void this_type_does_not_support_comparisons() const {}
+-
+-  operator bool_type() const
+-  {
+-    return (! (this->base() == nullptr)) ?
+-      &Halfedge_around_source_iterator::this_type_does_not_support_comparisons : 0;
+-  }
+-
+   bool operator==( const Self& i) const {
+     CGAL_assertion( anchor == anchor);
+     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
+@@ -313,18 +302,7 @@ class Halfedge_around_target_iterator { (public)
+   {}
+ 
+ #ifndef DOXYGEN_RUNNING
+-  // design patter: "safe bool"
+-  // will be replaced by explicit operator bool with C++11
+-  typedef void (Halfedge_around_target_iterator::*bool_type)() const;
+ 
+-  void this_type_does_not_support_comparisons() const {}
+-
+-  operator bool_type() const
+-  {
+-    return (! (this->base() == nullptr)) ?
+-      &Halfedge_around_target_iterator::this_type_does_not_support_comparisons : 0;
+-  }
+-
+   bool operator==( const Self& i) const {
+     CGAL_assertion( anchor == anchor);
+     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
+@@ -411,18 +389,6 @@ class Halfedge_around_face_iterator { (public)
+   const value_type& operator *  ( ) const { return  pos; }
+   pointer           operator -> ( )       { return &pos; }
+   const value_type* operator -> ( ) const { return &pos; }
+-
+-  // design patter: "safe bool"
+-  // will be replaced by explicit operator bool with C++11
+-  typedef void (Halfedge_around_face_iterator::*bool_type)() const;
+-
+-  void this_type_does_not_support_comparisons() const {}
+-
+-  operator bool_type() const
+-  {
+-    return (! (this->base() == nullptr)) ?
+-      &Halfedge_around_face_iterator::this_type_does_not_support_comparisons : 0;
+-  }
+ 
+   bool operator==( const Self& i) const {
+     CGAL_assertion( anchor == anchor);