Ticket #38495: Portfile.patch

Portfile

@@ -4 +4 @@
 PortSystem              1.0
 
 name                    cassandra
-version                 1.2.2
+set upver               1.2.2
+set patchver            1
+version                 ${upver}_${patchver}
 categories              databases
 maintainers             nomaintainer
 homepage                http://cassandra.apache.org/
 platforms               darwin
 license                 Apache-2
 master_sites            apache
-master_sites.mirror_subdir  ${name}/${version}
-distname                apache-${name}-${version}-src
+master_sites.mirror_subdir  ${name}/${upver}
+distname                apache-${name}-${upver}-src
 
 description             A highly scalable, eventually consistent, \
                         distributed, structured key-value store.
@@ -42 +44 @@
                         port:google-guava
 
 set java_basepath       ${prefix}/share/java
-set cassandra_destpath  ${java_basepath}/${name}-${version}
+set cassandra_destpath  ${java_basepath}/${name}-${upver}
 
 set mp_libs {antlr junit jline slf4j-api slf4j-log4j12 commons-cli \
     commons-lang commons-codec jakarta-log4j \
@@ -65 +67 @@
 destroot {
     # create directories
     set cas_home ${destroot}${cassandra_destpath}
-    set doc_dir ${destroot}${prefix}/share/doc/${name}-${version}
+    set doc_dir ${destroot}${prefix}/share/doc/${name}-${upver}
     xinstall -m 755 -d ${cas_home}/lib ${doc_dir}
     
     # move in docs
@@ -81 +83 @@
     eval xinstall -m 755 [glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin
 
     # install jars
-    xinstall -m 644 ${worksrcpath}/build/apache-${name}-${version}-SNAPSHOT.jar \
+    xinstall -m 644 ${worksrcpath}/build/apache-${name}-${upver}-SNAPSHOT.jar \
         ${cas_home}/lib/${name}.jar
-    xinstall -m 644 ${worksrcpath}/build/apache-${name}-thrift-${version}-SNAPSHOT.jar \
+    xinstall -m 644 ${worksrcpath}/build/apache-${name}-thrift-${upver}-SNAPSHOT.jar \
         ${cas_home}/lib/${name}-thrift.jar
     eval xinstall -m 644 [glob ${worksrcpath}/lib/*.jar] ${cas_home}/lib/
     
@@ -106 +108 @@
 }
 
 startupitem.create      yes
-startupitem.executable  sudo -u ${cassandrauser} ${prefix}/bin/cassandra
+startupitem.executable  sudo -u ${cassandrauser} env PATH=${prefix}/bin:${prefix}/sbin:/usr/bin:/bin:/usr/sbin:/sbin \
+                                                     __CFPREFERENCES_AVOID_DAEMON=1 \
+                                                     ${prefix}/bin/cassandra -f
 
 livecheck.type          regex
 livecheck.url           ${homepage}download/