sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Upgrade to 1.6.8.529

Browse source
This commit is contained in:
Veniamin Gvozdikov 2016-02-26 16:02:50 +00:00
parent ab5465da21
commit 87342c7028
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=409618
4 changed files with 6 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
databases/tarantool/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= tarantool PORTNAME= tarantool
PORTVERSION= 1.6.8.371 PORTVERSION= 1.6.8.529
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://tarantool.org/dist/1.6/ MASTER_SITES= http://tarantool.org/dist/1.6/

4
databases/tarantool/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (tarantool-1.6.8.371.tar.gz) = 73ffe8d960e2a17528d5743aaf273dc0f33f27714f9e2a24bb5c8133b092131c SHA256 (tarantool-1.6.8.529.tar.gz) = 433693396b5cebd1468f10ccfa64f0ade23e6ebfb94105717dc357fda327a062
SIZE (tarantool-1.6.8.371.tar.gz) = 4894701 SIZE (tarantool-1.6.8.529.tar.gz) = 3955265

51
databases/tarantool/files/patch-extra_dist_CMakeLists.txt
View file

@ -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/

4
databases/tarantool/pkg-plist
View file

@ -11,7 +11,9 @@ include/tarantool/lualib.h
include/tarantool/module.h include/tarantool/module.h
man/man1/tarantool.1.gz man/man1/tarantool.1.gz
man/man1/tarantoolctl.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_DATADIR%%
@dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_LOGDIR%% @dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_LOGDIR%%
@dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_RUNDIR%% @dir(%%TT_USER%%,%%TT_GROUP%%,) %%TT_RUNDIR%%