Index: head/devel/efivar/Makefile
===================================================================
--- head/devel/efivar/Makefile	(revision 381792)
+++ head/devel/efivar/Makefile	(revision 381793)
@@ -1,54 +1,54 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	efivar
 PORTVERSION=	0.15
 CATEGORIES=	devel
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Tools and library to manipulate EFI variables
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
 
-USE_GCC=	4.8+
+USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rhinstaller
 GH_COMMIT=	5776088
 
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 
 NOT_FOR_ARCHS=	powerpc powerpc64 sparc64
 NOT_FOR_ARCHS_REASON=	specification only supports little-endian processors
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/efivar.pc.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/efivar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/src/libefivar.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/libefivar.so.0 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/src/efivar.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/efivar-guids.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/src/efivar.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${INSTALL_MAN} ${WRKSRC}/docs/efivar.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_append_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_del_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_next_variable_name.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_variable_attributes.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_get_variable_size.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_guid_to_name.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_guid_to_str.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_guid_to_symbol.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_name_to_guid.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_set_variable.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_str_to_guid.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_symbol_to_guid.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/docs/efi_variables_supported.3 ${STAGEDIR}${MAN1PREFIX}/man/man3
 
 .include <bsd.port.post.mk>
Index: head/devel/gnu-efi/Makefile
===================================================================
--- head/devel/gnu-efi/Makefile	(revision 381792)
+++ head/devel/gnu-efi/Makefile	(revision 381793)
@@ -1,25 +1,25 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnu-efi
 PORTVERSION=	3.0.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnu-efi
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	SDK for EFI applications
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:${PORTSDIR}/devel/binutils
 
 USES=		gmake tar:bz2
-USE_GCC=	4.8+
+USE_GCC=	yes
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	"-fPIC"
 CPPFLAGS+=	"-fPIC"
 MAKE_ARGS+=	CC=${CC} HOSTCC=${CC} AR=${AR}
 ONLY_FOR_ARCHS=	amd64
 
 .include <bsd.port.mk>
Index: head/sysutils/pesign/Makefile
===================================================================
--- head/sysutils/pesign/Makefile	(revision 381792)
+++ head/sysutils/pesign/Makefile	(revision 381793)
@@ -1,47 +1,47 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pesign
 PORTVERSION=	0.110
 CATEGORIES=	sysutils
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Signing utility for UEFI secure boot
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libefivar.so:${PORTSDIR}/devel/efivar \
 		libnspr4.so:${PORTSDIR}/devel/nspr \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libpopt.so:${PORTSDIR}/devel/popt \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
-USE_GCC=	4.8+
+USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rhinstaller
 GH_COMMIT=	00288b4
 
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001505
 BROKEN=		This port requires ppoll(2) system call
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/efikeygen ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/pesign ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/libdpe/libdpe.so ${STAGEDIR}${PREFIX}/lib
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libdpe
 	${INSTALL_DATA} ${WRKSRC}/include/libdpe/pe.h ${STAGEDIR}${PREFIX}/include/libdpe
 	${INSTALL_DATA} ${WRKSRC}/include/libdpe/libdpe.h ${STAGEDIR}${PREFIX}/include/libdpe
 	${INSTALL_MAN} ${WRKSRC}/src/efikeygen.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/src/pesign-client.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/src/pesign.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
Index: head/sysutils/shim/Makefile
===================================================================
--- head/sysutils/shim/Makefile	(revision 381792)
+++ head/sysutils/shim/Makefile	(revision 381793)
@@ -1,44 +1,44 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	shim
 PORTVERSION=	0.8
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	UEFI Secure Boot shim loader
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/gnu-efi \
 		bash:${PORTSDIR}/shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mjg59
 GH_COMMIT=	6f4d516
 
 USES=		gmake
-USE_GCC=	4.8+
+USE_GCC=	yes
 USE_GITHUB=	yes
 MAKE_JOBS_UNSAFE=	yes
 ONLY_FOR_ARCHS=	amd64
 
 PLIST_FILES=	lib/shim/shim.pem lib/shim/shim.key \
 		lib/shim/MokManager.efi lib/shim/fallback.efi lib/shim/shim.efi
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/make-certs
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Makefile
 
 do-install:
 	# Note that before this step, the shim.pem contains the _private_ key.
 	openssl x509 -inform der -in ${WRKSRC}/shim.cer -outform pem -out ${WRKSRC}/shim.pem
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} -m 600 ${WRKSRC}/shim.key ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/shim.pem ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim
 
 .include <bsd.port.mk>