Fix yokozuna solr distfile handling for good.

[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 18:24:53 2016 +0000
Changeset:	bdfa794910939b662ce7f87eb553f2374ab7d7fb

Modified Files:
	riak/Makefile
	riak/distinfo
Added Files:
	riak/patches/patch-deps_yokozuna_tools_grab-solr.sh
Removed Files:
	riak/patches/patch-deps_yokozuna_rebar.config

Log Message:
Fix yokozuna solr distfile handling for good.

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

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

diffstat:
 riak/Makefile                                      | 17 +++++++++------
 riak/distinfo                                      |  2 +-
 riak/patches/patch-deps_yokozuna_rebar.config      | 15 -------------
 .../patches/patch-deps_yokozuna_tools_grab-solr.sh | 25 ++++++++++++++++++++++
 4 files changed, 36 insertions(+), 23 deletions(-)

diffs:
diff --git a/riak/Makefile b/riak/Makefile
index 3585706..ad98779 100644
--- a/riak/Makefile
+++ b/riak/Makefile
@@ -11,9 +11,14 @@ HOMEPAGE=		http://www.basho.com/products_riak_overview.php
 COMMENT=		Distributed, highly available data store
 LICENSE=		apache-2.0
 
-DISTFILES=		${DEFAULT_DISTFILES} solr-4.7.0-yz-1.tgz yokozuna-3.jar yz_monitor-1.jar
-EXTRACT_ONLY=		${DEFAULT_DISTFILES}
+SOLR=			solr-4.7.0-yz-1.tgz
+YOKOZUNA=		yokozuna-3.jar
+YOKOMONIT=		yz_monitor-1.jar
+
 DIST_SUBDIR=		basho
+DISTFILES=		${DEFAULT_DISTFILES} ${SOLR} ${YOKOZUNA} ${YOKOMONIT}
+EXTRACT_ONLY=		${DEFAULT_DISTFILES} ${SOLR}
+EXTRACT_DIR.${SOLR}=	${WRKSRC}/deps/yokozuna/build
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -87,7 +92,7 @@ FILES_SUBST+=		RIAK_DATA=${RIAK_DATA}
 
 # Helper target to regenerate Makefile.versions
 update-deps: build
-	(${ECHO} '# $$NetBSD: Makefile,v 1.27 2015/07/14 19:44:09 fhajny Exp $$'; \
+	(${ECHO} '# $$NetBSD$$'; \
 	 ${ECHO} '# This file is generated by "${MAKE} update-deps", post-build'; \
 	 ${ECHO}; \
 	 cd ${WRKSRC}/deps && \
@@ -97,12 +102,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
+	${CP} ${_DISTDIR}/${YOKOZUNA} ${WRKSRC}/deps/yokozuna/priv/java_lib
+	${CP} ${_DISTDIR}/${YOKOMONIT} ${WRKSRC}/deps/yokozuna/priv/solr/lib/ext
 	${INSTALL_DATA} ${FILESDIR}/nspr-src-configure2.patch \
 	  ${WRKSRC}/deps/erlang_js/c_src/patches
 	${CHMOD} -R u=rwX,g=rX,o=rX ${WRKSRC}
diff --git a/riak/distinfo b/riak/distinfo
index af66bda..ad17294 100644
--- a/riak/distinfo
+++ b/riak/distinfo
@@ -21,5 +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-deps_yokozuna_tools_grab-solr.sh) = d90115d3522238cd6a6774ff221fad009d17ebbb
 SHA1 (patch-rel__vars.config) = 1cde95447a50300bd10994d6eb6628914a8ac97b
diff --git a/riak/patches/patch-deps_yokozuna_rebar.config b/riak/patches/patch-deps_yokozuna_rebar.config
deleted file mode 100644
index 0a25fc5..0000000
--- a/riak/patches/patch-deps_yokozuna_rebar.config
+++ /dev/null
@@ -1,15 +0,0 @@
-$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,
diff --git a/riak/patches/patch-deps_yokozuna_tools_grab-solr.sh b/riak/patches/patch-deps_yokozuna_tools_grab-solr.sh
new file mode 100644
index 0000000..7014329
--- /dev/null
+++ b/riak/patches/patch-deps_yokozuna_tools_grab-solr.sh
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Don't download, distfile already there.
+
+--- deps/yokozuna/tools/grab-solr.sh.orig	2015-11-17 15:14:49.000000000 +0000
++++ deps/yokozuna/tools/grab-solr.sh
+@@ -72,18 +72,6 @@ get_solr()
+ if ! check_for_solr
+ then
+ 
+-    echo "Create dir $BUILD_DIR"
+-    if [ ! -e $BUILD_DIR ]; then
+-        mkdir $BUILD_DIR
+-    fi
+-
+-    cd $BUILD_DIR
+-
+-    if [ ! -e $SRC_DIR ]
+-    then
+-        get_solr
+-    fi
+-
+     echo "Creating Solr dir $SOLR_DIR"
+ 
+     # Explicitly copy files needed rather than copying everything and