diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile
index 2f4814735bae..af8b6bb34ce1 100644
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@@ -1,96 +1,88 @@
 PORTNAME=	rebar3
 PORTVERSION=	3.15.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
+MASTER_SITES+=	https://repo.hex.pm/tarballs/:hex
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	erlang@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.3 \
 		cf-0.3.1 \
 		cth_readable-1.5.1 \
 		erlware_commons-1.4.0 \
 		eunit_formatters-0.5.0 \
 		getopt-1.0.1 \
 		parse_trans-3.3.1 \
 		providers-1.8.1 \
 		relx-4.4.0 \
 		ssl_verify_fun-1.1.6
 
 .for _dep in ${REBAR_DEPS}
 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
-
 # 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:
 	${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 <bsd.port.mk>
diff --git a/devel/rebar3/distinfo b/devel/rebar3/distinfo
index 7bdd3a59ca2d..521ca8ea0617 100644
--- a/devel/rebar3/distinfo
+++ b/devel/rebar3/distinfo
@@ -1,27 +1,25 @@
-TIMESTAMP = 1622630018
-SHA256 (rebar3-cache-3.15.2.tar.gz) = e4d09c7877e750be48c4a3c1bf5e57b3b15bc52f344c2754ea13ab56cb5c42a9
-SIZE (rebar3-cache-3.15.2.tar.gz) = 144
+TIMESTAMP = 1622642666
 SHA256 (bbmustache-1.10.0.tar) = 43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee
 SIZE (bbmustache-1.10.0.tar) = 17408
 SHA256 (certifi-2.5.3.tar) = ed516acb3929b101208a9d700062d520f3953da3b6b918d866106ffa980e1c10
 SIZE (certifi-2.5.3.tar) = 159232
 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.4.0.tar) = 185ecf5cf43bab3a013ddb3614ce7bba7f6c7a827904e64e57da54fcdfdce2e6
 SIZE (erlware_commons-1.4.0.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.1.tar) = 07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b
 SIZE (parse_trans-3.3.1.tar) = 35840
 SHA256 (providers-1.8.1.tar) = e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0
 SIZE (providers-1.8.1.tar) = 14336
 SHA256 (relx-4.4.0.tar) = 55c0ed63bb5d55eb983a19eb94d7f3075df6d126dbdff43102a6660a91fce925
 SIZE (relx-4.4.0.tar) = 74240
 SHA256 (ssl_verify_fun-1.1.6.tar) = bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680
 SIZE (ssl_verify_fun-1.1.6.tar) = 14848
 SHA256 (erlang-rebar3-3.15.2_GH0.tar.gz) = 11b6bead835421a276e287562588580b63ac1c8dcb0e3c51f674887e4ab395cd
 SIZE (erlang-rebar3-3.15.2_GH0.tar.gz) = 432659