Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Feb 2013 20:39:21 +0800 (CST)
From:      Hung-Yi Chen <gaod@hychen.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/176237: [MAINTAINER UPDATE/REPOCOPY] textproc/apache-solr -> textproc/apache-solr3 & update both ports
Message-ID:  <201302181239.r1ICdLkd005906@cse.tw>
Resent-Message-ID: <201302181250.r1ICo7at083104@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         176237
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE/REPOCOPY] textproc/apache-solr -> textproc/apache-solr3 & update both ports
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 18 12:50:06 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Hung-Yi Chen
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD cse.tw 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	Repo copy textproc/apache-solr to textproc/apache-solr3 & update to 3.6.2.
        After repo copy, bump textproc/apache-solr to 4.1.0.

>How-To-Repeat:
>Fix:


--- apache-solr.diff begins here ---
Index: textproc/Makefile
===================================================================
--- textproc/Makefile	(revision 312497)
+++ textproc/Makefile	(working copy)
@@ -22,6 +22,7 @@
     SUBDIR += ant-xinclude-task
     SUBDIR += antiword
     SUBDIR += apache-solr
+    SUBDIR += apache-solr3
     SUBDIR += apertium
     SUBDIR += archmage
     SUBDIR += artha
Index: textproc/apache-solr/Makefile
===================================================================
--- textproc/apache-solr/Makefile	(revision 312497)
+++ textproc/apache-solr/Makefile	(working copy)
@@ -2,10 +2,11 @@
 # $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
Index: textproc/apache-solr/distinfo
===================================================================
--- textproc/apache-solr/distinfo	(revision 312497)
+++ textproc/apache-solr/distinfo	(working copy)
@@ -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
Index: textproc/apache-solr/pkg-plist
===================================================================
--- textproc/apache-solr/pkg-plist	(revision 312497)
+++ textproc/apache-solr/pkg-plist	(working copy)
@@ -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%%/solrj-lib
+@dirrmtry %%JAVAJARDIR%%/test-framework/lib
+@dirrmtry %%JAVAJARDIR%%/test-framework/lucene-libs
+@dirrmtry %%JAVAJARDIR%%/test-framework
Index: textproc/apache-solr3/Makefile
===================================================================
--- textproc/apache-solr3/Makefile	(revision 0)
+++ textproc/apache-solr3/Makefile	(working copy)
@@ -0,0 +1,28 @@
+# Created by: Gea-Suan Lin <gslin@gslin.org>
+# $FreeBSD: ports/textproc/apache-solr/Makefile,v 1.9 2012/12/10 13:48:08 svnexp Exp $
+
+PORTNAME=	apache-solr3
+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
+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>
Index: textproc/apache-solr3/distinfo
===================================================================
--- textproc/apache-solr3/distinfo	(revision 0)
+++ textproc/apache-solr3/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (apache-solr-3.6.2.tgz) = 537426dcbdd0dc82dd5bf16b48b6bcaf87cb4049c1245eea8dcb79eeaf3e7ac6
+SIZE (apache-solr-3.6.2.tgz) = 87268464
Index: textproc/apache-solr3/pkg-descr
===================================================================
--- textproc/apache-solr3/pkg-descr	(revision 0)
+++ textproc/apache-solr3/pkg-descr	(working copy)
@@ -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/
Index: textproc/apache-solr3/pkg-plist
===================================================================
--- textproc/apache-solr3/pkg-plist	(revision 0)
+++ textproc/apache-solr3/pkg-plist	(working copy)
@@ -0,0 +1,25 @@
+@comment $FreeBSD: ports/textproc/apache-solr/pkg-plist,v 1.7 2012/11/17 06:01:51 svnexp Exp $
+%%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
--- apache-solr.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302181239.r1ICdLkd005906>