git: 0823be40fa82 - main - subpackages: fix flavors-package-names

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Tue, 02 Jan 2024 10:57:56 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0823be40fa82c02a1b2395a7529527eca5b25e66

commit 0823be40fa82c02a1b2395a7529527eca5b25e66
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-02 10:55:31 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-02 10:55:31 +0000

    subpackages: fix flavors-package-names
    
    Before subpackages was introduced, flavors-package-names was printing
    the full <name>-<version>, a regression was introduced with subpackages
    which made it print <name>.
    
    One of the side effect of this is pkg version -v -P was determining all
    the ports as orphaned.
    
    Reported by:    stephen@
---
 Mk/bsd.port.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index bd09f7c999c0..4b03eb491322 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -4848,20 +4848,20 @@ stage-qa:
 
 pretty-flavors-package-names: .PHONY
 .    if empty(FLAVORS)
-	@${ECHO_CMD} "no flavor: ${_PKGS}"
+	@${ECHO_CMD} "no flavor: ${PKGNAMES}"
 .    else
 .      for f in ${FLAVORS}
 	@${ECHO_CMD} -n "${f}: "
-	@cd ${.CURDIR} && ${SETENV} -i FLAVOR=${f} ${MAKE} -B -V _PKGS
+	@cd ${.CURDIR} && ${SETENV} -i FLAVOR=${f} ${MAKE} -B -V PKGNAMES
 .      endfor
 .    endif
 
 flavors-package-names: .PHONY
 .    if empty(FLAVORS)
-	@${ECHO_CMD} "${_PKGS}"
+	@${ECHO_CMD} "${PKGNAMES}"
 .    else
 .      for f in ${FLAVORS}
-	@cd ${.CURDIR} && ${SETENV} -i FLAVOR=${f} ${MAKE} -B -V _PKGS | ${XARGS} -n 1
+	@cd ${.CURDIR} && ${SETENV} -i FLAVOR=${f} ${MAKE} -B -V PKGNAMES | ${XARGS} -n 1
 .      endfor
 .    endif