Ticket #30506: Portfile-cassandra.diff

File Portfile-cassandra.diff, 1.1 KB (added by jonathan+macports@…, 13 years ago)

A diff is probably better than the whole Portfile

  • Portfile

    old new  
    5353   
    5454    # fix cassandra include file
    5555    move ${worksrcpath}/bin/cassandra.in.sh ${cas_home}/
    56     reinplace "s|cassandra_home=.*|cassandra_home=${prefix}/share/java/${name}|" ${cas_home}/cassandra.in.sh
    57     reinplace "s|cassandra_bin=.*|cassandra_bin=\$cassandra_home/../cassandra.jar|" ${cas_home}/cassandra.in.sh
     56    reinplace "s|CASSANDRA_HOME=.*|CASSANDRA_HOME=${prefix}/share/java/${name}|" ${cas_home}/cassandra.in.sh
    5857   
    5958    # install bin scripts
    6059    eval delete [glob ${worksrcpath}/bin/*.bat]
    … …  
    6362
    6463    # install jars
    6564    xinstall -m 644 ${worksrcpath}/build/apache-${name}-${version}-SNAPSHOT.jar \
    66         ${destroot}${prefix}/share/java/${name}.jar
     65        ${cas_home}/lib/${name}.jar
     66    xinstall -m 644 ${worksrcpath}/build/apache-${name}-thrift-${version}-SNAPSHOT.jar \
     67        ${cas_home}/lib/${name}-thrift.jar
    6768    if {[variant_isset no_deps]} {
    6869        eval xinstall -m 644 [glob ${worksrcpath}/lib/*.jar] ${cas_home}/lib/
    6970    } else {