Index: head/databases/tarantool/Makefile =================================================================== --- head/databases/tarantool/Makefile (revision 409617) +++ head/databases/tarantool/Makefile (revision 409618) @@ -1,60 +1,60 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.6.8.371 +PORTVERSION= 1.6.8.529 CATEGORIES= databases MASTER_SITES= http://tarantool.org/dist/1.6/ MAINTAINER= vg@FreeBSD.org COMMENT= NoSQL database running in a Lua application server LICENSE= BSD2CLAUSE 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_MANDIR=man \ -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \ -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -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 DEBUG_DESC= Enable 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 409617) +++ head/databases/tarantool/distinfo (revision 409618) @@ -1,2 +1,2 @@ -SHA256 (tarantool-1.6.8.371.tar.gz) = 73ffe8d960e2a17528d5743aaf273dc0f33f27714f9e2a24bb5c8133b092131c -SIZE (tarantool-1.6.8.371.tar.gz) = 4894701 +SHA256 (tarantool-1.6.8.529.tar.gz) = 433693396b5cebd1468f10ccfa64f0ade23e6ebfb94105717dc357fda327a062 +SIZE (tarantool-1.6.8.529.tar.gz) = 3955265 Index: head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt =================================================================== --- head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt (revision 409617) +++ head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt (nonexistent) @@ -1,51 +0,0 @@ ---- extra/dist/CMakeLists.txt.orig 2016-01-20 16:22:43 UTC -+++ extra/dist/CMakeLists.txt -@@ -5,7 +5,11 @@ include(systemd) - # - - # Default path to data in default/tarantool --set(TARANTOOL_DATADIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/tarantool") -+if (TARGET_OS_FREEBSD) -+ set(TARANTOOL_DATADIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/db/tarantool") -+else() -+ set(TARANTOOL_DATADIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/tarantool") -+endif() - message (STATUS "tarantoolctl datadir: ${TARANTOOL_DATADIR}") - set(TARANTOOL_LOGDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/tarantool") - message (STATUS "tarantoolctl logdir: ${TARANTOOL_LOGDIR}") -@@ -13,7 +17,9 @@ set(TARANTOOL_RUNDIR "${CMAKE_INSTALL_FU - message (STATUS "tarantoolctl rundir: ${TARANTOOL_RUNDIR}") - - # config file for tarantoolctl --if (NOT IS_DIRECTORY "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig") -+if (TARGET_OS_FREEBSD) -+ set(SYSCONFIG_DEFAULT "tarantool/default") -+elseif (NOT IS_DIRECTORY "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig") - # Debian/Ubuntu/etc. - set(SYSCONFIG_DEFAULT "default") - else() -@@ -58,6 +64,7 @@ install(DIRECTORY DESTINATION ${TARANTOO - install(DIRECTORY DESTINATION ${TARANTOOL_LOGDIR}) - install(DIRECTORY DESTINATION ${TARANTOOL_RUNDIR}) - -+if (NOT TARGET_OS_FREEBSD) - # logrotate files - configure_file(tarantool.logrotate.in tarantool.logrotate @ONLY) - install (FILES ${PROJECT_BINARY_DIR}/extra/dist/tarantool.logrotate -@@ -67,6 +74,7 @@ install (FILES ${PROJECT_BINARY_DIR}/ext - OWNER_READ OWNER_WRITE - GROUP_READ - WORLD_READ) -+endif() - - # man page for tarantoolctl - pod2man ( -@@ -106,6 +114,8 @@ if (WITH_SYSTEMD) - GROUP_READ GROUP_READ - WORLD_READ WORLD_READ) - -+elseif(TARGET_OS_FREEBSD) -+ message (STATUS "Skip installing init.d scripts on FreeBSD") - else() # sysvinit - message (STATUS "Using scripts for sysvinit") - install (FILES tarantool.init DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d/ Property changes on: head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/tarantool/pkg-plist =================================================================== --- head/databases/tarantool/pkg-plist (revision 409617) +++ head/databases/tarantool/pkg-plist (revision 409618) @@ -1,17 +1,19 @@ 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 %%ETCDIR%%/instances.enabled +@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%%