Unbreak after rebar3 upgrade (using local dependencies).

2 files changed, 30 insertions, 22 deletions

diff --git a/devel/relx/Makefile b/devel/relx/Makefile
index 453a24e65fe3..bb8a1ce479ff 100644
--- a/devel/relx/Makefile
+++ b/devel/relx/Makefile
@@ -4,10 +4,13 @@ PORTNAME=	relx
 PORTVERSION=	3.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-MASTER_SITES+=	http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
-		LOCAL/olgeni:deps
+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} \
-		relx-cache-7.tar.gz:deps
+		relx-cache-8.tar.gz:deps
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		relx-cache-8.tar.gz
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Sane, simple release creation for Erlang
@@ -15,14 +18,7 @@ COMMENT=	Sane, simple release creation for Erlang
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang \
-		rebar3>=0:${PORTSDIR}/devel/rebar3 \
-		erlang-bbmustache>=0:${PORTSDIR}/devel/erlang-bbmustache \
-		erlang-erlware_commons>=0:${PORTSDIR}/devel/erlang-erlware_commons \
-		erlang-getopt>=0:${PORTSDIR}/devel/erlang-getopt \
-		erlang-providers>=0:${PORTSDIR}/devel/erlang-providers \
-		erlang-jsx>=0:${PORTSDIR}/devel/erlang-jsx \
-		erlang-rebar3_hex>=0:${PORTSDIR}/devel/erlang-rebar3_hex \
-		erlang-ssl_verify_hostname>=0:${PORTSDIR}/devel/erlang-ssl_verify_hostname
+		rebar3>=0:${PORTSDIR}/devel/rebar3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
@@ -32,21 +28,25 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GITHUB=	yes
 GH_ACCOUNT=	erlware
 
+REBAR_DEPS=	bbmustache-1.0.3 \
+		erlware_commons-0.15.0 \
+		getopt-0.8.2 \
+		providers-1.4.1
+
+.for _dep in ${REBAR_DEPS}
+DISTFILES+=	${_dep}.tar:hex
+.endfor
+
 # rebar3 insists on downloading dependencies, and some kind of package
 # index into the user's HOME. We need to trick it into behaving by
 # providing both before building.
 
 post-extract:
 	@${LN} -s cache ${WRKDIR}/.cache
-
-pre-build:
-	@${MKDIR} ${WRKSRC}/_build/default/lib
-	@${MKDIR} ${WRKSRC}/_build/default/plugins
-.for lib in bbmustache erlware_commons getopt providers
-	@${LN} -s ${PREFIX}/lib/erlang/lib/${lib}-* ${WRKSRC}/_build/default/lib/${lib}
-.endfor
-.for plugin in jsx rebar3_hex ssl_verify_hostname
-	@${LN} -s ${PREFIX}/lib/erlang/lib/${plugin}-* ${WRKSRC}/_build/default/plugins/${plugin}
+.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:
diff --git a/devel/relx/distinfo b/devel/relx/distinfo
index cdff692f4a04..afa30923504d 100644
--- a/devel/relx/distinfo
+++ b/devel/relx/distinfo
@@ -1,4 +1,12 @@
 SHA256 (erlware-relx-v3.5.0_GH0.tar.gz) = 60d7252369325c4a1146bc443383df2692afa885ffe10c6def20e5aefcb142ff
 SIZE (erlware-relx-v3.5.0_GH0.tar.gz) = 600301
-SHA256 (relx-cache-7.tar.gz) = ec32c0bc47ec648e9a39c4175218af2019556abe0884d0fd0ce4fa00a7cf1155
-SIZE (relx-cache-7.tar.gz) = 284742
+SHA256 (relx-cache-8.tar.gz) = 17b3634e647b7c48eca09bc09b20b183fcab9ccc333579abb7bd1337b464880f
+SIZE (relx-cache-8.tar.gz) = 298974
+SHA256 (bbmustache-1.0.3.tar) = d79d9f3f90d14e20bda0c801063801ce9b72b71f5831d70b8d36065fb1a52208
+SIZE (bbmustache-1.0.3.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