diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index f0d83ef6c1ee..f568ff87966a 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} YEAR= 2025 MAJOR= 2 -MINOR= 2852709 +MINOR= 2907753 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index 5610ecd76f89..b74a5ae1ea79 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765918477 -SHA256 (p4source-2852709.tgz) = e2f40e0a8ccf3d4f0f65df9147107ff0cff4d52937b33f342625a80f32ec83f5 -SIZE (p4source-2852709.tgz) = 7007314 +TIMESTAMP = 1773520963 +SHA256 (p4source-2907753.tgz) = c5c15a57612791ce833ae0e181d6234e85a8b175321e3b819d38f66e0c981803 +SIZE (p4source-2907753.tgz) = 7009506 diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules index 466a1d46038f..7611cc625a7d 100644 --- a/devel/p4/files/patch-Jamrules +++ b/devel/p4/files/patch-Jamrules @@ -1,28 +1,28 @@ ---- Jamrules.orig 2024-05-24 15:48:33 UTC +--- Jamrules.orig 2025-05-19 13:45:05 UTC +++ Jamrules -@@ -690,12 +690,11 @@ +@@ -727,12 +727,11 @@ # P4BIN is set to ../p4-bin (relative to P4) SubDir AllP4 p4 ; # where we are - SubDir AllP4 p4-bin ; # where we want to be + SubDir AllP4 p4 p4-bin ; # where we want to be SubDir P4BIN ; # name is that SubDir AllP4 p4 ; # back to where we started EXEC_SUB_TOKENS = - $(OS:L)$(OSVER:EL)$(OSPLAT:EL) $(BUILD) $(TYPE:L) ; -@@ -1301,11 +1300,6 @@ +@@ -1358,11 +1357,6 @@ OPTIM += -Wno-parentheses -Wno-switch -fwrapv ; _mflags = ; - switch $(OSPLAT:U) - { - case X86 : _mflags = -m32 ; - case X86_64 : _mflags = -m64 ; - } $(GENFLAGS) += $(_mflags) -pipe ; LINKFLAGS += $(_mflags) ; diff --git a/devel/p4/files/patch-net_nettcptransport.cc b/devel/p4/files/patch-net_nettcptransport.cc new file mode 100644 index 000000000000..00c5e4ac72db --- /dev/null +++ b/devel/p4/files/patch-net_nettcptransport.cc @@ -0,0 +1,13 @@ +--- net/nettcptransport.cc.orig 2025-05-14 10:21:01 UTC ++++ net/nettcptransport.cc +@@ -63,6 +63,10 @@ + + # define PEEK_TIMEOUT 200 /* 200 milliseconds */ + ++# if defined(IPPROTO_TCP) && !defined(SOL_TCP) ++# define SOL_TCP IPPROTO_TCP ++# endif ++ + /* + * Server: + * p4tunables::list[] has values from the defns in debug.cc + loaded by