diff --git a/devel/rapidcheck/Makefile b/devel/rapidcheck/Makefile
index 1397f177102c..b30efdb82e64 100644
--- a/devel/rapidcheck/Makefile
+++ b/devel/rapidcheck/Makefile
@@ -1,33 +1,31 @@
 PORTNAME=	rapidcheck
-PORTVERSION=	g20200504
+PORTVERSION=	g20220314
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	QuickCheck clone for C++
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 TEST_DEPENDS=	catch>0:devel/catch
 
 USES=		cmake compiler:c++11-lang localbase
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	emil-e
-GH_TAGNAME=	7bc7d30
-USE_LDCONFIG=	yes
+GH_TAGNAME=	8fafda4
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 CXXFLAGS+=	-Wno-error
-
-post-install:
-	@${MV} ${STAGEDIR}${DATADIR}/cmake ${STAGEDIR}${PREFIX}/lib/
-	@${RMDIR} ${STAGEDIR}${DATADIR}
+CXXFLAGS+=	-I${WRKSRC}/extras/catch/include # only to fix tests (rapidcheck/catch.h)
 
 do-test: # broken: https://github.com/emil-e/rapidcheck/issues/242
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DRC_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/devel/rapidcheck/distinfo b/devel/rapidcheck/distinfo
index f52c0cbf305a..79b25d1a7520 100644
--- a/devel/rapidcheck/distinfo
+++ b/devel/rapidcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604784756
-SHA256 (emil-e-rapidcheck-g20200504-7bc7d30_GH0.tar.gz) = f289ec014eb305033910ec2fbb88cccaf3eaf1b76597d9993b75cdd37409b001
-SIZE (emil-e-rapidcheck-g20200504-7bc7d30_GH0.tar.gz) = 180865
+TIMESTAMP = 1659163344
+SHA256 (emil-e-rapidcheck-g20220314-8fafda4_GH0.tar.gz) = 2b7051602620198b0d83a2844152ca0f9a7279a75e5ac7552dc0e0ea22b4bd1c
+SIZE (emil-e-rapidcheck-g20220314-8fafda4_GH0.tar.gz) = 181827
diff --git a/devel/rapidcheck/pkg-plist b/devel/rapidcheck/pkg-plist
index ff2ca71d9754..f463ebc8264c 100644
--- a/devel/rapidcheck/pkg-plist
+++ b/devel/rapidcheck/pkg-plist
@@ -1,124 +1,126 @@
 include/rapidcheck.h
 include/rapidcheck/Assertions.h
 include/rapidcheck/Assertions.hpp
 include/rapidcheck/BeforeMinimalTestCase.h
 include/rapidcheck/Check.h
 include/rapidcheck/Check.hpp
 include/rapidcheck/Classify.h
 include/rapidcheck/Classify.hpp
+include/rapidcheck/Compat.h
+include/rapidcheck/Compat.hpp
 include/rapidcheck/Gen.h
 include/rapidcheck/Gen.hpp
 include/rapidcheck/GenerationFailure.h
 include/rapidcheck/Log.h
 include/rapidcheck/Log.hpp
 include/rapidcheck/Maybe.h
 include/rapidcheck/Maybe.hpp
 include/rapidcheck/Nothing.h
 include/rapidcheck/Random.h
 include/rapidcheck/Random.hpp
 include/rapidcheck/Seq.h
 include/rapidcheck/Seq.hpp
 include/rapidcheck/Show.h
 include/rapidcheck/Show.hpp
 include/rapidcheck/Shrinkable.h
 include/rapidcheck/Shrinkable.hpp
 include/rapidcheck/Traits.h
 include/rapidcheck/detail/AlignedUnion.h
 include/rapidcheck/detail/Any.h
 include/rapidcheck/detail/Any.hpp
 include/rapidcheck/detail/ApplyTuple.h
 include/rapidcheck/detail/BitStream.h
 include/rapidcheck/detail/BitStream.hpp
 include/rapidcheck/detail/Capture.h
 include/rapidcheck/detail/Configuration.h
 include/rapidcheck/detail/ExecFixture.h
 include/rapidcheck/detail/FrequencyMap.h
 include/rapidcheck/detail/FunctionTraits.h
 include/rapidcheck/detail/ImplicitParam.h
 include/rapidcheck/detail/ImplicitParam.hpp
 include/rapidcheck/detail/IntSequence.h
 include/rapidcheck/detail/Platform.h
 include/rapidcheck/detail/Property.h
 include/rapidcheck/detail/Property.hpp
 include/rapidcheck/detail/PropertyContext.h
 include/rapidcheck/detail/Results.h
 include/rapidcheck/detail/Results.hpp
 include/rapidcheck/detail/Serialization.h
 include/rapidcheck/detail/Serialization.hpp
 include/rapidcheck/detail/ShowType.h
 include/rapidcheck/detail/ShowType.hpp
 include/rapidcheck/detail/TestListener.h
 include/rapidcheck/detail/TestListenerAdapter.h
 include/rapidcheck/detail/TestMetadata.h
 include/rapidcheck/detail/TestParams.h
 include/rapidcheck/detail/Traits.h
 include/rapidcheck/detail/TypeList.h
 include/rapidcheck/detail/Utility.h
 include/rapidcheck/detail/Variant.h
 include/rapidcheck/detail/Variant.hpp
 include/rapidcheck/fn/Common.h
 include/rapidcheck/fn/Common.hpp
 include/rapidcheck/gen/Arbitrary.h
 include/rapidcheck/gen/Arbitrary.hpp
 include/rapidcheck/gen/Build.h
 include/rapidcheck/gen/Build.hpp
 include/rapidcheck/gen/Chrono.h
 include/rapidcheck/gen/Chrono.hpp
 include/rapidcheck/gen/Container.h
 include/rapidcheck/gen/Container.hpp
 include/rapidcheck/gen/Create.h
 include/rapidcheck/gen/Create.hpp
 include/rapidcheck/gen/Exec.h
 include/rapidcheck/gen/Exec.hpp
 include/rapidcheck/gen/Maybe.h
 include/rapidcheck/gen/Maybe.hpp
 include/rapidcheck/gen/Numeric.h
 include/rapidcheck/gen/Numeric.hpp
 include/rapidcheck/gen/Predicate.h
 include/rapidcheck/gen/Predicate.hpp
 include/rapidcheck/gen/Select.h
 include/rapidcheck/gen/Select.hpp
 include/rapidcheck/gen/Text.h
 include/rapidcheck/gen/Text.hpp
 include/rapidcheck/gen/Transform.h
 include/rapidcheck/gen/Transform.hpp
 include/rapidcheck/gen/Tuple.h
 include/rapidcheck/gen/Tuple.hpp
 include/rapidcheck/gen/detail/ExecHandler.h
 include/rapidcheck/gen/detail/ExecRaw.h
 include/rapidcheck/gen/detail/ExecRaw.hpp
 include/rapidcheck/gen/detail/GenerationHandler.h
 include/rapidcheck/gen/detail/Recipe.h
 include/rapidcheck/gen/detail/ScaleInteger.h
 include/rapidcheck/gen/detail/ShrinkValueIterator.h
 include/rapidcheck/gen/detail/ShrinkValueIterator.hpp
 include/rapidcheck/seq/Create.h
 include/rapidcheck/seq/Create.hpp
 include/rapidcheck/seq/Operations.h
 include/rapidcheck/seq/Operations.hpp
 include/rapidcheck/seq/SeqIterator.h
 include/rapidcheck/seq/SeqIterator.hpp
 include/rapidcheck/seq/Transform.h
 include/rapidcheck/seq/Transform.hpp
 include/rapidcheck/shrink/Shrink.h
 include/rapidcheck/shrink/Shrink.hpp
 include/rapidcheck/shrinkable/Create.h
 include/rapidcheck/shrinkable/Create.hpp
 include/rapidcheck/shrinkable/Operations.h
 include/rapidcheck/shrinkable/Operations.hpp
 include/rapidcheck/shrinkable/Transform.h
 include/rapidcheck/shrinkable/Transform.hpp
 include/rapidcheck/state.h
 include/rapidcheck/state/Command.h
 include/rapidcheck/state/Command.hpp
 include/rapidcheck/state/Commands.h
 include/rapidcheck/state/Commands.hpp
 include/rapidcheck/state/State.h
 include/rapidcheck/state/State.hpp
 include/rapidcheck/state/gen/Commands.h
 include/rapidcheck/state/gen/Commands.hpp
 include/rapidcheck/state/gen/ExecCommands.h
 include/rapidcheck/state/gen/ExecCommands.hpp
-lib/cmake/rapidcheckConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/rapidcheckConfig.cmake
 lib/librapidcheck.so
+%%DATADIR%%/cmake/rapidcheckConfig-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/cmake/rapidcheckConfig.cmake