From nobody Sun Jul 31 15:59:04 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 4LwmCF0snvz4XY6L; Sun, 31 Jul 2022 15:59:05 +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 4LwmCD6S8Bz3vTb; Sun, 31 Jul 2022 15:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659283144; 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=xvNFQD3Ge09gdLojmIjFmHLsxlTmh0vUaZ+rQXiwFAM=; b=hlNe8zKGNZHnpz+Nazd1Haol/3e78tsEGW6CsmlPw+Drm+93EYV/Ex7VuyWewPzvDpyQor N8Si9mbYeup82kBJKaZqdiVZFDy4+RKM121/SLnq/ENxjfF0FFdRQYiDOS5WDHScHarOtO tfauAjP0tN6rGjzsHr1IDxU2hjbtDK7cpzNVFSuEVN+TuXzFQ2kmMiYvQhhmwGxUbMWujJ xxJd9Ou9GRi8gmzI0Lnozg20LTANJli3kd71lOl4zcYXlWWs077XJdGVLHd2FRqseYnc+S l+exjzMmr4LIXE/ocmGXwsCYnrnvux7kcGITgnQGbgiAPlKxSRLcI6YZeQfCqw== 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 4LwmCD5TmZzykv; Sun, 31 Jul 2022 15:59:04 +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 26VFx4Eh008384; Sun, 31 Jul 2022 15:59:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26VFx4WM008383; Sun, 31 Jul 2022 15:59:04 GMT (envelope-from git) Date: Sun, 31 Jul 2022 15:59:04 GMT Message-Id: <202207311559.26VFx4WM008383@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: 949672a6bef2 - main - Uses/cabal.mk: Fix `cabal-extract` target when GH_TUPLE is present. 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: 949672a6bef2134dfe3f2518400b58999d69ac10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659283144; 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=xvNFQD3Ge09gdLojmIjFmHLsxlTmh0vUaZ+rQXiwFAM=; b=fpT9NasOkbUl9kMeN32kUSvQYrZ6r5IlWkJ2jctaTW7nXB5/IyLsw3/uUe8oBXyesf4mZg +1x6vp8r9kNky57E+vVqCb9opQpciKP+Iphy/z8cJSbH2lWqkKe93HSIFW+1pJ/3jlt61f egz831kNcemh66f4sFIe7FnoKTAhlh7BdjajlsTyOkLgQmPkMD2uK9bZe2mvssFppgZfY9 JUO4on95HM7s+96awJtF5uCLHAme2HCfUnI2ATLS7ELLOSafgedZOdczkexl9NvHopV08P BJh/jaoPhbXsZsXkUgSloc/O+IHnB266E5lEHlPKOnHvjETJaircSRtLQe/bow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659283144; a=rsa-sha256; cv=none; b=oyriysbPxnn0K47Nr4PyqN/UCYHDgd5TDdX37FTdgRgGSL0VOO7xyrw7aiDaYAYDE9Llti mI70J/jte2cO2VednHgZzANfgE+N3GGO3TxJ1kXlhuKSwOLRz9/ESV8FiMpkR1WWHCVBgr n5h2dh8qfTk5o5s5gPysHubHFumQrNoGmEkhXDWIAXNrm3q9Fu2KCHcn0JgX3CCHuBhsM2 R9APZrc6ZD8dob/+IUPn1hpvXxV++eiqrcQh09UXuNgq1IKei3DEYUSflea9BTSd2iN4LQ DrBMx3N72z6b+Wfk7FLfOwLWJqN3Daqjk6SIaCfyjpaTNhPA6v0jMa+SLtUbYA== 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=949672a6bef2134dfe3f2518400b58999d69ac10 commit 949672a6bef2134dfe3f2518400b58999d69ac10 Author: Gleb Popov AuthorDate: 2022-07-31 15:56:21 +0000 Commit: Gleb Popov CommitDate: 2022-07-31 15:58:30 +0000 Uses/cabal.mk: Fix `cabal-extract` target when GH_TUPLE is present. The presence of dist-newstyle directory created by unpacking Haskell dependencies from GH_TUPLE makes `cabal` run `git pull` instead of `git clone`. --- Mk/Uses/cabal.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index d04d6f5ed3fe..929b3d053cf5 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -180,6 +180,7 @@ cabal-extract: check-cabal @cd ${WRKSRC} && ${SETENV} HOME=${CABAL_HOME} ${HPACK_CMD} . endif . endif + @${RM} -r ${WRKSRC}/dist-newstyle @${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE} # Calls cabal configure on the Haskell package located in ${WRKSRC}