From owner-svn-ports-all@freebsd.org Tue Jan 16 00:42:02 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C80AEA7F0A; Tue, 16 Jan 2018 00:42:02 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F325A787D2; Tue, 16 Jan 2018 00:42:01 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5264018A99; Tue, 16 Jan 2018 00:42:01 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0G0g1xk055529; Tue, 16 Jan 2018 00:42:01 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0G0g0lc055524; Tue, 16 Jan 2018 00:42:00 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201801160042.w0G0g0lc055524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Tue, 16 Jan 2018 00:42:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459142 - in head/net/grive2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in head/net/grive2: . files X-SVN-Commit-Revision: 459142 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2018 00:42:02 -0000 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 +@@ -33,6 +33,10 @@ #include #include -+#include ++#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#include ++#endif ++ #ifdef WIN32 #include + 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