Index: head/net/ipxe/Makefile
===================================================================
--- head/net/ipxe/Makefile	(revision 447571)
+++ head/net/ipxe/Makefile	(revision 447572)
@@ -1,93 +1,101 @@
 # Created by: Guerkan Karaman <gk.freebsd@googlemail.com>
 # $FreeBSD$
 
 # With helpful hints from net/gpxe
 
 PORTNAME=	ipxe
 PORTVERSION=	20161208
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Open source network boot firmware
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \
 		bash:shells/bash \
 		mkisofs:sysutils/cdrtools
 
+USES=		gmake perl5 shebangfix
+USE_BINUTILS=	yes
+USE_GCC=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	ipxe
 # iPXE hasn't had a release since 2010.
 # See iPXE's FAQ at http://ipxe.org/faq
 #
 #   Q: Which version of iPXE should I use?
 #
 #   A: iPXE uses a rolling release model, in which every commit is intended
 #      to be production-ready.  You should always use the latest code.
 #
 GH_TAGNAME=	26050fd4c87c50503d5bd573b2ec91703676e211
+USE_PERL5=	build
 
-USES=		gmake perl5 shebangfix
-USE_BINUTILS=	yes
-USE_GCC=	yes
 MAKE_ARGS=	PERL=${PERL} \
 		CC=${CC} \
 		HOST_CC=${CC} \
+		AS=${AS} \
+		LD=${LD} \
+		SIZE=${SIZE} \
+		AR=${AR} \
+		RANLIB=${RANLIB} \
+		OBJCOPY=${OBJCOPY} \
+		NM=${NM} \
+		OBJDUMP=${OBJDUMP} \
 		NO_WERROR=1 \
 		V=1 \
-		OBJCOPY="${LOCALBASE}/bin/objcopy" \
 		ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \
 		LDLINUX_C32="${LOCALBASE}/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32"
 WRKSRC_SUBDIR=	src
 SHEBANG_FILES=	util/geniso util/gensdsk
 
 PLIST_FILES=	%%DATADIR%%/ipxe.dsk \
 		%%DATADIR%%/ipxe.usb \
 		%%DATADIR%%/ipxe.iso \
 		%%DATADIR%%/ipxe.pxe \
 		%%DATADIR%%/ipxe.lkrn
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64/i386
 
 .if ${ARCH} == "amd64"
 MAKE_ARGS+=	ARCH=i386
 .endif
 
 IPXE_EMBED?=	# Allows embedding of iPXE start scripts
 .if ${IPXE_EMBED} != ""
 MAKE_ARGS+=	EMBED="${IPXE_EMBED}"
 .endif
 
 IPXE_TRUST?=	# Path to the root certificates iPXE trusts
 .if ${IPXE_TRUST} != ""
 MAKE_ARGS+=	TRUST="${IPXE_TRUST}"
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "To build iPXE with an embedded script (path must be absolute):"
 	@${ECHO_MSG} "make IPXE_EMBED=/path/to/ipxe/script install clean"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build iPXE with new trusted root certificates"
 	@${ECHO_MSG} "(see http://ipxe.org/crypto for more information):"
 	@${ECHO_MSG} "make IPXE_TRUST=/path/to/ca1.crt,/path/to/ca2.crt"
 
 pre-build:
 # ISO creation fails if isolinux.bin is read only
 	${INSTALL} -m 644 ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin ${WRKSRC}/isolinux.bin
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/ipxe.dsk ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/ipxe.usb ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/ipxe.iso ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/ipxe.pxe ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/ipxe.lkrn ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/net/ipxe/files/pkg-message.in
===================================================================
--- head/net/ipxe/files/pkg-message.in	(revision 447571)
+++ head/net/ipxe/files/pkg-message.in	(revision 447572)
@@ -1,25 +1,6 @@
 The following files have been installed in %%DATADIR%%:
-
-* ipxe.dsk:  To create a bootable floppy run
-
-    dd if=%%DATADIR%%/ipxe.dsk of=/dev/fd0
-
-  where /dev/fd0 is your floppy drive.  This will erase any data
-  already on the disk.
-
-* ipxe.usb:  To create a bootable USB key run
-
-    dd if=%%DATADIR%%/ipxe.usb of=/dev/daX
-
-  where /dev/daX is your USB key, and is *not* a real hard disk on
-  your system.  This will erase any data already on the USB key.
-
-* ipxe.iso:  To create a bootable CD-ROM run
-
-    cdrecord %%DATADIR%%/ipxe.iso
-
-  to write the image to a blank CD.
-
-* ipxe.pxe:  For chainloading from a PXE ROM.
-
-* ipxe.lkrn:  For any boot manager that can boot Linux kernels.
+- ipxe.dsk for creating a bootable floppy disk
+- ipxe.usb for creating a bootable USB key
+- ipxe.iso for creating a bootable CD
+- ipxe.pxe for chainloading from a PXE ROM
+- ipxe.lkrn for any boot manager that can boot Linux kernels