From nobody Thu Mar 09 19:49:55 2023 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 4PXfsb55wqz3xKKc; Thu, 9 Mar 2023 19:49:55 +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 4PXfsb4Y9Bz3DPx; Thu, 9 Mar 2023 19:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678391395; 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=p9orbaPlO4xwqT9dKLvkY75E4Katg8JXlk7jhpRTBnk=; b=bfRmKHo9oVvrLXH5bW8txTamSviGr6EYIHZKE5vp3GNAulGrZiAbqb4/RMius6t0qN4xcw tu6cj4RBqYhvOdxWxR0ZwTzbY5LKsCfV9AKs2IVY16ysR2rfPrkcBI8uiILi0SAKlOTNva oQoAGJespx1i0vb6IaLgFDXSnvwTcmhv2tS8jp5MZvYjqb0iXdvM6/Au487rO+uVeInCx7 qPbihu1mkif84MXNf5GB/IIUujzXt8UU4knObiRCgxL64gLtm6kW8ra/bJn5Imr54hHoh/ QrE3w5n8qVB7uPxUVTUmhNuKaUpscr3D4wajfzFutVJFSZVGzPU0BkgQWkiVJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678391395; 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=p9orbaPlO4xwqT9dKLvkY75E4Katg8JXlk7jhpRTBnk=; b=UQpjOzOQ4jcCT9bD/RdgEHdRCw+YsdTrSoG80TgR4pdyiB3DQDiV4esfvDSGf4Y0AHwy19 /iwJMjL27MfWbYRD5CoSB1jlmy7OFHwToLGMoZ5J8f00EBb7Qhf59Rf20fdkIk3v1IaFrv w5VbWt+VCQziTePoqdF4hx5SO66YjiPwo2MQ5E8ZSsvnNaFONm1ybi0cEG/xmvh4ueumvC dkBcd4htOTZ+aJFAD/jssTk+4UQ55Ucqr2S7upvo6F4ftd82NDBg+iUWvQ/MFdYRvErNAp brltJ0VrVqDKnUCa1RPjwIOyCvcHN0F+m+A6DN/qoB43m+taXcLj7rZEEioZGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678391395; a=rsa-sha256; cv=none; b=ph5rpoonV0WwX1CtQbBBvc4X7TE62D0hZ2oTQm78zLqpqqniJ3cUL5nHi+GtEHthwoSMSH /fjsOVZsEgu4nWeEkwjCCt4VrTziuo+2IYq38HUWQttJQ3PD0GLVG7JFiaIkBPb4w7dxre Sog19zBHosJh51otMefjwqyxhve+xqqSLtyfIBoYUiuUYC6IfgBLJS8zpG60wWnz7P5SPE muHsxj6jEyPf9JSfUVVHkcitzP4ryuFCTBP1kkqwNl202c3sLwOjYSzkBdE3LdIJUWt/M3 l0m0dZLkfRWNDDAZHngpsEZiQQfRIxWGIfZKxJ6JmE+cwFxK9PVVC0Re2yde2A== 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 4PXfsb3YtqzKVH; Thu, 9 Mar 2023 19:49:55 +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 329JntcB044462; Thu, 9 Mar 2023 19:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329JntgE044461; Thu, 9 Mar 2023 19:49:55 GMT (envelope-from git) Date: Thu, 9 Mar 2023 19:49:55 GMT Message-Id: <202303091949.329JntgE044461@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: 4caa2e2b27f1 - main - Mk/Uses: Drop the "/package/" part of URI when calling cabal2tuple. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4caa2e2b27f1f5728591ccd9bba370791b7c8f28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4caa2e2b27f1f5728591ccd9bba370791b7c8f28 commit 4caa2e2b27f1f5728591ccd9bba370791b7c8f28 Author: Gleb Popov AuthorDate: 2023-03-09 19:25:49 +0000 Commit: Gleb Popov CommitDate: 2023-03-09 19:38:13 +0000 Mk/Uses: Drop the "/package/" part of URI when calling cabal2tuple. Some repositories unlike Hackage append "/package/" when accessing a package. This confuses cabal2tuple, so chop it. --- Mk/Uses/cabal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 23d0b0fa6ebb..0dda929e7e57 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -173,7 +173,7 @@ EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} . if defined(CABAL_REPOSITORIES) && !empty(CABAL_REPOSITORIES) . for r in ${CABAL_REPOSITORIES} -CABAL2TUPLE_ARGS+= --group=${r} --master-site=${MASTER_SITES:M*\:${r}:[1]:S/:${r}//} +CABAL2TUPLE_ARGS+= --group=${r} --master-site=${MASTER_SITES:M*\:${r}:[1]:S/:${r}//:S|/package/||} . endfor . endif