svn commit: r314772 - head/textproc/apache-solr

[Pawel Pekala]

Author: pawel
Date: Wed Mar 20 22:34:03 2013
New Revision: 314772
URL: http://svnweb.freebsd.org/changeset/ports/314772

Log:
  - Update to version 4.2.0 [1]
  - Convert to OptionsNG
  - Fix WWW: line in pkg-descr
  
  PR:		ports/176876 [1]
  Submitted by:	Hung-Yi Chen <gaod at hychen.org> (maintainer)

Modified:
  head/textproc/apache-solr/Makefile   (contents, props changed)
  head/textproc/apache-solr/distinfo   (contents, props changed)
  head/textproc/apache-solr/pkg-descr   (contents, props changed)
  head/textproc/apache-solr/pkg-plist   (contents, props changed)

Modified: head/textproc/apache-solr/Makefile
==============================================================================
--- head/textproc/apache-solr/Makefile	Wed Mar 20 22:08:52 2013	(r314771)
+++ head/textproc/apache-solr/Makefile	Wed Mar 20 22:34:03 2013	(r314772)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache-solr
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.0
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}
@@ -23,9 +23,11 @@ USE_JAVA=	yes
 PORTEXAMPLES=	*
 LATEST_LINK=	apache-solr
 
+.include <bsd.port.options.mk>
+
 do-install:
 	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} \* ${JAVAJARDIR}
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 .endif

Modified: head/textproc/apache-solr/distinfo
==============================================================================
--- head/textproc/apache-solr/distinfo	Wed Mar 20 22:08:52 2013	(r314771)
+++ head/textproc/apache-solr/distinfo	Wed Mar 20 22:34:03 2013	(r314772)
@@ -1,2 +1,2 @@
-SHA256 (solr-4.1.0.tgz) = 763b316a88fd5a61e4004c02eea813647c8ffc4201d0aa1db04deccc58b264bc
-SIZE (solr-4.1.0.tgz) = 114013338
+SHA256 (solr-4.2.0.tgz) = 6929d06fafea1a8b1a3e2dcee0ca4afd93db7dd9333468977aa4347da01db7ed
+SIZE (solr-4.2.0.tgz) = 116542235

Modified: head/textproc/apache-solr/pkg-descr
==============================================================================
--- head/textproc/apache-solr/pkg-descr	Wed Mar 20 22:08:52 2013	(r314771)
+++ head/textproc/apache-solr/pkg-descr	Wed Mar 20 22:34:03 2013	(r314772)
@@ -4,4 +4,4 @@ faceted search, caching, replication, a 
 and many more features. It runs in a Java servlet container such as
 Tomcat. 
 
-WWW:	http://lucene.apache.org/solr/
+WWW: http://lucene.apache.org/solr/

Modified: head/textproc/apache-solr/pkg-plist
==============================================================================
--- head/textproc/apache-solr/pkg-plist	Wed Mar 20 22:08:52 2013	(r314771)
+++ head/textproc/apache-solr/pkg-plist	Wed Mar 20 22:34:03 2013	(r314772)
@@ -12,9 +12,9 @@
 %%JAVAJARDIR%%/solr-uima-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/solr-velocity-%%PORTVERSION%%.jar
 %%JAVAJARDIR%%/solrj-lib/commons-io-2.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/httpclient-4.2.3.jar
+%%JAVAJARDIR%%/solrj-lib/httpcore-4.2.2.jar
+%%JAVAJARDIR%%/solrj-lib/httpmime-4.2.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
@@ -25,8 +25,8 @@
 %%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
+%%JAVAJARDIR%%/test-framework/lucene-libs/lucene-test-framework-%%PORTVERSION%%.jar
+ at dirrmtry %%JAVAJARDIR%%/solrj-lib
 @dirrmtry %%JAVAJARDIR%%/test-framework/lib
 @dirrmtry %%JAVAJARDIR%%/test-framework/lucene-libs
 @dirrmtry %%JAVAJARDIR%%/test-framework
- at dirrmtry %%JAVAJARDIR%%/solrj-lib