Index: head/devel/ignition-plugin/Makefile
===================================================================
--- head/devel/ignition-plugin/Makefile	(revision 485476)
+++ head/devel/ignition-plugin/Makefile	(revision 485477)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	ignition-plugin
 DISTVERSION=	1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for registering plugins and dynamically loading them
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake
 
 USES=		cmake:outsource compiler:c++17-lang
 USE_LDCONFIG=	yes
 
 BB_ACCOUNT=	ignitionrobotics
 BB_PROJECT=	ign-plugin
 BB_COMMIT=	6bf2bf09570f
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
-PLIST_SUB+=	IGN_VER=${DISTVERSION:R:R}
+PLIST_SUB+=	PLUGIN_IGN_VER=plugin${DISTVERSION:R:R}
 
 .include <bsd.port.mk>
Index: head/devel/ignition-plugin/pkg-plist
===================================================================
--- head/devel/ignition-plugin/pkg-plist	(revision 485476)
+++ head/devel/ignition-plugin/pkg-plist	(revision 485477)
@@ -1,48 +1,48 @@
-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/detail/Export.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Factory.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Loader.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Plugin.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/PluginPtr.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Register.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/SpecializedPlugin.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/utility.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/loader/Export.hh
-include/ignition/plugin%%IGN_VER%%/ignition/plugin/loader/detail/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.0.0~pre1
-lib/libignition-plugin%%IGN_VER%%.so
-lib/libignition-plugin%%IGN_VER%%.so.1
-lib/libignition-plugin%%IGN_VER%%.so.1.0.0~pre1
-libdata/pkgconfig/ignition-plugin%%IGN_VER%%-loader.pc
-libdata/pkgconfig/ignition-plugin%%IGN_VER%%-register.pc
-libdata/pkgconfig/ignition-plugin%%IGN_VER%%.pc
+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/detail/Export.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Factory.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Loader.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Plugin.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/PluginPtr.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Register.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/SpecializedPlugin.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/utility.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/loader/Export.hh
+include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/loader/detail/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.0.0~pre1
+lib/libignition-%%PLUGIN_IGN_VER%%.so
+lib/libignition-%%PLUGIN_IGN_VER%%.so.1
+lib/libignition-%%PLUGIN_IGN_VER%%.so.1.0.0~pre1
+libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%-loader.pc
+libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%-register.pc
+libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%.pc