Re-create textproc/elasticsearch6 after copying it from textproc/elasticsearch5

- Actualy provide elasticsearch6 with this port [1];
- Fix MAINTAINER address [2].

PR:		225836 [1]
Submitted by:	w.schwarzenfeld@utanet.at [1]
Reported by:	john@saltant.com [2] via ports@

6 files changed, 105 insertions, 150 deletions

diff --git a/textproc/elasticsearch6/Makefile b/textproc/elasticsearch6/Makefile
index c6130b19adac..92aaa84c2cff 100644
--- a/textproc/elasticsearch6/Makefile
+++ b/textproc/elasticsearch6/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	5.3.0
-PORTREVISION=	1
+PORTVERSION=	6.0.1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
-PKGNAMESUFFIX=	5
+PKGNAMESUFFIX=	6
 
-MAINTAINER=	tj@FreeBSD.org
+MAINTAINER=	w.schwarzenfeld@utanet.at
 COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash>0:shells/bash
 
-CONFLICTS=	elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch6-[0-9]*
+CONFLICTS=	elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch5-[0-9]*
 
 USES=		cpe shebangfix
 NO_ARCH=	yes
@@ -25,7 +24,7 @@ NO_BUILD=	yes
 JAVA_VERSION=	1.8+
 USE_RC_SUBR=	${PORTNAME}
 SHEBANG_FILES=	bin/elasticsearch-plugin \
-		bin/elasticsearch bin/elasticsearch.in.sh
+		bin/elasticsearch
 
 OPTIONS_DEFINE=	DOCS
 
@@ -33,8 +32,7 @@ OPTIONS_DEFINE=	DOCS
 
 LUCENEVER=	6.4.1
 CONFIG_FILES=	elasticsearch.yml log4j2.properties jvm.options
-BINS=		elasticsearch.in.sh \
-		elasticsearch \
+BINS=		elasticsearch \
 		elasticsearch-plugin
 
 DOCS=		LICENSE.txt \
@@ -62,7 +60,6 @@ PLIST_SUB+=	SEARCHUSER=${SEARCHUSER} \
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
-	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
 
 do-install:
diff --git a/textproc/elasticsearch6/distinfo b/textproc/elasticsearch6/distinfo
index 2a465d9e9d77..bfdd7f575058 100644
--- a/textproc/elasticsearch6/distinfo
+++ b/textproc/elasticsearch6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491415113
-SHA256 (elasticsearch-5.3.0.tar.gz) = effd922973e9f4fe25565e0a194a4b534c08b22849f03cb9fea13c311401e21b
-SIZE (elasticsearch-5.3.0.tar.gz) = 33696963
+TIMESTAMP = 1518385033
+SHA256 (elasticsearch-6.0.1.tar.gz) = efaf32aba41e1b7fd086639c0f062c39e1f28b360a78d5c2b8deed797a4c5c57
+SIZE (elasticsearch-6.0.1.tar.gz) = 28026460
diff --git a/textproc/elasticsearch6/files/patch-bin_elasticsearch b/textproc/elasticsearch6/files/patch-bin_elasticsearch
deleted file mode 100644
index f777ad03d55c..000000000000
--- a/textproc/elasticsearch6/files/patch-bin_elasticsearch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/elasticsearch.orig	2016-12-02 11:42:56 UTC
-+++ bin/elasticsearch
-@@ -112,7 +112,7 @@ ES_HOME=`cd "$ES_HOME"; pwd`
- 
- if [ -z "$ES_JVM_OPTIONS" ]; then
-     for jvm_options in "$ES_HOME"/config/jvm.options \
--                      /etc/elasticsearch/jvm.options; do
-+                      %%PREFIX%%/etc/elasticsearch/jvm.options; do
-         if [ -r "$jvm_options" ]; then
-             ES_JVM_OPTIONS=$jvm_options
-             break
diff --git a/textproc/elasticsearch6/files/patch-bin_elasticsearch.in.sh b/textproc/elasticsearch6/files/patch-bin_elasticsearch.in.sh
deleted file mode 100644
index 3a95104c81ca..000000000000
--- a/textproc/elasticsearch6/files/patch-bin_elasticsearch.in.sh
+++ /dev/null
@@ -1,22 +0,0 @@
---- bin/elasticsearch.in.sh.orig	2016-11-24 10:05:27 UTC
-+++ bin/elasticsearch.in.sh
-@@ -1,5 +1,19 @@
- #!/bin/bash
- 
-+if [ `uname -o` == "FreeBSD" ]; then
-+	. /etc/rc.subr
-+	load_rc_config elasticsearch
-+	ES_MIN_MEM=${elasticsearch_min_mem}
-+	ES_MAX_MEM=${elasticsearch_max_mem}
-+	ES_HEAP_NEW_SIZE=${elasticsearch_heap_newsize}
-+	ES_DIRECT_SIZE=${elasticsearch_direct_size}
-+	ES_USE_IPV4=${elasticsearch_use_ipv4}
-+	ES_GC_OPTS=${elasticsearch_gc_opts}
-+	ES_GC_LOG_FILE=${elasticsearch_gc_logfile}
-+	ES_JAVA_OPTS="$ES_JAVA_OPTS -Des.path.conf=${elasticsearch_config:="/usr/local/etc/elasticsearch"}"
-+	PATH=${PATH}:/usr/local/bin
-+fi
-+
- # check in case a user was using this mechanism
- if [ "x$ES_CLASSPATH" != "x" ]; then
-     cat >&2 << EOF
diff --git a/textproc/elasticsearch6/files/patch-config_elasticsearch.yml b/textproc/elasticsearch6/files/patch-config_elasticsearch.yml
index 3ba976999d32..d44fa1d5a675 100644
--- a/textproc/elasticsearch6/files/patch-config_elasticsearch.yml
+++ b/textproc/elasticsearch6/files/patch-config_elasticsearch.yml
@@ -1,11 +1,6 @@
---- config/elasticsearch.yml.orig	2016-11-24 10:05:27 UTC
+--- config/elasticsearch.yml.orig	2018-02-06 00:13:22 UTC
 +++ config/elasticsearch.yml
-@@ -31,10 +31,15 @@
- # Path to directory where to store the data (separate multiple locations by comma):
- #
- #path.data: /path/to/data
-+path.data: /var/db/elasticsearch
- #
+@@ -35,6 +35,10 @@
  # Path to log files:
  #
  #path.logs: /path/to/logs
diff --git a/textproc/elasticsearch6/pkg-plist b/textproc/elasticsearch6/pkg-plist
index 9e4913c849a0..c2c14636015e 100644
--- a/textproc/elasticsearch6/pkg-plist
+++ b/textproc/elasticsearch6/pkg-plist
@@ -1,107 +1,103 @@
 @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
 @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/log4j2.properties.sample
 @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/jvm.options.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
-bin/elasticsearch-plugin
-lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
-lib/elasticsearch/lib/elasticsearch-%%PORTVERSION%%.jar
-lib/elasticsearch/lib/hppc-0.7.1.jar
-lib/elasticsearch/lib/jackson-core-2.8.6.jar
-lib/elasticsearch/lib/jackson-dataformat-cbor-2.8.6.jar
-lib/elasticsearch/lib/jackson-dataformat-smile-2.8.6.jar
-lib/elasticsearch/lib/jackson-dataformat-yaml-2.8.6.jar
-lib/elasticsearch/lib/java-version-checker-%%PORTVERSION%%.jar
-lib/elasticsearch/lib/jna-4.2.2.jar
-lib/elasticsearch/lib/joda-time-2.9.5.jar
-lib/elasticsearch/lib/jopt-simple-5.0.2.jar
-lib/elasticsearch/lib/jts-1.13.jar
-lib/elasticsearch/lib/log4j-1.2-api-2.7.jar
-lib/elasticsearch/lib/log4j-api-2.7.jar
-lib/elasticsearch/lib/log4j-core-2.7.jar
-lib/elasticsearch/lib/lucene-analyzers-common-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-backward-codecs-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-core-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-grouping-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-highlighter-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-join-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-memory-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-misc-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-queries-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-spatial-extras-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
-lib/elasticsearch/lib/securesm-1.1.jar
-lib/elasticsearch/lib/snakeyaml-1.15.jar
-lib/elasticsearch/lib/spatial4j-0.6.jar
-lib/elasticsearch/lib/t-digest-3.0.jar
-lib/elasticsearch/bin/elasticsearch.in.sh
-lib/elasticsearch/bin/elasticsearch
-lib/elasticsearch/bin/elasticsearch-plugin
-lib/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties
-lib/elasticsearch/modules/ingest-common/ingest-common-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/ingest-common/jcodings-1.0.12.jar
-lib/elasticsearch/modules/ingest-common/joni-2.1.6.jar
-lib/elasticsearch/modules/ingest-common/plugin-descriptor.properties
-lib/elasticsearch/modules/lang-expression/antlr4-runtime-4.5.1-1.jar
-lib/elasticsearch/modules/lang-expression/asm-5.0.4.jar
-lib/elasticsearch/modules/lang-expression/asm-commons-5.0.4.jar
-lib/elasticsearch/modules/lang-expression/asm-tree-5.0.4.jar
-lib/elasticsearch/modules/lang-expression/lang-expression-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/lang-expression/lucene-expressions-%%LUCENEVER%%.jar
-lib/elasticsearch/modules/lang-expression/plugin-descriptor.properties
-lib/elasticsearch/modules/lang-expression/plugin-security.policy
-lib/elasticsearch/modules/lang-groovy/groovy-2.4.6-indy.jar
-lib/elasticsearch/modules/lang-groovy/lang-groovy-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/lang-groovy/plugin-descriptor.properties
-lib/elasticsearch/modules/lang-groovy/plugin-security.policy
-lib/elasticsearch/modules/lang-mustache/compiler-0.9.3.jar
-lib/elasticsearch/modules/lang-mustache/lang-mustache-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/lang-mustache/plugin-descriptor.properties
-lib/elasticsearch/modules/lang-mustache/plugin-security.policy
-lib/elasticsearch/modules/lang-painless/antlr4-runtime-4.5.1-1.jar
-lib/elasticsearch/modules/lang-painless/asm-debug-all-5.1.jar
-lib/elasticsearch/modules/lang-painless/lang-painless-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/lang-painless/plugin-descriptor.properties
-lib/elasticsearch/modules/lang-painless/plugin-security.policy
-lib/elasticsearch/modules/percolator/percolator-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/percolator/plugin-descriptor.properties
-lib/elasticsearch/modules/reindex/commons-codec-1.10.jar
-lib/elasticsearch/modules/reindex/commons-logging-1.1.3.jar
-lib/elasticsearch/modules/reindex/httpasyncclient-4.1.2.jar
-lib/elasticsearch/modules/reindex/httpclient-4.5.2.jar
-lib/elasticsearch/modules/reindex/httpcore-4.4.5.jar
-lib/elasticsearch/modules/reindex/httpcore-nio-4.4.5.jar
-lib/elasticsearch/modules/reindex/plugin-descriptor.properties
-lib/elasticsearch/modules/reindex/reindex-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/reindex/rest-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/transport-netty3/netty-3.10.6.Final.jar
-lib/elasticsearch/modules/transport-netty3/plugin-descriptor.properties
-lib/elasticsearch/modules/transport-netty3/plugin-security.policy
-lib/elasticsearch/modules/transport-netty3/transport-netty3-%%PORTVERSION%%.jar
-lib/elasticsearch/modules/transport-netty4/netty-buffer-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/netty-codec-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/netty-codec-http-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/netty-common-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/netty-handler-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/netty-resolver-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/netty-transport-4.1.7.Final.jar
-lib/elasticsearch/modules/transport-netty4/plugin-descriptor.properties
-lib/elasticsearch/modules/transport-netty4/plugin-security.policy
-lib/elasticsearch/modules/transport-netty4/transport-netty4-%%PORTVERSION%%.jar
+bin/%%SEARCHUSER%%-plugin
+lib/%%SEARCHUSER%%/bin/%%SEARCHUSER%%
+lib/%%SEARCHUSER%%/bin/%%SEARCHUSER%%-plugin
+lib/%%SEARCHUSER%%/lib/HdrHistogram-2.1.9.jar
+lib/%%SEARCHUSER%%/lib/%%SEARCHUSER%%-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/lib/hppc-0.7.1.jar
+lib/%%SEARCHUSER%%/lib/jackson-core-2.8.6.jar
+lib/%%SEARCHUSER%%/lib/jackson-dataformat-cbor-2.8.6.jar
+lib/%%SEARCHUSER%%/lib/jackson-dataformat-smile-2.8.6.jar
+lib/%%SEARCHUSER%%/lib/jackson-dataformat-yaml-2.8.6.jar
+lib/%%SEARCHUSER%%/lib/java-version-checker-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/lib/jna-4.4.0-1.jar
+lib/%%SEARCHUSER%%/lib/joda-time-2.9.5.jar
+lib/%%SEARCHUSER%%/lib/jopt-simple-5.0.2.jar
+lib/%%SEARCHUSER%%/lib/jts-1.13.jar
+lib/%%SEARCHUSER%%/lib/log4j-1.2-api-2.9.1.jar
+lib/%%SEARCHUSER%%/lib/log4j-api-2.9.1.jar
+lib/%%SEARCHUSER%%/lib/log4j-core-2.9.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-analyzers-common-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-backward-codecs-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-core-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-grouping-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-highlighter-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-join-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-memory-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-misc-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-queries-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-queryparser-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-sandbox-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-spatial-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-spatial-extras-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-spatial3d-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/lucene-suggest-7.0.1.jar
+lib/%%SEARCHUSER%%/lib/plugin-cli-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/lib/securesm-1.2.jar
+lib/%%SEARCHUSER%%/lib/snakeyaml-1.15.jar
+lib/%%SEARCHUSER%%/lib/spatial4j-0.6.jar
+lib/%%SEARCHUSER%%/lib/t-digest-3.0.jar
+lib/%%SEARCHUSER%%/modules/aggs-matrix-stats/aggs-matrix-stats-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/aggs-matrix-stats/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/analysis-common/analysis-common-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/analysis-common/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/ingest-common/ingest-common-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/ingest-common/jcodings-1.0.12.jar
+lib/%%SEARCHUSER%%/modules/ingest-common/joni-2.1.6.jar
+lib/%%SEARCHUSER%%/modules/ingest-common/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/lang-expression/antlr4-runtime-4.5.1-1.jar
+lib/%%SEARCHUSER%%/modules/lang-expression/asm-5.0.4.jar
+lib/%%SEARCHUSER%%/modules/lang-expression/asm-commons-5.0.4.jar
+lib/%%SEARCHUSER%%/modules/lang-expression/asm-tree-5.0.4.jar
+lib/%%SEARCHUSER%%/modules/lang-expression/lang-expression-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/lang-expression/lucene-expressions-7.0.1.jar
+lib/%%SEARCHUSER%%/modules/lang-expression/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/lang-expression/plugin-security.policy
+lib/%%SEARCHUSER%%/modules/lang-mustache/compiler-0.9.3.jar
+lib/%%SEARCHUSER%%/modules/lang-mustache/lang-mustache-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/lang-mustache/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/lang-mustache/plugin-security.policy
+lib/%%SEARCHUSER%%/modules/lang-painless/antlr4-runtime-4.5.1-1.jar
+lib/%%SEARCHUSER%%/modules/lang-painless/asm-debug-all-5.1.jar
+lib/%%SEARCHUSER%%/modules/lang-painless/lang-painless-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/lang-painless/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/lang-painless/plugin-security.policy
+lib/%%SEARCHUSER%%/modules/parent-join/parent-join-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/parent-join/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/percolator/percolator-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/percolator/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/reindex/commons-codec-1.10.jar
+lib/%%SEARCHUSER%%/modules/reindex/commons-logging-1.1.3.jar
+lib/%%SEARCHUSER%%/modules/reindex/%%SEARCHUSER%%-rest-client-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/reindex/httpasyncclient-4.1.2.jar
+lib/%%SEARCHUSER%%/modules/reindex/httpclient-4.5.2.jar
+lib/%%SEARCHUSER%%/modules/reindex/httpcore-4.4.5.jar
+lib/%%SEARCHUSER%%/modules/reindex/httpcore-nio-4.4.5.jar
+lib/%%SEARCHUSER%%/modules/reindex/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/reindex/plugin-security.policy
+lib/%%SEARCHUSER%%/modules/reindex/reindex-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/repository-url/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/repository-url/plugin-security.policy
+lib/%%SEARCHUSER%%/modules/repository-url/repository-url-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-buffer-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-codec-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-codec-http-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-common-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-handler-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-resolver-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-transport-4.1.13.Final.jar
+lib/%%SEARCHUSER%%/modules/transport-netty4/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/transport-netty4/plugin-security.policy
+lib/%%SEARCHUSER%%/modules/transport-netty4/transport-netty4-%%PORTVERSION%%.jar
+lib/%%SEARCHUSER%%/modules/tribe/plugin-descriptor.properties
+lib/%%SEARCHUSER%%/modules/tribe/tribe-%%PORTVERSION%%.jar
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile
-@dir lib/elasticsearch/lib
-@dir lib/elasticsearch/bin
-@dir lib/elasticsearch/modules
-@dir lib/elasticsearch/plugins
-@dir lib/elasticsearch
-@dir libexec/elasticsearch
+@dir lib/%%SEARCHUSER%%/plugins
+@dir libexec/%%SEARCHUSER%%
 @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_LOGDIR%%
 @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_DBDIR%%
 @postunexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi