From owner-svn-ports-head@FreeBSD.ORG Sun May 19 13:26:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3D8CA9FF; Sun, 19 May 2013 13:26:56 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2F2579D3; Sun, 19 May 2013 13:26:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4JDQuJl075173; Sun, 19 May 2013 13:26:56 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4JDQtuA075169; Sun, 19 May 2013 13:26:55 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201305191326.r4JDQtuA075169@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 19 May 2013 13:26:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318521 - in head/databases/tarantool: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 May 2013 13:26:56 -0000 Author: rakuco Date: Sun May 19 13:26:55 2013 New Revision: 318521 URL: http://svnweb.freebsd.org/changeset/ports/318521 Log: Update to 1.4.9. PR: ports/178737 Submitted by: Veniamin Gvozdikov (maintainer) Deleted: head/databases/tarantool/files/patch-doc_man_CMakeLists.txt Modified: head/databases/tarantool/Makefile head/databases/tarantool/distinfo head/databases/tarantool/files/patch-src_CMakeLists.txt head/databases/tarantool/pkg-plist Modified: head/databases/tarantool/Makefile ============================================================================== --- head/databases/tarantool/Makefile Sun May 19 12:51:48 2013 (r318520) +++ head/databases/tarantool/Makefile Sun May 19 13:26:55 2013 (r318521) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.4.8 -PORTREVISION= 2 +PORTVERSION= 1.4.9 CATEGORIES= databases MASTER_SITES= http://tarantool.org/dist/ DISTNAME= ${PORTNAME}-${PORTVERSION}-${TR_REV}-src @@ -13,7 +12,7 @@ COMMENT= High performance key/value stor LICENSE= BSD -TR_REV= 72-g277010b +TR_REV= 45-g2f7b3f9 USES= cmake gettext:build USE_GCC= 4.6+ USE_GMAKE= yes @@ -22,6 +21,7 @@ USE_PERL5= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message MAN1= tarantool_box.1 +CMAKE_ARGS= -DCMAKE_MAN_DIR=man/man1 OPTIONS_DEFINE= CLIENT DEBUG STATIC CLIENT_DESC= Enable client @@ -46,6 +46,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithD .endif .if ${PORT_OPTIONS:MSTATIC} +LIB_DEPENDS+= iconv:${PORTSDIR}/converters/iconv CMAKE_ARGS+= -DENABLE_STATIC=true .endif Modified: head/databases/tarantool/distinfo ============================================================================== --- head/databases/tarantool/distinfo Sun May 19 12:51:48 2013 (r318520) +++ head/databases/tarantool/distinfo Sun May 19 13:26:55 2013 (r318521) @@ -1,2 +1,2 @@ -SHA256 (tarantool-1.4.8-72-g277010b-src.tar.gz) = ff19a272d912947fb4d56d4bec3986681a3fad3091c1bb0504a7ea5dc38f4330 -SIZE (tarantool-1.4.8-72-g277010b-src.tar.gz) = 2268177 +SHA256 (tarantool-1.4.9-45-g2f7b3f9-src.tar.gz) = 45c37824c0f2cef8746523347ba727ced98e8c21eec17e11729d6ff38d1f7bbd +SIZE (tarantool-1.4.9-45-g2f7b3f9-src.tar.gz) = 2772012 Modified: head/databases/tarantool/files/patch-src_CMakeLists.txt ============================================================================== --- head/databases/tarantool/files/patch-src_CMakeLists.txt Sun May 19 12:51:48 2013 (r318520) +++ head/databases/tarantool/files/patch-src_CMakeLists.txt Sun May 19 13:26:55 2013 (r318521) @@ -1,13 +1,22 @@ ---- 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 @@ +--- src/CMakeLists.txt.orig 2013-05-18 07:08:17.087914237 +0000 ++++ src/CMakeLists.txt 2013-05-18 10:23:24.584910099 +0000 +@@ -138,6 +138,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 ++if (TARGET_OS_FREEBSD) ++ set (common_libraries ${common_libraries} intl) +endif() + - if (ENABLE_GCOV) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCOV_C_FLAGS}") - set (LDFLAGS "${LDFLAGS} ${GCOV_LDFLAGS}") + if (ENABLE_BACKTRACE AND HAVE_BFD) + set (common_libraries ${common_libraries} bfd) + if (NOT TARGET_OS_DARWIN) +@@ -145,7 +149,7 @@ + endif() + if (ENABLE_STATIC OR TARGET_OS_FREEBSD) + include (FindZLIB) +- set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES}) ++ set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES} iconv intl) + endif() + endif() + Modified: head/databases/tarantool/pkg-plist ============================================================================== --- head/databases/tarantool/pkg-plist Sun May 19 12:51:48 2013 (r318520) +++ head/databases/tarantool/pkg-plist Sun May 19 13:26:55 2013 (r318521) @@ -47,7 +47,7 @@ lib/libtarantoolsql.so lib/libtarantool.so.1.1 lib/libtarantoolrpl.a lib/libtarantool.so -%%DOCSDIR%%/README +%%DOCSDIR%%/README.md %%DOCSDIR%%/box-protocol.txt %%DOCSDIR%%/LICENSE @dirrm %%DOCSDIR%%