diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
index f7b6bf3bcb73..c27707afd5ec 100644
--- a/graphics/pcl-pointclouds/Makefile
+++ b/graphics/pcl-pointclouds/Makefile
@@ -1,71 +1,80 @@
 PORTNAME=	pcl
 DISTVERSION=	1.12.1
+PORTREVISION=	1
 CATEGORIES=	graphics math
 MASTER_SITES=	https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	-pointclouds
 DISTNAME=	source
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}/${DISTVERSION}
 
+# backport of patches fixing tests
+PATCH_SITES=	https://github.com/PointCloudLibrary/pcl/commit/
+PATCHFILES=	ba388061b0f9ed9584e57d6019c30b044a657c3e.patch:-p1 \
+		614e19d96bd8415dbfb52d86df0f3774a9f462fe.patch:-p1 \
+		09c76582b5ff0f2b942609f5c85744f1ce96e332.patch:-p1 \
+		5be6766fbb8f5e9b2fe97a077dd5be53e5fc6983.patch:-p1 \
+		09ea81f995f00b9565037b0fafe121eccfe4cf57.patch:-p1
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Point Cloud Library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=		undefined reference to `__atomic_load'
 NOT_FOR_ARCHS=		armv6 armv7
 NOT_FOR_ARCHS_REASON=	common/include/pcl/pcl_macros.h:420:4: error: aligned_malloc not supported on your platform
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libflann_cpp.so:math/flann \
 		libfreetype.so:print/freetype2 \
 		liblz4.so:archivers/liblz4 \
 		libpcap.so:net/libpcap \
 		libtiff.so:graphics/tiff
 
 USES=		cmake:testing compiler:c++14-lang eigen:3 jpeg localbase:ldflags python xorg
 USE_XORG=	x11 xext xt ice sm
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	google:gtest
 GH_PROJECT=	googletest:gtest
 GH_TAGNAME=	release-1.11.0:gtest
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # workaround, otherwise USE_GITHUB=nodefault doesn't work #'
 
 CMAKE_TESTING_ON=	BUILD_global_tests # 6 tests are known to fail: https://github.com/PointCloudLibrary/pcl/issues/5127
 CMAKE_TESTING_TARGET=	tests
 CMAKE_ARGS=		-DGTEST_SRC_DIR=${WRKSRC_gtest}/googletest -DGTEST_INCLUDE_DIR=${WRKSRC_gtest}/googletest/include
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_SUB=	SHL3=${DISTVERSION} SHL2=${DISTVERSION:R}
 
 DATADIR=	${PREFIX}/share/${PORTNAME}-${DISTVERSION:R}  # match the directory where the project installs .cmake files
 
 OPTIONS_DEFINE=		OPENGL PNG QHULL QT5 VTK
-OPTIONS_DEFAULT=	PNG QHULL
+OPTIONS_DEFAULT=	PNG # QHULL is disabled due to conflicts qhull8 vs. qhull
 OPTIONS_SUB=		yes
 
 OPENGL_CMAKE_BOOL=	WITH_OPENGL # it finds OpenGL, but no binaries are linked with it: https://github.com/PointCloudLibrary/pcl/issues/2641
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glu
 
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 QHULL_DESC=		Include convex-hull operations
 QHULL_CMAKE_BOOL=	WITH_QHULL
 QHULL_LIB_DEPENDS=	libqhull_r.so:math/qhull8
 
 QT5_CMAKE_BOOL=		WITH_QT
 QT5_BROKEN=		WITH_QT doesn't do anything, should be used by apps, but apps is also broken: see https://github.com/PointCloudLibrary/pcl/issues/2642
 
 VTK_DESC=		Build VTK-Visualizations
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_LIB_DEPENDS=	libvtkCommonCore-8.2.so:math/vtk8
 VTK_BROKEN=		VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/issues/17444
 
 .include <bsd.port.mk>
diff --git a/graphics/pcl-pointclouds/distinfo b/graphics/pcl-pointclouds/distinfo
index 8cafd7e1de04..fec4f413e3a1 100644
--- a/graphics/pcl-pointclouds/distinfo
+++ b/graphics/pcl-pointclouds/distinfo
@@ -1,5 +1,15 @@
-TIMESTAMP = 1641548254
+TIMESTAMP = 1642240245
 SHA256 (pcl-pointclouds/1.12.1/source.tar.gz) = a9573efad5e024c02f2cc9180bb8f82605c3772c62463efbe25c5d6e634b91dc
 SIZE (pcl-pointclouds/1.12.1/source.tar.gz) = 68733343
 SHA256 (pcl-pointclouds/1.12.1/google-googletest-release-1.11.0_GH0.tar.gz) = b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
 SIZE (pcl-pointclouds/1.12.1/google-googletest-release-1.11.0_GH0.tar.gz) = 886330
+SHA256 (pcl-pointclouds/1.12.1/ba388061b0f9ed9584e57d6019c30b044a657c3e.patch) = 7eceb1673c43205086dd2b00d8b0e0b4173e9141920de6460069a77614fde2c5
+SIZE (pcl-pointclouds/1.12.1/ba388061b0f9ed9584e57d6019c30b044a657c3e.patch) = 1584
+SHA256 (pcl-pointclouds/1.12.1/614e19d96bd8415dbfb52d86df0f3774a9f462fe.patch) = 8859e031322c2a45af18132754dc260f1928379315163950b3032bf8be137bc3
+SIZE (pcl-pointclouds/1.12.1/614e19d96bd8415dbfb52d86df0f3774a9f462fe.patch) = 2002
+SHA256 (pcl-pointclouds/1.12.1/09c76582b5ff0f2b942609f5c85744f1ce96e332.patch) = 74b3c4f67ad788147b7fe0aad23fc82e3f7a3d0c266a2a8d94588ae38969cea6
+SIZE (pcl-pointclouds/1.12.1/09c76582b5ff0f2b942609f5c85744f1ce96e332.patch) = 2098
+SHA256 (pcl-pointclouds/1.12.1/5be6766fbb8f5e9b2fe97a077dd5be53e5fc6983.patch) = 768aa306d30dd296177f140946ec1fad9b84965aa98e5e318c389d23ec0d76e9
+SIZE (pcl-pointclouds/1.12.1/5be6766fbb8f5e9b2fe97a077dd5be53e5fc6983.patch) = 2515
+SHA256 (pcl-pointclouds/1.12.1/09ea81f995f00b9565037b0fafe121eccfe4cf57.patch) = c58c8d4cb35770aec51662c1798980c4791b494519aa781fc3d4b66c184d1836
+SIZE (pcl-pointclouds/1.12.1/09ea81f995f00b9565037b0fafe121eccfe4cf57.patch) = 8044