9 files changed, 77 insertions, 39 deletions
diff --git a/databases/neo4j/files/neo4j.in b/databases/neo4j/files/neo4j.in
index 31705c8a4362..db100a197ecc 100644
--- a/databases/neo4j/files/neo4j.in
+++ b/databases/neo4j/files/neo4j.in
@@ -20,7 +20,7 @@ load_rc_config $name
 
 : ${neo4j_enable:=NO}
 
-command=%%PREFIX%%/libexec/neo4j/neo4j
+command=%%PREFIX%%/bin/neo4j
 start_cmd="$command start"
 start_precmd=neo4j_prestart
 stop_cmd="$command stop"
@@ -29,7 +29,7 @@ status_cmd="$command status"
 neo4j_prestart()
 {
 	NEO4J_DATA=%%DATADIR%%
-	NEO4J_LIB=%%PREFIX%%/lib/neo4j
+	NEO4J_LIB=%%PREFIX%%/neo4j/lib
 	NEO4J_LOGS=/var/log/neo4j
 	NEO4J_PLUGINS=${NEO4J_LIB}/plugins
 	NEO4J_RUN=/var/run/neo4j
diff --git a/databases/neo4j/files/neo4j.sh.in b/databases/neo4j/files/neo4j.sh.in
index 3edd106647a5..8aa90d6c4240 100644
--- a/databases/neo4j/files/neo4j.sh.in
+++ b/databases/neo4j/files/neo4j.sh.in
@@ -2,6 +2,4 @@
 #
 # $FreeBSD$
 
-. %%PREFIX%%/libexec/neo4j/neo4j-shared.sh
-
-exec %%PREFIX%%/libexec/neo4j/$(basename $0) ${1+"$@"}
+exec %%PREFIX%%/bin/$(basename $0) ${1+"$@"}
diff --git a/databases/neo4j/files/patch-bin-neo4j-shared-sh b/databases/neo4j/files/patch-bin-neo4j-shared-sh
deleted file mode 100644
index fadf6b3ab19c..000000000000
--- a/databases/neo4j/files/patch-bin-neo4j-shared-sh
+++ /dev/null
@@ -1,27 +0,0 @@
---- bin/neo4j-shared.sh.orig	2016-08-25 00:54:03.496139435 +0100
-+++ bin/neo4j-shared.sh	2016-08-25 01:02:34.689503862 +0100
-@@ -124,7 +124,7 @@
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
-     NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  export NEO4J_CONF=%%PREFIX%%/etc
-   readonly NEO4J_HOME NEO4J_CONF
- }
- 
-@@ -159,10 +159,10 @@
- }
- 
- _setup_configurable_paths() {
--  NEO4J_DATA=$(resolve_path "${dbms_directories_data:-data}")
--  NEO4J_LIB=$(resolve_path "${dbms_directories_lib:-lib}")
--  NEO4J_LOGS=$(resolve_path "${dbms_directories_logs:-logs}")
--  NEO4J_PLUGINS=$(resolve_path "${dbms_directories_plugins:-plugins}")
--  NEO4J_RUN=$(resolve_path "${dbms_directories_run:-run}")
-+  export NEO4J_DATA=%%DATADIR%%
-+  export NEO4J_LIB=%%PREFIX%%/lib/neo4j
-+  export NEO4J_LOGS=/var/log/neo4j
-+  export NEO4J_PLUGINS=${NEO4J_LIB}/plugins
-+  export NEO4J_RUN=/var/run
-   readonly NEO4J_DATA NEO4J_LIB NEO4J_LOGS NEO4J_PLUGINS NEO4J_RUN
- }
diff --git a/databases/neo4j/files/patch-bin_cypher-shell b/databases/neo4j/files/patch-bin_cypher-shell
new file mode 100644
index 000000000000..7c9bea6e4729
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_cypher-shell
@@ -0,0 +1,11 @@
+--- bin/cypher-shell.orig	2017-07-04 01:59:39 UTC
++++ bin/cypher-shell
+@@ -72,7 +72,7 @@ build_classpath() {
+ 
+   # Then try installation directory (prefix/bin and prefix/share/cypher-shell/lib)
+   if [[ -z "${JARPATH}" ]]; then
+-    APP_HOME="${APP_HOME}/../share/cypher-shell"
++    APP_HOME="${APP_HOME}/../neo4j/lib"
+     JARPATH="$(find "${APP_HOME}" -name "cypher-shell-all.jar" )"
+   fi
+ }
diff --git a/databases/neo4j/files/patch-bin_neo4j b/databases/neo4j/files/patch-bin_neo4j
new file mode 100644
index 000000000000..3cb38d4c0c13
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j
@@ -0,0 +1,20 @@
+--- bin/neo4j.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/local/bin/bash
+ # Copyright (c) 2002-2016 "Neo Technology,"
+ # Network Engine for Objects in Lund AB [http://neotechnology.com]
+ #
+@@ -162,9 +162,9 @@ _show_java_help() {
+ 
+ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-bin_neo4j-admin b/databases/neo4j/files/patch-bin_neo4j-admin
new file mode 100644
index 000000000000..17bbec1bcdcf
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j-admin
@@ -0,0 +1,12 @@
+--- bin/neo4j-admin.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j-admin
+@@ -140,7 +140,7 @@ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-bin_neo4j-import b/databases/neo4j/files/patch-bin_neo4j-import
new file mode 100644
index 000000000000..fcebfeece4b8
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j-import
@@ -0,0 +1,12 @@
+--- bin/neo4j-import.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j-import
+@@ -140,7 +140,7 @@ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-bin_neo4j-shell b/databases/neo4j/files/patch-bin_neo4j-shell
new file mode 100644
index 000000000000..f1801c40b4da
--- /dev/null
+++ b/databases/neo4j/files/patch-bin_neo4j-shell
@@ -0,0 +1,12 @@
+--- bin/neo4j-shell.orig	2017-07-04 01:59:39 UTC
++++ bin/neo4j-shell
+@@ -140,7 +140,7 @@ _setup_calculated_paths() {
+   if [[ -z "${NEO4J_HOME:-}" ]]; then
+-    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
++    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
+   fi
+-  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
++  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
+   readonly NEO4J_HOME NEO4J_CONF
+ }
+ 
diff --git a/databases/neo4j/files/patch-conf-neo4j-conf b/databases/neo4j/files/patch-conf-neo4j-conf
index 5d99f4f2c78c..7ddbe28f5267 100644
--- a/databases/neo4j/files/patch-conf-neo4j-conf
+++ b/databases/neo4j/files/patch-conf-neo4j-conf
@@ -1,15 +1,15 @@
---- conf/neo4j.conf.orig	2016-08-25 02:30:25.057742736 +0100
-+++ conf/neo4j.conf	2016-08-25 02:32:53.932724521 +0100
-@@ -6,9 +6,9 @@
+--- conf/neo4j.conf.orig	2017-05-31 21:11:19 UTC
++++ conf/neo4j.conf
+@@ -9,9 +9,9 @@
  #dbms.active_database=graph.db
  
  # Paths of directories in the installation.
 -#dbms.directories.data=data
 -#dbms.directories.plugins=plugins
 -#dbms.directories.certificates=certificates
-+dbms.directories.data=%%DATADIR%%
++dbms.directories.data=%%DBDIR%%
 +dbms.directories.plugins=%%PREFIX%%/lib/neo4j/plugins
 +dbms.directories.certificates=%%PREFIX%%/etc/neo4j-certificates
- 
- # This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or uncomment it to
- # allow files to be loaded from anywhere in filesystem; this introduces possible security problems. See the `LOAD CSV`
+ #dbms.directories.logs=logs
+ #dbms.directories.lib=lib
+ #dbms.directories.run=run