sysutils/vm-bhyve-devel: add new port

Contrary to the sysutils/vm-bhyve port which tracks releases,
this port will track the head of the main branch. The main reason
is that upstream has become stale in creating releases. This way
we atleast get some improvements that have not yet been included
in a release. Last release dates from January 2020.

Changes:	https://github.com/churchers/vm-bhyve/compare/6385042...ec0e12e

Reviewed by:		0mp philip
Differential Revision:	https://reviews.freebsd.org/D35760

7 files changed, 111 insertions, 0 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4162ad76ea23..e85ed43b1f91 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1520,6 +1520,7 @@
     SUBDIR += virtualmin
     SUBDIR += vivid
     SUBDIR += vm-bhyve
+    SUBDIR += vm-bhyve-devel
     SUBDIR += vmdktool
     SUBDIR += vmtouch
     SUBDIR += vobcopy
diff --git a/sysutils/vm-bhyve-devel/Makefile b/sysutils/vm-bhyve-devel/Makefile
new file mode 100644
index 000000000000..54bc2604fc83
--- /dev/null
+++ b/sysutils/vm-bhyve-devel/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=		vm-bhyve
+DISTVERSIONPREFIX=	v
+DISTVERSION=		1.4.0-73
+DISTVERSIONSUFFIX=	-gec0e12e
+CATEGORIES=		sysutils
+PKGNAMESUFFIX=		-devel
+
+MAINTAINER=	driesm@FreeBSD.org
+COMMENT=	Management system for bhyve virtual machines
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	churchers
+
+CONFLICTS_INSTALL=	vm-bhyve
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=		BHYVE_FIRMWARE EXAMPLES GRUB2_BHYVE TMUX
+BHYVE_FIRMWARE_DESC=	Required to run UEFI guests
+EXAMPLES_DESC=		Install example guest templates
+GRUB2_BHYVE_DESC=	Required to run Linux or any other guests that need a Grub bootloader
+TMUX_DESC=		Tmux console access instead of cu/nmdm
+
+BHYVE_FIRMWARE_RUN_DEPENDS=	bhyve-firmware>0:sysutils/bhyve-firmware
+GRUB2_BHYVE_RUN_DEPENDS=	grub2-bhyve>0:sysutils/grub2-bhyve
+TMUX_RUN_DEPENDS=		tmux:sysutils/tmux
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/vm ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/vm ${STAGEDIR}${PREFIX}/etc/rc.d
+	(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/vm-bhyve)
+	(cd ${WRKSRC}/sample-templates/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_MAN} ${WRKSRC}/vm.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+
+.include <bsd.port.mk>
diff --git a/sysutils/vm-bhyve-devel/distinfo b/sysutils/vm-bhyve-devel/distinfo
new file mode 100644
index 000000000000..360fe3cbfcc4
--- /dev/null
+++ b/sysutils/vm-bhyve-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1657368424
+SHA256 (churchers-vm-bhyve-v1.4.0-73-gec0e12e_GH0.tar.gz) = 6749a02349bb96133600d56752e3a11718d58dd780854e55c5c209f099358026
+SIZE (churchers-vm-bhyve-v1.4.0-73-gec0e12e_GH0.tar.gz) = 75831
diff --git a/sysutils/vm-bhyve-devel/pkg-descr b/sysutils/vm-bhyve-devel/pkg-descr
new file mode 100644
index 000000000000..94175b7d5a0b
--- /dev/null
+++ b/sysutils/vm-bhyve-devel/pkg-descr
@@ -0,0 +1,6 @@
+A frontend for bhyve which provides the 'vm' command
+Create/start/stop virtual machines easily
+Bridged/NAT networking
+BSD/Linux/Windows guest support
+
+WWW: https://github.com/churchers/vm-bhyve
diff --git a/sysutils/vm-bhyve-devel/pkg-message b/sysutils/vm-bhyve-devel/pkg-message
new file mode 100644
index 000000000000..e04a7ea5298f
--- /dev/null
+++ b/sysutils/vm-bhyve-devel/pkg-message
@@ -0,0 +1,19 @@
+[
+{ type: install
+  message: <<EOM
+To enable vm-bhyve, please add the following lines to rc.conf,
+depending on whether you are using ZFS storage or not. Please note
+that the directory or dataset specified should already exist.
+
+    vm_enable="YES"
+    vm_dir="zfs:pool/dataset"
+
+OR
+
+    vm_enable="YES"
+    vm_dir="/directory/path"
+
+Then run 'vm init'.
+EOM
+}
+]
diff --git a/sysutils/vm-bhyve-devel/pkg-plist b/sysutils/vm-bhyve-devel/pkg-plist
new file mode 100644
index 000000000000..3341daea718c
--- /dev/null
+++ b/sysutils/vm-bhyve-devel/pkg-plist
@@ -0,0 +1,38 @@
+etc/rc.d/vm
+lib/vm-bhyve/vm-base
+lib/vm-bhyve/vm-cmd
+lib/vm-bhyve/vm-config
+lib/vm-bhyve/vm-core
+lib/vm-bhyve/vm-datastore
+lib/vm-bhyve/vm-guest
+lib/vm-bhyve/vm-info
+lib/vm-bhyve/vm-migration
+lib/vm-bhyve/vm-rctl
+lib/vm-bhyve/vm-run
+lib/vm-bhyve/vm-switch
+lib/vm-bhyve/vm-switch-manual
+lib/vm-bhyve/vm-switch-standard
+lib/vm-bhyve/vm-switch-vale
+lib/vm-bhyve/vm-switch-vxlan
+lib/vm-bhyve/vm-util
+lib/vm-bhyve/vm-zfs
+man/man8/vm.8.gz
+sbin/vm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arch.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coreos.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gentoo.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-zvol.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf
diff --git a/sysutils/vm-bhyve/Makefile b/sysutils/vm-bhyve/Makefile
index 68956127bc0f..b9f2640b7fe8 100644
--- a/sysutils/vm-bhyve/Makefile
+++ b/sysutils/vm-bhyve/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	vm-bhyve
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	churchers@gmail.com
@@ -13,6 +14,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 USE_GITHUB=	yes
 GH_ACCOUNT=	churchers
 
+CONFLICTS_INSTALL=	vm-bhyve-devel
+
 NO_ARCH=	yes
 NO_BUILD=	yes