From nobody Fri Sep 12 15:21:23 2025 X-Original-To: dev-commits-src-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 4cNdS33QSVz67ZdL; Fri, 12 Sep 2025 15:21:23 +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 4cNdS32xGwz4Gch; Fri, 12 Sep 2025 15:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757690483; 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=jRKPk54AejhCpBSft2+5qs0hl1PzsKsiDBryVCyYtRM=; b=DZWNeQyejrhxHr3LVeikCervwgdP0BhXGztYgeD/AJzrG4gavKjfjb91pmVZ8hZByFFdRh W3VQwKmplDjPJI34lZfhOPWQ0ic/WUchNtiYFparvgHy2SVXJfXhGSQGdXUOn9u4WR0yN4 Jk0Yk1X0Chc9l7h6eC1ADtPctdmdYjaoFZPx8owO5U+skhVPGLQHH1YktHs+Z7ttIiIhsQ RsmOk+omGezMmdl1QvbynmtEuSlAXvaVbyhkSOJFeWtjNSnY9Npi6xKNdeAK2mzsVQ67gD ipHlppriumW2217Tfkd0CBftbXkJbzKHGDd974r9Rsbpq5sAbM0Xy3MxG+syDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757690483; 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=jRKPk54AejhCpBSft2+5qs0hl1PzsKsiDBryVCyYtRM=; b=k35EI5UKFZWjweNtyjAbXIsP6Cfdgmz3GLt6sEUPu6aHxwT4wkqbjvIMn4vP6lQiQ6o18v aqc18MciyiFlPF0gysGfCz5NnfPp2V6pO6CfkRg7/JmjuKhgSu2qmIHP6HcjRmJ+lO3ZC9 XQqr2A3AMkloHqUglYVTfPUoobSFDa2x8ThinGkMc/qjHWBC4BIG9tsdQn20FOGnQF1xRh i6kMZUdoiXIVSIldka5arrHQE29R9EVb7Oa1fFq5WjMIyAdC7Mmj8Nf6I23GhgD65ER3gE onv4TRTS4sdatNJphwUSuqcmKjCVuz8G+pG7LqwUh+gd3wXgjWH/bqjgD1bA0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757690483; a=rsa-sha256; cv=none; b=Fw9uRBTnLWMD0HuRujcHVgcBnNlpvj4/R6lW/8GTrD4v8X8M+v6sdkBaYN7tNKzzzqUxZ+ nzj2vklUNiTX74Q0HlMHMrdQ7WafmMQ4A0folK4hnsTaLl7BXs+XPU+h3gbJMT/f626D7V v6SYyfEEWy/8rIc5q5FN9rkrIGmH5i8EaimHwDfqTT9sOLzmlG1i3ten0Wk0JXaOLn/6VV ltruwgk0Iu568Htr0XunL5U/howbne8nal02cipuXDwEnq/I/GEC4e0IUhqM+SZwt9kS4f nipWLdhEQmuUfzRVSzoqeF1gmyJwiZfvBn7PlafDDxb04HPsAAYyWHgqvdvjTA== 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 4cNdS32XYhzyXw; Fri, 12 Sep 2025 15:21:23 +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 58CFLNhi099624; Fri, 12 Sep 2025 15:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58CFLNts099622; Fri, 12 Sep 2025 15:21:23 GMT (envelope-from git) Date: Fri, 12 Sep 2025 15:21:23 GMT Message-Id: <202509121521.58CFLNts099622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 1bc7ee74b6a8 - main - pkgbase: fix alpha and beta versioning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1bc7ee74b6a80081f0f5764970e3949e834965f1 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc7ee74b6a80081f0f5764970e3949e834965f1 commit 1bc7ee74b6a80081f0f5764970e3949e834965f1 Author: Baptiste Daroussin AuthorDate: 2025-09-12 15:20:25 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-12 15:21:11 +0000 pkgbase: fix alpha and beta versioning MFC After: 1 day --- 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}