Attachment 116024 Details for Bug 157926 – apache-solr-3.2.0.patch

[patch] apache-solr-3.2.0.patch

apache-solr-3.2.0.patch (text/plain), 8.62 KB, created by gslin on 2011-06-16 17:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gslin

Created: 2011-06-16 17:20:11 UTC

Size: 8.62 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/textproc/apache-solr/Makefile /home/staff/gslin/work/ports/apache-solr/Makefile
>--- /usr/ports/textproc/apache-solr/Makefile	2010-07-04 14:49:28.000000000 +0800
>+++ /home/staff/gslin/work/ports/apache-solr/Makefile	2011-06-16 21:05:20.000000000 +0800
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	apache-solr
>-PORTVERSION=	1.4.1
>+PORTVERSION=	3.2.0
> CATEGORIES=	textproc java
> MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/solr/${PORTVERSION},}
> EXTRACT_SUFX=	.tgz
>diff -ruN --exclude=CVS /usr/ports/textproc/apache-solr/distinfo /home/staff/gslin/work/ports/apache-solr/distinfo
>--- /usr/ports/textproc/apache-solr/distinfo	2010-07-04 14:49:28.000000000 +0800
>+++ /home/staff/gslin/work/ports/apache-solr/distinfo	2011-06-16 21:09:54.000000000 +0800
>@@ -1,3 +1,2 @@
>-MD5 (apache-solr-1.4.1.tgz) = 258a020ed8c3f44e13b09e8ae46a1c84
>-SHA256 (apache-solr-1.4.1.tgz) = d795bc477335b3e29bab7073b385c93fca4be867aae345203da0d1e438d7543f
>-SIZE (apache-solr-1.4.1.tgz) = 56374837
>+SHA256 (apache-solr-3.2.0.tgz) = 4852e866f77ba2e4dc1639610316a64d384531d00d7e8963e0984ad11e6d2b5a
>+SIZE (apache-solr-3.2.0.tgz) = 80230270
>diff -ruN --exclude=CVS /usr/ports/textproc/apache-solr/pkg-plist /home/staff/gslin/work/ports/apache-solr/pkg-plist
>--- /usr/ports/textproc/apache-solr/pkg-plist	2010-01-13 15:51:50.000000000 +0800
>+++ /home/staff/gslin/work/ports/apache-solr/pkg-plist	2011-06-16 21:19:29.000000000 +0800
>@@ -1,12 +1,15 @@
> @comment $FreeBSD: ports/textproc/apache-solr/pkg-plist,v 1.2 2010/01/13 07:51:50 nemoliu Exp $
> %%JAVAJARDIR%%/apache-solr-%%PORTVERSION%%.war
>+%%JAVAJARDIR%%/apache-solr-analysis-extras-3.2.0.jar
> %%JAVAJARDIR%%/apache-solr-cell-%%PORTVERSION%%.jar
> %%JAVAJARDIR%%/apache-solr-clustering-%%PORTVERSION%%.jar
> %%JAVAJARDIR%%/apache-solr-core-%%PORTVERSION%%.jar
> %%JAVAJARDIR%%/apache-solr-dataimporthandler-%%PORTVERSION%%.jar
> %%JAVAJARDIR%%/apache-solr-dataimporthandler-extras-%%PORTVERSION%%.jar
> %%JAVAJARDIR%%/apache-solr-solrj-%%PORTVERSION%%.jar
>-%%JAVAJARDIR%%/solrj-lib/commons-codec-1.3.jar
>+%%JAVAJARDIR%%/apache-solr-test-framework-3.2.0.jar
>+%%JAVAJARDIR%%/apache-solr-uima-3.2.0.jar
>+%%JAVAJARDIR%%/solrj-lib/commons-codec-1.4.jar
> %%JAVAJARDIR%%/solrj-lib/commons-httpclient-3.1.jar
> %%JAVAJARDIR%%/solrj-lib/commons-io-1.4.jar
> %%JAVAJARDIR%%/solrj-lib/geronimo-stax-api_1.0_spec-1.0.1.jar
>@@ -36,6 +39,8 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/xslt/example_rss.xsl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/xslt/luke.xsl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/lib/hsqldb-LICENSE-BSD_LIKE.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/lib/hsqldb-NOTICE.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/mail/conf/data-config.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/mail/conf/protwords.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/mail/conf/schema.xml
>@@ -52,7 +57,12 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/stopwords.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/synonyms.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/solr.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/tika/conf/schema.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/tika/conf/solrconfig.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/tika/conf/tika-data-config.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/books.csv
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/books.json
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/gb18030-example.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/hd.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/ipod_other.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/ipod_video.xml
>@@ -60,7 +70,6 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/monitor.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/monitor2.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/mp500.xml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/payload.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/post.jar
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/post.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/sd500.xml
>@@ -68,13 +77,15 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/test_utf8.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/utf8-example.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/vidcard.xml
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jetty-6.1.3.jar
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jetty-util-6.1.3.jar
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/ant-1.6.5.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jetty-6.1.26-patched-JETTY-1340.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jetty-LICENSE.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jetty-NOTICE.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jetty-util-6.1.26-patched-JETTY-1340.jar
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/core-3.1.1.jar
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/jsp-2.1.jar
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/jsp-api-2.1.jar
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/servlet-api-2.5-6.1.3.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lib/servlet-api-2.5-20081211.jar
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/core0/conf/schema.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/core0/conf/solrconfig.xml
>@@ -86,6 +97,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/README.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/admin-extra.html
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/elevate.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/mapping-FoldToASCII.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/mapping-ISOLatin1Accent.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/protwords.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/schema.xml
>@@ -94,15 +106,39 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/spellings.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/stopwords.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/synonyms.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/VM_global_library.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/browse.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/cluster.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/clusterResults.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/doc.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/facet_dates.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/facet_fields.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/facet_queries.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/facet_ranges.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/facets.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/footer.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/head.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/header.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/hit.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/jquery.autocomplete.css
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/jquery.autocomplete.js
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/layout.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/main.css
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/query.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/querySpatial.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/suggest.vm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/velocity/tabs.vm
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/xslt/example.xsl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/xslt/example_atom.xsl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/xslt/example_rss.xsl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/xslt/luke.xsl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/solr.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/start.jar
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webapps/solr.war
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/work
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/webapps
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/solr/conf/xslt
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/solr/conf/velocity
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/solr/conf
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/solr/bin
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/solr
>@@ -116,6 +152,8 @@
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/lib/jsp-2.1
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/lib
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/exampledocs
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/tika/conf
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/tika
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/rss/conf
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/rss
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/mail/lib

Actions: View | Diff

Attachments on bug 157926: 116024