[100865] trunk/dports/java/apache-solr3

30 Dec 2012

Revision: 100865
          https://trac.macports.org/changeset/100865
Author:   hum@macports.org
Date:     2012-12-30 03:47:56 -0800 (Sun, 30 Dec 2012)
Log Message:
-----------
apache-solr3: link to the Google-hosted jquery instead of fetching one; see http://lists.macosforge.org/pipermail/macports-dev/2012-December/021340.html.

Modified Paths:
--------------
    trunk/dports/java/apache-solr3/Portfile
    trunk/dports/java/apache-solr3/files/patch-head.vm.diff

Modified: trunk/dports/java/apache-solr3/Portfile
===================================================================

--- trunk/dports/java/apache-solr3/Portfile	2012-12-30 10:54:33 UTC (rev 100864)
+++ trunk/dports/java/apache-solr3/Portfile	2012-12-30 11:47:56 UTC (rev 100865)
@@ -5,6 +5,7 @@
 
 name                apache-solr3
 version             3.6.2
+revision            1
 categories          java textproc
 maintainers         hum gmail.com:haya10.ito openmaintainer
 
@@ -22,22 +23,10 @@
 distname            apache-solr-${version}
 extract.suffix      .tgz
 
-# install jquery file.
-set jquery_file     jquery-1.8.3.min.js
+master_sites        apache:lucene/solr/${version}
+checksums           rmd160  2f6b734c88979c2079658a21cc9358e12f228254 \
+                    sha256  537426dcbdd0dc82dd5bf16b48b6bcaf87cb4049c1245eea8dcb79eeaf3e7ac6
 
-distfiles-append    ${jquery_file}:js
-
-master_sites        apache:lucene/solr/${version}/ \
-                    http://code.jquery.com/:js
-checksums           ${distname}${extract.suffix} \
-                    rmd160  2f6b734c88979c2079658a21cc9358e12f228254 \
-                    sha256  537426dcbdd0dc82dd5bf16b48b6bcaf87cb4049c1245eea8dcb79eeaf3e7ac6 \
-                    ${jquery_file} \
-                    rmd160  e86b3151afcf6fab4da367cbce4ecd3f4cd756d0 \
-                    sha256  ba6eda7945ab8d7e57b34cc5a3dd292fa2e4c60a5ced79236ecf1a9e0f0c2d32
-
-extract.only-delete ${jquery_file}
-
 # set the destination paths.
 set java_basepath   ${prefix}/share/java
 set solr_destpath   ${java_basepath}/${distname}
@@ -47,8 +36,6 @@
 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

Modified: trunk/dports/java/apache-solr3/files/patch-head.vm.diff
===================================================================
--- trunk/dports/java/apache-solr3/files/patch-head.vm.diff	2012-12-30 10:54:33 UTC (rev 100864)
+++ trunk/dports/java/apache-solr3/files/patch-head.vm.diff	2012-12-30 11:47:56 UTC (rev 100865)
@@ -5,7 +5,7 @@
      <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.8.3.min.js&contentType=text/javascript"></script>
++<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></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>

    

hum＠macports.org

tags

participants (1)