6 files changed, 34 insertions, 42 deletions

diff --git a/net/grive2/Makefile b/net/grive2/Makefile
index 48ae38cc458c..b492696cb4dc 100644
--- a/net/grive2/Makefile
+++ b/net/grive2/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	grive2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1-dev
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	cpm@FreeBSD.org
@@ -12,8 +13,6 @@ COMMENT=	Open source client for Google Drive
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_powerpc64=	fails to compile: JsonValTest.cc.o: undefined reference to boost::unit_test::ut_detail::normalize_test_case_name
-
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
@@ -21,13 +20,22 @@ LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libgpg-error.so:security/libgpg-error \
 		libyajl.so:devel/yajl
 
-USES=		cmake localbase pkgconfig
+USES=		cmake compiler localbase pkgconfig
+CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
+CXXFLAGS_clang=	-Wno-c++11-narrowing
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vitalif
-GH_TAGNAME=	11a3d78
+GH_TAGNAME=	ad9b66a
 
 PLIST_FILES=	bin/grive \
 		man/man1/grive.1.gz
 
+OPTIONS_DEFINE=	BACKTRACE
+
+BACKTRACE_DESC=	Enable backtrace support
+BACKTRACE_LIB_DEPENDS=	libbfd.so:devel/libbfd
+BACKTRACE_LDFLAGS=	-lexecinfo
+BACKTRACE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_BFD=true
+
 .include <bsd.port.mk>
diff --git a/net/grive2/distinfo b/net/grive2/distinfo
index f140084fcd31..d5e8d8a98db3 100644
--- a/net/grive2/distinfo
+++ b/net/grive2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524507398
-SHA256 (vitalif-grive2-v0.5.1-dev-11a3d78_GH0.tar.gz) = b073ae8a7b18c259d577741476d5bedcd66ccfcf3a4677f8cbab7f5bd5515b2e
-SIZE (vitalif-grive2-v0.5.1-dev-11a3d78_GH0.tar.gz) = 161620
+TIMESTAMP = 1532536374
+SHA256 (vitalif-grive2-v0.5.1-dev-ad9b66a_GH0.tar.gz) = e0f2a68f985f1fb9d59c92c7605f3a3429b66ced51bc0f165ed4a843db4ef3d1
+SIZE (vitalif-grive2-v0.5.1-dev-ad9b66a_GH0.tar.gz) = 167622
diff --git a/net/grive2/files/patch-CMakeLists.txt b/net/grive2/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1a0345ad732d
--- /dev/null
+++ b/net/grive2/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig	2018-07-25 17:25:43 UTC
++++ CMakeLists.txt
+@@ -9,7 +9,6 @@ set( GRIVE_VERSION "0.5.1-dev" )
+ add_definitions( -DVERSION="${GRIVE_VERSION}" )
+ add_definitions( -D_FILE_OFFSET_BITS=64 -std=c++0x )
+ 
+-add_subdirectory( systemd )
+ add_subdirectory( libgrive )
+ add_subdirectory( grive )
+-	
+\ No newline at end of file
++	
diff --git a/net/grive2/files/patch-grive_CMakeLists.txt b/net/grive2/files/patch-grive_CMakeLists.txt
deleted file mode 100644
index b577efe95481..000000000000
--- a/net/grive2/files/patch-grive_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- grive/CMakeLists.txt.orig	2016-01-14 20:51:31 UTC
-+++ grive/CMakeLists.txt
-@@ -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 )
-+
-+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" )
diff --git a/net/grive2/files/patch-libgrive_CMakeLists.txt b/net/grive2/files/patch-libgrive_CMakeLists.txt
index ab4c836287aa..086ee91012e5 100644
--- a/net/grive2/files/patch-libgrive_CMakeLists.txt
+++ b/net/grive2/files/patch-libgrive_CMakeLists.txt
@@ -1,13 +1,11 @@
---- libgrive/CMakeLists.txt.orig	2018-01-15 23:32:17 UTC
+--- libgrive/CMakeLists.txt.orig	2018-07-22 23:40:23 UTC
 +++ libgrive/CMakeLists.txt
-@@ -149,6 +149,10 @@ target_link_libraries( btest
- 	${Boost_LIBRARIES}
+@@ -145,7 +145,7 @@ target_link_libraries( btest
  )
  
-+if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
-+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing" )
-+endif ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
-+
+ if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
+-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing" )
++  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0" )
+ endif ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
+ 
  if ( WIN32 )
- else ( WIN32 )
- 	set_target_properties( btest
diff --git a/net/grive2/files/patch-libgrive_src_util_File.cc b/net/grive2/files/patch-libgrive_src_util_File.cc
deleted file mode 100644
index 2910f9f876c7..000000000000
--- a/net/grive2/files/patch-libgrive_src_util_File.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgrive/src/util/File.cc.orig	2016-01-14 20:51:31 UTC
-+++ libgrive/src/util/File.cc
-@@ -33,6 +33,10 @@
- #include <sys/types.h>
- #include <fcntl.h>
- 
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#include <unistd.h>
-+#endif
-+
- #ifdef WIN32
- 	#include <io.h>
- 	typedef int ssize_t ;