View | Details | Raw Unified | Return to bug 193290 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-1 / +3 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/textproc/apache-solr/Makefile 363374 2014-07-29 19:11:51Z adamw $
2
# $FreeBSD: head/textproc/apache-solr/Makefile 363374 2014-07-29 19:11:51Z adamw $
3
3
4
PORTNAME=	apache-solr
4
PORTNAME=	apache-solr
5
PORTVERSION=	4.8.1
5
PORTVERSION=	4.9.0
6
CATEGORIES=	textproc java
6
CATEGORIES=	textproc java
7
MASTER_SITES=	APACHE
7
MASTER_SITES=	APACHE
8
MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}
8
MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}
Lines 19-28 Link Here
19
SHEBANG_FILES=	example/etc/create-solrtest.keystore.sh
19
SHEBANG_FILES=	example/etc/create-solrtest.keystore.sh
20
JAVA_VERSION=	1.7+
20
JAVA_VERSION=	1.7+
21
NO_BUILD=	yes
21
NO_BUILD=	yes
22
NO_ARCH=	yes
22
PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
23
PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
23
USE_JAVA=	yes
24
USE_JAVA=	yes
24
PORTEXAMPLES=	*
25
PORTEXAMPLES=	*
25
LATEST_LINK=	apache-solr
26
LATEST_LINK=	apache-solr
27
USE_RC_SUBR=	solr
26
28
27
do-install:
29
do-install:
28
	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR}
30
	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR}
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (solr-4.8.1.tgz) = ac814affbe4f7270cf98a5d4d70eb65579bff7c008ee96d74b4146b1060bf947
1
SHA256 (solr-4.9.0.tgz) = c42b1251f44f8e1b826d89c362b43dec4dd9094e6a07f2f1c27e990f8c6eafdc
2
SIZE (solr-4.8.1.tgz) = 152451311
2
SIZE (solr-4.9.0.tgz) = 152659468
(-)./files/solr.in (+50 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# Copyright (c) 2014, Radim Kolar
4
# All rights reserved.
5
#
6
# Redistribution and use in source and binary forms, with or without
7
# modification, are permitted provided that the following conditions are met:
8
#
9
#  * Redistributions of source code must retain the above copyright notice,
10
#    this list of conditions and the following disclaimer.
11
#  * Redistributions in binary form must reproduce the above copyright
12
#    notice, this list of conditions and the following disclaimer in the
13
#    documentation and/or other materials provided with the distribution.
14
#
15
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
16
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18
# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
19
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
22
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
25
# DAMAGE.
26
27
# $FreeBSD$
28
#
29
# PROVIDE: solr
30
# REQUIRE: LOGIN
31
# KEYWORD: shutdown
32
33
. /etc/rc.subr
34
35
name=solr
36
rcvar=solr_enable
37
load_rc_config $name
38
39
: ${solr_enable:=NO}
40
: ${solr_instance:=/var/db/solr}
41
42
required_files=${solr_instance}/solr.xml
43
pidfile=/var/run/solr.pid
44
command=/usr/sbin/daemon
45
procname=%%LOCALBASE%%/openjdk7/bin/java
46
start_precmd="cd %%EXAMPLESDIR%%"
47
48
command_args="-f -p ${pidfile} ${procname} ${solr_flags} -Dsolr.solr.home=${solr_instance} -Dsolr.log=/var/log -jar %%EXAMPLESDIR%%/start.jar"
49
50
run_rc_command "$1"
(-)./pkg-deinstall (+7 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# Removes jetty war cache
4
#
5
if [ "$2" = "DEINSTALL" ]; then
6
   rm -rf $PKG_PREFIX/share/examples/apache-solr/solr-webapp/*
7
fi
(-)./pkg-plist (-5 / +1 lines)
Lines 13-28 Link Here
13
%%JAVAJARDIR%%/solr-test-framework-%%PORTVERSION%%.jar
13
%%JAVAJARDIR%%/solr-test-framework-%%PORTVERSION%%.jar
14
%%JAVAJARDIR%%/solr-uima-%%PORTVERSION%%.jar
14
%%JAVAJARDIR%%/solr-uima-%%PORTVERSION%%.jar
15
%%JAVAJARDIR%%/solr-velocity-%%PORTVERSION%%.jar
15
%%JAVAJARDIR%%/solr-velocity-%%PORTVERSION%%.jar
16
%%JAVAJARDIR%%/solrj-lib/commons-io-2.1.jar
16
%%JAVAJARDIR%%/solrj-lib/commons-io-2.3.jar
17
%%JAVAJARDIR%%/solrj-lib/httpclient-4.3.1.jar
17
%%JAVAJARDIR%%/solrj-lib/httpclient-4.3.1.jar
18
%%JAVAJARDIR%%/solrj-lib/httpcore-4.3.jar
18
%%JAVAJARDIR%%/solrj-lib/httpcore-4.3.jar
19
%%JAVAJARDIR%%/solrj-lib/httpmime-4.3.1.jar
19
%%JAVAJARDIR%%/solrj-lib/httpmime-4.3.1.jar
20
%%JAVAJARDIR%%/solrj-lib/jcl-over-slf4j-1.7.6.jar
21
%%JAVAJARDIR%%/solrj-lib/jul-to-slf4j-1.7.6.jar
22
%%JAVAJARDIR%%/solrj-lib/log4j-1.2.16.jar
23
%%JAVAJARDIR%%/solrj-lib/noggit-0.5.jar
20
%%JAVAJARDIR%%/solrj-lib/noggit-0.5.jar
24
%%JAVAJARDIR%%/solrj-lib/slf4j-api-1.7.6.jar
21
%%JAVAJARDIR%%/solrj-lib/slf4j-api-1.7.6.jar
25
%%JAVAJARDIR%%/solrj-lib/slf4j-log4j12-1.7.6.jar
26
%%JAVAJARDIR%%/solrj-lib/wstx-asl-3.2.7.jar
22
%%JAVAJARDIR%%/solrj-lib/wstx-asl-3.2.7.jar
27
%%JAVAJARDIR%%/solrj-lib/zookeeper-3.4.6.jar
23
%%JAVAJARDIR%%/solrj-lib/zookeeper-3.4.6.jar
28
%%JAVAJARDIR%%/test-framework/README.txt
24
%%JAVAJARDIR%%/test-framework/README.txt

Return to bug 193290