Date: Tue, 16 Jan 2018 00:42:00 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459142 - in head/net/grive2: . files Message-ID: <201801160042.w0G0g0lc055524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Tue Jan 16 00:42:00 2018 New Revision: 459142 URL: https://svnweb.freebsd.org/changeset/ports/459142 Log: - Unbreak build with Clang 6 - Rework patches to push the code upstream - Fix WWW in pkg-descr - Pet portlint Reported by: pkg-fallout Added: head/net/grive2/files/patch-libgrive_CMakeLists.txt (contents, props changed) Modified: head/net/grive2/Makefile head/net/grive2/files/patch-grive_CMakeLists.txt head/net/grive2/files/patch-libgrive_src_util_File.cc head/net/grive2/pkg-descr Modified: head/net/grive2/Makefile ============================================================================== --- head/net/grive2/Makefile Tue Jan 16 00:34:30 2018 (r459141) +++ head/net/grive2/Makefile Tue Jan 16 00:42:00 2018 (r459142) @@ -22,10 +22,10 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ CONFLICTS_INSTALL= grive-[0-9]* +USES= cmake pkgconfig localbase + USE_GITHUB= yes GH_ACCOUNT= vitalif - -USES= cmake pkgconfig localbase PLIST_FILES= bin/grive \ man/man1/grive.1.gz Modified: head/net/grive2/files/patch-grive_CMakeLists.txt ============================================================================== --- head/net/grive2/files/patch-grive_CMakeLists.txt Tue Jan 16 00:34:30 2018 (r459141) +++ head/net/grive2/files/patch-grive_CMakeLists.txt Tue Jan 16 00:42:00 2018 (r459142) @@ -1,8 +1,13 @@ --- grive/CMakeLists.txt.orig 2016-01-14 20:51:31 UTC +++ grive/CMakeLists.txt -@@ -26,4 +26,4 @@ set_target_properties( grive_executable +@@ -26,4 +26,9 @@ set_target_properties( grive_executable ) install(TARGETS grive_executable RUNTIME DESTINATION bin) -install(FILES doc/grive.1 DESTINATION share/man/man1 ) -+install(FILES doc/grive.1 DESTINATION man/man1 ) ++ ++if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" ) ++ install(FILES doc/grive.1 DESTINATION man/man1 ) ++else ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" ) ++ install(FILES doc/grive.1 DESTINATION share/man/man1 ) ++endif( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" ) Added: head/net/grive2/files/patch-libgrive_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/grive2/files/patch-libgrive_CMakeLists.txt Tue Jan 16 00:42:00 2018 (r459142) @@ -0,0 +1,13 @@ +--- libgrive/CMakeLists.txt.orig 2018-01-15 23:32:17 UTC ++++ libgrive/CMakeLists.txt +@@ -149,6 +149,10 @@ target_link_libraries( btest + ${Boost_LIBRARIES} + ) + ++if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" ) ++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing" ) ++endif ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" ) ++ + if ( WIN32 ) + else ( WIN32 ) + set_target_properties( btest Modified: head/net/grive2/files/patch-libgrive_src_util_File.cc ============================================================================== --- head/net/grive2/files/patch-libgrive_src_util_File.cc Tue Jan 16 00:34:30 2018 (r459141) +++ head/net/grive2/files/patch-libgrive_src_util_File.cc Tue Jan 16 00:42:00 2018 (r459142) @@ -1,10 +1,13 @@ ---- libgrive/src/util/File.cc.orig 2016-08-28 12:56:18 UTC +--- libgrive/src/util/File.cc.orig 2016-01-14 20:51:31 UTC +++ libgrive/src/util/File.cc -@@ -32,6 +32,7 @@ - #include <sys/stat.h> +@@ -33,6 +33,10 @@ #include <sys/types.h> #include <fcntl.h> -+#include <unistd.h> ++#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#include <unistd.h> ++#endif ++ #ifdef WIN32 #include <io.h> + typedef int ssize_t ; Modified: head/net/grive2/pkg-descr ============================================================================== --- head/net/grive2/pkg-descr Tue Jan 16 00:34:30 2018 (r459141) +++ head/net/grive2/pkg-descr Tue Jan 16 00:42:00 2018 (r459142) @@ -1,4 +1,4 @@ Grive2 is the fork of original "Grive" Google Drive client with the support for the new Drive REST API and partial sync. -WWW: https://github.com/vitalif/grive2/ +WWW: https://github.com/vitalif/grive2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801160042.w0G0g0lc055524>