<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/595feae942f6bad624e04e3e848306709006f19d">https://github.com/macports/macports-ports/commit/595feae942f6bad624e04e3e848306709006f19d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 595feae942f6bad624e04e3e848306709006f19d
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Feb 7 22:03:04 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> haskell-language-server: Minor fixes and standalone binary
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix homepage
</span><span style='display:block; white-space:pre;color:#404040;'> * Build as standalone binary
</span><span style='display:block; white-space:pre;color:#404040;'> * Keep dynamic build variant as must be used with same ghc version
</span>---
devel/haskell-language-server/Portfile | 58 +++++++++++++++++++++++++---------
1 file changed, 43 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/haskell-language-server/Portfile b/devel/haskell-language-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69eba960a9a..c1e6a4b27cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/haskell-language-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/haskell-language-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup haskell_cabal 1.0
</span>
name haskell-language-server
version 2.6.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel haskell
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,7 @@ long_description The haskell-language-server (HLS) project is an \
</span> editor support for the LSP protocol is now \
widespread.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://hackage.haskell.org/package/haskell-language-server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://hackage.haskell.org/package/${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://github.com/haskell/haskell-language-server
</span>
checksums rmd160 66c0d520c28d2a8e4a1ca0e3665f2aa73ed75582 \
sha256 3655b8d741616f8e32d0181274f80a48d9b8dca47d3fd22675cadfa01ca80e48 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +39,6 @@ set paths_name_underscore src/Paths_${name_underscore}.hs
</span> set hls_libdir lib/${distname}
set hls_docdir share/doc/${distname}/html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-extract {
# Fix for cabal data-files hardcoded path in binary
# See:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,16 +63,44 @@ post-extract {
</span> depends_build-append \
port:file
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see ${name}.cabal for build specifics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# install depends on ghc version libraries, not simply `path:bin/ghc:ghc`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:ghc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:bin/ghc:ghc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:cabal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hscolour
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant dynamic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Use ghc-specific dynamic libraries for installation.} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# turn off dynamic library linking
</span> build.post_args-prepend \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --flags=-dynamic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset "dynamic"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see ${name}.cabal for build specifics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install depends on ghc version libraries, not simply `path:bin/ghc:ghc`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/ghc:ghc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ghc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # turn on dynamic library linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.post_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --flags=-dynamic \
</span> -fdynamic
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix and install all libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared_library_chase \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/${hls_libdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {@rpath/libHS.+\.dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set hls_build_binary {}
set hls_build_doc {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-destroot {
set hls_build_binary \
[glob -nocomplain ${workpath}/dist/build/*/ghc-*/${name}-${version}/x/${name}/build/${name}/${name}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,11 +115,9 @@ destroot {
</span> xinstall -m 0755 ${hls_build_binary} \
${destroot}${prefix}/bin/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix and install all libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared_library_chase \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/${hls_libdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {@rpath/libHS.+\.dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${name}-wrapper must point to the correct binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${name}-wrapper
</span>
# documentation
foreach f [glob ${hls_build_doc}/*.{css,html,json,png}] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +132,12 @@ destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "The Haskell Language Server (HLS) User Manual is available at:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "The Haskell Language Server (HLS) must be used with the same\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version of GHC with which it was built.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For an Emacs client, use `M-x package-install lsp-haskell`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The HLS User Manual is available at:
</span>
file://${prefix}/${hls_docdir}/index.html"
</pre><pre style='margin:0'>
</pre>