Attachment 146740 Details for Bug 193290 – port diff

[patch] port diff

solr.diff (text/plain), 4.73 KB, created by Radim Kolar on 2014-09-03 16:59:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2014-09-03 16:59:15 UTC

Size: 4.73 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with less
>diff -ruN /usr/ports/textproc/apache-solr/Makefile ./Makefile
>--- /usr/ports/textproc/apache-solr/Makefile	2014-07-29 21:11:51.000000000 +0200
>+++ ./Makefile	2014-09-02 21:37:23.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/textproc/apache-solr/Makefile 363374 2014-07-29 19:11:51Z adamw $
> 
> PORTNAME=	apache-solr
>-PORTVERSION=	4.8.1
>+PORTVERSION=	4.9.0
> CATEGORIES=	textproc java
> MASTER_SITES=	APACHE
> MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}
>@@ -19,10 +19,12 @@
> SHEBANG_FILES=	example/etc/create-solrtest.keystore.sh
> 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
> 
> do-install:
> 	cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR}
>diff -ruN /usr/ports/textproc/apache-solr/distinfo ./distinfo
>--- /usr/ports/textproc/apache-solr/distinfo	2014-06-05 05:29:57.000000000 +0200
>+++ ./distinfo	2014-09-02 17:18:48.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (solr-4.8.1.tgz) = ac814affbe4f7270cf98a5d4d70eb65579bff7c008ee96d74b4146b1060bf947
>-SIZE (solr-4.8.1.tgz) = 152451311
>+SHA256 (solr-4.9.0.tgz) = c42b1251f44f8e1b826d89c362b43dec4dd9094e6a07f2f1c27e990f8c6eafdc
>+SIZE (solr-4.9.0.tgz) = 152659468
>diff -ruN /usr/ports/textproc/apache-solr/files/solr.in ./files/solr.in
>--- /usr/ports/textproc/apache-solr/files/solr.in	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/solr.in	2014-09-03 18:41:24.000000000 +0200
>@@ -0,0 +1,50 @@
>+#!/bin/sh
>+#
>+# Copyright (c) 2014, Radim Kolar
>+# All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions are met:
>+#
>+#  * Redistributions of source code must retain the above copyright notice,
>+#    this list of conditions and the following disclaimer.
>+#  * Redistributions in binary form must reproduce the above copyright
>+#    notice, this list of conditions and the following disclaimer in the
>+#    documentation and/or other materials provided with the distribution.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
>+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
>+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
>+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
>+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
>+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
>+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
>+# DAMAGE.
>+
>+# $FreeBSD$
>+#
>+# PROVIDE: solr
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+
>+. /etc/rc.subr
>+
>+name=solr
>+rcvar=solr_enable
>+load_rc_config $name
>+
>+: ${solr_enable:=NO}
>+: ${solr_instance:=/var/db/solr}
>+
>+required_files=${solr_instance}/solr.xml
>+pidfile=/var/run/solr.pid
>+command=/usr/sbin/daemon
>+procname=%%LOCALBASE%%/openjdk7/bin/java
>+start_precmd="cd %%EXAMPLESDIR%%"
>+
>+command_args="-f -p ${pidfile} ${procname} ${solr_flags} -Dsolr.solr.home=${solr_instance} -Dsolr.log=/var/log -jar %%EXAMPLESDIR%%/start.jar"
>+
>+run_rc_command "$1"
>diff -ruN /usr/ports/textproc/apache-solr/pkg-deinstall ./pkg-deinstall
>--- /usr/ports/textproc/apache-solr/pkg-deinstall	1970-01-01 01:00:00.000000000 +0100
>+++ ./pkg-deinstall	2014-09-03 18:12:44.000000000 +0200
>@@ -0,0 +1,7 @@
>+#!/bin/sh
>+#
>+# Removes jetty war cache
>+#
>+if [ "$2" = "DEINSTALL" ]; then
>+   rm -rf $PKG_PREFIX/share/examples/apache-solr/solr-webapp/*
>+fi
>diff -ruN /usr/ports/textproc/apache-solr/pkg-plist ./pkg-plist
>--- /usr/ports/textproc/apache-solr/pkg-plist	2014-06-05 05:29:57.000000000 +0200
>+++ ./pkg-plist	2014-09-02 22:36:17.000000000 +0200
>@@ -13,16 +13,12 @@
> %%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/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/jcl-over-slf4j-1.7.6.jar
>-%%JAVAJARDIR%%/solrj-lib/jul-to-slf4j-1.7.6.jar
>-%%JAVAJARDIR%%/solrj-lib/log4j-1.2.16.jar
> %%JAVAJARDIR%%/solrj-lib/noggit-0.5.jar
> %%JAVAJARDIR%%/solrj-lib/slf4j-api-1.7.6.jar
>-%%JAVAJARDIR%%/solrj-lib/slf4j-log4j12-1.7.6.jar
> %%JAVAJARDIR%%/solrj-lib/wstx-asl-3.2.7.jar
> %%JAVAJARDIR%%/solrj-lib/zookeeper-3.4.6.jar
> %%JAVAJARDIR%%/test-framework/README.txt
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 193290: 146740 | 148475