From nobody Wed Jul 27 14:56:49 2022 X-Original-To: dev-commits-ports-main@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 4LtH1F4pwfz4Xlt8; Wed, 27 Jul 2022 14:56:49 +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 4LtH1F4PpYz3lq5; Wed, 27 Jul 2022 14:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933809; 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=LBxctdQNSJ8b6um2+HJGd5ruO4hfovfh7kjHYK3tqPE=; b=ezTJ3UEvK+wEU1Phek2Wf5qt6zLostGm+zGvGRHtkK4gmkvCCwJfIsECVXBCQvlwtIYoKs rHP6a1XOWmMEd0yE8OOIqRUuizWCiZwOl1d9q+GRSeB3dtLKS/9mlE5wcJHZdBoUVFjjNf tB/ZnAxNdO0m+vv0eJlIHLl6HYN1nksilxHXkl4eisRoLW0PFTBSq6PP1xXOhB0AWlKbIW +JJEwOq+to7A9J1cDKE53e5eas80PY9Ab5Cu8hPCzRQ8k/7bkc9I/kHKDDu9Ca//7QF3EB XS0UGxOmLy2xsuJ9MaQp5Zda8lncOFX/WuUw7b3ool1CkMIpbnR64953Ynrt0g== 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 4LtH1F3V1WzLTn; Wed, 27 Jul 2022 14:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26REunGD005141; Wed, 27 Jul 2022 14:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26REunoW005140; Wed, 27 Jul 2022 14:56:49 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:56:49 GMT Message-Id: <202207271456.26REunoW005140@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: d5655de18216 - main - Uses/cabal.mk: Do not include '.' package when CABAL_PROJECT=append List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5655de18216ed5bfe20522e3285574eb720f3e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933809; 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=LBxctdQNSJ8b6um2+HJGd5ruO4hfovfh7kjHYK3tqPE=; b=sQNkf8QXK/r8aisRaghWfE/SiS0Wb6X1+Yw8RgW4pgwd3GwgB2DSNf6wCkc7UHuHTqjJzX mJozA3zrn7teuwrCiEQM2jBZ8Nj5mq0kIN5i8r60dJl0KM+4OndLBPPHdmp0sCX3mvj0fg flA/DWVcADJlabJkVgvx/HUM8Q/4Ib/YVIVWtoYxtdIrMdL6hKw2QnJuLy4nrPkpfMqz3w F5Lun87z8yHWvq9SWWHpkCxqzyb5KYqBaTQMXg4e1iHjs34x/4ttRZGvEb/oo1t/kY6kzf gGpoJglOTRiDiyVX8xsqjMm9GWhj7WrcGTeb/iUy+jMo50DGV97VKfHlKmXbOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658933809; a=rsa-sha256; cv=none; b=vQGxqtN0+a8VJ9bADzbj7rUF7vPXcHjBRyBfG5MGgA3Q15YfMq4bT4VKCFoFuIyFC7xbbu xrNSzwFOyjcnpHwA+V/vvKm88D2Soh2hG9j1lQAsy1HLb/2DToB2T6t+usntqGfRh9bMqr Mj0Yxzw1xGBqdUF1h7u1XplcXtHFsoovBUM53n4zZW1pdB48AZj/niSjSTJGyBFOEAmk5R bg3cv9HtKUP76h64bc0g0cSvDWLR+PHOv/CG/39i6jGHAcUb3ESt2YsxWViGaoZR1iT2FC p4mtUVsA75VNG53g5uFwk2jH8ZB7WPkgwqC02tZ7ZPsqR7QSkBgmBejw69rCwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5655de18216ed5bfe20522e3285574eb720f3e5 commit d5655de18216ed5bfe20522e3285574eb720f3e5 Author: Gleb Popov AuthorDate: 2022-07-26 15:01:35 +0000 Commit: Gleb Popov CommitDate: 2022-07-27 14:55:50 +0000 Uses/cabal.mk: Do not include '.' package when CABAL_PROJECT=append If we are appending to an exisiting project file all needed package directories are already listed there. --- Mk/Uses/cabal.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 2037696ab369..748bdced162c 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -224,7 +224,10 @@ cabal-post-extract: cabal-post-patch: # Create our own cabal.project - ${ECHO_CMD} "packages: ." > ${WRKSRC}/cabal.project + ${ECHO_CMD} "packages:" > ${WRKSRC}/cabal.project +. if "${CABAL_PROJECT}" != "append" + ${ECHO_CMD} " ." >> ${WRKSRC}/cabal.project +. endif . for package in ${_use_cabal} ${ECHO_CMD} " ${CABAL_DEPS_SUBDIR}/${package:C/_[0-9]+//}" >> ${WRKSRC}/cabal.project . endfor