From nobody Tue Jan 2 10:57:56 2024 X-Original-To: dev-commits-ports-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 4T48vm3JQrz556w7; Tue, 2 Jan 2024 10:57:56 +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 4T48vm2kvfz4NjM; Tue, 2 Jan 2024 10:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704193076; 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=tOMDvtdWN+hRoXDaOvMUyt//woszOAJD3Dzb3u5TS1c=; b=p2LMDJu/syVVZMubdZxkEQ1eqePPLWWzunWHzaF7+nefz6V83lyHy16juN9j/GZF5psuB1 0X9sbkFbcyiOd5+7cX5RZTGUzvKJftRUU4BGN+km69W/1XWh0u9tkya5YGblTycgDgsI/3 DW6zJefAuYQ0XgFZeXlv63SHTJZASRiBsbIpyKwdSojUZ56DZWgvme90fYUHt8RZ3fD2h1 n247pOuiugfLpvM2MsF61kzdcY1OnoByhYMQjQ5Qx+7FSPSfDDXwbR9n17VAwEi4HPMNL5 dHh5G4Cj5GpdDgqLVTHbUymnwsmKAkrw239Fu9RUMISk1Jgk0b1knMeQcp6c9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704193076; a=rsa-sha256; cv=none; b=mqBSqPEZYU4/hHK0zH3wS5J9/N0LiZ+zKb+KUpkE4HFQ25hBruAfwyfqD8So6LwCko73EQ GGeF1Xo/cRaZrxiS8RWjdMEk31XdTjnO0RN7EC4SKod/ApY2XqyLQA+ezeEGo2Q/QP1Bpy ZQHVjWX3PDyAoaMsCMSRkNkJH0fWomtZ54VYF+5j3t0zaABrmhNqWS7cde/jQ8Nd8VSa3r S4ejjjYmuaoAjprRJ0EKH85LB+h2Fss057IzOaOdAKFsZNirMMbRlZ2Sn/vUlLTGLoKRdn CVxJlwiRMnfb5Rj+ig2uJgZT/X2zQ9hZ4rmpVWTx03n/6qxC7sSqojtaoFdXvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704193076; 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=tOMDvtdWN+hRoXDaOvMUyt//woszOAJD3Dzb3u5TS1c=; b=gffAWOKUZZoqcHyHLFUpGls5vzSpfAQDDDYeu/bNMk3p+vcTWhkrJnur6FUJNDXB4KBUWs /yTtgYwYarI7uCalZthEc3W4hjuCOvcANO/cpInP1R70INXY4s7y1PSxBUfA9p5oNQQpCp jTD9qd+baTNMz6aQDSmAZxaRoQHDmgQiujxeqW5VpIDN/nJSfWPq2cxsZG1gZ6Q++8PGhv Q/u+xKKHUHSGdpXhsWSKPMT0d2ejIGC7gLwcMGCiLNB8GeuIrZhiIx92K0dVy3Chx1P66O N7A5AZsgIZos0FKMe96iDUb71ZUyxYNzAEKY5dbSBXvAEPSi2ewgnd1vMyRcEg== 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 4T48vm1g7Czy3J; Tue, 2 Jan 2024 10:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 402Avueb029406; Tue, 2 Jan 2024 10:57:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 402Avu77029403; Tue, 2 Jan 2024 10:57:56 GMT (envelope-from git) Date: Tue, 2 Jan 2024 10:57:56 GMT Message-Id: <202401021057.402Avu77029403@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0823be40fa82 - main - subpackages: fix flavors-package-names List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0823be40fa82c02a1b2395a7529527eca5b25e66 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0823be40fa82c02a1b2395a7529527eca5b25e66 commit 0823be40fa82c02a1b2395a7529527eca5b25e66 Author: Baptiste Daroussin AuthorDate: 2024-01-02 10:55:31 +0000 Commit: Baptiste Daroussin CommitDate: 2024-01-02 10:55:31 +0000 subpackages: fix flavors-package-names Before subpackages was introduced, flavors-package-names was printing the full -, a regression was introduced with subpackages which made it print . 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