Attachment 157932 Details for Bug 201008 – Upgrade patch

[patch] Upgrade patch

elasticsearch.patch (text/plain), 3.54 KB, created by Jimmy Olgeni on 2015-06-21 15:43:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2015-06-21 15:43:22 UTC

Size: 3.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 390209)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	elasticsearch
>-PORTVERSION=	1.5.2
>-PORTREVISION=	1
>+PORTVERSION=	1.6.0
> CATEGORIES=	textproc java devel
> MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
> 		http://mirrors.rit.edu/zi/
>@@ -96,9 +95,9 @@
> 	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch ${STAGEDIR}${DATADIR}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
> .for f in ${CONFIG_FILES}
>-	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${DATADIR}/${f}.sample
>+	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
> .endfor
> 	${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch
>Index: distinfo
>===================================================================
>--- distinfo	(revision 390209)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (elasticsearch-1.5.2.tar.gz) = efae7897367ac3fa8057d02fad31c72e215b6edef599b63e373d3ce0c1049a14
>-SIZE (elasticsearch-1.5.2.tar.gz) = 28173132
>+SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
>+SIZE (elasticsearch-1.6.0.tar.gz) = 28401477
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 390209)
>+++ files/pkg-message.in	(working copy)
>@@ -1,6 +1,6 @@
> ======================================================================
> 
>-Please see %%DATADIR%% for sample versions of
>+Please see %%ETCDIR%% for sample versions of
> elasticsearch.yml and logging.yml.
> 
> ======================================================================
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 390209)
>+++ pkg-plist	(working copy)
>@@ -1,20 +1,12 @@
>-@owner %%SEARCHUSER%%
>-@group %%SEARCHGROUP%%
>-@unexec if cmp  -s %D/%%DATADIR%%/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi
>-%%DATADIR%%/elasticsearch.yml.sample
>-@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/elasticsearch.yml; fi
>-@unexec if cmp  -s %D/%%DATADIR%%/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi
>-%%DATADIR%%/logging.yml.sample
>-@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/logging.yml; fi
>+@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
>+@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
> @unexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
> @unexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi
>-@owner root
>-@group wheel
> bin/elasticsearch-plugin
> lib/elasticsearch/antlr-runtime-3.5.jar
>+lib/elasticsearch/apache-log4j-extras-1.2.17.jar
> lib/elasticsearch/asm-4.1.jar
> lib/elasticsearch/asm-commons-4.1.jar
>-lib/elasticsearch/apache-log4j-extras-1.2.17.jar
> lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
> lib/elasticsearch/groovy-all-2.4.0.jar
> lib/elasticsearch/jna-4.1.0.jar
>@@ -40,4 +32,3 @@
> %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
> %%PORTDOCS%%%%DOCSDIR%%/README.textile
> @dir lib/elasticsearch/plugins
>-@dir %%ETCDIR%%

Flags:

koobs: maintainer-approval? (tj)

Actions: View | Diff

Attachments on bug 201008: 157932 | 157933 | 158063