diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index 923340f92187..69f4dffd192b 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -YEAR= 2023 -MAJOR= 2 -MINOR= 2578891 +YEAR= 2024 +MAJOR= 1 +MINOR= 2596294 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index fb63529445c8..6b2a5913c060 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712260835 -SHA256 (p4source-2578891.tgz) = 8f65397a2248ba60646673ccb021d4d533e220b73823552c8a718029879be080 -SIZE (p4source-2578891.tgz) = 6677990 +TIMESTAMP = 1715886503 +SHA256 (p4source-2596294.tgz) = ebe0ce24f795ccfe31d14b0df4c959440caeb1aa414c8097d01bb2bd5050042f +SIZE (p4source-2596294.tgz) = 6789770 diff --git a/devel/p4/files/patch-zlib_deflate.c b/devel/p4/files/patch-zlib_deflate.c deleted file mode 100644 index b3fafd3b27ed..000000000000 --- a/devel/p4/files/patch-zlib_deflate.c +++ /dev/null @@ -1,11 +0,0 @@ ---- zlib/deflate.c.orig 2022-11-09 18:15:37 UTC -+++ zlib/deflate.c -@@ -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(__aarch64__) || defined( OS_FREEBSD ) - #undef __ARM_NEON__ - #undef __ARM_NEON - #endif diff --git a/devel/p4/pkg-descr b/devel/p4/pkg-descr index 065461562518..208646740ff6 100644 --- a/devel/p4/pkg-descr +++ b/devel/p4/pkg-descr @@ -1,12 +1,12 @@ Perforce is a commercial revision control system. This is the command line client which works with servers remotely or locally. The clients and the api for Perforce is freely available. This build does not support the "Extensions" feature. The server is no longer available for FreeBSD but the Linux version should work. There is a limited free use level and non-profit organizations might qualify for free licencing. See "p4 -V" for more licensing and version information. -See https://ftp.perforce.com/perforce/r23.2/doc/user/ for release notes. +See https://ftp.perforce.com/perforce/r24.1/doc/user/ for release notes.