From owner-svn-ports-head@freebsd.org Fri Sep 4 12:58:52 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A64D9CAABE; Fri, 4 Sep 2015 12:58:52 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AB7F8BF; Fri, 4 Sep 2015 12:58:52 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t84Cwqij049279; Fri, 4 Sep 2015 12:58:52 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t84Cwpq7049277; Fri, 4 Sep 2015 12:58:51 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201509041258.t84Cwpq7049277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Fri, 4 Sep 2015 12:58:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396085 - head/devel/relx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2015 12:58:52 -0000 Author: olgeni Date: Fri Sep 4 12:58:51 2015 New Revision: 396085 URL: https://svnweb.freebsd.org/changeset/ports/396085 Log: Unbreak after rebar3 upgrade (using local dependencies). Modified: head/devel/relx/Makefile head/devel/relx/distinfo Modified: head/devel/relx/Makefile ============================================================================== --- head/devel/relx/Makefile Fri Sep 4 12:21:46 2015 (r396084) +++ head/devel/relx/Makefile Fri Sep 4 12:58:51 2015 (r396085) @@ -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 f 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: Modified: head/devel/relx/distinfo ============================================================================== --- head/devel/relx/distinfo Fri Sep 4 12:21:46 2015 (r396084) +++ head/devel/relx/distinfo Fri Sep 4 12:58:51 2015 (r396085) @@ -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