[98747] trunk/dports/java
hum at macports.org
hum at macports.org
Sun Oct 14 06:17:42 PDT 2012
Revision: 98747
http://trac.macports.org//changeset/98747
Author: hum at macports.org
Date: 2012-10-14 06:17:42 -0700 (Sun, 14 Oct 2012)
Log Message:
-----------
apache-solr4: new version 4.0.0, derived from apache-solr (apache-solr3) port.
Modified Paths:
--------------
trunk/dports/java/apache-solr4/Portfile
trunk/dports/java/apache-solr4/files/patch-solr-ja.diff
Added Paths:
-----------
trunk/dports/java/apache-solr4/
Removed Paths:
-------------
trunk/dports/java/apache-solr4/files/patch-head.vm.diff
Modified: trunk/dports/java/apache-solr4/Portfile
===================================================================
--- trunk/dports/java/apache-solr/Portfile 2012-10-08 09:59:15 UTC (rev 98535)
+++ trunk/dports/java/apache-solr4/Portfile 2012-10-14 13:17:42 UTC (rev 98747)
@@ -3,12 +3,13 @@
PortSystem 1.0
-name apache-solr
-version 3.6.1
+name apache-solr4
+version 4.0.0
categories java textproc
-maintainers gmail.com:haya10.ito hum openmaintainer
+maintainers hum openmaintainer
description An open source enterprise search platform.
+
long_description Solr is the popular, blazing fast open source enterprise \
search platform from the Apache Lucene project.
@@ -17,6 +18,8 @@
supported_archs noarch
license Apache-2
+dist_subdir apache-solr
+distname apache-solr-${version}
extract.suffix .tgz
# install jquery file.
@@ -27,8 +30,8 @@
master_sites apache:lucene/solr/${version}/ \
http://code.jquery.com/:js
checksums ${distname}${extract.suffix} \
- rmd160 7e21a5e9bcfbd931457780ce64e681eec1c36e17 \
- sha256 1b4552ba95c8456d4fbd596e82028eaa0619b6942786e98e1c4c31258543c708 \
+ rmd160 a0cada9dd2c0930ec80bfda7970eff0d223b6b74 \
+ sha256 4b7ac4fdc1f1610f2d13e8dddf310e9d61620c00c463ba24e0f385a4c5c6f3ec \
${jquery_file} \
rmd160 225961b3a1283b366b41e1c20a00708c01cdc1b1 \
sha256 47b68dce8cb6805ad5b3ea4d27af92a241f4e29a5c12a274c852e4346a0500b4
@@ -41,14 +44,12 @@
set solr_path ${solr_destpath}/example
set solr_home ${solr_path}/solr
-patchfiles patch-head.vm.diff
-
post-patch {
# copy jquery file.
- copy ${distpath}/${jquery_file} ${worksrcpath}/example/solr/conf/velocity/
+ copy ${distpath}/${jquery_file} ${worksrcpath}/example/solr/collection1/conf/velocity/
# expand relative pathes into abusolute ones.
- reinplace "s|\"\\.\\./\\.\\./|\"${solr_destpath}/|g" \
- ${worksrcpath}/example/solr/conf/solrconfig.xml
+ reinplace "s|\"\\.\\./\\.\\./\\.\\./|\"${solr_destpath}/|g" \
+ ${worksrcpath}/example/solr/collection1/conf/solrconfig.xml
}
use_configure no
@@ -60,13 +61,13 @@
xinstall -d ${destroot}${java_basepath}
copy ${worksrcpath} ${destroot}${java_basepath}
# install the solr script.
- xinstall -m 755 ${filespath}/solr.in ${destroot}${prefix}/bin/solr
- reinplace "s|@solr_path@|${solr_path}|g" ${destroot}${prefix}/bin/solr
- reinplace "s|@solr_home@|${solr_home}|g" ${destroot}${prefix}/bin/solr
+ xinstall -m 755 ${filespath}/solr.in ${destroot}${prefix}/bin/solr4
+ reinplace "s|@solr_path@|${solr_path}|g" ${destroot}${prefix}/bin/solr4
+ reinplace "s|@solr_home@|${solr_home}|g" ${destroot}${prefix}/bin/solr4
}
notes "
-To try apache-solr, run 'sudo solr' and open http://localhost:8983/solr/browse.
+To try apache-solr4, run 'sudo solr4' and open http://localhost:8983/solr/collection1/browse.
To store sample documents, run 'cd ${solr_path}/exampledocs && ./post.sh *.xml'."
# solr home for Japanese configurations.
@@ -80,22 +81,22 @@
patchfiles-append patch-solr-ja.diff
post-patch {
# expand relative pathes into abusolute ones.
- reinplace "s|\"\\.\\./\\.\\./|\"${solr_destpath}/|g" \
- ${worksrcpath}/example/solr-ja/conf/solrconfig.xml
+ reinplace "s|\"\\.\\./\\.\\./\\.\\./|\"${solr_destpath}/|g" \
+ ${worksrcpath}/example/solr-ja/collection1/conf/solrconfig.xml
}
post-destroot {
# install a property file for UTF-8 encoding.
- copy ${filespath}/velocity.properties ${destroot}${solr_home_ja}/conf
+ copy ${filespath}/velocity.properties ${destroot}${solr_home_ja}/collection1/conf
# copy a sample Japanese doc for testing.
copy ${filespath}/solr-ja.xml ${destroot}${solr_path}/exampledocs
# install the solr-ja script.
- xinstall -m 755 ${filespath}/solr.in ${destroot}${prefix}/bin/solr-ja
- reinplace "s|@solr_path@|${solr_path}|g" ${destroot}${prefix}/bin/solr-ja
- reinplace "s|@solr_home@|${solr_home_ja}|g" ${destroot}${prefix}/bin/solr-ja
+ xinstall -m 755 ${filespath}/solr.in ${destroot}${prefix}/bin/solr4-ja
+ reinplace "s|@solr_path@|${solr_path}|g" ${destroot}${prefix}/bin/solr4-ja
+ reinplace "s|@solr_home@|${solr_home_ja}|g" ${destroot}${prefix}/bin/solr4-ja
}
notes-append "
-For Japanese texts, please run 'sudo solr-ja' instead of 'sudo solr'.
+For Japanese texts, please run 'sudo solr4-ja' instead of 'sudo solr4'.
See ${solr_home_ja}."
}
Deleted: trunk/dports/java/apache-solr4/files/patch-head.vm.diff
===================================================================
--- trunk/dports/java/apache-solr/files/patch-head.vm.diff 2012-10-08 09:59:15 UTC (rev 98535)
+++ trunk/dports/java/apache-solr4/files/patch-head.vm.diff 2012-10-14 13:17:42 UTC (rev 98747)
@@ -1,11 +0,0 @@
---- example/solr/conf/velocity/head.vm.orig 2012-07-17 18:39:39.000000000 +0900
-+++ example/solr/conf/velocity/head.vm 2012-08-02 13:50:10.000000000 +0900
-@@ -20,7 +20,7 @@
- <title>#param('title')</title>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-
--<script type="text/javascript" src="#{url_for_solr}/admin/jquery-1.4.3.min.js"></script>
-+<script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery-1.7.2.min.js&contentType=text/javascript"></script>
- <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
- <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
- <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
Modified: trunk/dports/java/apache-solr4/files/patch-solr-ja.diff
===================================================================
--- trunk/dports/java/apache-solr/files/patch-solr-ja.diff 2012-10-08 09:59:15 UTC (rev 98535)
+++ trunk/dports/java/apache-solr4/files/patch-solr-ja.diff 2012-10-14 13:17:42 UTC (rev 98747)
@@ -1,6 +1,6 @@
---- example/solr-ja/conf/schema.xml.orig 2012-03-31 01:07:12.000000000 +0900
-+++ example/solr-ja/conf/schema.xml 2012-04-13 00:51:09.000000000 +0900
-@@ -931,7 +931,7 @@
+--- example/solr-ja/collection1/conf/schema.xml.orig 2012-09-24 05:43:35.000000000 +0900
++++ example/solr-ja/collection1/conf/schema.xml 2012-10-14 22:06:02.000000000 +0900
+@@ -142,7 +142,7 @@
<!-- catchall field, containing all other searchable text fields (implemented
via copyField further on in this schema -->
@@ -9,19 +9,19 @@
<!-- catchall text field that indexes tokens both normally and in reverse for efficient
leading wildcard queries. -->
---- example/solr-ja/conf/solrconfig.xml.orig 2012-03-31 01:07:12.000000000 +0900
-+++ example/solr-ja/conf/solrconfig.xml 2012-04-13 00:51:09.000000000 +0900
-@@ -798,6 +798,7 @@
+--- example/solr-ja/collection1/conf/solrconfig.xml.orig 2012-09-22 21:36:48.000000000 +0900
++++ example/solr-ja/collection1/conf/solrconfig.xml 2012-10-14 22:06:02.000000000 +0900
+@@ -848,6 +848,7 @@
+ <!-- VelocityResponseWriter settings -->
<str name="wt">velocity</str>
-
<str name="v.template">browse</str>
+ <str name="v.properties">velocity.properties</str>
<str name="v.layout">layout</str>
<str name="title">Solritas</str>
---- example/solr-ja/conf/velocity/head.vm.orig 2011-09-03 23:57:07.000000000 +0900
-+++ example/solr-ja/conf/velocity/head.vm 2011-09-05 23:56:41.000000000 +0900
-@@ -32,7 +32,7 @@
+--- example/solr-ja/collection1/conf/velocity/head.vm.orig 2012-09-22 21:36:48.000000000 +0900
++++ example/solr-ja/collection1/conf/velocity/head.vm 2012-10-14 22:06:02.000000000 +0900
+@@ -15,7 +15,7 @@
extraParams:{
'terms.prefix': function() { return $("\#q").val();},
'terms.sort': 'count',
@@ -30,8 +30,8 @@
'wt': 'velocity',
'v.template': 'suggest'
}
---- example/solr-ja/conf/velocity/suggest.vm.orig 2011-09-03 23:57:07.000000000 +0900
-+++ example/solr-ja/conf/velocity/suggest.vm 2011-09-05 23:57:16.000000000 +0900
+--- example/solr-ja/collection1/conf/velocity/suggest.vm.orig 2011-09-03 23:57:07.000000000 +0900
++++ example/solr-ja/collection1/conf/velocity/suggest.vm 2011-09-05 23:57:16.000000000 +0900
@@ -1,3 +1,3 @@
-#foreach($t in $response.response.terms.name)
+#foreach($t in $response.response.terms.text)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121014/6bbe966f/attachment.html>
More information about the macports-changes
mailing list