3 files changed, 27 insertions, 37 deletions

diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile
index 4609dae91153..ddf904973e98 100644
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	rebar3
-PORTVERSION=	20150630
-PORTREVISION=	1
+PORTVERSION=	20150830
 CATEGORIES=	devel
-MASTER_SITES+=	LOCAL/olgeni:pkg \
-		http://olgeni.olgeni.com/~olgeni/distfiles/:pkg \
+MASTER_SITES+=	LOCAL/olgeni:deps \
+		http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
 		https://s3.amazonaws.com/s3.hex.pm/tarballs/:hex
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		rebar3-packages-1${EXTRACT_SUFX}:pkg
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+		rebar3-cache-1${EXTRACT_SUFX}:deps
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		rebar3-cache-1${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Build tool for Erlang
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	BASH ZSH
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rebar
-GH_TAGNAME=	4f98106
+GH_TAGNAME=	bfd40d5
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTEXAMPLES=	rebar.config.sample
@@ -32,14 +32,13 @@ PORTEXAMPLES=	rebar.config.sample
 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 \
+REBAR_DEPS=	bbmustache-1.0.4 \
+		erlware_commons-0.15.0 \
 		getopt-0.8.2 \
 		providers-1.4.1 \
-		relx-3.0.0
+		relx-3.5.0 \
+		ssl_verify_hostname-1.0.5
 
 .for _dep in ${REBAR_DEPS}
 DISTFILES+=	${_dep}.tar:hex
@@ -48,11 +47,7 @@ DISTFILES+=	${_dep}.tar:hex
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${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
+	@${LN} -s cache ${WRKDIR}/.cache
 .for _dep in ${REBAR_DEPS}
 	@${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
 	@${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
@@ -60,6 +55,7 @@ post-extract:
 .endfor
 
 do-build:
+	@${RM} ${WRKSRC}/rebar.lock
 	@cd ${WRKSRC} && HOME=${WRKDIR} ./bootstrap
 
 do-install:
diff --git a/devel/rebar3/distinfo b/devel/rebar3/distinfo
index cb30b77b013b..dcff74d5dda3 100644
--- a/devel/rebar3/distinfo
+++ b/devel/rebar3/distinfo
@@ -1,14 +1,16 @@
-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 (rebar-rebar3-20150830-bfd40d5_GH0.tar.gz) = 1f4d165d39b0b56bb5689e0bc07ec933a147e5569c03a89850aee1d35af2c4fa
+SIZE (rebar-rebar3-20150830-bfd40d5_GH0.tar.gz) = 310031
+SHA256 (rebar3-cache-1.tar.gz) = 3590ef8087f1b4427000d51e4830dcf78f2111852b50f4c7a8075fb8d1ac87ad
+SIZE (rebar3-cache-1.tar.gz) = 293129
+SHA256 (bbmustache-1.0.4.tar) = 03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12
+SIZE (bbmustache-1.0.4.tar) = 20480
+SHA256 (erlware_commons-0.15.0.tar) = 5f38cb1df90148a7b21d48b221f399244ce86256584e6ea7986f2de732dee3c6
+SIZE (erlware_commons-0.15.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
+SHA256 (relx-3.5.0.tar) = a8cbf529702024f56d03d43349a5aafac55a6aa1b2ecf7bd3e8cc61e72a858a1
+SIZE (relx-3.5.0.tar) = 71680
+SHA256 (ssl_verify_hostname-1.0.5.tar) = f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf
+SIZE (ssl_verify_hostname-1.0.5.tar) = 10240
diff --git a/devel/rebar3/files/patch-bootstrap b/devel/rebar3/files/patch-bootstrap
index 4b586d96c229..cb958d04e7b7 100644
--- a/devel/rebar3/files/patch-bootstrap
+++ b/devel/rebar3/files/patch-bootstrap
@@ -1,6 +1,6 @@
---- bootstrap.orig	2015-06-29 12:47:25 UTC
+--- bootstrap.orig	2015-08-30 15:32:00 UTC
 +++ bootstrap
-@@ -30,7 +30,6 @@ main(_Args) ->
+@@ -32,7 +32,6 @@ main(_Args) ->
  
      setup_env(),
      os:putenv("REBAR_PROFILE", "bootstrap"),
@@ -8,11 +8,3 @@
      {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) ->