svn commit: r505107 - in head/databases/tarantool-c: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Tue Jun 25 20:51:43 2019
New Revision: 505107
URL: https://svnweb.freebsd.org/changeset/ports/505107

Log:
  Update r504086: use an unconditional patch which could be merged upstream
  
  Tested by:	linimon

Added:
  head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt   (contents, props changed)
Deleted:
  head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt
Modified:
  head/databases/tarantool-c/Makefile

Modified: head/databases/tarantool-c/Makefile
==============================================================================
--- head/databases/tarantool-c/Makefile	Tue Jun 25 20:51:37 2019	(r505106)
+++ head/databases/tarantool-c/Makefile	Tue Jun 25 20:51:43 2019	(r505107)
@@ -25,10 +25,4 @@ 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 <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tnt_CMakeLists.txt
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt	Tue Jun 25 20:51:43 2019	(r505107)
@@ -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)