8 files changed, 104 insertions, 21 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 4ef737c40125..298229b4ec46 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -22,6 +22,7 @@
     SUBDIR += ant-xinclude-task
     SUBDIR += antiword
     SUBDIR += apache-solr
+    SUBDIR += apache-solr3
     SUBDIR += apertium
     SUBDIR += archmage
     SUBDIR += artha
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index fcadbed4a772..6920b14f02fd 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -2,21 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	apache-solr
-PORTVERSION=	3.6.0
+PORTVERSION=	4.1.0
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}/
+MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}
+DISTNAME=	solr-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	High performance search server built using Lucene Java
 
 LICENSE=	AL2
+
+CONFLICT=	apache-solr-3.6.*
+
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 USE_JAVA=	yes
 PORTEXAMPLES=	*
+LATEST_LINK=	apache-solr
 
 do-install:
 	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} \* ${JAVAJARDIR}
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index c032d7e59a74..b5362ce1c772 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-solr-3.6.0.tgz) = 3acac4323ba3dbfa153d8ef01f156bab9b0eccf1b1f1f03e91b8b6739d3dc6c6
-SIZE (apache-solr-3.6.0.tgz) = 86744700
+SHA256 (solr-4.1.0.tgz) = 763b316a88fd5a61e4004c02eea813647c8ffc4201d0aa1db04deccc58b264bc
+SIZE (solr-4.1.0.tgz) = 114013338
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index bbffbc8d777a..c3a80d8d4695 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -1,21 +1,32 @@
 @comment $FreeBSD$
-%%JAVAJARDIR%%/apache-solr-%%PORTVERSION%%.war
-%%JAVAJARDIR%%/apache-solr-analysis-extras-%%PORTVERSION%%.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-langid-%%PORTVERSION%%.jar
-%%JAVAJARDIR%%/apache-solr-solrj-%%PORTVERSION%%.jar
-%%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.6.jar
-%%JAVAJARDIR%%/solrj-lib/commons-httpclient-3.1.jar
+%%JAVAJARDIR%%/solr-%%PORTVERSION%%.war
+%%JAVAJARDIR%%/solr-analysis-extras-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-cell-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-clustering-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-core-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-dataimporthandler-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-dataimporthandler-extras-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-langid-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-solrj-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-test-framework-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-uima-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-velocity-%%PORTVERSION%%.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/httpclient-4.1.3.jar
+%%JAVAJARDIR%%/solrj-lib/httpcore-4.1.4.jar
+%%JAVAJARDIR%%/solrj-lib/httpmime-4.1.3.jar
+%%JAVAJARDIR%%/solrj-lib/jcl-over-slf4j-1.6.4.jar
+%%JAVAJARDIR%%/solrj-lib/slf4j-api-1.6.4.jar
+%%JAVAJARDIR%%/solrj-lib/slf4j-jdk14-1.6.4.jar
 %%JAVAJARDIR%%/solrj-lib/wstx-asl-3.2.7.jar
+%%JAVAJARDIR%%/solrj-lib/zookeeper-3.4.5.jar
+%%JAVAJARDIR%%/test-framework/README.txt
+%%JAVAJARDIR%%/test-framework/lib/ant-1.8.2.jar
+%%JAVAJARDIR%%/test-framework/lib/junit-4.10.jar
+%%JAVAJARDIR%%/test-framework/lib/junit4-ant-2.0.8.jar
+%%JAVAJARDIR%%/test-framework/lib/randomizedtesting-runner-2.0.8.jar
+%%JAVAJARDIR%%/test-framework/lucene-libs/lucene-test-framework-4.1.0.jar
+@dirrmtry %%JAVAJARDIR%%/test-framework/lib
+@dirrmtry %%JAVAJARDIR%%/test-framework/lucene-libs
+@dirrmtry %%JAVAJARDIR%%/test-framework
 @dirrmtry %%JAVAJARDIR%%/solrj-lib
diff --git a/textproc/apache-solr3/Makefile b/textproc/apache-solr3/Makefile
new file mode 100644
index 000000000000..578758e1deb5
--- /dev/null
+++ b/textproc/apache-solr3/Makefile
@@ -0,0 +1,32 @@
+# Created by: Gea-Suan Lin <gslin@gslin.org>
+# $FreeBSD$
+
+PORTNAME=	apache-solr
+PORTVERSION=	3.6.2
+CATEGORIES=	textproc java
+MASTER_SITES=	APACHE
+MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	gaod@hychen.org
+COMMENT=	High performance search server built using Lucene Java
+
+LICENSE=	AL2
+
+CONFLICT=	apache-solr-4.1.*
+
+NO_LATEST_LINK=	yes
+JAVA_VERSION=	1.6+
+NO_BUILD=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+USE_JAVA=	yes
+PORTEXAMPLES=	*
+
+do-install:
+	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} \* ${JAVAJARDIR}
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/textproc/apache-solr3/distinfo b/textproc/apache-solr3/distinfo
new file mode 100644
index 000000000000..2ac3dc611c45
--- /dev/null
+++ b/textproc/apache-solr3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (apache-solr-3.6.2.tgz) = 537426dcbdd0dc82dd5bf16b48b6bcaf87cb4049c1245eea8dcb79eeaf3e7ac6
+SIZE (apache-solr-3.6.2.tgz) = 87268464
diff --git a/textproc/apache-solr3/pkg-descr b/textproc/apache-solr3/pkg-descr
new file mode 100644
index 000000000000..60e4ece056bb
--- /dev/null
+++ b/textproc/apache-solr3/pkg-descr
@@ -0,0 +1,7 @@
+Solr is an open source enterprise search server based on the Lucene
+Java search library, with XML/HTTP and JSON APIs, hit highlighting,
+faceted search, caching, replication, a web administration interface
+and many more features. It runs in a Java servlet container such as
+Tomcat. 
+
+WWW:	http://lucene.apache.org/solr/
diff --git a/textproc/apache-solr3/pkg-plist b/textproc/apache-solr3/pkg-plist
new file mode 100644
index 000000000000..07325e581acd
--- /dev/null
+++ b/textproc/apache-solr3/pkg-plist
@@ -0,0 +1,25 @@
+@comment $FreeBSD$
+%%JAVAJARDIR%%/apache-solr-%%PORTVERSION%%.war
+%%JAVAJARDIR%%/apache-solr-analysis-extras-%%PORTVERSION%%.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-langid-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/apache-solr-solrj-%%PORTVERSION%%.jar
+%%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.6.jar
+%%JAVAJARDIR%%/solrj-lib/commons-httpclient-3.1.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
+%%JAVAJARDIR%%/solrj-lib/optional/httpclient-4.1.3.jar
+%%JAVAJARDIR%%/solrj-lib/optional/httpcore-4.1.4.jar
+%%JAVAJARDIR%%/solrj-lib/optional/httpmime-4.1.3.jar
+@dirrmtry %%JAVAJARDIR%%/solrj-lib/optional
+@dirrmtry %%JAVAJARDIR%%/solrj-lib