Date: Thu, 21 Jan 2016 12:20:10 +0000 (UTC) From: Veniamin Gvozdikov <vg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406850 - in head/databases/tarantool: . files Message-ID: <201601211220.u0LCKAEP002731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vg Date: Thu Jan 21 12:20:10 2016 New Revision: 406850 URL: https://svnweb.freebsd.org/changeset/ports/406850 Log: - Update to 1.6.8.371 Added: head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt (contents, props changed) Deleted: head/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake head/databases/tarantool/files/patch-cmake_compiler.cmake head/databases/tarantool/files/patch-extra_dist_default_tarantool.in head/databases/tarantool/files/patch-extra_dist_tarantoolctl head/databases/tarantool/files/patch-src_box_lua_load__cfg.lua head/databases/tarantool/files/patch-src_lib_csv_csv.h head/databases/tarantool/files/patch-third__party_libev_ev.c head/databases/tarantool/files/patch-third__party_luajit_src_Makefile Modified: head/databases/tarantool/Makefile head/databases/tarantool/distinfo head/databases/tarantool/pkg-plist Modified: head/databases/tarantool/Makefile ============================================================================== --- head/databases/tarantool/Makefile Thu Jan 21 12:09:29 2016 (r406849) +++ head/databases/tarantool/Makefile Thu Jan 21 12:20:10 2016 (r406850) @@ -2,20 +2,17 @@ # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.6.6 +PORTVERSION= 1.6.8.371 CATEGORIES= databases -MASTER_SITES= http://tarantool.org/dist/master/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-${TR_REV}-src +MASTER_SITES= http://tarantool.org/dist/1.6/ MAINTAINER= vg@FreeBSD.org COMMENT= NoSQL database running in a Lua application server LICENSE= BSD2CLAUSE -TR_REV= 130-ge3f2420 MAKE_JOBS_UNSAFE=yes USES= cmake compiler:c++11-lang gettext gmake perl5 readline -USE_GCC= yes # clang bug PR/201270 USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message @@ -25,9 +22,9 @@ TT_RUNDIR?= /var/run/tarantool TT_LOGDIR?= /var/log/tarantool CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man \ - -DCMAKE_INSTALL_SYSCONFDIR=${ETCDIR} \ - -DCMAKE_LOCALSTATE_DIR=${DATADIR} \ - -DTARANTOOL_DATADIR="${TT_DATADIR}" + -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DENABLE_DIST=ON USERS= tarantool GROUPS= tarantool @@ -52,11 +49,6 @@ NOT_FOR_ARCHS_REASON= not yet ported to .include <bsd.port.options.mk> -.include "${.CURDIR}/../../Mk/bsd.default-versions.mk" -.if defined(USE_GCC) && ${USE_GCC} == yes && ${GCC_DEFAULT} == 4.8 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_trivia_config.h.cmake -.endif - .if ${PORT_OPTIONS:MDEBUG} CMAKE_BUILD_TYPE= RelWithDebugInfo CMAKE_ARGS+= -DENABLE_BACKTRACE=ON @@ -65,10 +57,4 @@ CMAKE_BUILD_TYPE= Rel CMAKE_ARGS+= -DENABLE_BACKTRACE=OFF .endif -post-install: - ${MKDIR} ${STAGEDIR}${TT_LOGDIR} \ - ${STAGEDIR}${TT_DATADIR} \ - ${STAGEDIR}${TT_RUNDIR} \ - ${STAGEDIR}${ETCDIR}/instances.enabled - .include <bsd.port.mk> Modified: head/databases/tarantool/distinfo ============================================================================== --- head/databases/tarantool/distinfo Thu Jan 21 12:09:29 2016 (r406849) +++ head/databases/tarantool/distinfo Thu Jan 21 12:20:10 2016 (r406850) @@ -1,2 +1,2 @@ -SHA256 (tarantool-1.6.6-130-ge3f2420-src.tar.gz) = a14f5a89c1a7e4695df4f02b963f30d7d537bd6bc0a3ae862c88ffc80e2cf499 -SIZE (tarantool-1.6.6-130-ge3f2420-src.tar.gz) = 3791681 +SHA256 (tarantool-1.6.8.371.tar.gz) = 73ffe8d960e2a17528d5743aaf273dc0f33f27714f9e2a24bb5c8133b092131c +SIZE (tarantool-1.6.8.371.tar.gz) = 4894701 Added: head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-extra_dist_CMakeLists.txt Thu Jan 21 12:20:10 2016 (r406850) @@ -0,0 +1,51 @@ +--- 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/ Modified: head/databases/tarantool/pkg-plist ============================================================================== --- head/databases/tarantool/pkg-plist Thu Jan 21 12:09:29 2016 (r406849) +++ head/databases/tarantool/pkg-plist Thu Jan 21 12:20:10 2016 (r406850) @@ -1,17 +1,16 @@ 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/tarantool.h +include/tarantool/module.h man/man1/tarantool.1.gz man/man1/tarantoolctl.1.gz -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README.md @dir %%ETCDIR%%/instances.enabled @dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_DATADIR%% @dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_LOGDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601211220.u0LCKAEP002731>