Index: head/databases/tarantool/Makefile =================================================================== --- head/databases/tarantool/Makefile (revision 395520) +++ head/databases/tarantool/Makefile (revision 395521) @@ -1,71 +1,70 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.6.5 -PORTREVISION= 3 +PORTVERSION= 1.6.6 CATEGORIES= databases MASTER_SITES= http://tarantool.org/dist/master/ DISTNAME= ${PORTNAME}-${PORTVERSION}-${TR_REV}-src MAINTAINER= vg@FreeBSD.org COMMENT= NoSQL database running in a Lua application server LICENSE= BSD2CLAUSE -TR_REV= 305-g3a9640b +TR_REV= 130-ge3f2420 MAKE_JOBS_UNSAFE=yes USES= cmake compiler:c++11-lang gettext gmake perl5 readline USE_GCC= 4.8+ # clang bug PR/201270 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_SYSCONFDIR=${ETCDIR} \ -DCMAKE_LOCALSTATE_DIR=${DATADIR} \ -DTARANTOOL_DATADIR="${TT_DATADIR}" 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 .if defined(USE_GCC) && ${USE_GCC:S/+//} == 4.8 EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_trivia_config.h.cmake .endif .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 post-install: ${MKDIR} ${STAGEDIR}${TT_LOGDIR} \ ${STAGEDIR}${TT_DATADIR} \ ${STAGEDIR}${TT_RUNDIR} \ ${STAGEDIR}${ETCDIR}/instances.enabled .include Index: head/databases/tarantool/distinfo =================================================================== --- head/databases/tarantool/distinfo (revision 395520) +++ head/databases/tarantool/distinfo (revision 395521) @@ -1,2 +1,2 @@ -SHA256 (tarantool-1.6.5-305-g3a9640b-src.tar.gz) = ed66b7e3ec6faccd24d3ecb66b2de35c2f56cdcb4e98c0a7d7d6b2431c7ffea4 -SIZE (tarantool-1.6.5-305-g3a9640b-src.tar.gz) = 3692664 +SHA256 (tarantool-1.6.6-130-ge3f2420-src.tar.gz) = a14f5a89c1a7e4695df4f02b963f30d7d537bd6bc0a3ae862c88ffc80e2cf499 +SIZE (tarantool-1.6.6-130-ge3f2420-src.tar.gz) = 3791681 Index: head/databases/tarantool/files/patch-src_lib_csv_csv.h =================================================================== --- head/databases/tarantool/files/patch-src_lib_csv_csv.h (nonexistent) +++ head/databases/tarantool/files/patch-src_lib_csv_csv.h (revision 395521) @@ -0,0 +1,10 @@ +--- src/lib/csv/csv.h.orig 2015-08-28 14:36:01 UTC ++++ src/lib/csv/csv.h +@@ -30,6 +30,7 @@ + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ ++#include "trivia/config.h" + #include + + #if defined(__cplusplus) Property changes on: head/databases/tarantool/files/patch-src_lib_csv_csv.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/tarantool/files/patch-third__party_luajit_src_Makefile =================================================================== --- head/databases/tarantool/files/patch-third__party_luajit_src_Makefile (nonexistent) +++ head/databases/tarantool/files/patch-third__party_luajit_src_Makefile (revision 395521) @@ -0,0 +1,30 @@ +--- third_party/luajit/src/Makefile.orig 2015-05-18 09:43:16 UTC ++++ third_party/luajit/src/Makefile +@@ -25,7 +25,7 @@ NODOTABIVER= 51 + # with "make clean", followed by "make" if you change any options. + # + # LuaJIT builds as a native 32 or 64 bit binary by default. +-CC= gcc ++#CC= gcc + # + # Use this if you want to force a 32 bit build on a 64 bit multilib OS. + #CC= gcc -m32 +@@ -34,7 +34,7 @@ CC= gcc + # to slow down the C part by not omitting it. Debugging, tracebacks and + # unwinding are not affected -- the assembler part has frame unwind + # information and GCC emits it where needed (x64) or with -g (see CCDEBUG). +-CCOPT= -O2 -fomit-frame-pointer ++#CCOPT= -O2 -fomit-frame-pointer + # Use this if you want to generate a smaller binary (but it's slower): + #CCOPT= -Os -fomit-frame-pointer + # Note: it's no longer recommended to use -O3 with GCC 4.x. +@@ -48,7 +48,8 @@ CCOPT= -O2 -fomit-frame-pointer + # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute + # the binaries to a different machine you could also use: -march=native + # +-CCOPT_x86= -march=i686 ++#CCOPT_x86= -march=i686 ++CCOPT_x86= + CCOPT_x64= + CCOPT_arm= + CCOPT_ppc= Property changes on: head/databases/tarantool/files/patch-third__party_luajit_src_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property