diff options
| author | Veniamin Gvozdikov <vg@FreeBSD.org> | 2016-02-27 00:02:50 +0800 |
|---|---|---|
| committer | Veniamin Gvozdikov <vg@FreeBSD.org> | 2016-02-27 00:02:50 +0800 |
| commit | 87342c702891b235c8a5610071b64dd97c0c1ac5 (patch) | |
| tree | ecd4aea87e43e72142f38d9614e92773df3f4f39 /databases | |
| parent | ab5465da21c3b50e969a75aed4ddf9bf9f69a55a (diff) | |
| download | freebsd-ports-gnome-87342c702891b235c8a5610071b64dd97c0c1ac5.tar.gz freebsd-ports-gnome-87342c702891b235c8a5610071b64dd97c0c1ac5.tar.zst freebsd-ports-gnome-87342c702891b235c8a5610071b64dd97c0c1ac5.zip | |
- Upgrade to 1.6.8.529
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/tarantool/Makefile | 2 | ||||
| -rw-r--r-- | databases/tarantool/distinfo | 4 | ||||
| -rw-r--r-- | databases/tarantool/files/patch-extra_dist_CMakeLists.txt | 51 | ||||
| -rw-r--r-- | databases/tarantool/pkg-plist | 4 |
4 files changed, 6 insertions, 55 deletions
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index 356c85ff81f3..f5df54000743 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.6.8.371 +PORTVERSION= 1.6.8.529 CATEGORIES= databases MASTER_SITES= http://tarantool.org/dist/1.6/ diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo index 883ed6ceaf33..13fe7466091b 100644 --- a/databases/tarantool/distinfo +++ b/databases/tarantool/distinfo @@ -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 diff --git a/databases/tarantool/files/patch-extra_dist_CMakeLists.txt b/databases/tarantool/files/patch-extra_dist_CMakeLists.txt deleted file mode 100644 index fb7c769035ae..000000000000 --- a/databases/tarantool/files/patch-extra_dist_CMakeLists.txt +++ /dev/null @@ -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/ diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist index 9e3905d601f0..881ad614ab5c 100644 --- a/databases/tarantool/pkg-plist +++ b/databases/tarantool/pkg-plist @@ -11,7 +11,9 @@ 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%% |