Date: Fri, 17 May 2024 00:52:15 GMT From: Craig Leres <leres@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9b65a19563af - main - devel/p4: Update to 2024.1 (2596294) Message-ID: <202405170052.44H0qFf2010840@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b65a19563aff2056f49c3029cf53915472038a1 commit 9b65a19563aff2056f49c3029cf53915472038a1 Author: Craig Leres <leres@FreeBSD.org> AuthorDate: 2024-05-17 00:51:44 +0000 Commit: Craig Leres <leres@FreeBSD.org> CommitDate: 2024-05-17 00:51:44 +0000 devel/p4: Update to 2024.1 (2596294) PR: 279046 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4/Makefile.inc | 6 +++--- devel/p4/distinfo | 6 +++--- devel/p4/files/patch-zlib_deflate.c | 11 ----------- devel/p4/pkg-descr | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) 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 @@ -9,4 +9,4 @@ 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405170052.44H0qFf2010840>