Index: uefi-edk2-bhyve-nocsm/Makefile
===================================================================
--- uefi-edk2-bhyve-nocsm/Makefile
+++ uefi-edk2-bhyve-nocsm/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-nocsm
+
+COMMENT=	UEFI-EDK2 firmware for bhyve without CSM
+
+MASTERDIR=	${.CURDIR}/../uefi-edk2-bhyve
+
+OPTIONS_EXCLUDE=	CSM
+
+.include "${MASTERDIR}/Makefile"
Index: uefi-edk2-bhyve/Makefile
===================================================================
--- uefi-edk2-bhyve/Makefile
+++ uefi-edk2-bhyve/Makefile
@@ -5,23 +5,23 @@
 CATEGORIES=	sysutils
 
 MAINTAINER=	fabian.freyer@physik.tu-berlin.de
-COMMENT=	UEFI-EDK2 firmware for bhyve
+COMMENT?=	UEFI-EDK2 firmware for bhyve
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	bash:shells/bash \
-		gcc48:lang/gcc48 \
 		nasm:devel/nasm \
 		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		gmake \
 		python:build
+USE_GCC=	4.8
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	uefi-edk2
 GH_TAGNAME=	a36132939e259df79b16699c03c6f1d63c7454b9
 
-PLIST_FILES=    ${PREFIX}/share/uefi-firmwares/BHYVE_UEFI.fd
+PLIST_FILES=    ${PREFIX}/share/uefi-firmwares/BHYVE_UEFI${PLIST_SUFFIX}.fd
 
 ONLY_FOR_ARCHS=	amd64
 
@@ -44,6 +44,10 @@
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MCSM}
+PLIST_SUFFIX=_CSM
+.endif
+
 post-extract:
 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/BaseTools/Tests/GNUmakefile \
 							${WRKSRC}/BaseTools/BinWrappers/PosixLike/*
@@ -75,6 +79,6 @@
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/uefi-firmwares/
 	${INSTALL} ${BUILD_WRKSRC}/Build/BhyveX64/${UEFI_TARGET}_GCC48/FV/BHYVE.fd \
-		${STAGEDIR}${PREFIX}/share/uefi-firmwares/BHYVE_UEFI.fd
+		${STAGEDIR}${PREFIX}/share/uefi-firmwares/BHYVE_UEFI${PLIST_SUFFIX}.fd
 
 .include <bsd.port.mk>