Index: head/devel/gnu-efi/Makefile
===================================================================
--- head/devel/gnu-efi/Makefile	(revision 486592)
+++ head/devel/gnu-efi/Makefile	(revision 486593)
@@ -1,27 +1,36 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnu-efi
 PORTVERSION=	3.0.9
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/gnu-efi
 
 MAINTAINER=	egypcio@googlemail.com
 COMMENT=	SDK for EFI applications
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	amd64 i386
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:devel/binutils
+BUILD_DEPENDS=	${LOCALBASE}/bin/ar:devel/binutils
 
 USES=		compiler:c++11-lib gmake tar:bz2
 
 CFLAGS+=	-fPIC
 CPPFLAGS+=	-fPIC
 MAKE_ARGS+=	CC=${CC} HOSTCC=${CC} AR=${AR}
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == amd64
+PLIST_SUB=	ARCH_amd64="" ARCH_i386="@comment "
+.elif ${ARCH} == i386
+PLIST_SUB=	ARCH_i386="" ARCH_amd64="@comment "
+.endif
+
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/crt0-efi-x86_64.o
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.o
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/devel/gnu-efi/pkg-plist
===================================================================
--- head/devel/gnu-efi/pkg-plist	(revision 486592)
+++ head/devel/gnu-efi/pkg-plist	(revision 486593)
@@ -1,49 +1,57 @@
 include/efi/efi.h
 include/efi/efi_nii.h
 include/efi/efi_pxe.h
 include/efi/efiapi.h
 include/efi/eficompiler.h
 include/efi/eficon.h
 include/efi/efidebug.h
 include/efi/efidef.h
 include/efi/efidevp.h
 include/efi/efierr.h
 include/efi/efifs.h
 include/efi/efigpt.h
 include/efi/efiip.h
 include/efi/efilib.h
 include/efi/efilink.h
 include/efi/efinet.h
 include/efi/efipart.h
 include/efi/efipciio.h
 include/efi/efipoint.h
 include/efi/efiprot.h
 include/efi/efipxebc.h
 include/efi/efirtlib.h
 include/efi/efiser.h
 include/efi/efisetjmp.h
 include/efi/efishellintf.h
 include/efi/efishellparm.h
 include/efi/efistdarg.h
 include/efi/efitcp.h
 include/efi/efiudp.h
 include/efi/efiui.h
 include/efi/libsmbios.h
 include/efi/pci22.h
 include/efi/protocol/adapterdebug.h
 include/efi/protocol/eficonsplit.h
 include/efi/protocol/efidbg.h
 include/efi/protocol/efivar.h
 include/efi/protocol/intload.h
 include/efi/protocol/legacyboot.h
 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
 lib/libefi.a
 lib/libgnuefi.a
+@comment Architecture Specific Packages List, amd64
+%%ARCH_amd64%%include/efi/x86_64/efibind.h
+%%ARCH_amd64%%include/efi/x86_64/efilibplat.h
+%%ARCH_amd64%%include/efi/x86_64/efisetjmp_arch.h
+%%ARCH_amd64%%include/efi/x86_64/pe.h
+%%ARCH_amd64%%lib/crt0-efi-x86_64.o
+%%ARCH_amd64%%lib/elf_x86_64_fbsd_efi.lds
+@comment Architecture Specific Packages List, i386
+%%ARCH_i386%%include/efi/ia32/efibind.h
+%%ARCH_i386%%include/efi/ia32/efilibplat.h
+%%ARCH_i386%%include/efi/ia32/efisetjmp_arch.h
+%%ARCH_i386%%include/efi/ia32/pe.h
+%%ARCH_i386%%lib/crt0-efi-ia32.o
+%%ARCH_i386%%lib/elf_ia32_efi.lds