4 files changed, 31 insertions, 8 deletions
diff --git a/sysutils/bhyvemgr/Makefile b/sysutils/bhyvemgr/Makefile
index 85ad508a22e2..eb5d843e017a 100644
--- a/sysutils/bhyvemgr/Makefile
+++ b/sysutils/bhyvemgr/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bhyvemgr
 DISTVERSIONPREFIX=	v
-PORTVERSION=	1.5.3
+PORTVERSION=	1.8.0
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -20,15 +20,21 @@ USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	alonsobsd
 
-OPTIONS_DEFINE=		FREERDP3
+OPTIONS_DEFINE=		FREERDP3 QEMU-TOOLS
 
 FREERDP3_DESC=		Install freerdp3 to enable rdp connection option
 FREERDP3_RUN_DEPENDS=	freerdp3>0:net/freerdp3
 
+QEMU-TOOLS_DESC=	Install qemu-img tool
+QEMU-TOOLS_RUN_DEPENDS=	qemu-img:emulators/qemu@tools
+
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500000)
 ONLY_FOR_ARCHS=	aarch64 amd64
+.endif
+
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1403000)
 RUN_DEPENDS+=	swtpm>0:sysutils/swtpm
 .endif
 
@@ -61,6 +67,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/setup/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "images" ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "images samples templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/bhyvemgr/distinfo b/sysutils/bhyvemgr/distinfo
index 49454c48ce44..614ea70bcc80 100644
--- a/sysutils/bhyvemgr/distinfo
+++ b/sysutils/bhyvemgr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748048188
-SHA256 (alonsobsd-bhyvemgr-v1.5.3_GH0.tar.gz) = 4adec8b6b4194abdaecce250719769bf029a8fa17b05ce926b2e1cd7e64e10d8
-SIZE (alonsobsd-bhyvemgr-v1.5.3_GH0.tar.gz) = 256995
+TIMESTAMP = 1754457775
+SHA256 (alonsobsd-bhyvemgr-v1.8.0_GH0.tar.gz) = c7d0b02e12ee65d63cc79a0da501d4f80ffd4e77d14c4c092280c7cf5366d456
+SIZE (alonsobsd-bhyvemgr-v1.8.0_GH0.tar.gz) = 273325
diff --git a/sysutils/bhyvemgr/files/pkg-message.in b/sysutils/bhyvemgr/files/pkg-message.in
index 2054ec3a0998..8943b45cd81c 100644
--- a/sysutils/bhyvemgr/files/pkg-message.in
+++ b/sysutils/bhyvemgr/files/pkg-message.in
@@ -9,12 +9,24 @@ bhyvemgr was installed
 
 3) It can be compiled with supports for gtk2, qt5 or qt6 graphic interfaces
 
-4) For a better use of bhyvemgr, some settings must be applied to your system.
+4) Now, bhyvemgr supports the use of cloud and VM images. You can even use cloud
+   init or nuageinit to initialize them.
+
+5) If you use a minimal configuration it uses  files templates files inside
+   of %%DATADIR%%/templates directory.
+
+6) If you want to use your own configuration files: user-data, meta-data, try to
+   keep %%UUID%% and %%HOSTAME%% inside of them as you can look at
+   %%DATADIR%%/samples directory.
+
+   They will be will replace with virtual machine values.
+
+7) For a optimal use of bhyvemgr, some settings must be applied to your system.
    Take a look at the following url:
 
    https://github.com/alonsobsd/bhyvemgr/blob/main/README.md
 
-5) Enjoy it ;)
+8) Enjoy it ;)
 EOM
 }
 ]
diff --git a/sysutils/bhyvemgr/pkg-plist b/sysutils/bhyvemgr/pkg-plist
index ccae9dcbd3b5..2b8f96366243 100644
--- a/sysutils/bhyvemgr/pkg-plist
+++ b/sysutils/bhyvemgr/pkg-plist
@@ -26,6 +26,7 @@ share/applications/bhyvemgr.desktop
 %%DATADIR%%/images/menu/com.png
 %%DATADIR%%/images/menu/edit.png
 %%DATADIR%%/images/menu/hide.png
+%%DATADIR%%/images/menu/paste.png
 %%DATADIR%%/images/menu/quit.png
 %%DATADIR%%/images/menu/rdp.png
 %%DATADIR%%/images/menu/remove.png
@@ -54,5 +55,9 @@ share/applications/bhyvemgr.desktop
 %%DATADIR%%/images/systems/rockylinux.png
 %%DATADIR%%/images/systems/ubuntu.png
 %%DATADIR%%/images/systems/windows.png
+%%DATADIR%%/samples/meta-data
+%%DATADIR%%/samples/user-data
+%%DATADIR%%/templates/meta-data
+%%DATADIR%%/templates/user-data
 share/icons/hicolor/512x512/apps/bhyvemgr.png
 share/icons/hicolor/scalable/apps/bhyvemgr.svg