From nobody Fri Sep 12 15:38:15 2025 X-Original-To: dev-commits-src-branches@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 4cNdqW2kMKz67Zrl; Fri, 12 Sep 2025 15:38:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cNdqW26dlz4LrZ; Fri, 12 Sep 2025 15:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757691495; 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=PF0qB878FXBdlH99/4SS3dKN2wqBJY9GCu7mmduX3DI=; b=d/iWVTbZNTGENt+3bP08vVmJcO4VIzKzNysy4AdzBoLMye8kClDYRmZYP4n0fACJ9RgIaa olj7Twe92U0zqVwuIUoLlSiJAswlCZYxfgNZetLRHbc+2c3t7HSWUSgEdzm8ZdjPIU1Kgq +u/CcPNbgpAw2l0b524o59DFcpuqAxQpH0X5XnvZ4Y8ktTQPzyhhbHPaQQscbwGYaz14Zc Se/GVZWklT+vYTj3xC70h60dNl5i7mgSAPkyve47HgTHnwr9mPgm5zCFl22UkwGWl/Rn41 dHDiQYzDCohOFPcv2t4ZFFBowEaJxa8voZp5cdv5cdkRAEoVJr3UMNido/gaTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757691495; 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=PF0qB878FXBdlH99/4SS3dKN2wqBJY9GCu7mmduX3DI=; b=QvBiEHrTit2GpJYGhnhxxAY76T+yhxoxTCy8fRcy/0wKaP8CpFsE4SbGMQ7nIH/f5goLqR 6JQpeLIhqGFODWSHIlGl+d7rryr8D+1NTrzj8Ymensv9qJhnbjuBeHXEUyL9NNKsf5vUtN SeYUk5EwF3cL+QlU6WOAbSxMw+WuRdAZgWWYorNYt9/JF789CQhkA/0uWS7yN7t2yoFfeJ /0tEIqqVwJdLgrET4uuc3sI18dgPU0mbawQiXGhBdnn9DD6L18qnPUuq1Ltzpj8ENVdTGj Cxk9a9yNL45Nrx/uWRNnnFYNfK/vIm7VbITBBt31r6Y2f93bp8MYQ4kQYJSbjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757691495; a=rsa-sha256; cv=none; b=T7zNmj+4EXf9q84gC/uv4LlvF4DMYyNaz3rpgSINucPuRZZlgLgAW+lZYkaosHhcDN7PRE UDVf/SjUjJ9oVMyX0LZ0RMKiIpw7LwA0BJeGRQU4vvAhChQgAh0ryjMmRQrcsr3dVJ3mA+ RWHVD9PugWWAerGmT/pqIUNHUE6rjllqF9DHBgFgpyME14H86Kza7ocILcbvIkUAez6KZL Vg+bBnn4pGWcZEzyddm7pC8gBm5em9MbfpG9EUaRXi8oMv5BCmNBQLrd7nX3om30bmbAC0 o+P5y+ck0b9hf0gV0aUSDDhzH2dRsoXukTnO4gQ+O5OM+1A7ALSdnndtEGkUDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cNdqW1MSMzyPR; Fri, 12 Sep 2025 15:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58CFcFFi024994; Fri, 12 Sep 2025 15:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58CFcFIh024991; Fri, 12 Sep 2025 15:38:15 GMT (envelope-from git) Date: Fri, 12 Sep 2025 15:38:15 GMT Message-Id: <202509121538.58CFcFIh024991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c8a4d636af8a - stable/15 - pkgbase: fix alpha and beta versioning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c8a4d636af8ac360ce6329c4a029dd8934d904de Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c8a4d636af8ac360ce6329c4a029dd8934d904de commit c8a4d636af8ac360ce6329c4a029dd8934d904de Author: Baptiste Daroussin AuthorDate: 2025-09-12 15:20:25 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-12 15:37:38 +0000 pkgbase: fix alpha and beta versioning MFC After: 1 day (cherry picked from commit 1bc7ee74b6a80081f0f5764970e3949e834965f1) --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01866f949e49..98059640daab 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -585,10 +585,10 @@ BRANCH_EXT= ${MAJOR_REVISION}.snap EXTRA_REVISION= .snap${_TIMENOW} .elif ${_BRANCH:MALPHA*} BRANCH_EXT= alpha -EXTRA_REVISION= .${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} +EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:MBETA*} BRANCH_EXT= beta -EXTRA_REVISION= .${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} +EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} .elif ${_BRANCH:MRC*} BRANCH_EXT= rc EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW}