diff --git a/devel/ignition-plugin/Makefile b/devel/ignition-plugin/Makefile
index 114f84a477ff..1bffb63db944 100644
--- a/devel/ignition-plugin/Makefile
+++ b/devel/ignition-plugin/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	ignition-plugin
-DISTVERSIONPREFIX=	ignition-plugin_
-DISTVERSION=	1.4.0
+DISTVERSIONPREFIX=	gz-plugin4_
+DISTVERSION=	4.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for registering plugins and dynamically loading them
 WWW=		https://ignitionrobotics.org/home
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	ignition-cmake>=2:devel/ignition-cmake
+BUILD_DEPENDS=	cli11>0:devel/cli11 \
+		ignition-cmake>=5:devel/ignition-cmake
+LIB_DEPENDS=	libgz-utils.so:devel/ignition-utils
 
 USES=		cmake compiler:c++17-lang
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 
 GH_ACCOUNT=	gazebosim
 GH_PROJECT=	gz-plugin
 
 PLIST_SUB+=	PLUGIN_IGN_VER=plugin${DISTVERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/devel/ignition-plugin/distinfo b/devel/ignition-plugin/distinfo
index 4957b891a749..1e967b04ce6f 100644
--- a/devel/ignition-plugin/distinfo
+++ b/devel/ignition-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1779061196
-SHA256 (gazebosim-gz-plugin-ignition-plugin_1.4.0_GH0.tar.gz) = 582746af1ea61a7ba438d68c3a2e58b6962164ea0bd580c120fc799e9679365e
-SIZE (gazebosim-gz-plugin-ignition-plugin_1.4.0_GH0.tar.gz) = 336715
+TIMESTAMP = 1779173912
+SHA256 (gazebosim-gz-plugin-gz-plugin4_4.0.0_GH0.tar.gz) = 97810f74a8dd3af867ccc3ba3a76853d81167606582dd4f0935284e9979a6209
+SIZE (gazebosim-gz-plugin-gz-plugin4_4.0.0_GH0.tar.gz) = 327074
diff --git a/devel/ignition-plugin/pkg-plist b/devel/ignition-plugin/pkg-plist
index 838de666a01e..4b00a825915a 100644
--- a/devel/ignition-plugin/pkg-plist
+++ b/devel/ignition-plugin/pkg-plist
@@ -1,68 +1,57 @@
-include/ignition/%%PLUGIN_IGN_VER%%/CMakeLists.txt
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/EnablePluginFromThis.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/Export.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/Factory.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/Info.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/Loader.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/Plugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/PluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/Register.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/RegisterMore.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/SpecializedPlugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/SpecializedPluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/WeakPluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/config.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Export.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Factory.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Loader.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Plugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/PluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Register.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/SpecializedPlugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/detail/utility.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/loader/Export.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/loader/detail/Export.hh
-include/ignition/%%PLUGIN_IGN_VER%%/gz/plugin/utility.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/EnablePluginFromThis.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Export.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Factory.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Info.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Loader.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Plugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/PluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Register.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/RegisterMore.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/SpecializedPlugin.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/SpecializedPluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/WeakPluginPtr.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/config.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/loader/Export.hh
-include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/utility.hh
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-all/ignition-%%PLUGIN_IGN_VER%%-all-config-version.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-all/ignition-%%PLUGIN_IGN_VER%%-all-config.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-all/ignition-%%PLUGIN_IGN_VER%%-all-targets.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-config-version.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-config.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-targets.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-register/ignition-%%PLUGIN_IGN_VER%%-register-config-version.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-register/ignition-%%PLUGIN_IGN_VER%%-register-config.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%-register/ignition-%%PLUGIN_IGN_VER%%-register-targets.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-config-version.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-config.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-targets.cmake
-lib/libignition-%%PLUGIN_IGN_VER%%-loader.so
-lib/libignition-%%PLUGIN_IGN_VER%%-loader.so.1
-lib/libignition-%%PLUGIN_IGN_VER%%-loader.so.1.4.0
-lib/libignition-%%PLUGIN_IGN_VER%%.so
-lib/libignition-%%PLUGIN_IGN_VER%%.so.1
-lib/libignition-%%PLUGIN_IGN_VER%%.so.1.4.0
-lib/ruby/ignition/cmd%%PLUGIN_IGN_VER%%.rb
-libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%-loader.pc
-libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%-register.pc
-libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%.pc
-share/gz/gz1.completion.d/%%PLUGIN_IGN_VER%%.bash_completion.sh
-share/ignition/%%PLUGIN_IGN_VER%%.yaml
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/EnablePluginFromThis.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/Export.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/Factory.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/Info.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/Loader.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/Plugin.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/PluginPtr.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/Register.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/RegisterMore.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/RegisterStatic.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/SpecializedPlugin.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/SpecializedPluginPtr.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/WeakPluginPtr.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/config.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Common.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Export.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Factory.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Loader.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Plugin.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/PluginPtr.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Register.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/RegisterStatic.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/Registry.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/SpecializedPlugin.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/StaticRegistry.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/detail/utility.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/loader/Export.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/loader/detail/Export.hh
+include/gz/%%PLUGIN_IGN_VER%%/gz/plugin/utility.hh
+lib/cmake/gz-plugin-all/gz-plugin-all-config-version.cmake
+lib/cmake/gz-plugin-all/gz-plugin-all-config.cmake
+lib/cmake/gz-plugin-all/gz-plugin-all-targets.cmake
+lib/cmake/gz-plugin-loader/gz-plugin-loader-config-version.cmake
+lib/cmake/gz-plugin-loader/gz-plugin-loader-config.cmake
+lib/cmake/gz-plugin-loader/gz-plugin-loader-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/gz-plugin-loader/gz-plugin-loader-targets.cmake
+lib/cmake/gz-plugin-register/gz-plugin-register-config-version.cmake
+lib/cmake/gz-plugin-register/gz-plugin-register-config.cmake
+lib/cmake/gz-plugin-register/gz-plugin-register-targets.cmake
+lib/cmake/gz-plugin/gz-plugin-config-version.cmake
+lib/cmake/gz-plugin/gz-plugin-config.cmake
+lib/cmake/gz-plugin/gz-plugin-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/gz-plugin/gz-plugin-targets.cmake
+lib/libgz-plugin-loader.so
+lib/libgz-plugin-loader.so.4
+lib/libgz-plugin-loader.so.4.0.0
+lib/libgz-plugin.so
+lib/libgz-plugin.so.4
+lib/libgz-plugin.so.4.0.0
+lib/ruby/gz/cmd%%PLUGIN_IGN_VER%%.rb
+libdata/pkgconfig/gz-plugin-loader.pc
+libdata/pkgconfig/gz-plugin-register.pc
+libdata/pkgconfig/gz-plugin.pc
+libexec/gz/%%PLUGIN_IGN_VER%%/gz-plugin
+share/gz/gz2.completion.d/%%PLUGIN_IGN_VER%%.bash_completion.sh
+share/gz/%%PLUGIN_IGN_VER%%.yaml