3 files changed, 13 insertions, 164 deletions

diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 75fbe62157f9..f005eb20a98b 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	apache-solr
-PORTVERSION=	3.5.0
+PORTVERSION=	3.6.0
 CATEGORIES=	textproc java
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/solr/${PORTVERSION},}
+MASTER_SITES=	APACHE
+MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	gslin@gslin.org
+MAINTAINER=	gaod@hychen.org
 COMMENT=	High performance search server built using Lucene Java
 
+LICENSE=	AL2
 JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 USE_JAVA=	yes
-
-.include <bsd.port.pre.mk>
+PORTEXAMPLES=	*
 
 do-install:
-	${CP} -R ${WRKSRC}/dist/ ${JAVAJARDIR}
+	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} \* ${JAVAJARDIR}
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/example/ ${EXAMPLESDIR}
+	cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index 4a24263ac997..c032d7e59a74 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-solr-3.5.0.tgz) = 804f3ba9d1296f81388605a79538b7362355693fbdd03b7b2dbf9a706bf1d1d0
-SIZE (apache-solr-3.5.0.tgz) = 78673382
+SHA256 (apache-solr-3.6.0.tgz) = 3acac4323ba3dbfa153d8ef01f156bab9b0eccf1b1f1f03e91b8b6739d3dc6c6
+SIZE (apache-solr-3.6.0.tgz) = 86744700
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index e7b47e833d7c..bbffbc8d777a 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -11,163 +11,11 @@
 %%JAVAJARDIR%%/apache-solr-test-framework-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/apache-solr-uima-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/apache-solr-velocity-%%PORTVERSION%%.jar
-%%JAVAJARDIR%%/solrj-lib/commons-codec-1.5.jar
+%%JAVAJARDIR%%/solrj-lib/commons-codec-1.6.jar
 %%JAVAJARDIR%%/solrj-lib/commons-httpclient-3.1.jar
-%%JAVAJARDIR%%/solrj-lib/commons-io-1.4.jar
+%%JAVAJARDIR%%/solrj-lib/commons-io-2.1.jar
 %%JAVAJARDIR%%/solrj-lib/geronimo-stax-api_1.0_spec-1.0.1.jar
 %%JAVAJARDIR%%/solrj-lib/jcl-over-slf4j-1.6.1.jar
 %%JAVAJARDIR%%/solrj-lib/slf4j-api-1.6.1.jar
 %%JAVAJARDIR%%/solrj-lib/wstx-asl-3.2.7.jar
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/etc/jetty.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/etc/webdefault.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/hsqldb/ex.backup
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/hsqldb/ex.data
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/hsqldb/ex.log
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/hsqldb/ex.properties
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/hsqldb/ex.script
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/admin-extra.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/db-data-config.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/elevate.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/protwords.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/schema.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/scripts.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/solrconfig.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/stopwords.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/synonyms.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/xslt/example.xsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/db/conf/xslt/example_atom.xsl
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/mail/conf/solrconfig.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/mail/conf/stopwords.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/mail/conf/synonyms.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/admin-extra.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/elevate.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/protwords.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/rss-data-config.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/schema.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/scripts.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-DIH/solr/rss/conf/solrconfig.xml
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/mem.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/monitor.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/monitor2.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/mp500.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/post.jar
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/post.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/sd500.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/solr.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/test_utf8.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/utf8-example.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/vidcard.xml
-%%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-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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/core1/conf/schema.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/core1/conf/solrconfig.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/exampledocs/ipod_other.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/exampledocs/ipod_video.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/solr.xml
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/scripts.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/solrconfig.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/spellings.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/stopwords.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/stopwords_en.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_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
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/multicore/exampledocs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/multicore/core1/conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/multicore/core1
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/multicore/core0/conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/multicore/core0
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/multicore
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/logs
-%%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
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/mail/conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/mail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/db/lib
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/db/conf/xslt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/db/conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr/db
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/solr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH/hsqldb
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example-DIH
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/etc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%JAVAJARDIR%%/solrj-lib