From owner-dev-commits-ports-all@freebsd.org Wed May 19 14:15:26 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5222E64388F; Wed, 19 May 2021 14:15:26 +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 4FlZdn724tz3GRT; Wed, 19 May 2021 14:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C9FA114077; Wed, 19 May 2021 14:15:25 +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 14JEFPtL028092; Wed, 19 May 2021 14:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14JEFPAt028091; Wed, 19 May 2021 14:15:25 GMT (envelope-from git) Date: Wed, 19 May 2021 14:15:25 GMT Message-Id: <202105191415.14JEFPAt028091@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: 8cc38e007720 - main - devel/hs-haskell-language-server: Adapt to recent USES=cabal changes 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: 8cc38e00772077b566fa163b9758a0428c98788c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 14:15:26 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cc38e00772077b566fa163b9758a0428c98788c commit 8cc38e00772077b566fa163b9758a0428c98788c Author: Gleb Popov AuthorDate: 2021-05-19 08:24:45 +0000 Commit: Gleb Popov CommitDate: 2021-05-19 14:13:53 +0000 devel/hs-haskell-language-server: Adapt to recent USES=cabal changes --- devel/hs-haskell-language-server/Makefile | 12 +----------- .../files/patch-cabal.project.haskell-language-server | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile index 2ad93a40b1b9..037ddbddfdee 100644 --- a/devel/hs-haskell-language-server/Makefile +++ b/devel/hs-haskell-language-server/Makefile @@ -210,6 +210,7 @@ USE_CABAL= Diff-0.4.0 \ zlib-0.6.2.3 SKIP_CABAL_PLIST= yes +CABAL_PROJECT= append EXECUTABLES= ${PORTNAME} \ ${PORTNAME}-wrapper @@ -219,17 +220,6 @@ PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-8.10.4 \ bin/${PORTNAME}-wrapper -post-extract: - ${MV} ${WRKSRC}/cabal.project ${WRKSRC}/cabal.project.hls - -post-patch: - echo "packages: " > ${WRKSRC}/cabal.project.port -.for package in ${USE_CABAL} - echo " ${package:C/_[0-9]+//}" >> ${WRKSRC}/cabal.project.port -.endfor - ${REINPLACE_CMD} '/ .\/shake-bench/d' ${WRKSRC}/cabal.project.hls - ${CAT} ${WRKSRC}/cabal.project.port ${WRKSRC}/cabal.project.hls > ${WRKSRC}/cabal.project - do-build: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} hls-install hls diff --git a/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server b/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server new file mode 100644 index 000000000000..96f8458a3c07 --- /dev/null +++ b/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server @@ -0,0 +1,10 @@ +--- cabal.project.haskell-language-server.orig 2021-04-13 07:56:15 UTC ++++ cabal.project.haskell-language-server +@@ -1,7 +1,6 @@ + packages: + ./ + ./hie-compat +- ./shake-bench + ./ghcide + ./hls-plugin-api + ./hls-test-utils