Re: [new] editors/helix version 22.08.1
On Mon, Oct 31, 2022 at 07:47:31PM +0100, Solène Rapenne wrote:
>
> with theses changes, it's ok solene@ for import
>
just one note regarding WANTLIB:
-WANTLIB += ${COMPILER_LIBCXX} c c++abi m pthread
+WANTLIB += ${MODCARGO_WANTLIB} m
COMPILER_LIBCXX is used for c++ ports, but here there is no C++ involved.
MODCARGO_WANTLIB has been recently introduced to cover the Rust stdlib part
(which is arch dependent).
and "m" comes from (Rust) libc.
ok semarie@ to import.
--
Sebastien Marie
Re: [new] editors/helix version 22.08.1
Le Tue, 1 Nov 2022 17:50:38 - (UTC),
Laurent Cheylus a écrit :
> Hi,
>
> On Mon, 31 Oct 2022 19:47:31 +0100, Solène Rapenne wrote:
>
> > the ports looks in good shape and works fine, including LSP support
> > which I tested with gopls and clangd.
>
> Thanks Solene for your review of my port.
>
> > in pkg/DESCR, delete "written in Rust" because this brings nothing
> > useful, and wrap the long line
> >
> > remove "post-modern" in the COMMENT, that's not useful
> >
> > please add ${WRKSRC}/languages.toml into ${PREFIX}/share/helix,
> > regenerate PLIST after this. this file is useful to use it as a
> > reference for local tweaks.
> >
> > with theses changes, it's ok solene@ for import
>
> OK for the changes requested, see my diff below.
>
> Laurent
>
> diff --git a/editors/helix/Makefile b/editors/helix/Makefile
> index b0e36f063..adc20f67b 100644
> --- a/editors/helix/Makefile
> +++ b/editors/helix/Makefile
> @@ -1,4 +1,4 @@
> -COMMENT =post-modern modal text editor
> +COMMENT =modal text editor
>
> VER =22.08.1
> DISTNAME = helix-${VER}
> @@ -51,7 +51,8 @@ do-install:
> cp -a {} ${PREFIX}/share/helix/runtime/grammars \;
>
> ${INSTALL_DATA} ${WRKSRC}/runtime/tutor.txt \
> - ${PREFIX}/share/helix/runtime/tutor.txt
> + ${PREFIX}/share/helix/runtime
> + ${INSTALL_DATA} ${WRKSRC}/languages.toml ${PREFIX}/share/helix
>
> .include "crates.inc"
>
> diff --git a/editors/helix/pkg/DESCR b/editors/helix/pkg/DESCR
> index f267ea457..0baab06c5 100644
> --- a/editors/helix/pkg/DESCR
> +++ b/editors/helix/pkg/DESCR
> @@ -1,7 +1,8 @@
> -A Kakoune / Neovim inspired editor, written in Rust.
> +A Kakoune / Neovim inspired text editor.
>
> Features:
>- Vim-like modal editing
>- Multiple selections
>- Built-in language server support
> - - Smart, incremental syntax highlighting and code editing via tree-sitter
> + - Smart, incremental syntax highlighting and code editing
> + via tree-sitter
> diff --git a/editors/helix/pkg/PLIST b/editors/helix/pkg/PLIST
> index bea09c806..2ab38cefd 100644
> --- a/editors/helix/pkg/PLIST
> +++ b/editors/helix/pkg/PLIST
> @@ -1,5 +1,6 @@
> @bin bin/hx
> share/helix/
> +share/helix/languages.toml
> share/helix/runtime/
> share/helix/runtime/grammars/
> @so share/helix/runtime/grammars/awk.so
>
looks fine to me, but could you provide a tarball of the latest version?
It's easier for people to review :) otherwise they need to find a tarball
and look for all the thread to look for pathces, which isn't ideal
Re: [new] editors/helix version 22.08.1
Hi,
On Mon, 31 Oct 2022 19:47:31 +0100, Solène Rapenne wrote:
> the ports looks in good shape and works fine, including LSP support
> which I tested with gopls and clangd.
Thanks Solene for your review of my port.
> in pkg/DESCR, delete "written in Rust" because this brings nothing
> useful, and wrap the long line
>
> remove "post-modern" in the COMMENT, that's not useful
>
> please add ${WRKSRC}/languages.toml into ${PREFIX}/share/helix,
> regenerate PLIST after this. this file is useful to use it as a
> reference for local tweaks.
>
> with theses changes, it's ok solene@ for import
OK for the changes requested, see my diff below.
Laurent
diff --git a/editors/helix/Makefile b/editors/helix/Makefile
index b0e36f063..adc20f67b 100644
--- a/editors/helix/Makefile
+++ b/editors/helix/Makefile
@@ -1,4 +1,4 @@
-COMMENT = post-modern modal text editor
+COMMENT = modal text editor
VER = 22.08.1
DISTNAME = helix-${VER}
@@ -51,7 +51,8 @@ do-install:
cp -a {} ${PREFIX}/share/helix/runtime/grammars \;
${INSTALL_DATA} ${WRKSRC}/runtime/tutor.txt \
- ${PREFIX}/share/helix/runtime/tutor.txt
+ ${PREFIX}/share/helix/runtime
+ ${INSTALL_DATA} ${WRKSRC}/languages.toml ${PREFIX}/share/helix
.include "crates.inc"
diff --git a/editors/helix/pkg/DESCR b/editors/helix/pkg/DESCR
index f267ea457..0baab06c5 100644
--- a/editors/helix/pkg/DESCR
+++ b/editors/helix/pkg/DESCR
@@ -1,7 +1,8 @@
-A Kakoune / Neovim inspired editor, written in Rust.
+A Kakoune / Neovim inspired text editor.
Features:
- Vim-like modal editing
- Multiple selections
- Built-in language server support
- - Smart, incremental syntax highlighting and code editing via tree-sitter
+ - Smart, incremental syntax highlighting and code editing
+ via tree-sitter
diff --git a/editors/helix/pkg/PLIST b/editors/helix/pkg/PLIST
index bea09c806..2ab38cefd 100644
--- a/editors/helix/pkg/PLIST
+++ b/editors/helix/pkg/PLIST
@@ -1,5 +1,6 @@
@bin bin/hx
share/helix/
+share/helix/languages.toml
share/helix/runtime/
share/helix/runtime/grammars/
@so share/helix/runtime/grammars/awk.so
Re: [new] editors/helix version 22.08.1
Le Mon, 31 Oct 2022 10:07:04 +0100,
Laurent Cheylus a écrit :
> Hi,
>
> this is a port for Helix (text editor) https://helix-editor.com
>
> Features:
>- Vim-like modal editing
>- Multiple selections
>- Built-in language server support
>- Smart, incremental syntax highlighting and code editing via
> tree-sitter
>
> It's my first port for a Rust tool. Tested on amd64, works fine.
>
> - Makefile defines MASTER_SITES to download helix-22.08.1-source.tar.xz
> : full sources (Helix + TreeSitter grammars)
> - Special case with EXTRACT_CASES to decompress sources in WRKDIST
>
> - Patches (derived from those of the FreeBSD port
> https://github.com/freebsd/freebsd-ports/tree/main/editors/helix/)
>* patch-helix-term_build_rs: remove Git hash in internal version
>* patch-helix-loader_src_lib_rs: define path for data directory
> (${PREFIX}/share/helix)
>* patch-helix-loader_src_grammar_rs: disable internal command 'hx
> --grammar fetch' to fetch TreeSitter grammar with Git
>
> - Install tutor.txt, themes, queries and grammars (.so files built from
> TreeSitter sources) in ${PREFIX}/share/helix/runtime
>
>
> Port also available on GH openbsd-wip
> https://github.com/jasperla/openbsd-wip/tree/master/editors/helix
>
>
> comments welcome, Laurent
the ports looks in good shape and works fine, including LSP support
which I tested with gopls and clangd.
in pkg/DESCR, delete "written in Rust" because this brings
nothing useful, and wrap the long line
remove "post-modern" in the COMMENT, that's not useful
please add ${WRKSRC}/languages.toml into ${PREFIX}/share/helix,
regenerate PLIST after this. this file is useful to use it as a
reference for local tweaks.
with theses changes, it's ok solene@ for import
[new] editors/helix version 22.08.1
Hi,
this is a port for Helix (text editor) https://helix-editor.com
Features:
- Vim-like modal editing
- Multiple selections
- Built-in language server support
- Smart, incremental syntax highlighting and code editing via
tree-sitter
It's my first port for a Rust tool. Tested on amd64, works fine.
- Makefile defines MASTER_SITES to download helix-22.08.1-source.tar.xz
: full sources (Helix + TreeSitter grammars)
- Special case with EXTRACT_CASES to decompress sources in WRKDIST
- Patches (derived from those of the FreeBSD port
https://github.com/freebsd/freebsd-ports/tree/main/editors/helix/)
* patch-helix-term_build_rs: remove Git hash in internal version
* patch-helix-loader_src_lib_rs: define path for data directory
(${PREFIX}/share/helix)
* patch-helix-loader_src_grammar_rs: disable internal command 'hx
--grammar fetch' to fetch TreeSitter grammar with Git
- Install tutor.txt, themes, queries and grammars (.so files built from
TreeSitter sources) in ${PREFIX}/share/helix/runtime
Port also available on GH openbsd-wip
https://github.com/jasperla/openbsd-wip/tree/master/editors/helix
comments welcome, Laurent
helix-22.08.1.tar.gz
Description: GNU Zip compressed data
