[84041] trunk/dports/java/apache-solr

[hum at macports.org]

Revision: 84041
          http://trac.macports.org/changeset/84041
Author:   hum at macports.org
Date:     2011-09-15 10:01:42 -0700 (Thu, 15 Sep 2011)
Log Message:
-----------
apache-solr: update to 3.4.0; add data_dir option (-d) to the command scripts; see #31274.

Modified Paths:
--------------
    trunk/dports/java/apache-solr/Portfile
    trunk/dports/java/apache-solr/files/patch-solr-ja.diff
    trunk/dports/java/apache-solr/files/solr.in

Modified: trunk/dports/java/apache-solr/Portfile
===================================================================
--- trunk/dports/java/apache-solr/Portfile	2011-09-15 16:32:03 UTC (rev 84040)
+++ trunk/dports/java/apache-solr/Portfile	2011-09-15 17:01:42 UTC (rev 84041)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                apache-solr
-version             3.3.0
-revision            1
+version             3.4.0
 categories          java textproc
 platforms           darwin
 maintainers         gmail.com:haya10.ito hum openmaintainer
@@ -18,8 +17,8 @@
 
 master_sites        apache:lucene/solr/${version}/
 extract.suffix      .tgz
-checksums           sha1    e6017419051e5eda9cb222e3b17006eeed682db9 \
-                    rmd160  ef2c2e58d44a9d8786c2fc5b2f19f59bf9e1f70c
+checksums           sha1    4dc9bdbf3c49c4907c91d1bd75c40fccb4b430ba \
+                    rmd160  5b4058f78b60fb270da6114b6648253fa3b06dbc
 
 # set the destination paths.
 set java_basepath   ${prefix}/share/java

Modified: trunk/dports/java/apache-solr/files/patch-solr-ja.diff
===================================================================
--- trunk/dports/java/apache-solr/files/patch-solr-ja.diff	2011-09-15 16:32:03 UTC (rev 84040)
+++ trunk/dports/java/apache-solr/files/patch-solr-ja.diff	2011-09-15 17:01:42 UTC (rev 84041)
@@ -112,7 +112,7 @@
    <lib dir="/total/crap/dir/ignored" /> 
    <!-- an exact path can be used to specify a specific file.  This
         will cause a serious error to be logged if it can't be loaded.
-@@ -780,6 +781,7 @@
+@@ -785,6 +786,7 @@
         <str name="wt">velocity</str>
  
         <str name="v.template">browse</str>

Modified: trunk/dports/java/apache-solr/files/solr.in
===================================================================
--- trunk/dports/java/apache-solr/files/solr.in	2011-09-15 16:32:03 UTC (rev 84040)
+++ trunk/dports/java/apache-solr/files/solr.in	2011-09-15 17:01:42 UTC (rev 84041)
@@ -3,21 +3,26 @@
 CMDNAME=`basename "$0"`
 
 usage() {
-    echo "Usage: ${CMDNAME} [-h|--help] [solr_home]" 1>&2
+    echo "Usage: ${CMDNAME} [-h|--help] [-d data_dir] [solr_home]" 1>&2
     exit 1
 }
 
 SOLR_PATH=@solr_path@
 SOLR_HOME=@solr_home@
+SOLR_DATA=${SOLR_HOME}/data
 
 while test -n "$1"; do
     case "$1" in
         -h|--help) usage ;;
-        *)         SOLR_HOME="$1";    shift ;;
+        -d|--datadir) shift 
+                   SOLR_DATA=$1;;
+        *)         SOLR_HOME="$1";;
     esac
+    shift
 done
 
 java -Dsolr.clustering.enabled=true \
      -Dsolr.solr.home="${SOLR_HOME}" \
+     -Dsolr.data.dir="${SOLR_DATA}" \
      -Djetty.home="${SOLR_PATH}" \
      -jar ${SOLR_PATH}/start.jar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110915/ce75dea7/attachment.html>