2 files changed, 206 insertions, 2 deletions

diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 85d4cbbaa219..ff66aaf74175 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	apache-solr
 PORTVERSION=	5.2.1
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
@@ -29,7 +30,10 @@ CPE_VENDOR=	apache
 
 do-install:
 	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/server && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/post ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index cfe219e9b95d..0e04f35864ea 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -1,3 +1,5 @@
+bin/solr
+bin/post
 %%JAVAJARDIR%%/solr-analysis-extras-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/solr-analytics-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/solr-cell-%%PORTVERSION%%.jar
@@ -28,4 +30,202 @@
 %%JAVAJARDIR%%/test-framework/lib/junit4-ant-2.1.13.jar
 %%JAVAJARDIR%%/test-framework/lib/randomizedtesting-runner-2.1.13.jar
 %%JAVAJARDIR%%/test-framework/lucene-libs/lucene-test-framework-%%PORTVERSION%%.jar
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/example-DIH/solr/mail/lib
+%%WWWDIR%%/README.txt
+%%WWWDIR%%/contexts/solr-jetty-context.xml
+%%WWWDIR%%/etc/jetty-http.xml
+%%WWWDIR%%/etc/jetty-https-ssl.xml
+%%WWWDIR%%/etc/jetty-https.xml
+%%WWWDIR%%/etc/jetty-ssl.xml
+%%WWWDIR%%/etc/jetty.xml
+%%WWWDIR%%/etc/webdefault.xml
+%%WWWDIR%%/lib/ext/jcl-over-slf4j-1.7.7.jar
+%%WWWDIR%%/lib/ext/jul-to-slf4j-1.7.7.jar
+%%WWWDIR%%/lib/ext/log4j-1.2.17.jar
+%%WWWDIR%%/lib/ext/slf4j-api-1.7.7.jar
+%%WWWDIR%%/lib/ext/slf4j-log4j12-1.7.7.jar
+%%WWWDIR%%/lib/javax.servlet-api-3.1.0.jar
+%%WWWDIR%%/lib/jetty-continuation-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-deploy-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-http-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-io-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-jmx-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-rewrite-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-security-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-server-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-servlet-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-servlets-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-util-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-webapp-9.2.10.v20150310.jar
+%%WWWDIR%%/lib/jetty-xml-9.2.10.v20150310.jar
+%%WWWDIR%%/modules/http.mod
+%%WWWDIR%%/modules/https.mod
+%%WWWDIR%%/modules/server.mod
+%%WWWDIR%%/modules/ssl.mod
+%%WWWDIR%%/resources/jetty-logging.properties
+%%WWWDIR%%/resources/log4j.properties
+%%WWWDIR%%/scripts/cloud-scripts/log4j.properties
+%%WWWDIR%%/scripts/cloud-scripts/zkcli.bat
+%%WWWDIR%%/scripts/cloud-scripts/zkcli.sh
+%%WWWDIR%%/scripts/map-reduce/set-map-reduce-classpath.sh
+%%WWWDIR%%/solr/README.txt
+%%WWWDIR%%/solr/configsets/basic_configs/conf/_rest_managed.json
+%%WWWDIR%%/solr/configsets/basic_configs/conf/currency.xml
+%%WWWDIR%%/solr/configsets/basic_configs/conf/lang/stopwords_en.txt
+%%WWWDIR%%/solr/configsets/basic_configs/conf/protwords.txt
+%%WWWDIR%%/solr/configsets/basic_configs/conf/schema.xml
+%%WWWDIR%%/solr/configsets/basic_configs/conf/solrconfig.xml
+%%WWWDIR%%/solr/configsets/basic_configs/conf/stopwords.txt
+%%WWWDIR%%/solr/configsets/basic_configs/conf/synonyms.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/currency.xml
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/elevate.xml
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/contractions_ca.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/contractions_fr.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/contractions_ga.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/contractions_it.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/hyphenations_ga.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stemdict_nl.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stoptags_ja.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_ar.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_bg.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_ca.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_cz.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_da.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_de.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_el.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_en.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_es.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_eu.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_fa.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_fi.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_fr.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_ga.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_gl.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_hi.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_hu.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_hy.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_id.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_it.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_ja.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_lv.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_nl.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_no.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_pt.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_ro.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_ru.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_sv.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_th.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/stopwords_tr.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/lang/userdict_ja.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/managed-schema
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/params.json
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/protwords.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/stopwords.txt
+%%WWWDIR%%/solr/configsets/data_driven_schema_configs/conf/synonyms.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/_rest_managed.json
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/_schema_analysis_stopwords_english.json
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/_schema_analysis_synonyms_english.json
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/kmeans-attributes.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/lingo-attributes.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/clustering/carrot2/stc-attributes.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/currency.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/elevate.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/contractions_ca.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/contractions_fr.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/contractions_ga.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/contractions_it.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/hyphenations_ga.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stemdict_nl.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stoptags_ja.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ar.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_bg.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ca.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ckb.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_cz.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_da.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_de.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_el.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_en.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_es.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_eu.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_fa.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_fi.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_fr.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ga.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_gl.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_hi.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_hu.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_hy.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_id.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_it.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ja.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_lv.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_nl.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_no.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_pt.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ro.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_ru.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_sv.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_th.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/stopwords_tr.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/lang/userdict_ja.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/mapping-FoldToASCII.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/mapping-ISOLatin1Accent.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/protwords.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/schema.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/spellings.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/stopwords.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/synonyms.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/update-script.js
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/README.txt
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/browse.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/cluster.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/cluster_results.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/debug.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/did_you_mean.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/error.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/facet_fields.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/facet_pivot.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/facet_queries.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/facet_ranges.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/facets.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/footer.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/hit.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/hit_grouped.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/hit_plain.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/join_doc.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.css
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/jquery.autocomplete.js
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/layout.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/pagination_bottom.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/pagination_top.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/product_doc.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/query.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/query_form.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/query_group.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/query_spatial.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/results_list.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/suggest.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/velocity/tabs.vm
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/xslt/example.xsl
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/xslt/example_atom.xsl
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/xslt/example_rss.xsl
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
+%%WWWDIR%%/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl
+%%WWWDIR%%/solr/solr.xml
+%%WWWDIR%%/solr/zoo.cfg
+%%WWWDIR%%/start.jar
+%%WWWDIR%%/webapps/solr.war
+@dir %%EXAMPLESDIR%%/example-DIH/solr/mail/lib
+@dir %%WWWDIR%%/logs
+@dir %%WWWDIR%%/solr-webapp