Index: head/textproc/apache-solr/Makefile
===================================================================
--- head/textproc/apache-solr/Makefile	(revision 390625)
+++ head/textproc/apache-solr/Makefile	(revision 390626)
@@ -1,36 +1,35 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	apache-solr
-PORTVERSION=	4.10.4
+PORTVERSION=	5.2.1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance search server built using Lucene Java
 
 LICENSE=	APACHE20
 
-CONFLICT=	apache-solr-3.6.*
+CONFLICT=	apache-solr3-* apache-solr-4*
 
-USES=		cpe shebangfix tar:tgz
-SHEBANG_FILES=	example/etc/create-solrtest.keystore.sh
+USES=		cpe tar:tgz
 JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 USE_JAVA=	yes
 PORTEXAMPLES=	*
 LATEST_LINK=	apache-solr
 USE_RC_SUBR=	solr
 
 CPE_PRODUCT=	solr
 CPE_VENDOR=	apache
 
 do-install:
 	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/textproc/apache-solr/distinfo
===================================================================
--- head/textproc/apache-solr/distinfo	(revision 390625)
+++ head/textproc/apache-solr/distinfo	(revision 390626)
@@ -1,2 +1,2 @@
-SHA256 (solr-4.10.4.tgz) = ac3543880f1b591bcaa962d7508b528d7b42e2b5548386197940b704629ae851
-SIZE (solr-4.10.4.tgz) = 150059757
+SHA256 (solr-5.2.1.tgz) = 3f54cec862da1376857f96f4a6f2044a5addcebc4df159b8797fd71f7ba8df86
+SIZE (solr-5.2.1.tgz) = 148849766
Index: head/textproc/apache-solr/pkg-plist
===================================================================
--- head/textproc/apache-solr/pkg-plist	(revision 390625)
+++ head/textproc/apache-solr/pkg-plist	(revision 390626)
@@ -1,33 +1,31 @@
-%%JAVAJARDIR%%/solr-%%PORTVERSION%%.war
 %%JAVAJARDIR%%/solr-analysis-extras-%%PORTVERSION%%.jar
+%%JAVAJARDIR%%/solr-analytics-%%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-map-reduce-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/solr-morphlines-cell-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/solr-morphlines-core-%%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.3.jar
-%%JAVAJARDIR%%/solrj-lib/httpclient-4.3.1.jar
-%%JAVAJARDIR%%/solrj-lib/httpcore-4.3.jar
-%%JAVAJARDIR%%/solrj-lib/httpmime-4.3.1.jar
-%%JAVAJARDIR%%/solrj-lib/noggit-0.5.jar
-%%JAVAJARDIR%%/solrj-lib/slf4j-api-1.7.6.jar
-%%JAVAJARDIR%%/solrj-lib/wstx-asl-3.2.7.jar
+%%JAVAJARDIR%%/solrj-lib/commons-io-2.4.jar
+%%JAVAJARDIR%%/solrj-lib/httpclient-4.4.1.jar
+%%JAVAJARDIR%%/solrj-lib/httpcore-4.4.1.jar
+%%JAVAJARDIR%%/solrj-lib/httpmime-4.4.1.jar
+%%JAVAJARDIR%%/solrj-lib/noggit-0.6.jar
+%%JAVAJARDIR%%/solrj-lib/slf4j-api-1.7.7.jar
+%%JAVAJARDIR%%/solrj-lib/stax2-api-3.1.4.jar
+%%JAVAJARDIR%%/solrj-lib/woodstox-core-asl-4.4.1.jar
 %%JAVAJARDIR%%/solrj-lib/zookeeper-3.4.6.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.1.6.jar
-%%JAVAJARDIR%%/test-framework/lib/randomizedtesting-runner-2.1.6.jar
+%%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
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/logs
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/solr/bin
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/solr-webapp