diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-07-06 17:44:59 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-07-06 17:44:59 +0000 |
| commit | ebb675949b46a1bff069bcd2cc58129d008a0a19 (patch) | |
| tree | 3b20ae4b88ff6f21016638bfe7f059438fc47a80 /net-im/wildfire | |
| parent | Stable on sparc wrt #139255 (diff) | |
| download | gentoo-2-ebb675949b46a1bff069bcd2cc58129d008a0a19.tar.gz gentoo-2-ebb675949b46a1bff069bcd2cc58129d008a0a19.tar.bz2 gentoo-2-ebb675949b46a1bff069bcd2cc58129d008a0a19.zip | |
Fixed for patch. Added ant-contrib dependency.
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'net-im/wildfire')
| -rw-r--r-- | net-im/wildfire/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/wildfire/files/wildfire-3.0.0-for.patch | 47 | ||||
| -rw-r--r-- | net-im/wildfire/wildfire-3.0.0.ebuild | 3 |
3 files changed, 34 insertions, 22 deletions
diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog index 5311bef93977..420571f4a193 100644 --- a/net-im/wildfire/ChangeLog +++ b/net-im/wildfire/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/wildfire # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.5 2006/07/04 16:20:55 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.6 2006/07/06 17:44:59 nichoj Exp $ + + 06 Jul 2006; Joshua Nichols <jnichols@gentoo.org> + files/wildfire-3.0.0-for.patch, wildfire-3.0.0.ebuild: + Fixed for patch. Added ant-contrib dependency. 04 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>; +files/wildfire-3.0.0-for.patch, wildfire-3.0.0.ebuild: diff --git a/net-im/wildfire/files/wildfire-3.0.0-for.patch b/net-im/wildfire/files/wildfire-3.0.0-for.patch index 0a01114824ff..a30bb61166e2 100644 --- a/net-im/wildfire/files/wildfire-3.0.0-for.patch +++ b/net-im/wildfire/files/wildfire-3.0.0-for.patch @@ -1,20 +1,27 @@ -Only in wildfire_src-patched/build: .build.xml.swp -diff -ru wildfire_src/build/build.xml wildfire_src-patched/build/build.xml ---- wildfire_src/build/build.xml 2006-06-29 20:19:49.000000000 -0500 -+++ wildfire_src-patched/build/build.xml 2006-07-04 09:42:58.000000000 -0500 -@@ -904,6 +904,7 @@ - <target name="-plugins-impl" if="dirlist"> - - <!-- For each plugin in the main src dir, call the 'buildplugin' macro --> -+ <taskdef classname="net.sf.antcontrib.logic.For" name="for"/> - <for list="${dirlist}" param="plugin" trim="true"> - <sequential> - <buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}"/> -@@ -922,6 +923,7 @@ - <target name="-plugin-impl-dev-build" if="dirlist2"> - - <!-- For each list of plugins in the dev dir call the 'buildplugin' macro --> -+ <taskdef classname="net.sf.antcontrib.logic.For" name="for"/> - <for list="${dirlist2}" param="plugin" trim="true"> - <sequential> - <buildplugin plugin="@{plugin}" pluginsrc="${plugin.dev.dir}"/> +diff -ru wildfire_src-orig/build/build.xml wildfire_src/build/build.xml +--- wildfire_src-orig/build/build.xml 2006-07-06 11:09:43.000000000 -0400 ++++ wildfire_src/build/build.xml 2006-07-06 11:10:49.000000000 -0400 +@@ -691,6 +691,7 @@ +
+ <!-- Pack200 processing on JAR files in lib dir -->
+
++ <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+ <for param="jar">
+ <path>
+ <fileset dir="${release.out.dir}/lib" includes="*.jar" excludes="startup.jar,jdic.jar,mail.jar,activation.jar,bouncycastle.jar" />
+@@ -904,6 +905,7 @@ + <target name="-plugins-impl" if="dirlist">
+
+ <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
++ <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+ <for list="${dirlist}" param="plugin" trim="true">
+ <sequential>
+ <buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}"/>
+@@ -922,6 +924,7 @@ + <target name="-plugin-impl-dev-build" if="dirlist2">
+
+ <!-- For each list of plugins in the dev dir call the 'buildplugin' macro -->
++ <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+ <for list="${dirlist2}" param="plugin" trim="true">
+ <sequential>
+ <buildplugin plugin="@{plugin}" pluginsrc="${plugin.dev.dir}"/>
diff --git a/net-im/wildfire/wildfire-3.0.0.ebuild b/net-im/wildfire/wildfire-3.0.0.ebuild index c720106503e0..881cf7b9eaf9 100644 --- a/net-im/wildfire/wildfire-3.0.0.ebuild +++ b/net-im/wildfire/wildfire-3.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.0.0.ebuild,v 1.2 2006/07/04 16:20:55 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.0.0.ebuild,v 1.3 2006/07/06 17:44:59 nichoj Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -23,6 +23,7 @@ RDEPEND=" >=virtual/jre-1.5 " DEPEND="net-im/jabber-base =virtual/jdk-1.5* dev-java/ant + dev-java/ant-contrib >=dev-java/commons-net-1.4" S=${WORKDIR}/${PN//-/_}_src |