git: 1dda54b6e6ce - main - devel/p4: Update to 2024.1 release patch 2 (2655224)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Sep 2024 01:12:14 UTC
The branch main has been updated by leres:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1dda54b6e6ce255097449f65a76594f4f0ec0da5
commit 1dda54b6e6ce255097449f65a76594f4f0ec0da5
Author: Craig Leres <leres@FreeBSD.org>
AuthorDate: 2024-09-24 01:11:46 +0000
Commit: Craig Leres <leres@FreeBSD.org>
CommitDate: 2024-09-24 01:11:46 +0000
devel/p4: Update to 2024.1 release patch 2 (2655224)
PR: 281679
Approved by: antonfb@hesiod.org (maintainer)
---
devel/p4/Makefile | 7 +++++--
devel/p4/Makefile.inc | 2 +-
devel/p4/distinfo | 6 +++---
devel/p4/files/patch-Jamrules | 6 +++---
devel/p4/files/patch-sys_fileio.cc | 23 +++++++++++++++++++++++
devel/p4/files/patch-sys_stdhdrs.h | 11 +++++++++++
6 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 60de77148a3a..8fdeb92b44ff 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel
# zip file's checksum. This does not play well with FreeBSD's conventions.
# maintainer is backup hosting
MASTER_SITES= https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/p4source${EXTRACT_SUFX}?dummy=/ \
- https://hesiod.org/distfiles/perforce-${MINOR}/p4source${EXTRACT_SUFX}?dummy=/
+ https://hesiod.org/distfiles/perforce/
DISTNAME= p4source-${MINOR}
MAINTAINER= antonfb@hesiod.org
@@ -35,8 +35,11 @@ do-build:
LINKFLAGS="${LDFLAGS}" \
OSVER=${OSVER} \
SSL="yes" \
+ SSLVER="1.1.1" \
SSLPREFIX=${OPENSSLLIB} \
- ${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4
+ USE_EXTENSIONS=0 \
+ USE_OPTIMIZED_ZLIB=0 \
+ ${JAM} -dx -j${MAKE_JOBS_NUMBER} p4
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/p4-bin/p4 ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc
index 69f4dffd192b..5ff5842ac290 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= 2596294
+MINOR= 2655224
JAM?= ${LOCALBASE}/bin/jam
OSVER?= ${OSREL:S/.//}
diff --git a/devel/p4/distinfo b/devel/p4/distinfo
index 6b2a5913c060..840dc831073b 100644
--- a/devel/p4/distinfo
+++ b/devel/p4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715886503
-SHA256 (p4source-2596294.tgz) = ebe0ce24f795ccfe31d14b0df4c959440caeb1aa414c8097d01bb2bd5050042f
-SIZE (p4source-2596294.tgz) = 6789770
+TIMESTAMP = 1727095903
+SHA256 (p4source-2655224.tgz) = f9fb71a0de4b9fdb8297c627a97ded99bc944d958e36c1b4887cfb22921ba1d4
+SIZE (p4source-2655224.tgz) = 6794469
diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules
index d8d80e736493..466a1d46038f 100644
--- a/devel/p4/files/patch-Jamrules
+++ b/devel/p4/files/patch-Jamrules
@@ -1,6 +1,6 @@
---- Jamrules.orig 2022-12-15 10:39:01 UTC
+--- Jamrules.orig 2024-05-24 15:48:33 UTC
+++ Jamrules
-@@ -673,12 +673,11 @@
+@@ -690,12 +690,11 @@
# P4BIN is set to ../p4-bin (relative to P4)
SubDir AllP4 p4 ; # where we are
@@ -14,7 +14,7 @@
$(BUILD)
$(TYPE:L) ;
-@@ -1245,11 +1244,6 @@
+@@ -1301,11 +1300,6 @@
OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;
_mflags = ;
diff --git a/devel/p4/files/patch-sys_fileio.cc b/devel/p4/files/patch-sys_fileio.cc
new file mode 100644
index 000000000000..2b074034ecc5
--- /dev/null
+++ b/devel/p4/files/patch-sys_fileio.cc
@@ -0,0 +1,23 @@
+--- 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
new file mode 100644
index 000000000000..31b6f9d87ef9
--- /dev/null
+++ b/devel/p4/files/patch-sys_stdhdrs.h
@@ -0,0 +1,11 @@
+--- 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 ) && \