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

[jmr at macports.org]

Revision: 92798
          https://trac.macports.org/changeset/92798
Author:   jmr at macports.org
Date:     2012-05-06 22:26:54 -0700 (Sun, 06 May 2012)
Log Message:
-----------
cassandra: fix cassandra.in.sh variables, install thrift jar (#30506), use preferred license formatting

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

Modified: trunk/dports/databases/cassandra/Portfile
===================================================================
--- trunk/dports/databases/cassandra/Portfile	2012-05-07 05:10:24 UTC (rev 92797)
+++ trunk/dports/databases/cassandra/Portfile	2012-05-07 05:26:54 UTC (rev 92798)
@@ -9,7 +9,7 @@
 maintainers             singingwolfboy openmaintainer
 homepage                http://cassandra.apache.org/
 platforms               darwin
-license                 Apache-2.0
+license                 Apache-2
 master_sites            apache
 master_sites.mirror_subdir  ${name}/${version}
 distname                apache-${name}-${version}-src
@@ -53,8 +53,7 @@
     
     # fix cassandra include file
     move ${worksrcpath}/bin/cassandra.in.sh ${cas_home}/
-    reinplace "s|cassandra_home=.*|cassandra_home=${prefix}/share/java/${name}|" ${cas_home}/cassandra.in.sh
-    reinplace "s|cassandra_bin=.*|cassandra_bin=\$cassandra_home/../cassandra.jar|" ${cas_home}/cassandra.in.sh
+    reinplace "s|CASSANDRA_HOME=.*|CASSANDRA_HOME=${prefix}/share/java/${name}|" ${cas_home}/cassandra.in.sh
     
     # install bin scripts
     eval delete [glob ${worksrcpath}/bin/*.bat]
@@ -63,7 +62,9 @@
 
     # install jars
     xinstall -m 644 ${worksrcpath}/build/apache-${name}-${version}-SNAPSHOT.jar \
-        ${destroot}${prefix}/share/java/${name}.jar
+        ${cas_home}/lib/${name}.jar
+    xinstall -m 644 ${worksrcpath}/build/apache-${name}-thrift-${version}-SNAPSHOT.jar \
+        ${cas_home}/lib/${name}-thrift.jar
     if {[variant_isset no_deps]} {
         eval xinstall -m 644 [glob ${worksrcpath}/lib/*.jar] ${cas_home}/lib/
     } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120506/f0ae894f/attachment.html>