Upgrade to snapshot of beta-1 (4f98106).

3 files changed, 64 insertions, 12 deletions

diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile
index 9db1b1952a59..27bbcdcefef5 100644
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@@ -1,11 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	rebar3
-PORTVERSION=	20150601
+PORTVERSION=	20150630
 CATEGORIES=	devel
-MASTER_SITES+=	http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
-		LOCAL/olgeni:deps
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} rebar3-deps-2.tar.gz:deps
+MASTER_SITES+=	LOCAL/olgeni:pkg \
+		http://olgeni.olgeni.com/~olgeni/distfiles/:pkg \
+		https://s3.amazonaws.com/s3.hex.pm/tarballs/:hex
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		rebar3-packages-1${EXTRACT_SUFX}:pkg
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Build tool for Erlang
@@ -20,21 +23,42 @@ OPTIONS_DEFINE=	BASH ZSH
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rebar
-GH_TAGNAME=	e09be18
+GH_TAGNAME=	4f98106
 
 PLIST_FILES=	bin/${PORTNAME}
 
 BASH_PLIST_FILES=	share/bash-completion/completions/rebar3
 ZSH_PLIST_FILES=	share/zsh/site-functions/_rebar3
 
+REBAR_PACKAGES=	${WRKDIR}/.cache/rebar3/hex/com/amazonaws/s3/s3.hex.pm/tarballs/packages
+
+# from rebar.config
+REBAR_DEPS=	bbmustache-1.0.1 \
+		erlware_commons-0.12.0 \
+		getopt-0.8.2 \
+		providers-1.4.1 \
+		relx-3.0.0
+
+.for _dep in ${REBAR_DEPS}
+DISTFILES+=	${_dep}.tar:hex
+.endfor
+
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${CP} -R ${WRKDIR}/_build ${WRKSRC}/
+	@${MKDIR} ${REBAR_PACKAGES}
+	@${TAR} xfz ${DISTDIR}/rebar3-packages-1${EXTRACT_SUFX} -C ${REBAR_PACKAGES}
+.for _dep in ${REBAR_DEPS}
+	@${INSTALL_DATA} ${DISTDIR}/${_dep}.tar ${REBAR_PACKAGES}
+.endfor
+.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
 
 do-build:
-	@${RM} ${WRKSRC}/rebar.lock
-	@cd ${WRKSRC} && ./bootstrap
+	@cd ${WRKSRC} && HOME=${WRKDIR} ./bootstrap
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/devel/rebar3/distinfo b/devel/rebar3/distinfo
index 261fd57f34b8..cb30b77b013b 100644
--- a/devel/rebar3/distinfo
+++ b/devel/rebar3/distinfo
@@ -1,4 +1,14 @@
-SHA256 (rebar-rebar3-20150601-e09be18_GH0.tar.gz) = d72b269142315c03a5f7bb5866226f3170253a7354fb02918bbe6d355081d838
-SIZE (rebar-rebar3-20150601-e09be18_GH0.tar.gz) = 146166
-SHA256 (rebar3-deps-2.tar.gz) = 5a305bcb195dac3853ede2d6ef129f3c7d582b2ab937c4df33c1498463f10dea
-SIZE (rebar3-deps-2.tar.gz) = 6620075
+SHA256 (rebar-rebar3-20150630-4f98106_GH0.tar.gz) = d97d923f4d6bbf3c0b6d3a6290b1adff8f02221e5f4d980eca6c28f3b79931c6
+SIZE (rebar-rebar3-20150630-4f98106_GH0.tar.gz) = 151656
+SHA256 (rebar3-packages-1.tar.gz) = 66b4b36f7ca0064d35336ea8bd89c7bdabd3f7eca98949418f89c144d05155a1
+SIZE (rebar3-packages-1.tar.gz) = 216988
+SHA256 (bbmustache-1.0.1.tar) = 274f8e35a4f11d3ba40b2ebdae5784ce7faf2cd2b6c6e247d8d5273a30d56cd4
+SIZE (bbmustache-1.0.1.tar) = 20480
+SHA256 (erlware_commons-0.12.0.tar) = ee9a20540e9a60fd8b455a1fc18d7d341a7a4e3a255b6b91c4f5ba967e3ac98c
+SIZE (erlware_commons-0.12.0.tar) = 61440
+SHA256 (getopt-0.8.2.tar) = 736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7
+SIZE (getopt-0.8.2.tar) = 20480
+SHA256 (providers-1.4.1.tar) = dfd88305670a3d942c08a2d852eeb4c20ec40ee2ba589339a48083ac74f14e36
+SIZE (providers-1.4.1.tar) = 20480
+SHA256 (relx-3.0.0.tar) = a04657b05ea127bc6ffdde61de1512e506199289d2ba5d2f5fb14605fb7471d4
+SIZE (relx-3.0.0.tar) = 71680
diff --git a/devel/rebar3/files/patch-bootstrap b/devel/rebar3/files/patch-bootstrap
new file mode 100644
index 000000000000..4b586d96c229
--- /dev/null
+++ b/devel/rebar3/files/patch-bootstrap
@@ -0,0 +1,18 @@
+--- bootstrap.orig	2015-06-29 12:47:25 UTC
++++ bootstrap
+@@ -30,7 +30,6 @@ main(_Args) ->
+ 
+     setup_env(),
+     os:putenv("REBAR_PROFILE", "bootstrap"),
+-    rebar3:run(["update"]),
+     {ok, State} = rebar3:run(["compile"]),
+     reset_env(),
+     os:putenv("REBAR_PROFILE", ""),
+@@ -60,7 +59,6 @@ main(_Args) ->
+ 
+ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+     {Name, _, Repo} = lists:keyfind(Name, 1, Deps),
+-    ok = fetch(Repo, Name),
+     compile(Name, ErlFirstFiles).
+ 
+ fetch({pkg, Name, Vsn}, App) ->