Index: head/databases/neo4j/Makefile =================================================================== --- head/databases/neo4j/Makefile +++ head/databases/neo4j/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ PORTNAME= neo4j -DISTVERSION= 3.0.4 -PORTREVISION= 2 +DISTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= http://dist.neo4j.org/ DISTNAME= ${PORTNAME}-community-${DISTVERSION}-unix +LICENSE= GPLv3 MAINTAINER= crees@FreeBSD.org COMMENT= High performance graph store and database @@ -15,29 +16,29 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S,-unix,,} NO_BUILD= yes USES= shebangfix -SHEBANG_FILES= bin/neo4j-shell bin/neo4j-import +SHEBANG_FILES= bin/cypher-shell bin/neo4j-admin bin/neo4j-shell bin/neo4j-import USE_JAVA= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= ${PORTNAME}.sh +DBDIR= /var/db/${PORTNAME} + post-patch: - ${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g;s,%%PREFIX%%,${PREFIX},g' \ - ${WRKSRC}/bin/neo4j-shared.sh ${WRKSRC}/conf/neo4j.conf + ${REINPLACE_CMD} 's,%%DBDIR%%,${DBDIR},g;s,%%PREFIX%%,${PREFIX},g' \ + ${WRKSRC}/bin/cypher-shell ${WRKSRC}/bin/neo4j* \ + ${WRKSRC}/conf/neo4j.conf do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/tools + ${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools ${INSTALL_SCRIPT} ${WRKSRC}/bin/tools/* \ - ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/tools -.for j in j j-admin j-import j-shell - ${INSTALL_SCRIPT} ${WRKSRC}/bin/neo4$j ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} - -cd ${STAGEDIR}${PREFIX}/bin && ${LN} ${PORTNAME} neo4$j 2>/dev/null + ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools +.for name in cypher-shell neo4j neo4j-admin neo4j-import neo4j-shell + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${name} ${STAGEDIR}${PREFIX}/bin .endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins - ${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-shared.sh \ - ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} -.for f in ${PORTNAME}.conf ${PORTNAME}-wrapper.conf + ${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/plugins + ${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/${PORTNAME}/lib +.for f in ${PORTNAME}.conf ${INSTALL_DATA} ${WRKSRC}/conf/$f \ ${STAGEDIR}${PREFIX}/etc/$f.sample .endfor Index: head/databases/neo4j/distinfo =================================================================== --- head/databases/neo4j/distinfo +++ head/databases/neo4j/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472081606 -SHA256 (neo4j-community-3.0.4-unix.tar.gz) = e1da51163eb18380623788eabea34dfe23ee21c99deca4e7922094b0d242e805 -SIZE (neo4j-community-3.0.4-unix.tar.gz) = 61425809 +TIMESTAMP = 1498754546 +SHA256 (neo4j-community-3.2.1-unix.tar.gz) = 24fd6a704e0d80c4b4f9a3d17ce0db23f258a8cdcfa1eb28d7803b7d1811ee96 +SIZE (neo4j-community-3.2.1-unix.tar.gz) = 77979397 Index: head/databases/neo4j/files/neo4j.in =================================================================== --- head/databases/neo4j/files/neo4j.in +++ head/databases/neo4j/files/neo4j.in @@ -20,7 +20,7 @@ : ${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 @@ 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 Index: head/databases/neo4j/files/neo4j.sh.in =================================================================== --- head/databases/neo4j/files/neo4j.sh.in +++ head/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+"$@"} Index: head/databases/neo4j/files/patch-bin-neo4j-shared-sh =================================================================== --- head/databases/neo4j/files/patch-bin-neo4j-shared-sh +++ head/databases/neo4j/files/patch-bin-neo4j-shared-sh @@ -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 - } Index: head/databases/neo4j/files/patch-bin_cypher-shell =================================================================== --- head/databases/neo4j/files/patch-bin_cypher-shell +++ head/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 + } Index: head/databases/neo4j/files/patch-bin_neo4j =================================================================== --- head/databases/neo4j/files/patch-bin_neo4j +++ head/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 + } + Index: head/databases/neo4j/files/patch-bin_neo4j-admin =================================================================== --- head/databases/neo4j/files/patch-bin_neo4j-admin +++ head/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 + } + Index: head/databases/neo4j/files/patch-bin_neo4j-import =================================================================== --- head/databases/neo4j/files/patch-bin_neo4j-import +++ head/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 + } + Index: head/databases/neo4j/files/patch-bin_neo4j-shell =================================================================== --- head/databases/neo4j/files/patch-bin_neo4j-shell +++ head/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 + } + Index: head/databases/neo4j/files/patch-conf-neo4j-conf =================================================================== --- head/databases/neo4j/files/patch-conf-neo4j-conf +++ head/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 Index: head/databases/neo4j/pkg-plist =================================================================== --- head/databases/neo4j/pkg-plist +++ head/databases/neo4j/pkg-plist @@ -1,88 +1,91 @@ +bin/cypher-shell bin/neo4j bin/neo4j-admin bin/neo4j-import bin/neo4j-shell -@sample etc/neo4j-wrapper.conf.sample @sample etc/neo4j.conf.sample -lib/neo4j/asm-5.0.2.jar -lib/neo4j/bcpkix-jdk15on-1.53.jar -lib/neo4j/bcprov-jdk15on-1.53.jar -lib/neo4j/commons-beanutils-1.8.3.jar -lib/neo4j/commons-configuration-1.10.jar -lib/neo4j/commons-digester-2.1.jar -lib/neo4j/commons-io-2.4.jar -lib/neo4j/commons-lang-2.6.jar -lib/neo4j/commons-lang3-3.3.2.jar -lib/neo4j/commons-logging-1.1.1.jar -lib/neo4j/concurrentlinkedhashmap-lru-1.4.2.jar -lib/neo4j/jackson-core-asl-1.9.13.jar -lib/neo4j/jackson-jaxrs-1.9.13.jar -lib/neo4j/jackson-mapper-asl-1.9.13.jar -lib/neo4j/javax.servlet-api-3.1.0.jar -lib/neo4j/jersey-core-1.19.jar -lib/neo4j/jersey-multipart-1.19.jar -lib/neo4j/jersey-server-1.19.jar -lib/neo4j/jersey-servlet-1.19.jar -lib/neo4j/jetty-http-9.2.9.v20150224.jar -lib/neo4j/jetty-io-9.2.9.v20150224.jar -lib/neo4j/jetty-security-9.2.9.v20150224.jar -lib/neo4j/jetty-server-9.2.9.v20150224.jar -lib/neo4j/jetty-servlet-9.2.9.v20150224.jar -lib/neo4j/jetty-util-9.2.9.v20150224.jar -lib/neo4j/jetty-webapp-9.2.9.v20150224.jar -lib/neo4j/jetty-xml-9.2.9.v20150224.jar -lib/neo4j/jline-2.12.jar -lib/neo4j/jsr311-api-1.1.2.r612.jar -lib/neo4j/lucene-analyzers-common-5.5.0.jar -lib/neo4j/lucene-codecs-5.5.0.jar -lib/neo4j/lucene-core-5.5.0.jar -lib/neo4j/lucene-queryparser-5.5.0.jar -lib/neo4j/mimepull-1.9.3.jar -lib/neo4j/neo4j-bolt-3.0.4.jar -lib/neo4j/neo4j-browser-1.1.8.jar -lib/neo4j/neo4j-codegen-3.0.4.jar -lib/neo4j/neo4j-collections-3.0.4.jar -lib/neo4j/neo4j-command-line-3.0.4.jar -lib/neo4j/neo4j-common-3.0.4.jar -lib/neo4j/neo4j-consistency-check-3.0.4.jar -lib/neo4j/neo4j-csv-3.0.4.jar -lib/neo4j/neo4j-cypher-3.0.4.jar -lib/neo4j/neo4j-cypher-compiler-2.3-2.3.5.jar -lib/neo4j/neo4j-cypher-compiler-3.0-3.0.4.jar -lib/neo4j/neo4j-cypher-frontend-2.3-2.3.5.jar -lib/neo4j/neo4j-cypher-frontend-3.0-3.0.4.jar -lib/neo4j/neo4j-dbms-3.0.4.jar -lib/neo4j/neo4j-graph-algo-3.0.4.jar -lib/neo4j/neo4j-graph-matching-3.0.4.jar -lib/neo4j/neo4j-graphdb-api-3.0.4.jar -lib/neo4j/neo4j-import-tool-3.0.4.jar -lib/neo4j/neo4j-io-3.0.4.jar -lib/neo4j/neo4j-jmx-3.0.4.jar -lib/neo4j/neo4j-kernel-3.0.4.jar -lib/neo4j/neo4j-logging-3.0.4.jar -lib/neo4j/neo4j-lucene-index-3.0.4.jar -lib/neo4j/neo4j-lucene-upgrade-3.0.4.jar -lib/neo4j/neo4j-primitive-collections-3.0.4.jar -lib/neo4j/neo4j-resource-3.0.4.jar -lib/neo4j/neo4j-security-3.0.4.jar -lib/neo4j/neo4j-server-3.0.4.jar -lib/neo4j/neo4j-shell-3.0.4.jar -lib/neo4j/neo4j-udc-3.0.4.jar -lib/neo4j/neo4j-unsafe-3.0.4.jar -lib/neo4j/netty-all-4.0.28.Final.jar -lib/neo4j/opencsv-2.3.jar -lib/neo4j/parboiled-core-1.1.7.jar -lib/neo4j/parboiled-scala_2.11-1.1.7.jar -lib/neo4j/rhino-1.7R4.jar -lib/neo4j/scala-library-2.11.8.jar -lib/neo4j/scala-reflect-2.11.8.jar -lib/neo4j/server-api-3.0.4.jar -libexec/neo4j/neo4j -libexec/neo4j/neo4j-admin -libexec/neo4j/neo4j-import -libexec/neo4j/neo4j-shared.sh -libexec/neo4j/neo4j-shell -libexec/neo4j/tools/config-migrator.jar -@dir lib/neo4j/plugins +neo4j/lib/asm-5.2.jar +neo4j/lib/bcpkix-jdk15on-1.53.jar +neo4j/lib/bcprov-jdk15on-1.53.jar +neo4j/lib/caffeine-2.3.3.jar +neo4j/lib/commons-beanutils-1.8.3.jar +neo4j/lib/commons-compress-1.12.jar +neo4j/lib/commons-configuration-1.10.jar +neo4j/lib/commons-digester-2.1.jar +neo4j/lib/commons-io-2.4.jar +neo4j/lib/commons-lang-2.6.jar +neo4j/lib/commons-lang3-3.3.2.jar +neo4j/lib/commons-logging-1.1.1.jar +neo4j/lib/concurrentlinkedhashmap-lru-1.4.2.jar +neo4j/lib/jackson-core-asl-1.9.13.jar +neo4j/lib/jackson-jaxrs-1.9.13.jar +neo4j/lib/jackson-mapper-asl-1.9.13.jar +neo4j/lib/javax.servlet-api-3.1.0.jar +neo4j/lib/jersey-core-1.19.jar +neo4j/lib/jersey-multipart-1.19.jar +neo4j/lib/jersey-server-1.19.jar +neo4j/lib/jersey-servlet-1.19.jar +neo4j/lib/jetty-http-9.2.9.v20150224.jar +neo4j/lib/jetty-io-9.2.9.v20150224.jar +neo4j/lib/jetty-security-9.2.9.v20150224.jar +neo4j/lib/jetty-server-9.2.9.v20150224.jar +neo4j/lib/jetty-servlet-9.2.9.v20150224.jar +neo4j/lib/jetty-util-9.2.9.v20150224.jar +neo4j/lib/jetty-webapp-9.2.9.v20150224.jar +neo4j/lib/jetty-xml-9.2.9.v20150224.jar +neo4j/lib/jline-2.12.jar +neo4j/lib/jsr311-api-1.1.2.r612.jar +neo4j/lib/lucene-analyzers-common-5.5.0.jar +neo4j/lib/lucene-codecs-5.5.0.jar +neo4j/lib/lucene-core-5.5.0.jar +neo4j/lib/lucene-queryparser-5.5.0.jar +neo4j/lib/mimepull-1.9.3.jar +neo4j/lib/neo4j-bolt-3.2.1.jar +neo4j/lib/neo4j-browser-3.0.4.jar +neo4j/lib/neo4j-codegen-3.2.1.jar +neo4j/lib/neo4j-collections-3.2.1.jar +neo4j/lib/neo4j-command-line-3.2.1.jar +neo4j/lib/neo4j-common-3.2.1.jar +neo4j/lib/neo4j-configuration-3.2.1.jar +neo4j/lib/neo4j-consistency-check-3.2.1.jar +neo4j/lib/neo4j-csv-3.2.1.jar +neo4j/lib/neo4j-cypher-3.2.1.jar +neo4j/lib/neo4j-cypher-compiler-2.3-2.3.10.jar +neo4j/lib/neo4j-cypher-compiler-3.1-3.1.4.jar +neo4j/lib/neo4j-cypher-compiler-3.2-3.2.1.jar +neo4j/lib/neo4j-cypher-frontend-2.3-2.3.10.jar +neo4j/lib/neo4j-cypher-frontend-3.1-3.1.4.jar +neo4j/lib/neo4j-cypher-frontend-3.2-3.2.1.jar +neo4j/lib/neo4j-cypher-ir-3.2-3.2.1.jar +neo4j/lib/neo4j-dbms-3.2.1.jar +neo4j/lib/neo4j-graph-algo-3.2.1.jar +neo4j/lib/neo4j-graph-matching-3.1.3.jar +neo4j/lib/neo4j-graphdb-api-3.2.1.jar +neo4j/lib/neo4j-import-tool-3.2.1.jar +neo4j/lib/neo4j-index-3.2.1.jar +neo4j/lib/neo4j-io-3.2.1.jar +neo4j/lib/neo4j-jmx-3.2.1.jar +neo4j/lib/neo4j-kernel-3.2.1.jar +neo4j/lib/neo4j-logging-3.2.1.jar +neo4j/lib/neo4j-lucene-index-3.2.1.jar +neo4j/lib/neo4j-lucene-upgrade-3.2.1.jar +neo4j/lib/neo4j-primitive-collections-3.2.1.jar +neo4j/lib/neo4j-resource-3.2.1.jar +neo4j/lib/neo4j-security-3.2.1.jar +neo4j/lib/neo4j-server-3.2.1.jar +neo4j/lib/neo4j-shell-3.2.1.jar +neo4j/lib/neo4j-udc-3.2.1.jar +neo4j/lib/neo4j-unsafe-3.2.1.jar +neo4j/lib/netty-all-4.1.8.Final.jar +neo4j/lib/opencsv-2.3.jar +neo4j/lib/parboiled-core-1.1.7.jar +neo4j/lib/parboiled-scala_2.11-1.1.7.jar +neo4j/lib/rhino-1.7R4.jar +neo4j/lib/scala-library-2.11.8.jar +neo4j/lib/scala-reflect-2.11.8.jar +neo4j/lib/server-api-3.2.1.jar +neo4j/libexec/tools/2.x-config-migrator.jar +neo4j/libexec/tools/cypher-shell-all.jar +@dir neo4j/lib/plugins @dir %%DATADIR%% @dir etc/neo4j-certificates