From nobody Mon Jan 09 15:43:26 2023 X-Original-To: dev-commits-src-all@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 4NrJBR1byRz2sL9R; Mon, 9 Jan 2023 15:43:27 +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 4NrJBR143Bz3xr0; Mon, 9 Jan 2023 15:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673279007; 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=hxD6y39AQa1YQIHcTXh5/OFmochCIhABYz77hYEY0mc=; b=griPR/1YF+uSqhBSjOKnE1KqkZMG9+NljtdEM7F2KzctH9leWeh0BEbGiYP4YUeSGs5ULZ mtYjuuu2Ci6G50OypJY0PwQuqo+rw4YsipkABds96l+Zh1wl7rm0HAXrWUyettIRKW1WTU Ka0zGfHqjjFEoYBJ/J1iAuGwWgxgkEfdUefr0VQE4gxlqMuTd0HpchyyW5pWTizyWT8FcP ZZ7xn+F2uQc1wU5JqLLr793WmSlWcGg+1dnRVsfgWf8Y6+ysID9+ziI5j83V2J1wIxncQb QZZv1Ql4BcHmnQd0vrakjN+eCFrXlfjnjKaepygSSgyoDA0+KLFTkRa/N+3Whw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673279007; 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=hxD6y39AQa1YQIHcTXh5/OFmochCIhABYz77hYEY0mc=; b=C0Cvn9V4T2HN4D+XviORkfU9AmMjSBHznV5HEydiNenDbFjaxYYQ9do1li4a7biVKmpOEb nvmBaaXhBw5g5c/fk/G7r+dFUHqltGQZBfUAf98AKNNQTRHXEiYceZdr/SyVjSN9y50MXO O2dqxvp5vCpVg4JqQOjRjmV5QcXEyqGlBSo0UQqXw4l+GsyLwW4GiNSAG6y8I6jsUjPEfi KMDAkauB4elxp1Pu/b6cxRCQ9deQmD16pDhUC4UHbyhZbicuIxJSAqexE1Gw6zjFbdZMt7 GDqeS4S0CZcMtIfTQ1Okw7Bj6OADNfv/7bLmXZXTIrs8wIMOGxmN3xKeGKh9Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673279007; a=rsa-sha256; cv=none; b=QSgBSyxQBx6QcWe4J224zF/R8QezTK1qHwjQGaRw74Vx8j8CU+pE4RA7LClB28gdEZpLUU 5srn4/f+mwdSAcZMh23Dq5qjtGDKVg8gydpZNoEKPCJwzQH1iaas7E6j8Au6vbRthzOcET JuzdpOYDZTg+OFLFjR3k78Ah+e6EjoR9SqPHs1/UneJIbDoVUOnGaREE7xBD5uP9DC7Otv iDyXwjvp7XFwPQZMirfuk3iOmDFTQnlOmelpRbeb7g1A5BbzfGXsPOLb1dvpHnSP79LMsT Ii1aHAsO+lDnA0S1oVpKikkxGRWjYapamCilxtjtwEB/099ETkpeEyzzoSQ3oA== 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 4NrJBQ6t5dzYkS; Mon, 9 Jan 2023 15:43:26 +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 309FhQV6092991; Mon, 9 Jan 2023 15:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 309FhQ5O092990; Mon, 9 Jan 2023 15:43:26 GMT (envelope-from git) Date: Mon, 9 Jan 2023 15:43:26 GMT Message-Id: <202301091543.309FhQ5O092990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0eccd618a36a - main - pkgbase: share rules for packages without pkgdeps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eccd618a36aed1fb33d2f712e6624fdf111406d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0eccd618a36aed1fb33d2f712e6624fdf111406d commit 0eccd618a36aed1fb33d2f712e6624fdf111406d Author: Ed Maste AuthorDate: 2023-01-06 14:44:54 +0000 Commit: Ed Maste CommitDate: 2023-01-09 15:42:59 +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 --- 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}" ;;