[98746] trunk/dports/java

hum at macports.org hum at macports.org
Sun Oct 14 06:03:57 PDT 2012


Revision: 98746
          http://trac.macports.org//changeset/98746
Author:   hum at macports.org
Date:     2012-10-14 06:03:57 -0700 (Sun, 14 Oct 2012)
Log Message:
-----------
apache-solr, apache-solr3: apache-solr is replaced by apache-solr3.

Modified Paths:
--------------
    trunk/dports/java/apache-solr/Portfile
    trunk/dports/java/apache-solr3/Portfile

Added Paths:
-----------
    trunk/dports/java/apache-solr3/

Removed Paths:
-------------
    trunk/dports/java/apache-solr/files/

Modified: trunk/dports/java/apache-solr/Portfile
===================================================================
--- trunk/dports/java/apache-solr/Portfile	2012-10-14 13:01:34 UTC (rev 98745)
+++ trunk/dports/java/apache-solr/Portfile	2012-10-14 13:03:57 UTC (rev 98746)
@@ -3,102 +3,10 @@
 
 PortSystem          1.0
 
+replaced_by         apache-solr3
+PortGroup           obsolete 1.0
+
 name                apache-solr
 version             3.6.1
+revision            1
 categories          java textproc
-maintainers         gmail.com:haya10.ito 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.
-
-homepage            http://lucene.apache.org/solr/
-platforms           darwin
-supported_archs     noarch
-license             Apache-2
-
-extract.suffix      .tgz
-
-# install jquery file.
-set jquery_file     jquery-1.7.2.min.js
-
-distfiles-append    ${jquery_file}:js
-
-master_sites        apache:lucene/solr/${version}/ \
-                    http://code.jquery.com/:js
-checksums           ${distname}${extract.suffix} \
-                    rmd160  7e21a5e9bcfbd931457780ce64e681eec1c36e17 \
-                    sha256  1b4552ba95c8456d4fbd596e82028eaa0619b6942786e98e1c4c31258543c708 \
-                    ${jquery_file} \
-                    rmd160  225961b3a1283b366b41e1c20a00708c01cdc1b1 \
-                    sha256  47b68dce8cb6805ad5b3ea4d27af92a241f4e29a5c12a274c852e4346a0500b4
-
-extract.only-delete ${jquery_file}
-
-# set the destination paths.
-set java_basepath   ${prefix}/share/java
-set solr_destpath   ${java_basepath}/${distname}
-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/
-    # expand relative pathes into abusolute ones.
-    reinplace "s|\"\\.\\./\\.\\./|\"${solr_destpath}/|g" \
-        ${worksrcpath}/example/solr/conf/solrconfig.xml
-}
-
-use_configure       no
-
-build {}
-
-destroot {
-    # copy the distribution.
-    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
-}
-
-notes "
-To try apache-solr, run 'sudo solr' and open http://localhost:8983/solr/browse.
-To store sample documents, run 'cd ${solr_path}/exampledocs && ./post.sh *.xml'."
-
-# solr home for Japanese configurations.
-set solr_home_ja    ${solr_home}-ja
-
-variant ja description {Add Japanese settings} {
-    # create Japanese solr home 'solr-ja'.
-    post-extract {
-        copy ${worksrcpath}/example/solr ${worksrcpath}/example/solr-ja
-    }
-    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
-    }
-    post-destroot {
-        # install a property file for UTF-8 encoding.
-        copy ${filespath}/velocity.properties ${destroot}${solr_home_ja}/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
-    }
-    notes-append "
-
-For Japanese texts, please run 'sudo solr-ja' instead of 'sudo solr'.
-See ${solr_home_ja}."
-}
-
-livecheck.type      regex
-livecheck.url       http://www.apache.org/dist/lucene/solr/
-livecheck.regex     (\[0-9.\]+)\/

Modified: trunk/dports/java/apache-solr3/Portfile
===================================================================
--- trunk/dports/java/apache-solr/Portfile	2012-10-08 09:59:15 UTC (rev 98535)
+++ trunk/dports/java/apache-solr3/Portfile	2012-10-14 13:03:57 UTC (rev 98746)
@@ -3,12 +3,13 @@
 
 PortSystem          1.0
 
-name                apache-solr
+name                apache-solr3
 version             3.6.1
 categories          java textproc
-maintainers         gmail.com:haya10.ito hum openmaintainer
+maintainers         hum gmail.com:haya10.ito 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.
@@ -60,13 +63,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/solr3
+    reinplace "s|@solr_path@|${solr_path}|g" ${destroot}${prefix}/bin/solr3
+    reinplace "s|@solr_home@|${solr_home}|g" ${destroot}${prefix}/bin/solr3
 }
 
 notes "
-To try apache-solr, run 'sudo solr' and open http://localhost:8983/solr/browse.
+To try apache-solr3, run 'sudo solr3' and open http://localhost:8983/solr/browse.
 To store sample documents, run 'cd ${solr_path}/exampledocs && ./post.sh *.xml'."
 
 # solr home for Japanese configurations.
@@ -89,16 +92,16 @@
         # 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/solr3-ja
+        reinplace "s|@solr_path@|${solr_path}|g"    ${destroot}${prefix}/bin/solr3-ja
+        reinplace "s|@solr_home@|${solr_home_ja}|g" ${destroot}${prefix}/bin/solr3-ja
     }
     notes-append "
 
-For Japanese texts, please run 'sudo solr-ja' instead of 'sudo solr'.
+For Japanese texts, please run 'sudo solr3-ja' instead of 'sudo solr3'.
 See ${solr_home_ja}."
 }
 
 livecheck.type      regex
 livecheck.url       http://www.apache.org/dist/lucene/solr/
-livecheck.regex     (\[0-9.\]+)\/
+livecheck.regex     (3.\[0-9.\]+)\/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121014/8fcafc17/attachment-0001.html>


More information about the macports-changes mailing list