Date: Sat, 29 Oct 2022 09:46:40 GMT From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 115fd1a40fb8 - main - devel/rebar3: update to version 3.20.0 Message-ID: <202210290946.29T9kedG096939@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=115fd1a40fb8bba50bb0670e5fd310ad03841be1 commit 115fd1a40fb8bba50bb0670e5fd310ad03841be1 Author: Jimmy Olgeni <olgeni@FreeBSD.org> AuthorDate: 2022-10-29 09:42:40 +0000 Commit: Jimmy Olgeni <olgeni@FreeBSD.org> CommitDate: 2022-10-29 09:46:06 +0000 devel/rebar3: update to version 3.20.0 Nice point: all dependencies have been included upstream. --- devel/rebar3/Makefile | 43 ++-------------------- devel/rebar3/distinfo | 26 ++----------- devel/rebar3/files/patch-bootstrap | 14 +++---- .../files/patch-vendor_relx_src_rlx__log.erl | 8 ++++ 4 files changed, 20 insertions(+), 71 deletions(-) diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile index 258f13a9d498..4c95bd31dd4f 100644 --- a/devel/rebar3/Makefile +++ b/devel/rebar3/Makefile @@ -1,5 +1,5 @@ PORTNAME= rebar3 -PORTVERSION= 3.19.0 +PORTVERSION= 3.20.0 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= devel @@ -32,44 +32,7 @@ PORTEXAMPLES= rebar.config.sample BASH_PLIST_FILES= share/bash-completion/completions/rebar3 ZSH_PLIST_FILES= share/zsh/site-functions/_rebar3 -# from rebar.config -REBAR_DEPS= bbmustache-1.12.2 \ - certifi-2.8.0 \ - cf-0.3.1 \ - cth_readable-1.5.1 \ - erlware_commons-1.5.0 \ - eunit_formatters-0.5.0 \ - getopt-1.0.1 \ - providers-1.9.0 \ - relx-4.6.0 \ - ssl_verify_fun-1.1.6 - -.for _dep in ${REBAR_DEPS} -DISTFILES+= ${_dep}.tar:hex -.endfor - -# The '_checkouts' part is to avoid attempts to fetch files from the -# network during the build. -post-extract: -.for _dep in ${REBAR_DEPS} - ${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//} - ${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\ - ${TAR} xfz - -C ${WRKSRC}/_build/default/lib/${_dep:C/-.*//} - ${MKDIR} ${WRKSRC}/_checkouts/${_dep:C/-.*//} - ${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\ - ${TAR} xfz - -C ${WRKSRC}/_checkouts/${_dep:C/-.*//} -.endfor - @${MKDIR} ${WRKSRC}/_build/bootstrap/lib - @${MKDIR} ${WRKSRC}/_build/bootstrap/plugins -.for _dep in ${REBAR_DEPS} - ${LN} -sf ${WRKSRC}/_build/default/lib/${_dep:C/-.*//} ${WRKSRC}/_build/bootstrap/lib/ -.endfor -.for _dep in ${REBAR_PLUGINS} - ${LN} -sf ${WRKSRC}/_build/default/plugins/${_dep:C/-.*//} ${WRKSRC}/_build/bootstrap/plugins/ -.endfor - do-build: - @${RM} ${WRKSRC}/rebar.lock @cd ${WRKSRC} && HOME=${WRKDIR} ./bootstrap do-install: @@ -78,12 +41,12 @@ do-install: do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions - ${INSTALL_DATA} ${WRKSRC}/priv/shell-completion/bash/rebar3 \ + ${INSTALL_DATA} ${WRKSRC}/apps/rebar/priv/shell-completion/bash/rebar3 \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/rebar3 do-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ - ${INSTALL_DATA} ${WRKSRC}/priv/shell-completion/zsh/_rebar3 \ + ${INSTALL_DATA} ${WRKSRC}/apps/rebar/priv/shell-completion/zsh/_rebar3 \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ post-install-EXAMPLES-on: diff --git a/devel/rebar3/distinfo b/devel/rebar3/distinfo index c7cd29445302..7563969a452f 100644 --- a/devel/rebar3/distinfo +++ b/devel/rebar3/distinfo @@ -1,23 +1,3 @@ -TIMESTAMP = 1655807643 -SHA256 (bbmustache-1.12.2.tar) = 688b33a4d5cc2d51f575adf0b3683fc40a38314a2f150906edcfc77f5b577b3b -SIZE (bbmustache-1.12.2.tar) = 17920 -SHA256 (certifi-2.8.0.tar) = 6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea -SIZE (certifi-2.8.0.tar) = 153088 -SHA256 (cf-0.3.1.tar) = 315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672 -SIZE (cf-0.3.1.tar) = 10240 -SHA256 (cth_readable-1.5.1.tar) = 686541a22efe6ca5a41a047b39516c2dd28fb3cade5f24a2f19145b3967f9d80 -SIZE (cth_readable-1.5.1.tar) = 19968 -SHA256 (erlware_commons-1.5.0.tar) = 3e7c6fb2ba4c29b0dd5dfe9d031b66449e2088ecec1a81465bd9fde05ed7d0db -SIZE (erlware_commons-1.5.0.tar) = 53760 -SHA256 (eunit_formatters-0.5.0.tar) = d6c8ba213424944e6e05bbc097c32001cdd0abe3925d02454f229b20d68763c9 -SIZE (eunit_formatters-0.5.0.tar) = 14848 -SHA256 (getopt-1.0.1.tar) = 53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c -SIZE (getopt-1.0.1.tar) = 19456 -SHA256 (providers-1.9.0.tar) = d287e874406a1505608642b0a3db5b68d6ada3f2ab001aec87e7f4d7c79fc017 -SIZE (providers-1.9.0.tar) = 14848 -SHA256 (relx-4.6.0.tar) = 2ff8131c63093c621c6b37dc52d1b2848a938886584b4b701d35bdbe4377f509 -SIZE (relx-4.6.0.tar) = 75776 -SHA256 (ssl_verify_fun-1.1.6.tar) = bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680 -SIZE (ssl_verify_fun-1.1.6.tar) = 14848 -SHA256 (erlang-rebar3-3.19.0_GH0.tar.gz) = ff9ef42c737480477ebdf0dd9d95ece534a14c96f05edafbf32e9af973280bc3 -SIZE (erlang-rebar3-3.19.0_GH0.tar.gz) = 442286 +TIMESTAMP = 1667028193 +SHA256 (erlang-rebar3-3.20.0_GH0.tar.gz) = 53ed7f294a8b8fb4d7d75988c69194943831c104d39832a1fa30307b1a8593de +SIZE (erlang-rebar3-3.20.0_GH0.tar.gz) = 785992 diff --git a/devel/rebar3/files/patch-bootstrap b/devel/rebar3/files/patch-bootstrap index d31c2787d657..e424af034f91 100644 --- a/devel/rebar3/files/patch-bootstrap +++ b/devel/rebar3/files/patch-bootstrap @@ -1,6 +1,6 @@ ---- bootstrap.orig 2020-11-20 13:29:24 UTC +--- bootstrap.orig 2022-10-15 12:48:23 UTC +++ bootstrap -@@ -13,18 +13,18 @@ main(_) -> +@@ -24,16 +24,16 @@ main(Args) -> %% Clear directories for builds since bootstrapping may require %% a changed structure from an older one @@ -14,12 +14,10 @@ + %% rm_rf("_build/prod"), %% The same pattern happens with default/ as well, particularly when %% developing new things. - %% Keep other deps in <profile>/lib for build environments like Nix - %% where internet access is disabled that deps are not downloadable. -- rm_rf("_build/default/lib/rebar"), -- rm_rf("_build/test/lib/rebar"), -+ %% rm_rf("_build/default/lib/rebar"), -+ %% rm_rf("_build/test/lib/rebar"), +- rm_rf("_build/default/"), +- rm_rf("_build/test/"), ++ %% rm_rf("_build/default/"), ++ %% rm_rf("_build/test/"), filelib:ensure_dir("_build/bootstrap/lib/rebar/ebin/"), diff --git a/devel/rebar3/files/patch-vendor_relx_src_rlx__log.erl b/devel/rebar3/files/patch-vendor_relx_src_rlx__log.erl new file mode 100644 index 000000000000..36baa83160fc --- /dev/null +++ b/devel/rebar3/files/patch-vendor_relx_src_rlx__log.erl @@ -0,0 +1,8 @@ +--- vendor/relx/src/rlx_log.erl.orig 2022-10-29 06:26:35 UTC ++++ vendor/relx/src/rlx_log.erl +@@ -4,4 +4,4 @@ + + -spec log(atom(), atom() | string() | binary(), [term()]) -> ok. + log(_Level, Msg, Args) -> +- io:format(Msg, Args). ++ io:format(Msg ++ "~n", Args).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210290946.29T9kedG096939>