databases/elasticsearch: Commit forgotten updates to patches.

4 files changed, 47 insertions, 53 deletions

diff --git a/databases/elasticsearch/distinfo b/databases/elasticsearch/distinfo
index b5275e99f49..86b56e2e0ae 100644
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2017/11/20 15:36:47 fhajny Exp $
+$NetBSD: distinfo,v 1.37 2017/11/30 17:50:30 fhajny Exp $
 
 SHA1 (elasticsearch-6.0.0.tar.gz) = 8aa6c56edf30cebae13846ce5d774bfec06fed81
 RMD160 (elasticsearch-6.0.0.tar.gz) = 961ee8740e40601d56b01133f8e1c995b64fee32
 SHA512 (elasticsearch-6.0.0.tar.gz) = 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c
 Size (elasticsearch-6.0.0.tar.gz) = 28017602 bytes
-SHA1 (patch-bin_elasticsearch-env) = 1389988ca16bd11a7975d9d4c65408b54c657598
+SHA1 (patch-bin_elasticsearch-env) = 7d8f71c6c1a99168cc4a7322e054ddc8fe94b68e
 SHA1 (patch-config_elasticsearch.yml) = f66dad65dec48a45a4d52b685d6e3ab29de62cf2
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch b/databases/elasticsearch/patches/patch-bin_elasticsearch
deleted file mode 100644
index b694be39d75..00000000000
--- a/databases/elasticsearch/patches/patch-bin_elasticsearch
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bin_elasticsearch,v 1.1 2016/11/08 09:18:01 fhajny Exp $
-
-Default paths.
-
---- bin/elasticsearch.orig	2016-10-26 04:35:54.000000000 +0000
-+++ bin/elasticsearch
-@@ -104,8 +104,13 @@ while [ -h "$SCRIPT" ] ; do
-   fi
- done
- 
-+#set default JAVA_HOME
-+if [ -z "$JAVA_HOME" ]; then
-+  JAVA_HOME="@PKG_JAVA_HOME@"
-+fi
-+
- # determine elasticsearch home
--ES_HOME=`dirname "$SCRIPT"`/..
-+ES_HOME="@ES_BASEDIR@"
- 
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch-env b/databases/elasticsearch/patches/patch-bin_elasticsearch-env
new file mode 100644
index 00000000000..8bdaf1266ed
--- /dev/null
+++ b/databases/elasticsearch/patches/patch-bin_elasticsearch-env
@@ -0,0 +1,45 @@
+$NetBSD: patch-bin_elasticsearch-env,v 1.1 2017/11/30 17:50:30 fhajny Exp $
+
+Fix default paths.
+
+--- bin/elasticsearch-env.orig	2017-11-10 18:40:01.000000000 +0000
++++ bin/elasticsearch-env
+@@ -19,22 +19,17 @@ while [ -h "$SCRIPT" ] ; do
+   fi
+ done
+ 
+-# determine Elasticsearch home; to do this, we strip from the path until we find
+-# bin, and then strip bin (there is an assumption here that there is no nested
+-# directory under bin also named bin)
+-ES_HOME=`dirname "$SCRIPT"`
+-
+-# now make ES_HOME absolute
+-ES_HOME=`cd "$ES_HOME"; pwd`
+-
+-while [ "`basename "$ES_HOME"`" != "bin" ]; do
+-  ES_HOME=`dirname "$ES_HOME"`
+-done
+-ES_HOME=`dirname "$ES_HOME"`
++# hardcode home dir, because we can
++ES_HOME="@ES_BASEDIR@"
+ 
+ # now set the classpath
+ ES_CLASSPATH="$ES_HOME/lib/*"
+ 
++#set default JAVA_HOME
++if [ -z "$JAVA_HOME" ]; then
++  JAVA_HOME="@PKG_JAVA_HOME@"
++fi
++
+ # now set the path to java
+ if [ -x "$JAVA_HOME/bin/java" ]; then
+   JAVA="$JAVA_HOME/bin/java"
+@@ -67,7 +62,7 @@ fi
+ 
+ export HOSTNAME=$HOSTNAME
+ 
+-if [ -z "$ES_PATH_CONF" ]; then ES_PATH_CONF="$ES_HOME"/config; fi
++if [ -z "$ES_PATH_CONF" ]; then ES_PATH_CONF="@PKG_SYSCONFDIR@"; fi
+ 
+ if [ -z "$ES_PATH_CONF" ]; then
+   echo "ES_PATH_CONF must be set to the configuration path"
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin b/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin
deleted file mode 100644
index 7c764b6de5d..00000000000
--- a/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-bin_elasticsearch-plugin,v 1.1 2016/11/08 09:18:01 fhajny Exp $
-
-Default paths.
-
---- bin/elasticsearch-plugin.orig	2016-10-26 04:35:54.000000000 +0000
-+++ bin/elasticsearch-plugin
-@@ -15,8 +15,13 @@ while [ -h "$SCRIPT" ] ; do
-   fi
- done
- 
-+#set default JAVA_HOME
-+if [ -z "$JAVA_HOME" ]; then
-+  JAVA_HOME="@PKG_JAVA_HOME@"
-+fi
-+
- # determine elasticsearch home
--ES_HOME=`dirname "$SCRIPT"`/..
-+ES_HOME="@ES_BASEDIR@"
- 
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
-@@ -23,7 +29,7 @@ ES_HOME=`cd "$ES_HOME"; pwd`
- 
- # Sets the default values for elasticsearch variables used in this script
- if [ -z "$CONF_DIR" ]; then
--  CONF_DIR="$ES_HOME/config"
-+  CONF_DIR="@PKG_SYSCONFDIR@"
- fi
- 
- # The default env file is defined at building/packaging time.