Index: devel/gnu-efi/Makefile
===================================================================
--- devel/gnu-efi/Makefile
+++ devel/gnu-efi/Makefile
@@ -2,27 +2,56 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-efi
-PORTVERSION=	3.0.3
-PORTREVISION=	5
+PORTVERSION=	3.0.8
 CATEGORIES=	devel
 MASTER_SITES=	SF/gnu-efi
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SDK for EFI applications
 
+BROKEN_armv6=	INT compile errors/unknown types
+NOT_FOR_ARCHS=	mips
+
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:devel/binutils
 
+CFLAGS+=	-fPIC
+CXXFLAGS+=	-fPIC
+
 USES=		gmake tar:bz2
-USE_GCC=	yes
-MAKE_JOBS_UNSAFE=	yes
-CFLAGS+=	"-fPIC"
-CPPFLAGS+=	"-fPIC"
-MAKE_ARGS+=	CC=${CC} HOSTCC=${CC} AR=${AR}
-ONLY_FOR_ARCHS=	amd64
+MAKE_ARGS=	CC=${CC} HOSTCC=${CC}
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == "amd64"
+PLIST_SUB==	ARCH=x86_64
+PLIST_FILES=	include/efi/eficompiler.h \
+		include/efi/x86_64/pe.h \
+		lib/elf_x86_64_fbsd_efi.lds
+.endif
+
+.if ${ARCH} == "aarch64"
+PLIST_SUB=	ARCH=aarch64
+PLIST_FILES=	include/efi/eficompiler.h \
+		lib/elf_aarch64_efi.lds
+.endif
+
+.if ${ARCH} == "i386"
+PLIST_SUB=	ARCH=ia32
+PLIST_FILES=	include/efi/eficompiler.h \
+		include/efi/ia32/pe.h \
+		lib/elf_ia32_efi.lds
+.endif
+
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/crt0-efi-x86_64.o
+	${FIND} ${STAGEDIR}${PREFIX}/lib/ -name '.o' -exec \
+		${STRIP_CMD} {} +
+
+OPTIONS_DEFINE=	BUILD
+OPTIONS_DEFAULT=BUILD
+
+BUILD_DESC=	Support building of EFI applications
+BUILD_USE=	GCC=yes
 
 .include <bsd.port.mk>
Index: devel/gnu-efi/distinfo
===================================================================
--- devel/gnu-efi/distinfo
+++ devel/gnu-efi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnu-efi-3.0.3.tar.bz2) = c530f21a15fd9c214dd92d29a6caa20fac989289267512020b6da1f5e6f5b4cb
-SIZE (gnu-efi-3.0.3.tar.bz2) = 142229
+TIMESTAMP = 1536379812
+SHA256 (gnu-efi-3.0.8.tar.bz2) = 76006d8ea8d67bcf72f35d09d43e9ef6a69400d6d5d4bf64baf1ab7434e2b722
+SIZE (gnu-efi-3.0.8.tar.bz2) = 154397
Index: devel/gnu-efi/pkg-plist
===================================================================
--- devel/gnu-efi/pkg-plist
+++ devel/gnu-efi/pkg-plist
@@ -38,11 +38,9 @@
 include/efi/protocol/piflash64.h
 include/efi/protocol/vgaclass.h
 include/efi/romload.h
-include/efi/x86_64/efibind.h
-include/efi/x86_64/efilibplat.h
-include/efi/x86_64/efisetjmp_arch.h
-include/efi/x86_64/pe.h
-lib/crt0-efi-x86_64.o
-lib/elf_x86_64_fbsd_efi.lds
+include/efi/%%ARCH%%/efibind.h
+include/efi/%%ARCH%%/efilibplat.h
+include/efi/%%ARCH%%/efisetjmp_arch.h
+lib/crt0-efi-%%ARCH%%.o
 lib/libefi.a
 lib/libgnuefi.a