Index: head/databases/tarantool/Makefile =================================================================== --- head/databases/tarantool/Makefile (revision 432415) +++ head/databases/tarantool/Makefile (revision 432416) @@ -1,60 +1,61 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.6.9.9 +PORTVERSION= 1.7.3.99 CATEGORIES= databases -MASTER_SITES= http://download.tarantool.org/tarantool/1.6/src/ +MASTER_SITES= http://download.tarantool.org/tarantool/1.7/src/ MAINTAINER= vg@FreeBSD.org COMMENT= NoSQL database running in a Lua application server LICENSE= BSD2CLAUSE BROKEN_powerpc64= Does not build MAKE_JOBS_UNSAFE=yes USES= cmake compiler:c++11-lang gettext gmake perl5 readline USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message TT_DATADIR?= /var/db/tarantool TT_RUNDIR?= /var/run/tarantool TT_LOGDIR?= /var/log/tarantool CMAKE_ARGS= -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \ -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ -DENABLE_DIST=ON USERS= tarantool GROUPS= tarantool SUB_LIST+= PORTNAME=${PORTNAME} \ TT_USER=${USERS} \ TT_DATADIR=${TT_DATADIR} \ TT_LOGDIR=${TT_LOGDIR} \ TT_RUNDIR=${TT_RUNDIR} PLIST_SUB+= TT_USER=${USERS} \ TT_GROUP=${GROUPS} \ TT_LOGDIR=${TT_LOGDIR} \ TT_DATADIR=${TT_DATADIR} \ TT_RUNDIR=${TT_RUNDIR} OPTIONS_DEFINE= DEBUG NOT_FOR_ARCHS= sparc64 NOT_FOR_ARCHS_REASON= not yet ported to this architecture .include .if ${PORT_OPTIONS:MDEBUG} CMAKE_BUILD_TYPE= RelWithDebugInfo CMAKE_ARGS+= -DENABLE_BACKTRACE=ON .else CMAKE_BUILD_TYPE= Rel CMAKE_ARGS+= -DENABLE_BACKTRACE=OFF .endif .include Index: head/databases/tarantool/distinfo =================================================================== --- head/databases/tarantool/distinfo (revision 432415) +++ head/databases/tarantool/distinfo (revision 432416) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475134376 -SHA256 (tarantool-1.6.9.9.tar.gz) = 49dd694270804847a8a358509e7e7785365e9c8f51a38e5afbf4f2cb96da5fd1 -SIZE (tarantool-1.6.9.9.tar.gz) = 6270393 +TIMESTAMP = 1485344573 +SHA256 (tarantool-1.7.3.99.tar.gz) = e6fbe05f491cde472f30c3e978d8b6533245852bd353824e2e33164aa6bba903 +SIZE (tarantool-1.7.3.99.tar.gz) = 6117802 Index: head/databases/tarantool/files/pkg-message.in =================================================================== --- head/databases/tarantool/files/pkg-message.in (revision 432415) +++ head/databases/tarantool/files/pkg-message.in (revision 432416) @@ -1,14 +1,14 @@ ######################################################### # # # After install you'll need: # # Configuration at /etc/rc.conf: # # * Enable tarantool on startup: # tarantool_enable="YES" -# * Path to storage instances: +# * Path to storage link files of instances: # tarantool_instances="%%ETCDIR%%/instances.enabled" # # ######################################################### Index: head/databases/tarantool/files/tarantool.in =================================================================== --- head/databases/tarantool/files/tarantool.in (revision 432415) +++ head/databases/tarantool/files/tarantool.in (revision 432416) @@ -1,55 +1,55 @@ #!/bin/sh # # $FreeBSD$ # PROVIDE: tarantool # REQUIRE: LOGIN # KEYWORD: shutdown # # tarantool_enable="YES" # tarantool_instances="" # . /etc/rc.subr name="tarantool" rcvar=tarantool_enable load_rc_config "$name" tarantool_enable=${tarantool_enable:-"NO"} tarantool_instances=${tarantool_instances:-"%%ETCDIR%%/instances.enabled"} start_cmd="${name}_start" stop_cmd="${name}_stop" restart_cmd="${name}_restart" -INSTANCES=$(find ${tarantool_instances} -type f -name '*.lua') +INSTANCES=$(find ${tarantool_instances} -type l -name '*.lua') TDAEMON=%%PREFIX%%/bin/tarantool TCTL=%%PREFIX%%/bin/tarantoolctl tarantool_start() { echo "tarantool: Starting instances" for inst in ${INSTANCES} do ${TDAEMON} ${TCTL} start $(basename ${inst} .lua) done } tarantool_stop() { echo "tarantool: Stopping instances" for inst in ${INSTANCES} do ${TDAEMON} ${TCTL} stop $(basename ${inst} .lua) done } tarantool_restart() { tarantool_stop tarantool_start } run_rc_command "$1" Index: head/databases/tarantool/pkg-plist =================================================================== --- head/databases/tarantool/pkg-plist (revision 432415) +++ head/databases/tarantool/pkg-plist (revision 432416) @@ -1,19 +1,18 @@ bin/tarantool bin/tarantoolctl %%ETCDIR%%/default/tarantool %%ETCDIR%%/instances.available/example.lua include/tarantool/lauxlib.h include/tarantool/lua.h include/tarantool/lua.hpp include/tarantool/luaconf.h include/tarantool/luajit.h include/tarantool/lualib.h include/tarantool/module.h man/man1/tarantool.1.gz man/man1/tarantoolctl.1.gz @dir %%DATADIR%% @dir %%ETCDIR%%/instances.available @dir lib/tarantool @dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_DATADIR%% @dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_LOGDIR%% -@dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_RUNDIR%%