diff --git a/devel/ignition-cmake/Makefile b/devel/ignition-cmake/Makefile
index 1262b4115505..245a2582e1ad 100644
--- a/devel/ignition-cmake/Makefile
+++ b/devel/ignition-cmake/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	ignition-cmake
-DISTVERSION=	2.0.0
+DISTVERSIONPREFIX=	ignition-cmake2_
+DISTVERSION=	2.18.0
 CATEGORIES=	devel
-MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	CMake modules to be used by the Ignition projects
-WWW=		https://ignitionrobotics.org/home
+WWW=		https://gazebosim.org/home \
+		https://github.com/gazebosim/gz-cmake
 
 LICENSE=	APACHE20
 
 USES=		cmake pkgconfig ruby
 
 CMAKE_OFF=	BUILD_TESTING
 
-BB_ACCOUNT=	ignitionrobotics
-BB_PROJECT=	ign-cmake
-BB_COMMIT=	776c2bfe1d18
+USE_GITHUB=	yes
+GH_ACCOUNT=	gazebosim
+GH_PROJECT=	gz-cmake
 
-WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 NO_ARCH=	yes
 
 PLIST_SUB+=	CMAKE_IGN_VER=cmake${DISTVERSION:R:R}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/FindAVCODEC.cmake
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/FindAVDEVICE.cmake
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/FindAVFORMAT.cmake
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/FindAVUTIL.cmake
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/FindSWSCALE.cmake
 
 .include <bsd.port.mk>
diff --git a/devel/ignition-cmake/distinfo b/devel/ignition-cmake/distinfo
index 6adfb651c243..31212f07a91a 100644
--- a/devel/ignition-cmake/distinfo
+++ b/devel/ignition-cmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542654133
-SHA256 (ignition-cmake-2.0.0.tar.gz) = f530be842bc2ecdceab1ec0e9b825aaca9cd39a61669748ac5594e270b14df87
-SIZE (ignition-cmake-2.0.0.tar.gz) = 221328
+TIMESTAMP = 1779056780
+SHA256 (gazebosim-gz-cmake-ignition-cmake2_2.18.0_GH0.tar.gz) = 06d0f38718e76e5bdf4fe9522d59cefcc4dbf7d4391094b6720512d02a2d5c4e
+SIZE (gazebosim-gz-cmake-ignition-cmake2_2.18.0_GH0.tar.gz) = 273579
diff --git a/devel/ignition-cmake/pkg-plist b/devel/ignition-cmake/pkg-plist
index 07061169f28c..eda53b20a110 100644
--- a/devel/ignition-cmake/pkg-plist
+++ b/devel/ignition-cmake/pkg-plist
@@ -1,61 +1,80 @@
-include/ignition/%%CMAKE_IGN_VER%%/ignition/utilities/SuppressWarning.hh
-include/ignition/%%CMAKE_IGN_VER%%/ignition/utilities/detail/SuppressWarning.hh
-libdata/pkgconfig/ignition-%%CMAKE_IGN_VER%%.pc
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/Export.hh.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVCODEC.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVDEVICE.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVFORMAT.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVUTIL.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindCPPZMQ.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindDL.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindEIGEN3.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindFreeImage.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindGTS.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIFADDRS.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIgnCURL.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIgnOGRE.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIgnProtobuf.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindJSONCPP.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindODE.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindOGRE2.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindOptiX.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindSQLite3.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindSWSCALE.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindTINYXML2.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindUUID.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindYAML.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindZIP.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindZeroMQ.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCMake.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCheckSSE.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCodeCheck.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCodeCoverage.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnConfigureBuild.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnConfigureProject.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCreateDocs.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnImportTarget.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnPackaging.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnPkgConfig.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnRonn2Man.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnSetCompilerFlags.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnUtils.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/cmake_uninstall.cmake.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/cpack_options.cmake.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ign_auto_headers.hh.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ignition-all-config.cmake.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ignition-component-config.cmake.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ignition-config.cmake.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/pkgconfig/ignition-component.pc.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/pkgconfig/ignition.pc.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/upload_doc.sh.in
-share/cmake/ignition-%%CMAKE_IGN_VER%%/ignition-%%CMAKE_IGN_VER%%-config-version.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/ignition-%%CMAKE_IGN_VER%%-config.cmake
-share/cmake/ignition-%%CMAKE_IGN_VER%%/ignition-%%CMAKE_IGN_VER%%-utilities-targets.cmake
-share/ignition/ignition-%%CMAKE_IGN_VER%%/codecheck/cpplint.py
-share/ignition/ignition-%%CMAKE_IGN_VER%%/codecheck/header_guard.rule
-share/ignition/ignition-%%CMAKE_IGN_VER%%/codecheck/namespace_AZ.rule
-share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/api.in
-share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/cppreference.tag.xml
-share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/footer.html
-share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/header.html
-share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/layout.xml
+include/ignition/cmake2/gz/utilities/ExtraTestMacros.hh
+include/ignition/cmake2/gz/utilities/SuppressWarning.hh
+include/ignition/cmake2/gz/utilities/detail/ExtraTestMacros.hh
+include/ignition/cmake2/gz/utilities/detail/SuppressWarning.hh
+include/ignition/cmake2/ignition/utilities/ExtraTestMacros.hh
+include/ignition/cmake2/ignition/utilities/SuppressWarning.hh
+libdata/pkgconfig/ignition-cmake2.pc
+share/cmake/ignition-cmake2/cmake2/Export.hh.in
+share/cmake/ignition-cmake2/cmake2/FindAVCODEC.cmake
+share/cmake/ignition-cmake2/cmake2/FindAVDEVICE.cmake
+share/cmake/ignition-cmake2/cmake2/FindAVFORMAT.cmake
+share/cmake/ignition-cmake2/cmake2/FindAVUTIL.cmake
+share/cmake/ignition-cmake2/cmake2/FindCPPZMQ.cmake
+share/cmake/ignition-cmake2/cmake2/FindDL.cmake
+share/cmake/ignition-cmake2/cmake2/FindEIGEN3.cmake
+share/cmake/ignition-cmake2/cmake2/FindFreeImage.cmake
+share/cmake/ignition-cmake2/cmake2/FindGTS.cmake
+share/cmake/ignition-cmake2/cmake2/FindIFADDRS.cmake
+share/cmake/ignition-cmake2/cmake2/FindIgnBullet.cmake
+share/cmake/ignition-cmake2/cmake2/FindIgnCURL.cmake
+share/cmake/ignition-cmake2/cmake2/FindIgnOGRE.cmake
+share/cmake/ignition-cmake2/cmake2/FindIgnOGRE2.cmake
+share/cmake/ignition-cmake2/cmake2/FindIgnProtobuf.cmake
+share/cmake/ignition-cmake2/cmake2/FindIgnURDFDOM.cmake
+share/cmake/ignition-cmake2/cmake2/FindJSONCPP.cmake
+share/cmake/ignition-cmake2/cmake2/FindODE.cmake
+share/cmake/ignition-cmake2/cmake2/FindOptiX.cmake
+share/cmake/ignition-cmake2/cmake2/FindSQLite3.cmake
+share/cmake/ignition-cmake2/cmake2/FindSWSCALE.cmake
+share/cmake/ignition-cmake2/cmake2/FindTINYXML2.cmake
+share/cmake/ignition-cmake2/cmake2/FindUUID.cmake
+share/cmake/ignition-cmake2/cmake2/FindYAML.cmake
+share/cmake/ignition-cmake2/cmake2/FindZIP.cmake
+share/cmake/ignition-cmake2/cmake2/FindZeroMQ.cmake
+share/cmake/ignition-cmake2/cmake2/IgnBenchmark.cmake
+share/cmake/ignition-cmake2/cmake2/IgnCMake.cmake
+share/cmake/ignition-cmake2/cmake2/IgnCheckSSE.cmake
+share/cmake/ignition-cmake2/cmake2/IgnCodeCheck.cmake
+share/cmake/ignition-cmake2/cmake2/IgnCodeCoverage.cmake
+share/cmake/ignition-cmake2/cmake2/IgnConfigureBuild.cmake
+share/cmake/ignition-cmake2/cmake2/IgnConfigureProject.cmake
+share/cmake/ignition-cmake2/cmake2/IgnCreateDocs.cmake
+share/cmake/ignition-cmake2/cmake2/IgnGenerateVersionInfo.cmake
+share/cmake/ignition-cmake2/cmake2/IgnImportTarget.cmake
+share/cmake/ignition-cmake2/cmake2/IgnManualSearch.cmake
+share/cmake/ignition-cmake2/cmake2/IgnPackaging.cmake
+share/cmake/ignition-cmake2/cmake2/IgnPkgConfig.cmake
+share/cmake/ignition-cmake2/cmake2/IgnPython.cmake
+share/cmake/ignition-cmake2/cmake2/IgnRonn2Man.cmake
+share/cmake/ignition-cmake2/cmake2/IgnSanitizers.cmake
+share/cmake/ignition-cmake2/cmake2/IgnSetCompilerFlags.cmake
+share/cmake/ignition-cmake2/cmake2/IgnUtils.cmake
+share/cmake/ignition-cmake2/cmake2/JoinPaths.cmake
+share/cmake/ignition-cmake2/cmake2/cmake_uninstall.cmake.in
+share/cmake/ignition-cmake2/cmake2/cpack_options.cmake.in
+share/cmake/ignition-cmake2/cmake2/ign_auto_headers.hh.in
+share/cmake/ignition-cmake2/cmake2/ignition-all-config.cmake.in
+share/cmake/ignition-cmake2/cmake2/ignition-component-config.cmake.in
+share/cmake/ignition-cmake2/cmake2/ignition-config.cmake.in
+share/cmake/ignition-cmake2/cmake2/pkgconfig/ignition-component.pc.in
+share/cmake/ignition-cmake2/cmake2/pkgconfig/ignition.pc.in
+share/cmake/ignition-cmake2/cmake2/upload_doc.sh.in
+share/cmake/ignition-cmake2/cmake2/version_info.json.in
+share/cmake/ignition-cmake2/ignition-cmake2-config-version.cmake
+share/cmake/ignition-cmake2/ignition-cmake2-config.cmake
+share/cmake/ignition-cmake2/ignition-cmake2-utilities-targets.cmake
+share/ignition/ignition-cmake2/benchmark/run_benchmarks.py
+share/ignition/ignition-cmake2/codecheck/cpplint.py
+share/ignition/ignition-cmake2/codecheck/header_guard.rule
+share/ignition/ignition-cmake2/codecheck/namespace_AZ.rule
+share/ignition/ignition-cmake2/doxygen/api.in
+share/ignition/ignition-cmake2/doxygen/cppreference.tag.xml
+share/ignition/ignition-cmake2/doxygen/footer.html
+share/ignition/ignition-cmake2/doxygen/header.html
+share/ignition/ignition-cmake2/doxygen/layout.xml
+share/ignition/ignition-cmake2/tools/check_test_ran.py
+share/ignition/ignition-cmake2/tools/doc_check.sh
+@owner
+@group
+@mode