From owner-svn-ports-all@FreeBSD.ORG Tue Feb 26 04:01:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 12445C4; Tue, 26 Feb 2013 04:01:32 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 038E0AA7; Tue, 26 Feb 2013 04:01:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1Q41Vlp051389; Tue, 26 Feb 2013 04:01:31 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1Q41Ues051378; Tue, 26 Feb 2013 04:01:30 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201302260401.r1Q41Ues051378@svn.freebsd.org> From: "Vanilla I. Shu" Date: Tue, 26 Feb 2013 04:01:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312958 - in head/textproc: . apache-solr apache-solr3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 04:01:32 -0000 Author: vanilla Date: Tue Feb 26 04:01:30 2013 New Revision: 312958 URL: http://svnweb.freebsd.org/changeset/ports/312958 Log: 1: repo-copy apache-solr3 from apache-solr 2: upgrade apache-solr3 to 3.6.2. 3: upgrade apache-solr to 4.1.0. PR: ports/176237 Submitted by: maintainer Added: head/textproc/apache-solr3/ - copied from r312955, head/textproc/apache-solr/ Modified: head/textproc/Makefile head/textproc/apache-solr/Makefile head/textproc/apache-solr/distinfo head/textproc/apache-solr/pkg-plist head/textproc/apache-solr3/Makefile head/textproc/apache-solr3/distinfo head/textproc/apache-solr3/pkg-plist Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Tue Feb 26 03:55:49 2013 (r312957) +++ head/textproc/Makefile Tue Feb 26 04:01:30 2013 (r312958) @@ -22,6 +22,7 @@ SUBDIR += ant-xinclude-task SUBDIR += antiword SUBDIR += apache-solr + SUBDIR += apache-solr3 SUBDIR += apertium SUBDIR += archmage SUBDIR += artha Modified: head/textproc/apache-solr/Makefile ============================================================================== --- head/textproc/apache-solr/Makefile Tue Feb 26 03:55:49 2013 (r312957) +++ head/textproc/apache-solr/Makefile Tue Feb 26 04:01:30 2013 (r312958) @@ -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} Modified: head/textproc/apache-solr/distinfo ============================================================================== --- head/textproc/apache-solr/distinfo Tue Feb 26 03:55:49 2013 (r312957) +++ head/textproc/apache-solr/distinfo Tue Feb 26 04:01:30 2013 (r312958) @@ -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 Modified: head/textproc/apache-solr/pkg-plist ============================================================================== --- head/textproc/apache-solr/pkg-plist Tue Feb 26 03:55:49 2013 (r312957) +++ head/textproc/apache-solr/pkg-plist Tue Feb 26 04:01:30 2013 (r312958) @@ -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 Modified: head/textproc/apache-solr3/Makefile ============================================================================== --- head/textproc/apache-solr/Makefile Tue Feb 26 03:29:38 2013 (r312955) +++ head/textproc/apache-solr3/Makefile Tue Feb 26 04:01:30 2013 (r312958) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= apache-solr -PORTVERSION= 3.6.0 +PORTVERSION= 3.6.2 CATEGORIES= textproc java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= lucene/solr/${PORTVERSION}/ @@ -12,6 +12,10 @@ 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}" Modified: head/textproc/apache-solr3/distinfo ============================================================================== --- head/textproc/apache-solr/distinfo Tue Feb 26 03:29:38 2013 (r312955) +++ head/textproc/apache-solr3/distinfo Tue Feb 26 04:01:30 2013 (r312958) @@ -1,2 +1,2 @@ -SHA256 (apache-solr-3.6.0.tgz) = 3acac4323ba3dbfa153d8ef01f156bab9b0eccf1b1f1f03e91b8b6739d3dc6c6 -SIZE (apache-solr-3.6.0.tgz) = 86744700 +SHA256 (apache-solr-3.6.2.tgz) = 537426dcbdd0dc82dd5bf16b48b6bcaf87cb4049c1245eea8dcb79eeaf3e7ac6 +SIZE (apache-solr-3.6.2.tgz) = 87268464 Modified: head/textproc/apache-solr3/pkg-plist ============================================================================== --- head/textproc/apache-solr/pkg-plist Tue Feb 26 03:29:38 2013 (r312955) +++ head/textproc/apache-solr3/pkg-plist Tue Feb 26 04:01:30 2013 (r312958) @@ -18,4 +18,8 @@ %%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