svn commit: r308708 - in head/databases/tarantool: . files

Ruslan Mahmatkhanov rm at FreeBSD.org
Tue Dec 11 20:00:39 UTC 2012 

Author: rm
Date: Tue Dec 11 20:00:36 2012
New Revision: 308708
URL: http://svnweb.freebsd.org/changeset/ports/308708

Log:
  - update to 1.4.8
  
  PR:		170348
  Submitted by:	Veniamin Gvozdikov <g.veniamin at googlemail.com> (maintainer)

Added:
  head/databases/tarantool/files/patch-doc_man_CMakeLists.txt   (contents, props changed)
  head/databases/tarantool/files/patch-src_CMakeLists.txt   (contents, props changed)
Deleted:
  head/databases/tarantool/files/patch-CMakeLists.txt
  head/databases/tarantool/files/patch-test_box_tarantool.cfg
  head/databases/tarantool/files/patch-test_lib_sql.g
  head/databases/tarantool/files/patch-test_lib_sql.py
  head/databases/tarantool/files/patch-test_lib_sql_ast.py
  head/databases/tarantool/files/patch-test_lib_tarantool_connection.py
  head/databases/tarantool/files/patch-test_lib_tarantool_silverbox_server.py
  head/databases/tarantool/files/patch-test_lib_test_suite.py
  head/databases/tarantool/files/patch-test_tarantool
Modified:
  head/databases/tarantool/Makefile
  head/databases/tarantool/distinfo
  head/databases/tarantool/files/patch-test_CMakeLists.txt
  head/databases/tarantool/files/pkg-message.in
  head/databases/tarantool/files/tarantool.in
  head/databases/tarantool/pkg-descr
  head/databases/tarantool/pkg-plist

Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/Makefile	Tue Dec 11 20:00:36 2012	(r308708)
@@ -1,43 +1,55 @@
-# New ports collection makefile for:	tarantool
-# Date created:		2011-11-25
-# Whom:			Gvozdikov Veniamin <g.veniamin at googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin at googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	tarantool
-PORTVERSION=	1.3.5
+PORTVERSION=	1.4.8
 CATEGORIES=	databases
-MASTER_SITES=	http://launchpadlibrarian.net/71705094/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+MASTER_SITES=	http://tarantool.org/dist/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${TR_REV}-src
 
 MAINTAINER=	g.veniamin at googlemail.com
-COMMENT=	Tarantool, is a high performance key/value storage server
+COMMENT=	High performance key/value storage server
 
 LICENSE=	BSD
 
-ONLY_FOR_ARCHS=	i386
-
+TR_REV=		20-gdfe40fc
 USE_CMAKE=	yes
-ARCH=		i386
+USE_GCC=	4.6+
+USE_GETTEXT=	build
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+USE_PERL5=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
+MAN1=		tarantool_box.1
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \
-		${WRKSRC}/test/CMakeLists.txt
-	@${RM} ${WRKSRC}/test/lib/server.py \
-		${WRKSRC}/test/lib/silverbox.py \
-		${WRKSRC}/test/lib/tarantool_admin.py \
-		${WRKSRC}/test/lib/tarantool_feeder_server.py \
-		${WRKSRC}/test/lib/tarantool_server.py \
-		${WRKSRC}/test/lib/*.orig
+OPTIONS_DEFINE=	CLIENT DEBUG STATIC
+CLIENT_DESC=	Enable client
+DEBUG_DESC=	Enable debug
+STATIC_DESC=	Enable static (got core dump)
+
+OPTIONS_DEFAULT=CLIENT DEBUG
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCLIENT}
+CMAKE_ARGS+=	-DENABLE_CLIENT=true
+CFLAGS+=	"-O0 -g"
+PLIST_SUB+=	CLIENT=""
+MAN1+=		tarantool.1
+.else
+PLIST_SUB+=	CLIENT="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebugInfo
+.endif
+
+.if ${PORT_OPTIONS:MSTATIC}
+CMAKE_ARGS+=	-DENABLE_STATIC=true
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/tarantool/distinfo
==============================================================================
--- head/databases/tarantool/distinfo	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/distinfo	Tue Dec 11 20:00:36 2012	(r308708)
@@ -1,2 +1,2 @@
-SHA256 (tarantool-1.3.5-src.tar.gz) = c78eb302eabac7b6ae04a8eadf8b2819e992d2913cdafe1a86222148982351ec
-SIZE (tarantool-1.3.5-src.tar.gz) = 829327
+SHA256 (tarantool-1.4.8-20-gdfe40fc-src.tar.gz) = bb8095a1e54f4f9a86c64c5750b5e25c1f8ed2467c10ec8a878045da5f2965a9
+SIZE (tarantool-1.4.8-20-gdfe40fc-src.tar.gz) = 2243935

Added: head/databases/tarantool/files/patch-doc_man_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/tarantool/files/patch-doc_man_CMakeLists.txt	Tue Dec 11 20:00:36 2012	(r308708)
@@ -0,0 +1,12 @@
+--- doc/man/CMakeLists.txt.orig	2012-12-11 01:42:20.346392205 +0400
++++ doc/man/CMakeLists.txt	2012-12-11 01:42:53.437090883 +0400
+@@ -5,7 +5,7 @@
+ 	    ${CMAKE_SOURCE_DIR}/doc/man/tarantool.pod > ${PROJECT_BINARY_DIR}/doc/man/tarantool.1
+     )
+ 
+-install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool_box.1 DESTINATION "${CMAKE_MAN_DIR}")
++install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool_box.1 DESTINATION "${CMAKE_MAN_DIR}/man1")
+ if (ENABLE_CLIENT)
+-    install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool.1 DESTINATION "${CMAKE_MAN_DIR}")
++    install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool.1 DESTINATION "${CMAKE_MAN_DIR}/man1")
+ endif()

Added: head/databases/tarantool/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/tarantool/files/patch-src_CMakeLists.txt	Tue Dec 11 20:00:36 2012	(r308708)
@@ -0,0 +1,13 @@
+--- src/CMakeLists.txt.orig	2012-12-11 02:19:57.157548371 +0400
++++ src/CMakeLists.txt	2012-12-11 02:23:55.400718104 +0400
+@@ -155,6 +155,10 @@
+     set (common_libraries ${common_libraries} dl)
+ endif()
+ 
++if (NOT LINUX)
++    set (common_libraries ${common_libraries} intl) # if used not GNU libc, depended by gettext
++endif()
++
+ if (ENABLE_GCOV)
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCOV_C_FLAGS}")
+     set (LDFLAGS "${LDFLAGS} ${GCOV_LDFLAGS}")

Modified: head/databases/tarantool/files/patch-test_CMakeLists.txt
==============================================================================
--- head/databases/tarantool/files/patch-test_CMakeLists.txt	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/files/patch-test_CMakeLists.txt	Tue Dec 11 20:00:36 2012	(r308708)
@@ -1,9 +1,16 @@
---- test/CMakeLists.txt.orig	2011-12-11 16:16:40.594230551 +0000
-+++ test/CMakeLists.txt	2011-12-11 16:19:44.915010706 +0000
-@@ -9,5 +9,4 @@
- 
- install (PROGRAMS tarantool DESTINATION bin)
- install (DIRECTORY lib DESTINATION bin)
--install (FILES box/tarantool.cfg box/00000000000000000001.snap
--    DESTINATION bin)
-+install (FILES box/tarantool.cfg DESTINATION %%ETCDIR%%)
+--- test/CMakeLists.txt.orig	2012-07-30 17:05:05.000000000 +0400
++++ test/CMakeLists.txt	2012-11-02 14:25:15.725342910 +0400
+@@ -18,12 +18,9 @@ else()
+     if (NOT CPACK_GENERATOR OR "${CPACK_GENERATOR}" STREQUAL "TGZ")
+         install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_tgz.cfg
+                  DESTINATION "${CMAKE_SYSCONF_DIR}"
+-                 RENAME "tarantool.cfg")
++                 RENAME "tarantool.cfg.sample")
+     else()
+         install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool.cfg
+                  DESTINATION "${CMAKE_SYSCONF_DIR}")
+     endif()
+-
+-    install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap
+-             DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool")
+ endif()

Modified: head/databases/tarantool/files/pkg-message.in
==============================================================================
--- head/databases/tarantool/files/pkg-message.in	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/files/pkg-message.in	Tue Dec 11 20:00:36 2012	(r308708)
@@ -1,10 +1,13 @@
 #########################################################
 #
 #
-#        After install you'll need init storage:
+#        After install you'll need:
 #
-#    %%PREFIX%%/bin/tarantool_silverbox --init-storage \
-#    	-c %%ETCDIR%%/tarantool.cfg
+#    Edit example config:
+#    %%ETCDIR%%/tarantool.cfg.sample
+#    Init storage:
+#    %%PREFIX%%/bin/tarantool_box --init-storage \
+#      -c %%ETCDIR%%/tarantool.cfg
 #
 #
 #########################################################

Modified: head/databases/tarantool/files/tarantool.in
==============================================================================
--- head/databases/tarantool/files/tarantool.in	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/files/tarantool.in	Tue Dec 11 20:00:36 2012	(r308708)
@@ -20,7 +20,7 @@ load_rc_config "$name"
 tarantool_enable=${tarantool_enable:-"NO"}
 tarantool_config=${tarantool_config:-"%%ETCDIR%%/$name.cfg"}
 
-command="%%PREFIX%%/bin/tarantool_silverbox"
+command="%%PREFIX%%/bin/tarantool_box"
 command_args="--daemonize --config ${tarantool_config}"
 pidfile="/var/run/$name.pid"
 

Modified: head/databases/tarantool/pkg-descr
==============================================================================
--- head/databases/tarantool/pkg-descr	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/pkg-descr	Tue Dec 11 20:00:36 2012	(r308708)
@@ -2,4 +2,4 @@ Tarantool/Box, or simply Tarantool, is a
 storage server. The code is available for free under the terms of
 BSD license. Supported platforms are GNU/Linux and FreeBSD.
 
-WWW:	http://tarantool.org/
+WWW: http://tarantool.org/

Modified: head/databases/tarantool/pkg-plist
==============================================================================
--- head/databases/tarantool/pkg-plist	Tue Dec 11 19:56:22 2012	(r308707)
+++ head/databases/tarantool/pkg-plist	Tue Dec 11 20:00:36 2012	(r308708)
@@ -1,21 +1,54 @@
-bin/lib/__init__.py
-bin/lib/sql.g
-bin/lib/sql.py
-bin/lib/sql_ast.py
-bin/lib/tarantool_connection.py
-bin/lib/tarantool_preprocessor.py
-bin/lib/tarantool_silverbox_server.py
-bin/lib/test_suite.py
-bin/lib/yapps/__init__.py
-bin/lib/yapps/runtime.py
-bin/tarantool
-bin/tarantool_feeder
-bin/tarantool_silverbox
-%%DOCSDIR%%/LICENSE
+bin/tarantool_box
+bin/tarantool_checksum
+%%CLIENT%%bin/tarantool
+etc/tarantool.cfg.sample
+include/tarantool/tnt.h
+include/tarantool/tnt_buf.h
+include/tarantool/tnt_call.h
+include/tarantool/tnt_delete.h
+include/tarantool/tnt_dir.h
+include/tarantool/tnt_enc.h
+include/tarantool/tnt_insert.h
+include/tarantool/tnt_io.h
+include/tarantool/tnt_iob.h
+include/tarantool/tnt_iter.h
+include/tarantool/tnt_lex.h
+include/tarantool/tnt_log.h
+include/tarantool/tnt_mem.h
+include/tarantool/tnt_net.h
+include/tarantool/tnt_opt.h
+include/tarantool/tnt_ping.h
+include/tarantool/tnt_proto.h
+include/tarantool/tnt_queue.h
+include/tarantool/tnt_reply.h
+include/tarantool/tnt_request.h
+include/tarantool/tnt_rpl.h
+include/tarantool/tnt_select.h
+include/tarantool/tnt_snapshot.h
+include/tarantool/tnt_sql.h
+include/tarantool/tnt_stream.h
+include/tarantool/tnt_tuple.h
+include/tarantool/tnt_update.h
+include/tarantool/tnt_utf8.h
+include/tarantool/tnt_xlog.h
+lib/libtarantoolnet.so.1.1
+lib/libtarantoolrpl.so.1
+lib/libtarantoolnet.a
+lib/libtarantoolnet.so
+lib/libtarantool.a
+lib/libtarantoolnet.so.1
+lib/libtarantoolrpl.so
+lib/libtarantoolsql.so.1.1
+lib/libtarantoolsql.a
+lib/libtarantoolsql.so.1
+lib/libtarantoolrpl.so.1.1
+lib/libtarantool.so.1
+lib/libtarantoolsql.so
+lib/libtarantool.so.1.1
+lib/libtarantoolrpl.a
+lib/libtarantool.so
 %%DOCSDIR%%/README
-%%DOCSDIR%%/silverbox-protocol.txt
-%%ETCDIR%%/tarantool.cfg
+%%DOCSDIR%%/box-protocol.txt
+%%DOCSDIR%%/LICENSE
 @dirrm %%DOCSDIR%%
- at dirrm %%ETCDIR%%
- at dirrm bin/lib/yapps
- at dirrm bin/lib
+ at dirrm include/tarantool

More information about the svn-ports-all mailing list