Index: head/databases/tarantool-c/Makefile =================================================================== --- head/databases/tarantool-c/Makefile (revision 505106) +++ head/databases/tarantool-c/Makefile (revision 505107) @@ -1,34 +1,28 @@ # $FreeBSD$ PORTNAME= tarantool-c PORTVERSION= 1.0.1 PORTREVISION= 2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= C client for Tarantool 1.6+ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libmsgpuck.so:devel/msgpuck USES= cmake compiler CMAKE_OFF= ENABLE_BUNDLED_DOCS ENABLE_BUNDLED_MSGPUCK USE_GITHUB= yes GH_ACCOUNT= tarantool GH_TAGNAME= 0df3623 post-patch: @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' @${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake -.include - -.if ${CHOSEN_COMPILER_TYPE} == gcc -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tnt_CMakeLists.txt -.endif - -.include +.include Index: head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt =================================================================== --- head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt (revision 505106) +++ head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt (nonexistent) @@ -1,14 +0,0 @@ ---- tnt/CMakeLists.txt.orig 2019-02-21 14:33:51 UTC -+++ tnt/CMakeLists.txt -@@ -49,8 +49,9 @@ set (TNT_SOURCES - # Builds - #----------------------------------------------------------------------------# - --set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES -- COMPILE_FLAGS "-Wno-implicit-fallthrough") -+# -Wno-implicit-fallthrough only has meaning for llvm -+#set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES -+# COMPILE_FLAGS "-Wno-implicit-fallthrough") - - ## Static library - project(tnt) Property changes on: head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt =================================================================== --- head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt (nonexistent) +++ head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt (revision 505107) @@ -0,0 +1,15 @@ +--- tnt/CMakeLists.txt.orig 2019-06-14 13:13:47 UTC ++++ tnt/CMakeLists.txt +@@ -49,8 +49,10 @@ set (TNT_SOURCES + # Builds + #----------------------------------------------------------------------------# + +-set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES +- COMPILE_FLAGS "-Wno-implicit-fallthrough") ++if(CMAKE_COMPILER_IS_CLANG AND NOT CMAKE_COMPILER_IS_GNUCC) ++ set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES ++ COMPILE_FLAGS "-Wno-implicit-fallthrough") ++endif() + + ## Static library + project(tnt) Property changes on: head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt ___________________________________________________________________ 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