Skip to content

Commit

Permalink
subpackages: fix flavors-package-names
Browse files Browse the repository at this point in the history
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@
  • Loading branch information
bapt committed Jan 2, 2024
1 parent 19fe968 commit 0823be4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 0823be4

Please sign in to comment.