Index: databases/arangodb32/Makefile =================================================================== --- databases/arangodb32/Makefile +++ databases/arangodb32/Makefile @@ -11,10 +11,14 @@ COMMENT= ArangoDB is a distributed NoSQL database with multiple data models LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only builds on amd64" BROKEN_FreeBSD_10= libc++ is too old + +CONFLICTS_INSTALL= arangodb33 + USES= gmake ssl cmake:outsource,noninja python:2.7 compiler USE_GITHUB= yes Index: databases/arangodb32/pkg-descr =================================================================== --- databases/arangodb32/pkg-descr +++ databases/arangodb32/pkg-descr @@ -2,4 +2,8 @@ documents, graphs, and key-values. Build high performance applications using a convenient SQL-like query language or JavaScript extensions +This is not the latest version. +Please install arangodb33 (databases/arangodb33) for the latest +version. + WWW: https://www.arangodb.com Index: databases/arangodb33/Makefile =================================================================== --- databases/arangodb33/Makefile +++ databases/arangodb33/Makefile @@ -1,21 +1,25 @@ -# Created by: Vlad Galu # $FreeBSD$ PORTNAME= arangodb DISTVERSIONPREFIX= v -DISTVERSION= 3.2.9 +DISTVERSION= 3.3.2 CATEGORIES= databases net -PKGNAMESUFFIX= 32 +PKGNAMESUFFIX= 33 MAINTAINER= galu@packetdam.com COMMENT= ArangoDB is a distributed NoSQL database with multiple data models LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only builds on amd64" BROKEN_FreeBSD_10= libc++ is too old -USES= gmake ssl cmake:outsource,noninja python:2.7 compiler + +CONFLICTS_INSTALL= arangodb32 +CONFLICTS_BUILD= v8 + +USES= cmake:outsource,noninja compiler gmake python:2.7 ssl # ninja: error: loading 'build.ninja': No such file or directory USE_GITHUB= yes CMAKE_ARGS= -DUSE_JEMALLOC:BOOL=off \ @@ -28,18 +32,12 @@ post-install: .for section in 1 8 - ${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/ - ${RMDIR} ${STAGEDIR}${PREFIX}/share/man/man${section} + @${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/ + @${RMDIR} ${STAGEDIR}${PREFIX}/share/man/man${section} .endfor - ${RMDIR} ${STAGEDIR}${PREFIX}/share/man - ${REINPLACE_CMD} -e 's|/usr/local/var/lib/arangodb3|/var/db/arangodb|g' ${STAGEDIR}${PREFIX}/etc/arangodb/*.conf - ${REINPLACE_CMD} -e 's|/usr/local/var/log/arangodb3|/var/log/arangodb|g' ${STAGEDIR}${PREFIX}/etc/arangodb/arangod.conf - ${FIND} ${STAGEDIR}${PREFIX}/etc/arangodb/ -type f -name *.conf -exec ${MV} {} {}.sample \; - ${RMDIR} ${STAGEDIR}${PREFIX}/var/lib/arangodb - ${RMDIR} ${STAGEDIR}${PREFIX}/var/lib/arangodb-apps - ${RMDIR} ${STAGEDIR}${PREFIX}/var/lib - ${RMDIR} ${STAGEDIR}${PREFIX}/var/log/arangodb - ${RMDIR} ${STAGEDIR}${PREFIX}/var/log - ${RMDIR} ${STAGEDIR}${PREFIX}/var + @${REINPLACE_CMD} -e 's|/usr/local/var/lib/arangodb3|/var/db/arangodb|g' ${STAGEDIR}${PREFIX}/etc/arangodb/*.conf + @${REINPLACE_CMD} -e 's|/usr/local/var/log/arangodb3|/var/log/arangodb|g' ${STAGEDIR}${PREFIX}/etc/arangodb/arangod.conf + @${FIND} ${STAGEDIR}${PREFIX}/etc/arangodb/ -type f -name *.conf -exec ${MV} {} {}.sample \; + @cd ${STAGEDIR}${PREFIX} && ${RMDIR} share/man var/lib/arangodb var/lib/arangodb-apps var/lib var/log/arangodb var/log var .include Index: databases/arangodb33/distinfo =================================================================== --- databases/arangodb33/distinfo +++ databases/arangodb33/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512759306 -SHA256 (arangodb-arangodb-v3.2.9_GH0.tar.gz) = d327b6ca1b192ad83c75b526a89f8a7528a9502d277ae2798f72b55363e22b7b -SIZE (arangodb-arangodb-v3.2.9_GH0.tar.gz) = 144185432 +TIMESTAMP = 1515569986 +SHA256 (arangodb-arangodb-v3.3.2_GH0.tar.gz) = f3843a7238afb12a08373acaed3cd34cde885e56d499cf6c38a9a143a36fa636 +SIZE (arangodb-arangodb-v3.3.2_GH0.tar.gz) = 144685696 Index: databases/arangodb33/files/patch-CMakeLists.txt =================================================================== --- databases/arangodb33/files/patch-CMakeLists.txt +++ databases/arangodb33/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2017-11-15 11:23:07 UTC +--- CMakeLists.txt.orig 2018-01-05 13:56:52 UTC +++ CMakeLists.txt @@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) endif () @@ -12,7 +12,7 @@ endif () # required for clang completion in editors -@@ -364,7 +364,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE) +@@ -370,7 +370,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE) endif () if (CMAKE_COMPILER_IS_CLANG) @@ -21,7 +21,7 @@ set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++") add_definitions("-Wno-deprecated-declarations") else () -@@ -498,7 +498,11 @@ if (USE_BACKTRACE) +@@ -505,7 +505,11 @@ if (USE_BACKTRACE) if (MSVC) set(BT_LIBS "Dbghelp" CACHE path "Debug Helper libraries") else () @@ -34,7 +34,7 @@ endif () add_definitions("-DARANGODB_ENABLE_BACKTRACE=1") -@@ -573,7 +577,9 @@ endif () +@@ -580,7 +584,9 @@ endif () ################################################################################ if (NOT WINDOWS) @@ -45,3 +45,59 @@ if (NOT DARWIN) set(SYS_LIBS ${SYS_LIBS} rt) +@@ -651,17 +657,17 @@ if (CMAKE_COMPILER_IS_GNUCC) + + set(BASE_FLAGS "-Wall -Wextra -Wno-unused-parameter ${BASE_FLAGS}") + +- set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags") +- set(CMAKE_C_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C debug flags") +- set(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C minimal size flags") +- set(CMAKE_C_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C release flags") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C release with debug info flags") ++ #set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags") ++ set(CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} CACHE INTERNAL "C debug flags") ++ set(CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS} CACHE INTERNAL "C minimal size flags") ++ set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} CACHE INTERNAL "C release flags") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} CACHE INTERNAL "C release with debug info flags") + +- set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags") +- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C++ debug flags") +- set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C++ minimal size flags") +- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C++ release flags") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C++ release with debug info flags") ++ #set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags") ++ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C++ debug flags") ++ set(CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ minimal size flags") ++ set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release flags") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release with debug info flags") + + elseif (CMAKE_COMPILER_IS_CLANG) + if (VERBOSE) +@@ -670,17 +676,17 @@ elseif (CMAKE_COMPILER_IS_CLANG) + + set(BASE_FLAGS "-Wall -Wextra -Wno-unused-parameter ${BASE_FLAGS}") + +- set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags") +- set(CMAKE_C_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C debug flags") +- set(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C minimal size flags") +- set(CMAKE_C_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C release flags") +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C release with debug info flags") ++ #set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags") ++ set(CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} CACHE INTERNAL "C debug flags") ++ set(CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS} CACHE INTERNAL "C minimal size flags") ++ set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} CACHE INTERNAL "C release flags") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} CACHE INTERNAL "C release with debug info flags") + +- set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags") +- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -D_DEBUG=1" CACHE INTERNAL "C++ debug flags") +- set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os" CACHE INTERNAL "C++ minimal size flags") +- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fomit-frame-pointer" CACHE INTERNAL "C++ release flags") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -fno-omit-frame-pointer" CACHE INTERNAL "C++ release with debug info flags") ++ #set(CMAKE_CXX_FLAGS "-g -Wnon-virtual-dtor" CACHE INTERNAL "default C++ compiler flags") ++ set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ debug flags") ++ set(CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ minimal size flags") ++ set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release flags") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} CACHE INTERNAL "C++ release with debug info flags") + + elseif (MSVC) + if (VERBOSE) Index: databases/arangodb33/files/patch-arangod_Agency_Store.cpp =================================================================== --- databases/arangodb33/files/patch-arangod_Agency_Store.cpp +++ databases/arangodb33/files/patch-arangod_Agency_Store.cpp @@ -1,6 +1,6 @@ ---- arangod/Agency/Store.cpp.orig 2017-11-15 11:23:07 UTC +--- arangod/Agency/Store.cpp.orig 2018-01-05 13:56:52 UTC +++ arangod/Agency/Store.cpp -@@ -601,7 +601,7 @@ void Store::dumpToBuilder(Builder& build +@@ -603,7 +603,7 @@ void Store::dumpToBuilder(Builder& build auto ts = std::chrono::duration_cast( i.first.time_since_epoch()) .count(); Index: databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp =================================================================== --- databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp +++ databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp @@ -1,4 +1,4 @@ ---- arangod/RestHandler/RestAuthHandler.cpp.orig 2017-11-15 11:23:07 UTC +--- arangod/RestHandler/RestAuthHandler.cpp.orig 2018-01-05 13:56:52 UTC +++ arangod/RestHandler/RestAuthHandler.cpp @@ -59,7 +59,7 @@ std::string RestAuthHandler::generateJwt VPackObjectBuilder p(&bodyBuilder); Index: databases/arangodb33/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp =================================================================== --- /dev/null +++ databases/arangodb33/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp @@ -0,0 +1,25 @@ +--- arangod/RocksDBEngine/RocksDBThrottle.cpp.orig 2018-01-05 13:56:52 UTC ++++ arangod/RocksDBEngine/RocksDBThrottle.cpp +@@ -515,8 +515,8 @@ void RocksDBThrottle::AdjustThreadPriori + pid_t tid; + int ret_val; + +- tid = syscall(SYS_gettid); +- if (-1!=(int)tid) ++ ret_val = syscall(SYS_thr_self, &tid); ++ if (-1!=ret_val) + { + errno=0; + ret_val=getpriority(PRIO_PROCESS, tid); +@@ -534,8 +534,9 @@ void RocksDBThrottle::AdjustThreadPriori + && (gThreadPriority._basePriority+Adjustment)!=gThreadPriority._currentPriority) { + + pid_t tid; +- tid = syscall(SYS_gettid); +- if (-1!=(int)tid) ++ int ret_val; ++ ret_val = syscall(SYS_thr_self, &tid); ++ if (-1!=(int)ret_val) + { + gThreadPriority._currentPriority = gThreadPriority._basePriority + Adjustment; + setpriority(PRIO_PROCESS, tid, gThreadPriority._currentPriority); Index: databases/arangodb33/files/patch-cmake_ArangoDBInstall.cmake =================================================================== --- databases/arangodb33/files/patch-cmake_ArangoDBInstall.cmake +++ databases/arangodb33/files/patch-cmake_ArangoDBInstall.cmake @@ -1,4 +1,4 @@ ---- cmake/ArangoDBInstall.cmake.orig 2017-11-16 20:17:40 UTC +--- cmake/ArangoDBInstall.cmake.orig 2018-01-05 13:56:52 UTC +++ cmake/ArangoDBInstall.cmake @@ -100,7 +100,7 @@ endif () Index: databases/arangodb33/files/patch-lib_Basics_process-utils.cpp =================================================================== --- databases/arangodb33/files/patch-lib_Basics_process-utils.cpp +++ databases/arangodb33/files/patch-lib_Basics_process-utils.cpp @@ -1,15 +1,15 @@ ---- lib/Basics/process-utils.cpp.orig 2017-11-15 11:23:07 UTC +--- lib/Basics/process-utils.cpp.orig 2018-01-05 13:56:52 UTC +++ lib/Basics/process-utils.cpp @@ -23,7 +23,7 @@ #include "process-utils.h" -#if defined(TRI_HAVE_MACOS_MEM_STATS) -+#if defined(TRI_HAVE_MACOS_MEM_STATS) || defined (__FreeBSD__) ++#if defined(TRI_HAVE_MACOS_MEM_STATS) || defined(__FreeBSD__) #include #include #endif -@@ -581,6 +581,7 @@ TRI_process_info_t TRI_ProcessInfoSelf() +@@ -557,6 +557,7 @@ ProcessInfo TRI_ProcessInfoSelf() { } #else @@ -17,7 +17,7 @@ /// -------------------------------------------- /// transform a file time to timestamp /// Particularities: -@@ -673,6 +674,7 @@ TRI_process_info_t TRI_ProcessInfoSelf() +@@ -648,6 +649,7 @@ ProcessInfo TRI_ProcessInfoSelf() { return result; } #endif @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////////////////////////// /// @brief returns information about the process -@@ -1254,7 +1256,7 @@ bool TRI_ContinueExternalProcess(TRI_ext +@@ -1435,7 +1437,7 @@ bool TRI_ContinueExternalProcess(Externa /// @brief gets the physical memory //////////////////////////////////////////////////////////////////////////////// @@ -34,19 +34,3 @@ static uint64_t GetPhysicalMemory() { int mib[2]; -@@ -1297,6 +1299,7 @@ static uint64_t GetPhysicalMemory() { - - #else - -+#ifdef _WIN32 - static uint64_t GetPhysicalMemory() { - PROCESS_MEMORY_COUNTERS pmc; - memset(&result, 0, sizeof(result)); -@@ -1307,6 +1310,7 @@ static uint64_t GetPhysicalMemory() { - } - return 0; - } -+#endif // _WIN32 - #endif - #endif - #endif Index: databases/arangodb33/files/patch-lib_Basics_socket-utils.h =================================================================== --- databases/arangodb33/files/patch-lib_Basics_socket-utils.h +++ databases/arangodb33/files/patch-lib_Basics_socket-utils.h @@ -1,4 +1,4 @@ ---- lib/Basics/socket-utils.h.orig 2017-11-15 11:23:07 UTC +--- lib/Basics/socket-utils.h.orig 2018-01-05 13:56:52 UTC +++ lib/Basics/socket-utils.h @@ -31,6 +31,12 @@ #include Index: databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp =================================================================== --- databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp +++ databases/arangodb33/files/patch-lib_Logger_LogAppenderSyslog.cpp @@ -1,4 +1,4 @@ ---- lib/Logger/LogAppenderSyslog.cpp.orig 2017-11-15 11:23:07 UTC +--- lib/Logger/LogAppenderSyslog.cpp.orig 2018-01-05 13:56:52 UTC +++ lib/Logger/LogAppenderSyslog.cpp @@ -64,7 +64,7 @@ LogAppenderSyslog::LogAppenderSyslog(std if ('0' <= facility[0] && facility[0] <= '9') { Index: databases/arangodb33/pkg-message =================================================================== --- /dev/null +++ databases/arangodb33/pkg-message @@ -0,0 +1,20 @@ +====================================================================== +You installed ArangoDB: a distributed NoSQL database. + +To enable the service at startup, you should execute the command: +sysrc arangod_enable="YES" + +To start it as a service, you should execute the command: +# service arangod start + +ArangoDB starts with the empty root password. + +To change the root password, run 'arangosh' as root, and execute: +require("@arangodb/users").update("root", "new-secretpassword", true); + +ArangoDB has a web interface available at: +http://localhost:8529 + +ArangoDB uses the AQL language to manipulate data, as opposed to SQL +used by relational databases. +====================================================================== Index: databases/arangodb33/pkg-plist =================================================================== --- databases/arangodb33/pkg-plist +++ databases/arangodb33/pkg-plist @@ -39,9 +39,7 @@ %%DATADIR%%/js/actions/_admin/database/app.js %%DATADIR%%/js/actions/_admin/foxx/app.js %%DATADIR%%/js/actions/_admin/routing/app.js -%%DATADIR%%/js/actions/_admin/server/app.js %%DATADIR%%/js/actions/_admin/statistics/app.js -%%DATADIR%%/js/actions/_api/collection/app.js %%DATADIR%%/js/actions/api-aqlfunction.js %%DATADIR%%/js/actions/api-cluster.js %%DATADIR%%/js/actions/api-configuration.js @@ -49,7 +47,6 @@ %%DATADIR%%/js/actions/api-simple.js %%DATADIR%%/js/actions/api-system.js %%DATADIR%%/js/actions/api-tasks.js -%%DATADIR%%/js/actions/api-transaction.js %%DATADIR%%/js/actions/api-traversal.js %%DATADIR%%/js/apps/system/_admin/aardvark/APP/GruntFile.js %%DATADIR%%/js/apps/system/_admin/aardvark/APP/aardvark.js @@ -607,6 +604,7 @@ %%DATADIR%%/js/client/modules/@arangodb/testsuites/dfdb.js %%DATADIR%%/js/client/modules/@arangodb/testsuites/dump.js %%DATADIR%%/js/client/modules/@arangodb/testsuites/dump_authentication.js +%%DATADIR%%/js/client/modules/@arangodb/testsuites/dump_encrypted.js %%DATADIR%%/js/client/modules/@arangodb/testsuites/endpoints.js %%DATADIR%%/js/client/modules/@arangodb/testsuites/export.js %%DATADIR%%/js/client/modules/@arangodb/testsuites/fail.js @@ -671,6 +669,9 @@ %%DATADIR%%/js/common/modules/loadtestrunner.js %%DATADIR%%/js/common/modules/reportgenerator.js %%DATADIR%%/js/contrib/CSV_export/CSVexport.js +%%DATADIR%%/js/contrib/flux/ansi.js +%%DATADIR%%/js/contrib/flux/axel.js +%%DATADIR%%/js/contrib/flux/flux.js %%DATADIR%%/js/contrib/graph_generators/circle.js %%DATADIR%%/js/contrib/graph_generators/grid.js %%DATADIR%%/js/contrib/graph_generators/random.js @@ -4782,6 +4783,7 @@ %%DATADIR%%/js/server/modules/@arangodb/foxx/types.js %%DATADIR%%/js/server/modules/@arangodb/index.js %%DATADIR%%/js/server/modules/@arangodb/parser.js +%%DATADIR%%/js/server/modules/@arangodb/pregel.js %%DATADIR%%/js/server/modules/@arangodb/replication.js %%DATADIR%%/js/server/modules/@arangodb/request.js %%DATADIR%%/js/server/modules/@arangodb/simple-query.js