Hi Edward,
On Sat, Nov 24, 2018 at 05:59:15PM -0600, Edward Lopez-Acosta wrote:
> Version bump.
>
> I had to remove the pledge patch as the code was majorly changed and it no
> longer applied. I spent a couple hours trying to figure out where to apply
> pledge into the updated code, but got stuck. Would someone be willing to
> help with this please?
I think it is fine to remove pledge() and look to re-add it later (if possible).
For now, I will focus on the port update without pledge (so the "uses
pledge()" comment could be removed for now).
> Otherwise:
>
> Builds and runs successfully on amd64.
> No maintainer listed in Makefile.
> Nothing depends on this [1]
> All tests pass [2]
it is on the right road.
> Required crate versions match Cargo.lock [3]
> https://github.com/BurntSushi/ripgrep/blob/master/Cargo.lock
how do you update the list of MODCARGO_CRATES in Makefile ?
port infrastructure has tools for helping regenerating MODCARGO_CRATES
lines.
on port-modules(5) man-page, see modcargo-gen-crates and
modcargo-gen-crates-licenses targets.
note the usage could be a bit tricky...
$ edit Makefile #remove all MODCARGO_CRATES lines
$ make clean && make patch
$ make modcargo-gen-crates > list
$ edit Makefile #include the list
$ make makesum
$ make clean && make patch
$ make modcargo-gen-crates-licenses > list
$ edit Makefile #replace all MODCARGO_CRATES by list
> Ok?
Just a detail: if you are not a commiter, avoid asking for "ok". It is
usually used by an openbsd developer to ask review from another commiter,
in order to commit the change.
Regarding the diff itself, some questions.
> diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
> index 16d2c678d98..c8f3ea47967 100644
> --- a/textproc/ripgrep/Makefile
> +++ b/textproc/ripgrep/Makefile
> @@ -22,53 +21,6 @@ MODULES = devel/cargo
> BUILD_DEPENDS = lang/rust>=1.20 \
> textproc/asciidoc
>
> -MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
> [...]
> -MODCARGO_CRATES += wincolor-0.1.6 # Unlicense/MIT
> -CONFIGURE_STYLE = cargo
does the remove of CONFIGURE_STYLE is intented ?
without, the build will use network for retrieving dependencies.
$ make
[...]
===> Building for ripgrep-0.10.0
Updating crates.io index
warning: spurious network error (2 tries remaining): curl error: Could not resolve host: github.com
; class=Net (12)
warning: spurious network error (1 tries remaining): curl error: Could not resolve host: github.com
; class=Net (12)
error: failed to fetch `https://github.com/rust-lang/crates.io-index`
Caused by:
curl error: Could not resolve host: github.com
; class=Net (12)
> PATCHORIG = .openbsd.orig
> SEPARATE_BUILD = Yes
> @@ -78,6 +30,92 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
> RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
> OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out
>
> +MODCARGO_CRATES += aho-corasick-0.6.8 # Unilicense/MIT
> +MODCARGO_CRATES += arrayvec-0.4.7 # MIT/Apache2.0
> [...]
and why moving MODCARGO_CRATES to the end ?
it doesn't help to review what changed and what is the same.
please avoid it if not necessary.
Thanks.
--
Sebastien Marie
No comments:
Post a Comment