diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2021-05-19 08:24:45 +0000 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2021-05-19 14:13:53 +0000 |
| commit | 8cc38e00772077b566fa163b9758a0428c98788c (patch) | |
| tree | b8a2af5c47d8c41e7b4943819a14bf59d5d54786 | |
| parent | 317c619b72cf556e65b19e624559a61b2aa80017 (diff) | |
| download | ports-8cc38e00772077b566fa163b9758a0428c98788c.tar.gz ports-8cc38e00772077b566fa163b9758a0428c98788c.zip | |
devel/hs-haskell-language-server: Adapt to recent USES=cabal changes
| -rw-r--r-- | devel/hs-haskell-language-server/Makefile | 12 | ||||
| -rw-r--r-- | devel/hs-haskell-language-server/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 |