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,28 +1,28 @@
---- 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)
  
  	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) ;
  
-@@ -1224,11 +1223,6 @@
+@@ -1245,11 +1244,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-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,55 +1,54 @@
 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.
 MASTER_SITES=	https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/p4source${EXTRACT_SUFX}?dummy=/ \
 		https://hesiod.org/distfiles/perforce-${MINOR}/p4source${EXTRACT_SUFX}?dummy=/
 DISTNAME=	p4source-${MINOR}
 
 MAINTAINER=	antonfb@hesiod.org
 COMMENT=	Perforce API (static libraries and header files)
 WWW=		https://www.perforce.com/products/helix-core
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${JAM}:devel/jam
 
 USES=		tar:tgz
 
 PATCHDIR=	${.CURDIR}/../p4/files
 
 DISTINFO_FILE=	${.CURDIR}/../p4/distinfo
 
 OPTIONS_DEFINE=	EXAMPLES
 
 WRKSRC=		${WRKDIR}/p4source-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 .include "../p4/Makefile.inc"
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
 		CCFLAGS="${CFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
 		OSVER=${OSVER} \
 		API=1 \
 		SSL="yes" \
 		SSLLIB=-lssl \
 		CRYPTOLIB=-lcrypto \
 		TYPE=pic \
 		${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4api p4api.tar
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/include/p4 && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/perforce
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>