From nobody Thu Feb 02 10:06:56 2023 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 4P6vb50M8Cz3cmm0; Thu, 2 Feb 2023 10:06:57 +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 4P6vb450lMz3xB7; Thu, 2 Feb 2023 10:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675332416; 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=MvwMavBl/BU5JTb7WrqCXWI52wLSJW+BpW850VutPJs=; b=T20oOiDeI1d4UW5K+Jng85LT0KBKN4WcsHNA8b7JemGrfpNK+UCxxfIKe/TYAMNA8omsv7 vtFlynirSXDMnrggl8gQ+/1S1xTpC4Aljg5xQdZXcjgPQwBJLrDgesOCqN/Z1MDtIJeUMg EIo516QiWEetMBvBrsmow+4SsTMHGSuY/ZWXpdMAPp662b+Ir3hq/Ulmq015Sihwj8OnY5 ZEl6UTo5u8qU9jnUVOaCyI0UH0Q3+H6KaUpCqPFh4AFvPkl6CNbjtcdWOAomvr+xEKUDnw F122SUtSydjlcdZAlN3nF0fkmsSFYJ93vVdW0JwY0xURS5+/kBDYVizB0w+/og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675332416; 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=MvwMavBl/BU5JTb7WrqCXWI52wLSJW+BpW850VutPJs=; b=W3OMExyd6DATmsCxadMsUxQ14G7gNKlC+xtDEaxGvAwVG6PSLg0TmNZ5kw+lMEYEA5IRHX xxGEPJNFfdnRUAWeuni+tcnLVhyW/RzrDs0Hw/F84XKeV4Ah6fE91jk0hRrsrFzQNqk3hE STpg1xTVObhSIVuaOGxVZkI2SKispDVtTt1E2tYacjfI1UhvHA3W6ljZ17JwagZW2OS9Sv XmEJIdPxCnhMWyhdH9EgcHI7Up+1Qb+1UR6nIEmfS8pkTvccYWz6z0scpQ8dluZTkVLnc4 ilBa3IZgJGossNPAgtF2SjiA0cHpqqQKGijxf1pgei9cB4/wvEHxID9rJmu+oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675332416; a=rsa-sha256; cv=none; b=roloH+CWUS77ctQWwns3qQqmc0/LhpXlp1msf680wQt4Zv6dmReN1zkfxDFZiciLqyNMda 3CPXy/I4pRXtb5rPC48LoyUQv9Oq66EpV/kY3dWMg2yT8mnvf/wkaafAYQTrcth+kgBA1N YM4HkQbu5dWApWvWtebMotmo1KEOwPGY4JtB+bt+R3xhX93aTt9nQm/xVTWmkKhvpyrCwb HHGmEsDWYfv/ktUtXG2hQ8uMmX7wA/wcT5hO5LP97RJNFv+Fgnnx/4jU/DqSO2bvv1xDXQ XwjG5MtHTi50q1LiOrv7xICBERxhtMKgIzlxz756i8h74G7oujTiaXGTGJ5tvg== 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 4P6vb446xWzqWx; Thu, 2 Feb 2023 10:06:56 +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 312A6uJv077815; Thu, 2 Feb 2023 10:06:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312A6uVP077814; Thu, 2 Feb 2023 10:06:56 GMT (envelope-from git) Date: Thu, 2 Feb 2023 10:06:56 GMT Message-Id: <202302021006.312A6uVP077814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: ef120bffbfdc - stable/13 - pkgbase: share rules for packages without pkgdeps 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ef120bffbfdc682d9beb9d22d45d6a0553c3f0ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ef120bffbfdc682d9beb9d22d45d6a0553c3f0ed commit ef120bffbfdc682d9beb9d22d45d6a0553c3f0ed Author: Ed Maste AuthorDate: 2023-01-06 14:44:54 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-02 09:35:07 +0000 pkgbase: share rules for packages without pkgdeps Have liby and libcompat share *-dev and *-lib32_dev rules, and share *-man rule for libcompat and libelftc. Also correct name substitution and description for man rules. Reviewed by: manu Fixes: 5391bcf0f7e4 ("pkgbase: Do not record dependency on...") Fixes: 65fa2fd23b9d ("pkgbase: Do record dependency on non-...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37964 (cherry picked from commit 0eccd618a36aed1fb33d2f712e6624fdf111406d) --- release/packages/generate-ucl.sh | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 4b2992b9c827..2b1f71e95c11 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -48,31 +48,18 @@ main() { # -dev packages that have no corresponding non-dev package # as a dependency. - liby-dev) + libcompat-dev|liby-dev) outname=${outname%%-dev} _descr="Development Files" ;; - liby-lib32_dev) + libcompat-lib32_dev|liby-lib32_dev) outname=${outname%%-lib32_dev} _descr="32-bit Libraries, Development Files" ;; - libcompat-dev) - outname=${outname%%-dev} - _descr="Development Files" - ;; - libcompat-man) - outname=${outname%%-dev} - _descr="Development Files" - ;; - libcompat-lib32_dev) - outname=${outname%%-lib32_dev} - _descr="32-bit Libraries, Development Files" - ;; - libelftc-man) - outname=${outname%%-dev} - _descr="Development Files" + libcompat-man|libelftc-man) + outname=${outname%%-man} + _descr="Manual Pages" ;; - utilities) uclfile="${uclfile}" ;;