summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2018-11-23 08:57:55 +0000
committerTobias Kortkamp <tobik@FreeBSD.org>2018-11-23 08:57:55 +0000
commit596d8b7072d3df555305ccd9898beae6defd6571 (patch)
treea784f76ab30d68837e44a6ab950e8af0dd223798
parentdevel/bashdb: Update 4.4-1.0.0 -> 4.4-1.0.1 (diff)
net/ipxe: Update to latest commit
Notes
Notes: svn path=/head/; revision=485643
-rw-r--r--net/ipxe/Makefile5
-rw-r--r--net/ipxe/distinfo6
-rw-r--r--net/ipxe/files/patch-Makefile.housekeeping15
3 files changed, 20 insertions, 6 deletions
diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile
index 9a711430186b..9748fd29fc0c 100644
--- a/net/ipxe/Makefile
+++ b/net/ipxe/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ipxe
-PORTVERSION= 20180514
-PORTREVISION= 1
+PORTVERSION= 20180825
CATEGORIES= net
MAINTAINER= tobik@FreeBSD.org
@@ -26,7 +25,7 @@ USE_GITHUB= yes
# 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
diff --git a/net/ipxe/distinfo b/net/ipxe/distinfo
index d77560c1149e..b57f3712dff0 100644
--- a/net/ipxe/distinfo
+++ b/net/ipxe/distinfo
@@ -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
diff --git a/net/ipxe/files/patch-Makefile.housekeeping b/net/ipxe/files/patch-Makefile.housekeeping
new file mode 100644
index 000000000000..a62dbc30691c
--- /dev/null
+++ b/net/ipxe/files/patch-Makefile.housekeeping
@@ -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