git: 0eccd618a36a - main - pkgbase: share rules for packages without pkgdeps

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Mon, 09 Jan 2023 15:43:26 UTC
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=0eccd618a36aed1fb33d2f712e6624fdf111406d

commit 0eccd618a36aed1fb33d2f712e6624fdf111406d
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-01-06 14:44:54 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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}"
 			;;