From nobody Fri May 19 20:07:58 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QNHvg1v83z4CKhl; Fri, 19 May 2023 20:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QNHvg1DCZz3Mj6; Fri, 19 May 2023 20:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684526879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E91xzPzfM9jis0/VLDRlsl1zS4XX5TWKSEXFwUE7nBs=; b=RQcc12OjZxdxoqh5BWcbEd1AhZEVReFzYbmbWrj+n3i/5XKxj+DX+mF3AMpNfbcRPUc1WL QJWr/8LtKkvWcr52Wi1P7ewRx46ZTepFFE/P2Vd/bSuo6TwOhzm/UedVe1jvk6+3p3AEAx 7xlBFX1GD+B42SafSTFs1W2xyPWM2L98u2FexpJKS4j+UPPrd4z+TtKkQCawKupaeZtKH/ BUf6ugQcC0kCBNbSN0qbOpUKnXrfoVCqkqOlZyOzeupGkfpC7BHecx1WQhrb2NAwA4n1du zLH91mIWsCCqmUWbofVEXNW6TnPwPZU+vslxiThqg9aj75hV2sARLEVcHzu8Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684526879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E91xzPzfM9jis0/VLDRlsl1zS4XX5TWKSEXFwUE7nBs=; b=tZj5M5Ikt7UrLPtAwD28zccfu6CD1ltduKuFk3oBGKtlMQuzId15DU/aIQOcMwF2qgAkEE /0Au/e5cHOBGN5mVL9xlZ9rp1AJfDkFZZOrEETrwP26UKOuQENp5eotxPDdAnSBpGILdqm UAQ7Leqq5oLpgbnSAN3kWrC2/8JPZNPGQwWH/PuetzPgZ2Y2BN4kYwqLMugrCZRxImie4l NgYux47G2d3kbWz9yCJdMTF7smkqjuVErZj0+NdLVzUy5W/Sg1+G51plhJNbYDrVlHVWF6 7gdGk4PrRZ+UmBmtfy4gRSjZ5sITe9FWVASHRtXj6jswFcCC7RN5RK3hF83Mzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684526879; a=rsa-sha256; cv=none; b=U2JAeP9io5PZwQGmEApiPd5lz6bDaiSZJPOXjczvC20DD8JwNkO/AZV4KR8ng4W3Lb0uLI nyu1k7Anfbk1dZB3dOSeXEmFnq+TNJ58FjTMSPvsXq2HWALy/nGo1z7083MJuJmuStVBOQ ASP5LKNsFDieEsYmFczOC8t1BKGuUPjMZNd+96xvNMd5+vMslB90T+MVgAPKAB28ljypPo dDh+tr22SkTN5/LHF+LYUQbmo011R4WVFKY9YRbBNvXaT0dwnqw3/GzhtwLgrAsWjYm3QG ZA7cTaf/H3Yf1IqAuhOz8iGXRXgg75kRwuXySxFcRTQDnTT9lK6Q4PcCCq6+yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QNHvg0J5Hzgx6; Fri, 19 May 2023 20:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34JK7w3i086244; Fri, 19 May 2023 20:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JK7woW086243; Fri, 19 May 2023 20:07:58 GMT (envelope-from git) Date: Fri, 19 May 2023 20:07:58 GMT Message-Id: <202305192007.34JK7woW086243@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: c5db9bdcadca - main - devel/{p4,p4api}: Update to 2023.1 release and fix armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5db9bdcadca964e2baf67c245a3348208d16bb9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5db9bdcadca964e2baf67c245a3348208d16bb9 commit c5db9bdcadca964e2baf67c245a3348208d16bb9 Author: Craig Leres AuthorDate: 2023-05-19 20:07:34 +0000 Commit: Craig Leres CommitDate: 2023-05-19 20:07:34 +0000 devel/{p4,p4api}: Update to 2023.1 release and fix armv7 PR: 271502 Approved by: antonfb@hesiod.org (maintainer) --- devel/p4/Makefile.inc | 6 +++--- devel/p4/distinfo | 6 +++--- devel/p4/files/patch-Jamrules | 4 ++-- devel/p4/files/patch-zlib_deflate.c | 6 +++--- devel/p4api/Makefile | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index cbf88951e949..c6b4edfd2e8c 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -1,7 +1,7 @@ P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -YEAR= 2022 -MAJOR= 2 -MINOR= 2407422 +YEAR= 2023 +MAJOR= 1 +MINOR= 2442900 JAM?= ${LOCALBASE}/bin/jam OSVER?= ${OSREL:S/.//} diff --git a/devel/p4/distinfo b/devel/p4/distinfo index fb002e83d03d..c09d0430ff15 100644 --- a/devel/p4/distinfo +++ b/devel/p4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679422608 -SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b -SIZE (p4source-2407422.tgz) = 6325949 +TIMESTAMP = 1684444969 +SHA256 (p4source-2442900.tgz) = efdc59bf1443a6709998299cdff3a9cc52c5a6de790602ecb6ad70c6f509a496 +SIZE (p4source-2442900.tgz) = 6569147 diff --git a/devel/p4/files/patch-Jamrules b/devel/p4/files/patch-Jamrules index c63b4f543364..d8d80e736493 100644 --- a/devel/p4/files/patch-Jamrules +++ b/devel/p4/files/patch-Jamrules @@ -1,4 +1,4 @@ ---- Jamrules.orig 2023-01-19 09:37:52 UTC +--- Jamrules.orig 2022-12-15 10:39:01 UTC +++ Jamrules @@ -673,12 +673,11 @@ # P4BIN is set to ../p4-bin (relative to P4) @@ -14,7 +14,7 @@ $(BUILD) $(TYPE:L) ; -@@ -1224,11 +1223,6 @@ +@@ -1245,11 +1244,6 @@ OPTIM += -Wno-parentheses -Wno-switch -fwrapv ; _mflags = ; diff --git a/devel/p4/files/patch-zlib_deflate.c b/devel/p4/files/patch-zlib_deflate.c index b1c8c81fe1de..b3fafd3b27ed 100644 --- a/devel/p4/files/patch-zlib_deflate.c +++ b/devel/p4/files/patch-zlib_deflate.c @@ -1,11 +1,11 @@ ---- zlib/deflate.c.orig 2023-04-08 02:21:18 UTC +--- zlib/deflate.c.orig 2022-11-09 18:15:37 UTC +++ zlib/deflate.c -@@ -56,7 +56,7 @@ +@@ -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( OS_FREEBSD ) ) && 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/p4api/Makefile b/devel/p4api/Makefile index 970e1f63335e..dc68a5ed4b58 100644 --- a/devel/p4api/Makefile +++ b/devel/p4api/Makefile @@ -1,6 +1,5 @@ PORTNAME= p4api PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} -PORTREVISION= 1 CATEGORIES= devel # Perforce does not version their distfiles when they patch. # This does not play well with FreeBSD's conventions.