6 files changed, 13 insertions, 66 deletions

diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile
index 36d457f13b92..f37aa88cdd30 100644
--- a/devel/gnu-efi/Makefile
+++ b/devel/gnu-efi/Makefile
@@ -2,27 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-efi
-PORTVERSION=	3.0w
+PORTVERSION=	3.0.1
 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
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:${PORTSDIR}/devel/binutils
 
-USES=		gmake
-# The version of GCC is also hard-coded in files/patch-Make.defaults.
-USE_GCC=	4.8
+USES=		gmake tar:bz2
+USE_GCC=	4.8+
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	"-fPIC"
+CPPFLAGS+=	"-fPIC"
+MAKE_ARGS+=	CC=${CC} HOSTCC=${CC} AR=${AR}
 ONLY_FOR_ARCHS=	amd64
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults
-
 .include <bsd.port.mk>
diff --git a/devel/gnu-efi/distinfo b/devel/gnu-efi/distinfo
index eee5f573ce7f..1a2989d5a04b 100644
--- a/devel/gnu-efi/distinfo
+++ b/devel/gnu-efi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnu-efi_3.0w.orig.tar.gz) = d5c5ca168d25bb54ea936a25175d7626778001f788bddc60dbed103874583621
-SIZE (gnu-efi_3.0w.orig.tar.gz) = 172913
+SHA256 (gnu-efi-3.0.1.tar.bz2) = e2e8d5940347eebfb00eaaeef107a8ba59e7838e40bc716c74d9a36fff648f1f
+SIZE (gnu-efi-3.0.1.tar.bz2) = 136071
diff --git a/devel/gnu-efi/files/patch-Make.defaults b/devel/gnu-efi/files/patch-Make.defaults
index 9cd832ba602f..2618b9429682 100644
--- a/devel/gnu-efi/files/patch-Make.defaults
+++ b/devel/gnu-efi/files/patch-Make.defaults
@@ -1,6 +1,6 @@
---- Make.defaults.orig	2014-08-08 21:27:21.000000000 +0200
-+++ Make.defaults	2015-01-15 11:13:35.059134709 +0100
-@@ -45,14 +45,17 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; 
+--- Make.defaults.orig	2015-01-05 19:20:43.000000000 +0100
++++ Make.defaults	2015-02-12 16:31:43.487801000 +0100
+@@ -45,11 +45,14 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; 
  # Where to install the package. GNU-EFI will create and access
  # lib and include under the root
  #
@@ -14,30 +14,5 @@
 +CROSS_COMPILE:= $(LOCALBASE)/bin/
 +
  # Compilation tools
--HOSTCC       := $(prefix)gcc
--CC           := $(prefix)$(CROSS_COMPILE)gcc
-+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
+ HOSTCC       := $(prefix)gcc
+ CC           := $(prefix)$(CROSS_COMPILE)gcc
diff --git a/devel/gnu-efi/files/patch-gnuefi-Makefile b/devel/gnu-efi/files/patch-gnuefi-Makefile
index 93f5f411839c..7973dded5744 100644
--- a/devel/gnu-efi/files/patch-gnuefi-Makefile
+++ b/devel/gnu-efi/files/patch-gnuefi-Makefile
@@ -8,17 +8,3 @@
 +
  # on aarch64, avoid jump tables before all relocations have been processed
  reloc_aarch64.o: CFLAGS += -fno-jump-tables
- 
-@@ -77,9 +79,8 @@ $(LIBDIRINSTALL):
- 
- .SECONDEXPANSION:
- 
--$(LIBDIRINSTALL)/%: % | $$(dir $$@)
--	$(INSTALL) -m 644 $< $(dir $@)
--
--install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
-+install: $(INSTALLTARGETS)
-+	echo targets $(INSTALLTARGETS)
-+	$(INSTALL) -m 644 $(INSTALLTARGETS) $(LIBDIRINSTALL)
- 
- include $(SRCDIR)/../Make.rules
diff --git a/devel/gnu-efi/files/patch-inc-Makefile b/devel/gnu-efi/files/patch-inc-Makefile
deleted file mode 100644
index 367a424a1d06..000000000000
--- a/devel/gnu-efi/files/patch-inc-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- inc/Makefile.orig	2014-08-08 21:08:55.000000000 +0200
-+++ inc/Makefile	2014-11-30 18:26:02.000000000 +0100
-@@ -36,6 +36,6 @@ $(INCDIRINSTALL)/protocol/$(ARCH):
- $(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
- 	$(INSTALL) -m 644 $< $(dir $@)
- 
--install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
-+install: $(INCDIRINSTALL) $(INCDIRINSTALL)/protocol $(INCDIRINSTALL)/$(ARCH) $(INCDIRINSTALL)/protocol/$(ARCH) $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
- 
- include $(SRCDIR)/../Make.rules
diff --git a/devel/gnu-efi/pkg-plist b/devel/gnu-efi/pkg-plist
index 37a75ad83f4b..568682088670 100644
--- a/devel/gnu-efi/pkg-plist
+++ b/devel/gnu-efi/pkg-plist
@@ -44,4 +44,3 @@ lib/crt0-efi-x86_64.o
 lib/elf_x86_64_fbsd_efi.lds
 lib/libefi.a
 lib/libgnuefi.a
-@dir include/efi/protocol/x86_64