[75225] trunk/dports/databases/cassandra/Portfile

singingwolfboy at macports.org singingwolfboy at macports.org
Tue Jan 18 06:52:38 PST 2011


Revision: 75225
          http://trac.macports.org/changeset/75225
Author:   singingwolfboy at macports.org
Date:     2011-01-18 06:52:26 -0800 (Tue, 18 Jan 2011)
Log Message:
-----------
cassandra: consolidated pre-build sections

Modified Paths:
--------------
    trunk/dports/databases/cassandra/Portfile

Modified: trunk/dports/databases/cassandra/Portfile
===================================================================
--- trunk/dports/databases/cassandra/Portfile	2011-01-18 14:03:23 UTC (rev 75224)
+++ trunk/dports/databases/cassandra/Portfile	2011-01-18 14:52:26 UTC (rev 75225)
@@ -40,11 +40,6 @@
 
 build.cmd               ${prefix}/bin/ant
 build.target            jar
-pre-build {
-    # help Ant find Ivy
-    xinstall -d ${worksrcpath}/build
-    ln -s ${prefix}/share/java/ivy.jar ${worksrcpath}/build/ivy-2.1.0.jar
-}
 
 destroot {
     # create directories
@@ -93,6 +88,11 @@
 
 
 pre-build {
+    # help Ant find Ivy
+    xinstall -d ${worksrcpath}/build
+    ln -s ${prefix}/share/java/ivy.jar ${worksrcpath}/build/ivy.jar
+    reinplace "s|ivy-\${ivy\.version}\.jar|ivy.jar|" ${worksrcpath}/build.xml
+    
     if {[variant_isset no_deps]} {} else {
         file delete ${worksrcpath}/lib/antlr-3.1.3.jar
         ln -s ${prefix}/share/java/antlr.jar ${worksrcpath}/lib/antlr.jar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110118/60bce425/attachment.html>


More information about the macports-changes mailing list