Attachment #255019 for bug #282619

View | Details | Raw Unified | Return to bug 282619
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/devel/p4/Makefile.inc (-2 / +2 lines)
1	P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//}	1	P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
2	YEAR= 2024	2	YEAR= 2024
3	MAJOR= 1	3	MAJOR= 2
4	MINOR= 2655224	4	MINOR= 2675662
5		5
6	JAM?= ${LOCALBASE}/bin/jam	6	JAM?= ${LOCALBASE}/bin/jam
7	OSVER?= ${OSREL:S/.//}	7	OSVER?= ${OSREL:S/.//}

Lines 1-3 Link Here

(-)b/devel/p4/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1727095903	1	TIMESTAMP = 1731027711
2	SHA256 (p4source-2655224.tgz) = f9fb71a0de4b9fdb8297c627a97ded99bc944d958e36c1b4887cfb22921ba1d4	2	SHA256 (p4source-2675662.tgz) = 23d3a2d03b70d2d2198289b4ac58a70992df9d17ca76ca569928d56173960a89
3	SIZE (p4source-2655224.tgz) = 6794469	3	SIZE (p4source-2675662.tgz) = 6891588




--- 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

Removed Link Here

(-)a/devel/p4/files/patch-sys_stdhdrs.h (-11 lines)
1	--- sys/stdhdrs.h.orig 2024-09-23 13:23:02 UTC
2	+++ sys/stdhdrs.h
3	@@ -527,7 +527,7 @@ extern "C" int socketpair(int, int, int, int*);
4	# endif
5
6	# if defined(NEED_TIME_HP)
7	-# if defined( OS_LINUX )
8	+# if defined( OS_LINUX ) \|\| defined( OS_FREEBSD )
9	# define HAVE_CLOCK_GETTIME
10	#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
11	# if ( __GLIBC_PREREQ( 2, 10 ) && \

Lines 9-12 should work. There is a limited free use level and non-profit Link Here

(-)b/devel/p4/pkg-descr (-1 / +1 lines)
9	organizations might qualify for free licencing.	9	organizations might qualify for free licencing.
10		10
11	See "p4 -V" for more licensing and version information.	11	See "p4 -V" for more licensing and version information.
12	See https://ftp.perforce.com/perforce/r24.1/doc/user/ for release notes.	12	See https://ftp.perforce.com/perforce/r24.2/doc/user/ for release notes.

Return to bug 282619

Removed Link Here

(-)a/devel/p4/files/patch-sys_fileio.cc (-23 lines)
1	--- sys/fileio.cc.orig 2024-07-18 14:04:43 UTC
2	+++ sys/fileio.cc
3	@@ -595,7 +595,7 @@ FileIO::StatModTimeHP(DateTimeHighPrecision *modTime)
4	int nanosecs = 0;
5
6	// nanosecond support for stat is a bit of a portability mess
7	-#if defined(OS_LINUX)
8	+#if defined(OS_LINUX) \|\| defined(OS_FREEBSD)
9	#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
10	#if defined(_BSD_SOURCE) \|\| defined(_SVID_SOURCE) \
11	\|\| (__GLIBC_PREREQ(2, 12) \
12	@@ -862,6 +862,11 @@ void
13	FileIO::GetExtendedAttribute( StrPtr name, StrBuf val, Error *e )
14	{
15	val->Clear();
16	+}
17	+
18	+void
19	+FileIO::SetExtendedAttributes( StrDict vals, Error e )
20	+{
21	}
22
23	void