Re-use pkgsrc apache-ivy and cache dependency artefacts to avoid

build time on-demand fetching of resources. PKGREVISION++

4 files changed, 115 insertions, 3 deletions

diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index e8d3e2fe742..de3fe65eae8 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2015/10/09 13:59:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2015/10/13 15:03:37 fhajny Exp $
 #
 
 .include "Makefile.common"
 
+PKGREVISION=		1
 COMMENT=		Highly reliable distributed coordination server
 
+DISTFILES=			${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
+SITES.${DISTNAME}-deps.tar.gz=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
+
 BUILD_DEPENDS+=		apache-ant-[0-9]*:../../devel/apache-ant
+BUILD_DEPENDS+=		apache-ivy>=2.2.0:../../devel/apache-ivy
 
 USE_JAVA=		yes
 USE_JAVA2=		yes
@@ -57,8 +62,14 @@ CONF_FILES_PERMS+=	${EGDIR}/zookeeper-env.sh ${PKG_SYSCONFDIR}/zookeeper-env.sh
 
 FILES_SUBST+=		ZK_USER=${ZK_USER} ZK_GROUP=${ZK_GROUP}
 
+ANT_ARGS+=		-Duser.home=${FAKEHOMEDIR} -Divy.home=${WRKDIR}/ivy
+ANT_TARGET=		bin-package
+
+post-extract:
+	${LN} -s ${PREFIX}/lib/java/ant/ivy-*.jar ${WRKSRC}/src/java/lib/ivy-0.0.0.jar
+
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ant bin-package
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ant ${ANT_ARGS} ${ANT_TARGET}
 
 do-install:
 	${INSTALL_SCRIPT} ${BUILDDIR}/bin/zkCli.sh ${DESTDIR}${PREFIX}/bin
diff --git a/devel/zookeeper/distinfo b/devel/zookeeper/distinfo
index 48c4c6476ee..80d570620f7 100644
--- a/devel/zookeeper/distinfo
+++ b/devel/zookeeper/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.1 2015/10/09 13:59:56 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2015/10/13 15:03:37 fhajny Exp $
 
+SHA1 (zookeeper-3.4.6-deps.tar.gz) = ca9693b0b07750930762f086643a47d74e654e29
+RMD160 (zookeeper-3.4.6-deps.tar.gz) = 1ffbc12628a6956a289c77f9e2edf101d60dfe99
+Size (zookeeper-3.4.6-deps.tar.gz) = 10560464 bytes
 SHA1 (zookeeper-3.4.6.tar.gz) = 2a9e53f5990dfe0965834a525fbcad226bf93474
 RMD160 (zookeeper-3.4.6.tar.gz) = d9fadf07a40a85b8fd5a7e04e7200c74fd7393ce
 Size (zookeeper-3.4.6.tar.gz) = 17699306 bytes
 SHA1 (patch-bin_zkEnv.sh) = 210b94572a221cc46898750da0a822c90708ef9f
 SHA1 (patch-bin_zkServer.sh) = 5f024b604ecd27c16d6ce5be92b87f5523494ada
+SHA1 (patch-build.xml) = 4a41413251c850973119b4d97b01dedc95b60727
 SHA1 (patch-conf_zoo__sample.cfg) = 74885bea53e5b9b723fb1564db362a08d7b47705
 SHA1 (patch-include_recordio.h) = ab07325a556eee1f6b595de241e9f7c7084c8065
 SHA1 (patch-src_c_src_zookeeper.c) = 0cc9710914d2a329eb8f7d18683778f460180b72
+SHA1 (patch-src_contrib_build-contrib.xml) = f9d66493d537fa0ffa383928ce715ccb99ef2f58
 SHA1 (patch-src_packages_templates_conf_zookeeper-env.sh) = 5abb72f885a5ac884dfcfa480438ce82d544d489
 SHA1 (patch-src_recordio.c) = 6c3082fba3d48d891276636aea400ad631fc5997
 SHA1 (patch-src_zk__log.c) = 9dc6e801f53a96bf8b3ec1bac429f83a0ff2cae4
diff --git a/devel/zookeeper/patches/patch-build.xml b/devel/zookeeper/patches/patch-build.xml
new file mode 100644
index 00000000000..1cb36314803
--- /dev/null
+++ b/devel/zookeeper/patches/patch-build.xml
@@ -0,0 +1,62 @@
+$NetBSD: patch-build.xml,v 1.1 2015/10/13 15:03:37 fhajny Exp $
+
+Don't look for a specific Ivy version.
+Add Ivy resolver tasks to let us forbid fetch on demand.
+
+--- build.xml.orig	2014-02-20 10:14:08.000000000 +0000
++++ build.xml
+@@ -105,7 +105,7 @@ xmlns:maven="antlib:org.apache.maven.art
+     <property name="contrib.dir" value="${src.dir}/contrib"/>
+     <property name="recipes.dir" value="${src.dir}/recipes"/>
+ 
+-    <property name="ivy.version" value="2.2.0"/>
++    <property name="ivy.version" value="0.0.0"/>
+     <property name="ivy.url"
+               value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
+     <property name="ivy.home" value="${user.home}/.ant" />
+@@ -360,33 +360,45 @@ xmlns:maven="antlib:org.apache.maven.art
+     </target>
+ 
+     <target name="ivy-retrieve" depends="init,ivy-init">
++      <ivy:resolve settingsRef="${ant.project.name}" conf="default"
++                    useCacheOnly="true"/>
+       <ivy:retrieve settingsRef="${ant.project.name}" conf="default"
+                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+     </target>
+ 
+     <target name="ivy-retrieve-test" depends="init,ivy-init">
++      <ivy:resolve settingsRef="${ant.project.name}" conf="test"
++                    useCacheOnly="true"/>
+       <ivy:retrieve settingsRef="${ant.project.name}" conf="test"
+                     pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
+     </target>
+ 
+     <target name="ivy-retrieve-package" depends="init,ivy-init">
++      <ivy:resolve settingsRef="${ant.project.name}" conf="package"
++                    useCacheOnly="true"/>
+       <ivy:retrieve settingsRef="${ant.project.name}" conf="package"
+                     pattern="${ivy.package.lib}/[artifact]-[revision].[ext]"/>
+     </target>
+ 
+     <target name="ivy-retrieve-jdiff" depends="init,ivy-init">
+       <mkdir dir="${ivy.jdiff.lib}"/>
++      <ivy:resolve settingsRef="${ant.project.name}" conf="jdiff"
++                    useCacheOnly="true"/>
+       <ivy:retrieve settingsRef="${ant.project.name}" conf="jdiff"
+                     pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/>
+     </target>
+ 
+     <target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
++      <ivy:resolve settingsRef="${ant.project.name}" conf="releaseaudit"
++                    useCacheOnly="true"/>
+       <ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
+                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+       <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
+     </target>
+ 
+     <target name="ivy-retrieve-mvn-ant-task" depends="init,ivy-init">
++      <ivy:resolve settingsRef="${ant.project.name}" conf="mvn-ant-task"
++                    useCacheOnly="true"/>
+       <ivy:retrieve settingsRef="${ant.project.name}" conf="mvn-ant-task"
+                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+       <ivy:cachepath pathid="mvn-ant-task-classpath" conf="mvn-ant-task"/>
diff --git a/devel/zookeeper/patches/patch-src_contrib_build-contrib.xml b/devel/zookeeper/patches/patch-src_contrib_build-contrib.xml
new file mode 100644
index 00000000000..7d9f3139c61
--- /dev/null
+++ b/devel/zookeeper/patches/patch-src_contrib_build-contrib.xml
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_contrib_build-contrib.xml,v 1.1 2015/10/13 15:03:37 fhajny Exp $
+
+Don't look for a specific Ivy version.
+Add Ivy resolver tasks to let us forbid fetch on demand.
+
+--- src/contrib/build-contrib.xml.orig	2014-02-20 10:14:09.000000000 +0000
++++ src/contrib/build-contrib.xml
+@@ -41,7 +41,7 @@
+ 
+   <property name="build.encoding" value="ISO-8859-1"/>
+ 
+-  <property name="ivy.version" value="2.2.0"/>
++  <property name="ivy.version" value="0.0.0"/>
+   <property name="ivy.url"
+             value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
+   <property name="ivy.home" value="${user.home}/.ant" />
+@@ -233,6 +233,8 @@
+   </target>
+ 
+   <target name="ivy-retrieve" depends="init,ivy-init">
++    <ivy:resolve settingsRef="${ant.project.name}" conf="default"
++                 useCacheOnly="true"/>
+     <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default"
+                   pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+     <ivy:retrieve settingsRef="${ant.project.name}" type="bundle" conf="default"
+@@ -240,6 +242,8 @@
+   </target>
+ 
+   <target name="ivy-retrieve-test" depends="init,ivy-init">
++    <ivy:resolve settingsRef="${ant.project.name}" conf="test"
++                 useCacheOnly="true"/>
+     <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test"
+                   pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
+   </target>