Attachment 147079 Details for Bug 193467 – Patch to resolve issue

Patch to resolve issue

elasticsearch.diff.txt (text/plain), 3.91 KB, created by Ryan Steinmetz on 2014-09-08 19:49:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Steinmetz

Created: 2014-09-08 19:49:54 UTC

Size: 3.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 367659)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	elasticsearch
> PORTVERSION=	1.3.2
>+PORTREVISION=	1
> CATEGORIES=	textproc java devel
> MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
> 		http://mirrors.rit.edu/zi/
>@@ -18,7 +19,6 @@
> ONLY_FOR_ARCHS=	i386 amd64
> USE_RC_SUBR=	${PORTNAME}
> 
>-
> OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
>@@ -65,7 +65,7 @@
> SUB_LIST=	SEARCHUSER=${SEARCHUSER} \
> 		SEARCHGROUP=${SEARCHGROUP} \
> 		PORTVERSION=${PORTVERSION}
>-SUB_FILES=	elasticsearch-plugin
>+SUB_FILES=	elasticsearch-plugin pkg-message
> PLIST_SUB=	SIGAR_ARCH=${SIGAR_ARCH} \
> 		SEARCHUSER=${SEARCHUSER} \
> 		SEARCHGROUP=${SEARCHGROUP} \
>@@ -78,9 +78,9 @@
> 	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch ${STAGEDIR}${DATADIR}
> .for f in ${CONFIG_FILES}
>-	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${PREFIX}/etc/elasticsearch/${f}.sample
>+	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${DATADIR}/${f}.sample
> .endfor
> 	${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 0)
>+++ files/pkg-message.in	(working copy)
>@@ -0,0 +1,6 @@
>+======================================================================
>+
>+Please see %%DATADIR%% for sample versions of
>+elasticsearch.yml and logging.yml.
>+
>+======================================================================
>
>Property changes on: files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 367659)
>+++ pkg-plist	(working copy)
>@@ -1,11 +1,11 @@
> @owner %%SEARCHUSER%%
> @group %%SEARCHGROUP%%
>-@unexec if cmp  -s %D/etc/elasticsearch/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi
>-etc/elasticsearch/elasticsearch.yml.sample
>-@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi
>-@unexec if cmp  -s %D/etc/elasticsearch/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi
>-etc/elasticsearch/logging.yml.sample
>-@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %B/logging.yml; fi
>+@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/%%DATADIR%%/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
> @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
>@@ -39,6 +39,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
> %%PORTDOCS%%%%DOCSDIR%%/README.textile
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrmtry %%DATADIR%%
> @dirrmtry etc/elasticsearch
> @dirrm lib/elasticsearch/sigar
> @dirrm lib/elasticsearch

Actions: View

Attachments on bug 193467: 147079 | 147081