Index: head/devel/rebar3/Makefile =================================================================== --- head/devel/rebar3/Makefile (revision 555761) +++ head/devel/rebar3/Makefile (revision 555762) @@ -1,99 +1,99 @@ # $FreeBSD$ PORTNAME= rebar3 -PORTVERSION= 3.14.1 +PORTVERSION= 3.14.2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES+= LOCAL/olgeni:deps \ http://olgeni.olgeni.com/~olgeni/distfiles/:deps \ https://repo.hex.pm/tarballs/:hex DISTFILES= rebar3-cache-${PORTVERSION}${EXTRACT_SUFX}:deps EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ rebar3-cache-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Build tool for Erlang LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/bin/erl:lang/erlang \ ${LOCALBASE}/bin/git:devel/git RUN_DEPENDS= ${LOCALBASE}/bin/erl:lang/erlang OPTIONS_DEFINE= BASH ZSH EXAMPLES OPTIONS_DEFAULT=BASH ZSH USE_GITHUB= yes GH_ACCOUNT= erlang NO_ARCH= yes PLIST_FILES= bin/${PORTNAME} 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.10.0 \ certifi-2.5.2 \ cf-0.3.1 \ - cth_readable-1.4.8 \ + cth_readable-1.4.9 \ erlware_commons-1.3.1 \ eunit_formatters-0.5.0 \ getopt-1.0.1 \ parse_trans-3.3.0 \ providers-1.8.1 \ - relx-4.0.2 \ - ssl_verify_fun-1.1.6 \ + relx-4.1.0 \ + ssl_verify_fun-1.1.6 .for _dep in ${REBAR_DEPS} ${REBAR_PLUGINS} DISTFILES+= ${_dep}.tar:hex .endfor # convenience target to rebuild the rebar3 cache file build-cache: cd ${WRKDIR} && ${TAR} -c -v -z -f rebar3-cache-${PORTVERSION}${EXTRACT_SUFX} .cache post-extract: @${REINPLACE_CMD} -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src .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/-.*//} .endfor .for _dep in ${REBAR_PLUGINS} ${MKDIR} ${WRKSRC}/_build/default/plugins/${_dep:C/-.*//} ${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\ ${TAR} xfz - -C ${WRKSRC}/_build/default/plugins/${_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: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions ${INSTALL_DATA} ${WRKSRC}/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 \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/rebar.config.sample ${STAGEDIR}${EXAMPLESDIR} .include Index: head/devel/rebar3/distinfo =================================================================== --- head/devel/rebar3/distinfo (revision 555761) +++ head/devel/rebar3/distinfo (revision 555762) @@ -1,27 +1,27 @@ -TIMESTAMP = 1599337977 -SHA256 (rebar3-cache-3.14.1.tar.gz) = fd49f3d57db0fce6ed91cfdf92386beaa2763dabb02759656145a88c09263f86 -SIZE (rebar3-cache-3.14.1.tar.gz) = 131570 +TIMESTAMP = 1605880371 +SHA256 (rebar3-cache-3.14.2.tar.gz) = 39a7cc5504487edc411d5981aa47c717cb07a7d12aa90c6d4958ded6a70677b7 +SIZE (rebar3-cache-3.14.2.tar.gz) = 16758 SHA256 (bbmustache-1.10.0.tar) = 43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee SIZE (bbmustache-1.10.0.tar) = 17408 SHA256 (certifi-2.5.2.tar) = 3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040 SIZE (certifi-2.5.2.tar) = 161280 SHA256 (cf-0.3.1.tar) = 315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672 SIZE (cf-0.3.1.tar) = 10240 -SHA256 (cth_readable-1.4.8.tar) = 46c3bb14df581dc7a9dc0cb9e8c755bff596665fb9a23148dd76e3a200804e90 -SIZE (cth_readable-1.4.8.tar) = 18944 +SHA256 (cth_readable-1.4.9.tar) = b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24 +SIZE (cth_readable-1.4.9.tar) = 18944 SHA256 (erlware_commons-1.3.1.tar) = 7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166 SIZE (erlware_commons-1.3.1.tar) = 53248 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 (parse_trans-3.3.0.tar) = 17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960 SIZE (parse_trans-3.3.0.tar) = 35840 SHA256 (providers-1.8.1.tar) = e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0 SIZE (providers-1.8.1.tar) = 14336 -SHA256 (relx-4.0.2.tar) = 21b5d01c78d832b2ed62f9796c77718270ba35432c2845059919fad990c09e17 -SIZE (relx-4.0.2.tar) = 72192 +SHA256 (relx-4.1.0.tar) = b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4 +SIZE (relx-4.1.0.tar) = 73216 SHA256 (ssl_verify_fun-1.1.6.tar) = bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680 SIZE (ssl_verify_fun-1.1.6.tar) = 14848 -SHA256 (erlang-rebar3-3.14.1_GH0.tar.gz) = b01275b6cbdb354dcf9ed686fce2b5f9dfdd58972ded9e970e31b9215a8521f2 -SIZE (erlang-rebar3-3.14.1_GH0.tar.gz) = 412574 +SHA256 (erlang-rebar3-3.14.2_GH0.tar.gz) = 19fcdc73debb90d405864f728e188cbc5b61c3939b911e58c0b59bf1619c4810 +SIZE (erlang-rebar3-3.14.2_GH0.tar.gz) = 425600 Index: head/devel/rebar3/files/patch-bootstrap =================================================================== --- head/devel/rebar3/files/patch-bootstrap (revision 555761) +++ head/devel/rebar3/files/patch-bootstrap (revision 555762) @@ -1,21 +1,25 @@ ---- bootstrap.orig 2020-09-03 21:55:29 UTC +--- bootstrap.orig 2020-11-20 13:29:24 UTC +++ bootstrap -@@ -13,15 +13,15 @@ main(_) -> +@@ -13,18 +13,18 @@ main(_) -> %% Clear directories for builds since bootstrapping may require %% a changed structure from an older one - rm_rf("_build/bootstrap"), + %% rm_rf("_build/bootstrap"), %% When recompiling rebar3 itself, the path swaps and cleaning %% removes the modules in _build/bootstrap, but the VM still %% manages to discover those in _build/prod from previous builds and %% cause weird failures when compilers get modified between releases. - rm_rf("_build/prod"), + %% rm_rf("_build/prod"), %% The same pattern happens with default/ as well, particularly when - %% developig new things. -- rm_rf("_build/default"), -+ %% rm_rf("_build/default"), + %% developing new things. + %% Keep other deps in /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"), - %% We fetch a few deps from hex for boostraping, - %% so we must compile r3_safe_erl_term.xrl which + filelib:ensure_dir("_build/bootstrap/lib/rebar/ebin/"), +