Index: head/net/ipxe/Makefile =================================================================== --- head/net/ipxe/Makefile (revision 485642) +++ head/net/ipxe/Makefile (revision 485643) @@ -1,127 +1,126 @@ # Created by: Guerkan Karaman # $FreeBSD$ PORTNAME= ipxe -PORTVERSION= 20180514 -PORTREVISION= 1 +PORTVERSION= 20180825 CATEGORIES= net MAINTAINER= tobik@FreeBSD.org COMMENT= Open source network boot firmware LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64/i386 USES= gmake perl5 shebangfix USE_BINUTILS= yes USE_GCC= yes USE_GITHUB= yes # 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= e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2 +GH_TAGNAME= 133f4c47baef6002b2ccb4904a035cda2303c6e5 USE_PERL5= build ALL_TARGET= bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.pxe bin/ipxe.usb bin/undionly.kpxe MAKE_ARGS= HOST_CC=${CC} \ PERL=${PERL} \ CC=${CC} \ AS=${AS} \ LD=${LD} \ SIZE=${SIZE} \ AR=${AR} \ RANLIB=${RANLIB} \ OBJCOPY=${OBJCOPY} \ NM=${NM} \ OBJDUMP=${OBJDUMP} \ ARCH=${ARCH:S/amd64/i386/} \ NO_WERROR=1 \ V=1 \ ${IPXE_MAKE_ARGS} PLIST_FILES= ${ALL_TARGET:S@^bin/@${DATADIR}/@} SHEBANG_FILES= util/geniso util/gensdsk SUB_FILES= pkg-message WRKSRC_SUBDIR= src # Possible options are listed in ${WRKSRC}/config/*.h and # http://ipxe.org/buildcfg. Add a ! prefix to an option to undef it # i.e. turn it off. _IPXE_BUILDCFG= branding:PRODUCT_NAME="${PKGNAME} (${OPSYS} ${OSREL}/${ARCH})" \ console:CONSOLE_SERIAL \ console:KEYBOARD_MAP=us \ general:!DOWNLOAD_PROTO_FTP \ general:DOWNLOAD_PROTO_HTTPS \ general:DOWNLOAD_PROTO_NFS \ general:IMAGE_TRUST_CMD \ general:NET_PROTO_IPV6 \ general:PING_CMD \ general:POWEROFF_CMD OPTIONS_DEFAULT= ISO EFI OPTIONS_DEFINE= ISO EFI EFI_DESC= Create EFI image ISO_DESC= Create bootable CD image EFI_ARCHS= i386 ${ARCH:Mamd64:S/amd64/x86_64/} .for _arch in ${EFI_ARCHS} EFI_PLIST_FILES+= ${DATADIR}/ipxe.efi-${_arch} .endfor ISO_ALL_TARGET= bin/ipxe.iso ISO_BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \ mkisofs:sysutils/cdrtools ISO_MAKE_ARGS= ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \ LDLINUX_C32="${LOCALBASE}/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32" .include # Add user supplied build configuration after port options etc have # been processed as they might want to overwrite some settings. _IPXE_BUILDCFG+= ${IPXE_BUILDCFG} # XXX: iPXE uses csplit when embedding certificates and assumes # it's GNU csplit, so give it what it wants as a workaround if # CERT=... is in {IPXE_,}MAKE_ARGS. .if ${MAKE_ARGS:MCERT=*} BUILD_DEPENDS+= gcsplit:sysutils/coreutils MAKE_ARGS+= CSPLIT=gcsplit .endif do-configure: .for _cat _opt in ${_IPXE_BUILDCFG:C/\:/ /} @${ECHO_CMD} '#undef ${_opt:S/^!//:C/(.*)=(.*)/\1/}' >> ${WRKSRC}/config/local/${_cat}.h .if ${_opt:N!*} @${ECHO_CMD} '#define ${_opt:C/=/ /:S/^'//:S/'$//}' >> ${WRKSRC}/config/local/${_cat}.h .endif .endfor pre-build-ISO-on: # ISO creation fails if isolinux.bin is read only ${INSTALL} -m 644 ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin ${WRKSRC}/isolinux.bin do-build-EFI-on: .for _arch in ${EFI_ARCHS} ${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} bin-${_arch}-efi/ipxe.efi .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} ${ALL_TARGET} ${STAGEDIR}${DATADIR} do-install-EFI-on: .for _arch in ${EFI_ARCHS} ${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/ipxe.efi ${STAGEDIR}${DATADIR}/ipxe.efi-${_arch} .endfor .include RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} Index: head/net/ipxe/distinfo =================================================================== --- head/net/ipxe/distinfo (revision 485642) +++ head/net/ipxe/distinfo (revision 485643) @@ -1,3 +1,3 @@ -TIMESTAMP = 1528487574 -SHA256 (ipxe-ipxe-20180514-e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2_GH0.tar.gz) = 35cf8a645a151bb346a4d43df2b44e7aad4e28a5f76556800d657813c5960145 -SIZE (ipxe-ipxe-20180514-e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2_GH0.tar.gz) = 3782601 +TIMESTAMP = 1542961849 +SHA256 (ipxe-ipxe-20180825-133f4c47baef6002b2ccb4904a035cda2303c6e5_GH0.tar.gz) = ce3c7cb9c1cc1efcf6d11b08db021d63a819ebf1fd84e43e0b31dc88a02f4d42 +SIZE (ipxe-ipxe-20180825-133f4c47baef6002b2ccb4904a035cda2303c6e5_GH0.tar.gz) = 3796524 Index: head/net/ipxe/files/patch-Makefile.housekeeping =================================================================== --- head/net/ipxe/files/patch-Makefile.housekeeping (nonexistent) +++ head/net/ipxe/files/patch-Makefile.housekeeping (revision 485643) @@ -0,0 +1,15 @@ +sed: 1: "s/\.o\s*:/_DEPS +=/": RE error: trailing backslash (\) + +cf. PR 229925 + +--- Makefile.housekeeping.orig 2018-11-23 08:32:22 UTC ++++ Makefile.housekeeping +@@ -850,7 +850,7 @@ define deps_template_parts + @$(MKDIR) -p $(BIN)/deps/$(dir $(1)) + $(Q)$(CPP) $(CFLAGS) $(CFLAGS_$(2)) $(CFLAGS_$(3)) -DOBJECT=$(3) \ + -Wno-error -M $(1) -MG -MP | \ +- sed 's/\.o\s*:/_DEPS +=/' > $(BIN)/deps/$(1).d ++ sed 's/\.o[[:blank:]]*:/_DEPS +=/' > $(BIN)/deps/$(1).d + endef + + # rules_template : generate rules for a given source file Property changes on: head/net/ipxe/files/patch-Makefile.housekeeping ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property