One more distfile to fetch to avoid build-time fetching

[Filip Hajny <filip%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Thu Mar 31 16:28:34 2016 +0000
Changeset:	2931ea61ee57359fe7db8a6dfe692618360155d6

Modified Files:
	riak/Makefile
	riak/distinfo
Added Files:
	riak/patches/patch-deps_yokozuna_rebar.config

Log Message:
One more distfile to fetch to avoid build-time fetching

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2931ea61ee57359fe7db8a6dfe692618360155d6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 riak/Makefile                                 |  9 ++++++---
 riak/distinfo                                 |  5 +++++
 riak/patches/patch-deps_yokozuna_rebar.config | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs:
diff --git a/riak/Makefile b/riak/Makefile
index edb3172..3585706 100644
--- a/riak/Makefile
+++ b/riak/Makefile
@@ -2,15 +2,16 @@
 
 DISTNAME=		riak-2.1.3
 CATEGORIES=		databases
-MASTER_SITES=		http://s3.amazonaws.com/downloads.basho.com/riak/2.1/${PKGVERSION}/
-MASTER_SITES+=		http://s3.amazonaws.com/files.basho.com/yokozuna/
+MASTER_SITES=		http://s3.amazonaws.com/downloads.basho.com/riak/2.1/${PKGVERSION}/ \
+			http://s3.amazonaws.com/files.basho.com/solr/ \
+			http://s3.amazonaws.com/files.basho.com/yokozuna/
 
 MAINTAINER=		filip%joyent.com@localhost
 HOMEPAGE=		http://www.basho.com/products_riak_overview.php
 COMMENT=		Distributed, highly available data store
 LICENSE=		apache-2.0
 
-DISTFILES=		${DEFAULT_DISTFILES} yokozuna-3.jar yz_monitor-1.jar
+DISTFILES=		${DEFAULT_DISTFILES} solr-4.7.0-yz-1.tgz yokozuna-3.jar yz_monitor-1.jar
 EXTRACT_ONLY=		${DEFAULT_DISTFILES}
 DIST_SUBDIR=		basho
 
@@ -96,8 +97,10 @@ update-deps: build
 	 > ${.CURDIR}/../../wip/riak/Makefile.versions
 
 post-extract:
+	${MKDIR} ${WRKSRC}/deps/yokozuna/build
 	${MKDIR} ${WRKSRC}/deps/yokozuna/priv/java_lib
 	${MKDIR} ${WRKSRC}/deps/yokozuna/priv/solr/lib/ext
+	${CP} ${_DISTDIR}/solr-4.7.0-yz-1.tgz ${WRKSRC}/deps/yokozuna/build
 	${CP} ${_DISTDIR}/yokozuna-3.jar ${WRKSRC}/deps/yokozuna/priv/java_lib
 	${CP} ${_DISTDIR}/yz_monitor-1.jar ${WRKSRC}/deps/yokozuna/priv/solr/lib/ext
 	${INSTALL_DATA} ${FILESDIR}/nspr-src-configure2.patch \
diff --git a/riak/distinfo b/riak/distinfo
index e2198b7..af66bda 100644
--- a/riak/distinfo
+++ b/riak/distinfo
@@ -4,6 +4,10 @@ SHA1 (basho/riak-2.1.3.tar.gz) = 18743afc2463801acc5b8c4a1f41748e55d296db
 RMD160 (basho/riak-2.1.3.tar.gz) = 6163ce1f7efc80b725cdf7171aeb9619d868e9dd
 SHA512 (basho/riak-2.1.3.tar.gz) = d61c732d300dd28b05a5967c504f59fdc4536850acc6eb648ee8d5fc0712190d6294407a047361effebee57a6f38d85593585cd8de3d72d0f205d132df3fc873
 Size (basho/riak-2.1.3.tar.gz) = 18962967 bytes
+SHA1 (basho/solr-4.7.0-yz-1.tgz) = e21b7734bc112711cd6ec4ae7188726069ae16e3
+RMD160 (basho/solr-4.7.0-yz-1.tgz) = b06b0d4a11644da9d074e9d161c3bef5b35826cb
+SHA512 (basho/solr-4.7.0-yz-1.tgz) = 4d30a6f3048657e5f30fb0a7817e88a1279db75d9f9743028c0713bdbb86e40d2e47de0b6c86b9e2e279f9fc754ceac907835baec86b773eb861f1e5a62ffab9
+Size (basho/solr-4.7.0-yz-1.tgz) = 166999678 bytes
 SHA1 (basho/yokozuna-3.jar) = 8a1c98342258bdfa85cdeff5a13573f12e1590e4
 RMD160 (basho/yokozuna-3.jar) = edd77a888b1ef31a33745d87b23415c90e476b1b
 SHA512 (basho/yokozuna-3.jar) = d00720af7962e53ede000c2ea79b7342ace7cc233a11ac0c7ee1da8892db352d30aaf9ebf7f394f38a198140021880d67513ce836888a6a9fad751fbcb5acf2c
@@ -17,4 +21,5 @@ SHA1 (patch-deps_cuttlefish_rebar.config) = 23a0b960b88277a9370eefe5a284b7aa8bd7
 SHA1 (patch-deps_eleveldb_c__src_build__deps.sh) = 88348831637a6fcafea0099ae0bd35c36e197146
 SHA1 (patch-deps_eleveldb_c__src_eleveldb.cc) = 2e21a560c3f990ff9ac7dd604de00404644e7a5a
 SHA1 (patch-deps_node__package_priv_base_env.sh) = c7a32ac69b916c47706b914c71042ea6fd62a1e2
+SHA1 (patch-deps_yokozuna_rebar.config) = b2920445afb7058200126bad5479207d36814364
 SHA1 (patch-rel__vars.config) = 1cde95447a50300bd10994d6eb6628914a8ac97b
diff --git a/riak/patches/patch-deps_yokozuna_rebar.config b/riak/patches/patch-deps_yokozuna_rebar.config
new file mode 100644
index 0000000..0a25fc5
--- /dev/null
+++ b/riak/patches/patch-deps_yokozuna_rebar.config
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't download solr.
+
+--- deps/yokozuna/rebar.config.orig	2015-11-17 15:14:49.000000000 +0000
++++ deps/yokozuna/rebar.config
+@@ -18,8 +18,6 @@
+    {git, "git://github.com/cmullaparthi/ibrowse.git", {tag, "v4.0.2"}}}
+  ]}.
+ 
+-{pre_hooks, [{compile, "./tools/grab-solr.sh"}]}.
+-
+ {plugin_dir, ".rebar_plugins"}.
+ {plugins, [rebar_test_plugin]}.
+ {riak_test,