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@
This commit is contained in:
Baptiste Daroussin 2024-01-02 11:55:31 +01:00
parent 19fe9683f8
commit 0823be40fa

View file

@ -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