3 files changed, 60 insertions, 63 deletions

diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 68a840c5f1ae..12a341b66179 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apache-solr
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.0
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%,lucene/solr/${PORTVERSION},}
 EXTRACT_SUFX=	.tgz
@@ -14,9 +14,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	gslin@gslin.org
 COMMENT=	High performance search server built using Lucene Java
 
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index c9b2052bc100..72c945706545 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-solr-1.3.0.tgz) = 23774b077598c6440d69016fed5cc810
-SHA256 (apache-solr-1.3.0.tgz) = d3fac9e563deb618c8ca0b126964ebde6a946570c33b9b7e6d12f9ce5b348739
-SIZE (apache-solr-1.3.0.tgz) = 21662661
+MD5 (apache-solr-1.4.0.tgz) = 1cc3783316aa1f95ba5e250a4c1d0451
+SHA256 (apache-solr-1.4.0.tgz) = b189e6e800903d81c7c8dc86100d299d4dfd1e32d356a5bf56c42eb0a9e75d7f
+SIZE (apache-solr-1.4.0.tgz) = 56364075
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index 6fc64a7d4099..d2a73f3f4984 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -1,21 +1,27 @@
 @comment $FreeBSD$
-%%JAVAJARDIR%%/apache-solr-1.3.0.war
-%%JAVAJARDIR%%/apache-solr-common-1.3.0.jar
-%%JAVAJARDIR%%/apache-solr-core-1.3.0.jar
-%%JAVAJARDIR%%/apache-solr-dataimporthandler-1.3.0.jar
-%%JAVAJARDIR%%/apache-solr-solrj-1.3.0.jar
+%%JAVAJARDIR%%/apache-solr-%%PORTVERSION%%.war
+%%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%%/solrj-lib/commons-httpclient-3.1.jar
-%%JAVAJARDIR%%/solrj-lib/commons-io-1.3.1.jar
-%%JAVAJARDIR%%/solrj-lib/commons-logging-1.0.4.jar
+%%JAVAJARDIR%%/solrj-lib/commons-io-1.4.jar
 %%JAVAJARDIR%%/solrj-lib/geronimo-stax-api_1.0_spec-1.0.1.jar
-%%JAVAJARDIR%%/solrj-lib/stax-utils.jar
+%%JAVAJARDIR%%/solrj-lib/jcl-over-slf4j-1.5.5.jar
+%%JAVAJARDIR%%/solrj-lib/slf4j-api-1.5.5.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.zip
+%%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
@@ -29,6 +35,13 @@
 %%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/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
@@ -39,9 +52,6 @@
 %%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%%/exampleAnalysis/mem.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampleAnalysis/post.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampleAnalysis/small.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/books.csv
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/hd.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/ipod_other.xml
@@ -50,11 +60,11 @@
 %%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
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/solr.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/spellchecker.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/test_utf8.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/utf8-example.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exampledocs/vidcard.xml
@@ -74,26 +84,9 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/exampledocs/ipod_video.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multicore/solr.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/abc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/abo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/backup
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/backupcleaner
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/commit
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/optimize
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/readercycle
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/rsyncd-disable
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/rsyncd-enable
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/rsyncd-start
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/rsyncd-stop
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/scripts-util
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/snapcleaner
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/snapinstaller
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/snappuller
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/snappuller-disable
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/snappuller-enable
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/bin/snapshooter
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/admin-extra.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/elevate.xml
+%%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
@@ -107,31 +100,34 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solr/conf/xslt/luke.xsl
 %%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
+%%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/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
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/work
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/webapps
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/solr/conf/xslt
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/solr/conf
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/solr/bin
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/solr
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/multicore/exampledocs
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/multicore/core1/conf
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/multicore/core1
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/multicore/core0/conf
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/multicore/core0
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/multicore
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/logs
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/lib/jsp-2.1
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/lib
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/exampledocs
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/exampleAnalysis
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr/rss/conf
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr/rss
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr/db/lib
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr/db/conf/xslt
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr/db/conf
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr/db
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH/solr
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/example-DIH
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr/etc
-%%PORTEXAMPLES%%@dirrm share/examples/apache-solr