Attachment #134123 for bug #178737

View | Details | Raw Unified | Return to bug 178737
Collapse All | Expand All




# $FreeBSD: databases/tarantool/Makefile 317916 2013-05-11 21:16:32Z rakuco $

PORTNAME=	tarantool
PORTVERSION=	1.4.9
PORTREVISION=	2
CATEGORIES=	databases
MASTER_SITES=	http://tarantool.org/dist/
DISTNAME=	${PORTNAME}-${PORTVERSION}-${TR_REV}-src


LICENSE=	BSD

TR_REV=		45-g2f7b3f9
USES=		cmake gettext:build
USE_GCC=	4.6+
USE_GMAKE=	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

.endif

.if ${PORT_OPTIONS:MSTATIC}
LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/iconv
CMAKE_ARGS+=	-DENABLE_STATIC=true
.endif


Lines 1-2 Link Here

(-)tarantool/distinfo (-2 / +2 lines)
1	SHA256 (tarantool-1.4.8-72-g277010b-src.tar.gz) = ff19a272d912947fb4d56d4bec3986681a3fad3091c1bb0504a7ea5dc38f4330	1	SHA256 (tarantool-1.4.9-45-g2f7b3f9-src.tar.gz) = 45c37824c0f2cef8746523347ba727ced98e8c21eec17e11729d6ff38d1f7bbd
2	SIZE (tarantool-1.4.8-72-g277010b-src.tar.gz) = 2268177	2	SIZE (tarantool-1.4.9-45-g2f7b3f9-src.tar.gz) = 2772012




--- 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()




--- 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 (TARGET_OS_FREEBSD)
+    set (common_libraries ${common_libraries} intl)
+endif()
+
 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()
 

Lines 47-53 Link Here

(-)tarantool/pkg-plist (-1 / +1 lines)
47	lib/libtarantool.so.1.1	47	lib/libtarantool.so.1.1
48	lib/libtarantoolrpl.a	48	lib/libtarantoolrpl.a
49	lib/libtarantool.so	49	lib/libtarantool.so
50	%%DOCSDIR%%/README	50	%%DOCSDIR%%/README.md
51	%%DOCSDIR%%/box-protocol.txt	51	%%DOCSDIR%%/box-protocol.txt
52	%%DOCSDIR%%/LICENSE	52	%%DOCSDIR%%/LICENSE
53	@dirrm %%DOCSDIR%%	53	@dirrm %%DOCSDIR%%

Return to bug 178737

Lines 2-9 Link Here

(-)tarantool/Makefile (-3 / +4 lines)
2	# $FreeBSD: databases/tarantool/Makefile 317916 2013-05-11 21:16:32Z rakuco $	2	# $FreeBSD: databases/tarantool/Makefile 317916 2013-05-11 21:16:32Z rakuco $
3		3
4	PORTNAME= tarantool	4	PORTNAME= tarantool
5	PORTVERSION= 1.4.8	5	PORTVERSION= 1.4.9
6	PORTREVISION= 2
7	CATEGORIES= databases	6	CATEGORIES= databases
8	MASTER_SITES= http://tarantool.org/dist/	7	MASTER_SITES= http://tarantool.org/dist/
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-${TR_REV}-src	8	DISTNAME= ${PORTNAME}-${PORTVERSION}-${TR_REV}-src
Lines 13-19 Link Here
13		12
14	LICENSE= BSD	13	LICENSE= BSD
15		14
16	TR_REV= 72-g277010b	15	TR_REV= 45-g2f7b3f9
17	USES= cmake gettext:build	16	USES= cmake gettext:build
18	USE_GCC= 4.6+	17	USE_GCC= 4.6+
19	USE_GMAKE= yes	18	USE_GMAKE= yes
Lines 22-27 Link Here
22	USE_RC_SUBR= ${PORTNAME}	21	USE_RC_SUBR= ${PORTNAME}
23	SUB_FILES= pkg-message	22	SUB_FILES= pkg-message
24	MAN1= tarantool_box.1	23	MAN1= tarantool_box.1
		24	CMAKE_ARGS= -DCMAKE_MAN_DIR=man/man1
25		25
26	OPTIONS_DEFINE= CLIENT DEBUG STATIC	26	OPTIONS_DEFINE= CLIENT DEBUG STATIC
27	CLIENT_DESC= Enable client	27	CLIENT_DESC= Enable client
Lines 46-51 Link Here
46	.endif	46	.endif
47		47
48	.if ${PORT_OPTIONS:MSTATIC}	48	.if ${PORT_OPTIONS:MSTATIC}
		49	LIB_DEPENDS+= iconv:${PORTSDIR}/converters/iconv
49	CMAKE_ARGS+= -DENABLE_STATIC=true	50	CMAKE_ARGS+= -DENABLE_STATIC=true
50	.endif	51	.endif
51		52

Lines 1-12 Link Here

(-)tarantool/files/patch-doc_man_CMakeLists.txt (-12 lines)
1	--- doc/man/CMakeLists.txt.orig 2012-12-11 01:42:20.346392205 +0400
2	+++ doc/man/CMakeLists.txt 2012-12-11 01:42:53.437090883 +0400
3	@@ -5,7 +5,7 @@
4	${CMAKE_SOURCE_DIR}/doc/man/tarantool.pod > ${PROJECT_BINARY_DIR}/doc/man/tarantool.1
5	)
6
7	-install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool_box.1 DESTINATION "${CMAKE_MAN_DIR}")
8	+install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool_box.1 DESTINATION "${CMAKE_MAN_DIR}/man1")
9	if (ENABLE_CLIENT)
10	- install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool.1 DESTINATION "${CMAKE_MAN_DIR}")
11	+ install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool.1 DESTINATION "${CMAKE_MAN_DIR}/man1")
12	endif()

Lines 1-13 Link Here

(-)tarantool/files/patch-src_CMakeLists.txt (-8 / +17 lines)
1	--- src/CMakeLists.txt.orig 2012-12-11 02:19:57.157548371 +0400	1	--- src/CMakeLists.txt.orig 2013-05-18 07:08:17.087914237 +0000
2	+++ src/CMakeLists.txt 2012-12-11 02:23:55.400718104 +0400	2	+++ src/CMakeLists.txt 2013-05-18 10:23:24.584910099 +0000
3	@@ -155,6 +155,10 @@	3	@@ -138,6 +138,10 @@
4	set (common_libraries ${common_libraries} dl)	4	set (common_libraries ${common_libraries} dl)
5	endif()	5	endif()
6		6
7	+if (NOT LINUX)	7	+if (TARGET_OS_FREEBSD)
8	+ set (common_libraries ${common_libraries} intl) # if used not GNU libc, depended by gettext	8	+ set (common_libraries ${common_libraries} intl)
9	+endif()	9	+endif()
10	+	10	+
11	if (ENABLE_GCOV)	11	if (ENABLE_BACKTRACE AND HAVE_BFD)
12	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCOV_C_FLAGS}")	12	set (common_libraries ${common_libraries} bfd)
13	set (LDFLAGS "${LDFLAGS} ${GCOV_LDFLAGS}")	13	if (NOT TARGET_OS_DARWIN)
		14	@@ -145,7 +149,7 @@
		15	endif()
		16	if (ENABLE_STATIC OR TARGET_OS_FREEBSD)
		17	include (FindZLIB)
		18	- set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES})
		19	+ set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES} iconv intl)
		20	endif()
		21	endif()
		22