diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index 5ff5842ac290..0715410b8f86 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} YEAR= 2024 -MAJOR= 1 -MINOR= 2655224 +MAJOR= 2 +MINOR= 2675662 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index 840dc831073b..3885fa5cf103 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727095903 -SHA256 (p4source-2655224.tgz) = f9fb71a0de4b9fdb8297c627a97ded99bc944d958e36c1b4887cfb22921ba1d4 -SIZE (p4source-2655224.tgz) = 6794469 +TIMESTAMP = 1731027711 +SHA256 (p4source-2675662.tgz) = 23d3a2d03b70d2d2198289b4ac58a70992df9d17ca76ca569928d56173960a89 +SIZE (p4source-2675662.tgz) = 6891588 diff --git a/devel/p4/files/patch-sys_fileio.cc b/devel/p4/files/patch-sys_fileio.cc deleted file mode 100644 index 2b074034ecc5..000000000000 --- a/devel/p4/files/patch-sys_fileio.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- sys/fileio.cc.orig 2024-07-18 14:04:43 UTC -+++ sys/fileio.cc -@@ -595,7 +595,7 @@ FileIO::StatModTimeHP(DateTimeHighPrecision *modTime) - int nanosecs = 0; - - // nanosecond support for stat is a bit of a portability mess --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) - #if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) \ - || (__GLIBC_PREREQ(2, 12) \ -@@ -862,6 +862,11 @@ void - FileIO::GetExtendedAttribute( StrPtr *name, StrBuf *val, Error *e ) - { - val->Clear(); -+} -+ -+void -+FileIO::SetExtendedAttributes( StrDict *vals, Error *e ) -+{ - } - - void diff --git a/devel/p4/files/patch-sys_stdhdrs.h b/devel/p4/files/patch-sys_stdhdrs.h deleted file mode 100644 index 31b6f9d87ef9..000000000000 --- a/devel/p4/files/patch-sys_stdhdrs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- sys/stdhdrs.h.orig 2024-09-23 13:23:02 UTC -+++ sys/stdhdrs.h -@@ -527,7 +527,7 @@ extern "C" int socketpair(int, int, int, int*); - # endif - - # if defined(NEED_TIME_HP) --# if defined( OS_LINUX ) -+# if defined( OS_LINUX ) || defined( OS_FREEBSD ) - # define HAVE_CLOCK_GETTIME - #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) - # if ( __GLIBC_PREREQ( 2, 10 ) && \ diff --git a/devel/p4/pkg-descr b/devel/p4/pkg-descr index 208646740ff6..d2284a3eea8e 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/r24.1/doc/user/ for release notes. +See https://ftp.perforce.com/perforce/r24.2/doc/user/ for release notes.