Index: net/Makefile
===================================================================
--- net/Makefile
+++ net/Makefile
@@ -187,6 +187,7 @@
     SUBDIR += grilo
     SUBDIR += grilo-plugins
     SUBDIR += grive
+    SUBDIR += grive2
     SUBDIR += grsync
     SUBDIR += gsk
     SUBDIR += gspoof
Index: net/grive/Makefile
===================================================================
--- net/grive/Makefile
+++ net/grive/Makefile
@@ -20,6 +20,8 @@
 		libjson-c.so:devel/json-c \
 		libyajl.so:devel/yajl
 
+CONFLICTS_INSTALL=	grive2-[0-9]*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Grive
 GH_TAGNAME=	27817e8
Index: net/grive2/Makefile
===================================================================
--- net/grive2/Makefile
+++ net/grive2/Makefile
@@ -1,40 +1,32 @@
-# Created by: Key-Teck SIN <ktsin@acm.org>
+# Created by: Carlos J Puga Medina <cpm@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	grive
-PORTVERSION=	0.3.0
-PORTREVISION=	3
+PORTNAME=	grive2
+PORTVERSION=	0.5.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
-MAINTAINER=	ktsin@acm.org
+MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	Open source client for Google Drive
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_powerpc64=	Does not build
-
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libgcrypt.so:security/libgcrypt \
-		libjson-c.so:devel/json-c \
+		libgpg-error.so:security/libgpg-error \
 		libyajl.so:devel/yajl
 
+CONFLICTS_INSTALL=	grive-[0-9]*
+
 USE_GITHUB=	yes
-GH_ACCOUNT=	Grive
-GH_TAGNAME=	27817e8
+GH_ACCOUNT=	vitalif
 
-USES=		cmake
-CXXFLAGS+=	-I${LOCALBASE}/include
+USES=		cmake pkgconfig localbase
 
-PLIST_FILES=	bin/grive man/man1/grive.1.gz
+PLIST_FILES=	bin/grive \
+		man/man1/grive.1.gz
 
-post-patch:
-	@${REINPLACE_CMD} -e '/FIND_LIBRARY/s,json,&-c,' \
-		${WRKSRC}/cmake/Modules/FindJSONC.cmake
-# Do not build Qt4-based frontend: it's buggy and quite useless anyway
-	@${REINPLACE_CMD} -e '/ bgrive/d' ${WRKSRC}/CMakeLists.txt
-# Allow to build with GCC 4.2
-	@${REINPLACE_CMD} -e 's,log::,gr::&,g' ${WRKSRC}/grive/src/main.cc
-
 .include <bsd.port.mk>
Index: net/grive2/distinfo
===================================================================
--- net/grive2/distinfo
+++ net/grive2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Grive-grive-0.3.0-27817e8_GH0.tar.gz) = 901bdbb340b07b5fbc759892e6805ad98b60cbed05bf041ab10286c8f35302da
-SIZE (Grive-grive-0.3.0-27817e8_GH0.tar.gz) = 162467
+TIMESTAMP = 1472387091
+SHA256 (vitalif-grive2-v0.5.0_GH0.tar.gz) = 24641ef4802eb93bb55e7069bca55c4fb8aa17fd88833b9c89a1b2ee7d266567
+SIZE (vitalif-grive2-v0.5.0_GH0.tar.gz) = 162886
Index: net/grive2/files/patch-grive_CMakeLists.txt
===================================================================
--- net/grive2/files/patch-grive_CMakeLists.txt
+++ net/grive2/files/patch-grive_CMakeLists.txt
@@ -1,6 +1,6 @@
---- grive/CMakeLists.txt.orig	2012-07-07 23:43:18.000000000 +0800
-+++ grive/CMakeLists.txt	2013-04-21 23:34:38.000000000 +0800
-@@ -27,4 +27,4 @@
+--- grive/CMakeLists.txt.orig	2016-01-14 20:51:31 UTC
++++ grive/CMakeLists.txt
+@@ -26,4 +26,4 @@ set_target_properties( grive_executable
  )
  
  install(TARGETS grive_executable RUNTIME DESTINATION bin)
Index: net/grive2/files/patch-libgrive_src_util_File.cc
===================================================================
--- net/grive2/files/patch-libgrive_src_util_File.cc
+++ net/grive2/files/patch-libgrive_src_util_File.cc
@@ -0,0 +1,10 @@
+--- libgrive/src/util/File.cc.orig	2016-08-28 12:56:18 UTC
++++ libgrive/src/util/File.cc
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef WIN32
+ 	#include <io.h>
Index: net/grive2/pkg-descr
===================================================================
--- net/grive2/pkg-descr
+++ net/grive2/pkg-descr
@@ -1,4 +1,4 @@
-Grive is an independent implementation of Google Drive client. It uses
-the Google Document List API to talk to Google's servers.
+Grive2 is the fork of original "Grive" Google Drive client with the
+support for the new Drive REST API and partial sync.
 
-WWW: http://www.lbreda.com/grive/
+WWW: https://github.com/vitalif/grive2/