Index: head/devel/gnu-efi/Makefile
===================================================================
--- head/devel/gnu-efi/Makefile	(revision 377599)
+++ head/devel/gnu-efi/Makefile	(revision 377600)
@@ -1,25 +1,28 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnu-efi
 PORTVERSION=	3.0w
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnu-efi
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	SDK for EFI applications
 
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.0
 
 USES=		gmake
 # The version of GCC is also hard-coded in files/patch-Make.defaults.
 USE_GCC=	4.8
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	"-fPIC"
 ONLY_FOR_ARCHS=	amd64
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults
+
 .include <bsd.port.mk>
Index: head/devel/gnu-efi/files/patch-Make.defaults
===================================================================
--- head/devel/gnu-efi/files/patch-Make.defaults	(revision 377599)
+++ head/devel/gnu-efi/files/patch-Make.defaults	(revision 377600)
@@ -1,43 +1,43 @@
 --- Make.defaults.orig	2014-08-08 21:27:21.000000000 +0200
-+++ Make.defaults	2014-12-01 02:18:02.000000000 +0100
++++ Make.defaults	2015-01-15 11:13:35.059134709 +0100
 @@ -45,14 +45,17 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; 
  # Where to install the package. GNU-EFI will create and access
  # lib and include under the root
  #
 -INSTALLROOT  := /
 +INSTALLROOT  := $(DESTDIR)
  PREFIX       := /usr/local
  LIBDIR 	     := $(PREFIX)/lib
  INSTALL	     := install
  
 +LOCALBASE    := /usr/local
 +CROSS_COMPILE:= $(LOCALBASE)/bin/
 +
  # Compilation tools
 -HOSTCC       := $(prefix)gcc
 -CC           := $(prefix)$(CROSS_COMPILE)gcc
-+HOSTCC       := $(prefix)gcc48
-+CC           := $(prefix)$(CROSS_COMPILE)gcc48
++HOSTCC       := $(prefix)%%CC%%
++CC           := $(prefix)$(CROSS_COMPILE)%%CC%%
  AS           := $(prefix)$(CROSS_COMPILE)as
  LD           := $(prefix)$(CROSS_COMPILE)ld
  AR           := $(prefix)$(CROSS_COMPILE)ar
 @@ -98,7 +101,7 @@ ifeq ($(ARCH),x86_64)
                                   && [ $(GCCMINOR) -ge "7" ] ) ) \
                            && echo 1)
    ifeq ($(GCCNEWENOUGH),1)
 -    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
 +    CPPFLAGS += -fPIC -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
    endif
  
    CFLAGS += -mno-red-zone -mno-mmx -mno-sse
 @@ -118,8 +121,8 @@ endif
  # Generic compilation flags
  INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
             -I$(TOPDIR)/inc/protocol
 -CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
 +CFLAGS  += $(ARCH3264) -O2 -fPIC -Wall -fshort-wchar -fno-strict-aliasing \
             -fno-merge-constants -ffreestanding -fno-stack-protector       \
             -fno-stack-check
  ASFLAGS += $(ARCH3264)
 -LDFLAGS	+= -nostdlib --warn-common --no-undefined --fatal-warnings
 +LDFLAGS	+= -nostdlib