git: c5db9bdcadca - main - devel/{p4,p4api}: Update to 2023.1 release and fix armv7

The branch main has been updated by leres:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c5db9bdcadca964e2baf67c245a3348208d16bb9

commit c5db9bdcadca964e2baf67c245a3348208d16bb9
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2023-05-19 20:07:34 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2023-05-19 20:07:34 +0000

    devel/{p4,p4api}: Update to 2023.1 release and fix armv7
    
    PR:             271502
    Approved by:    antonfb@hesiod.org (maintainer)
---
 devel/p4/Makefile.inc               | 6 +++---
 devel/p4/distinfo                   | 6 +++---
 devel/p4/files/patch-Jamrules       | 4 ++--
 devel/p4/files/patch-zlib_deflate.c | 6 +++---
 devel/p4api/Makefile                | 1 -
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc
index cbf88951e949..c6b4edfd2e8c 100644
--- a/devel/p4/Makefile.inc
+++ b/devel/p4/Makefile.inc
@@ -1,7 +1,7 @@
 P4VERSION?=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
-YEAR=		2022
-MAJOR=		2
-MINOR=		2407422
+YEAR=		2023
+MAJOR=		1
+MINOR=		2442900
 
 JAM?=		${LOCALBASE}/bin/jam
 OSVER?=		${OSREL:S/.//}
diff --git a/devel/p4/distinfo b/devel/p4/distinfo
index fb002e83d03d..c09d0430ff15 100644
--- a/devel/p4/distinfo
+++ b/devel/p4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679422608
-SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b
-SIZE (p4source-2407422.tgz) = 6325949
+TIMESTAMP = 1684444969
+SHA256 (p4source-2442900.tgz) = efdc59bf1443a6709998299cdff3a9cc52c5a6de790602ecb6ad70c6f509a496
+SIZE (p4source-2442900.tgz) = 6569147
diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules
index c63b4f543364..d8d80e736493 100644
--- a/devel/p4/files/patch-Jamrules
+++ b/devel/p4/files/patch-Jamrules
@@ -1,4 +1,4 @@
---- Jamrules.orig	2023-01-19 09:37:52 UTC
+--- Jamrules.orig	2022-12-15 10:39:01 UTC
 +++ Jamrules
 @@ -673,12 +673,11 @@
  	# P4BIN is set to ../p4-bin (relative to P4)
@@ -14,7 +14,7 @@
  		$(BUILD)
  		$(TYPE:L) ;
  
-@@ -1224,11 +1223,6 @@
+@@ -1245,11 +1244,6 @@
  		OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;
  
  		_mflags = ;
diff --git a/devel/p4/files/patch-zlib_deflate.c b/devel/p4/files/patch-zlib_deflate.c
index b1c8c81fe1de..b3fafd3b27ed 100644
--- a/devel/p4/files/patch-zlib_deflate.c
+++ b/devel/p4/files/patch-zlib_deflate.c
@@ -1,11 +1,11 @@
---- zlib/deflate.c.orig	2023-04-08 02:21:18 UTC
+--- zlib/deflate.c.orig	2022-11-09 18:15:37 UTC
 +++ zlib/deflate.c
-@@ -56,7 +56,7 @@
+@@ -58,7 +58,7 @@
   * Perforce change. Disable neon speedup (for now)
   * on Apple M1 builds.
  */
 -#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__)
-+#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) || defined( OS_FREEBSD ) ) && defined(__aarch64__)
++#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__) || defined( OS_FREEBSD )
  #undef __ARM_NEON__
  #undef __ARM_NEON
  #endif
diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile
index 970e1f63335e..dc68a5ed4b58 100644
--- a/devel/p4api/Makefile
+++ b/devel/p4api/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	p4api
 PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
-PORTREVISION=	1
 CATEGORIES=	devel
 # Perforce does not version their distfiles when they patch.
 # This does not play well with FreeBSD's conventions.