svn commit: r475467 - in head/net/grive2: . files

[Carlos J. Puga Medina]

Author: cpm
Date: Fri Jul 27 21:17:18 2018
New Revision: 475467
URL: https://svnweb.freebsd.org/changeset/ports/475467

Log:
  - Unbreak build on powerpc64
  - Add BACKTRACE option
  - Remove patches added upstream
  - Bump PORTREVISION
  
  PR:		229118

Added:
  head/net/grive2/files/patch-CMakeLists.txt   (contents, props changed)
Deleted:
  head/net/grive2/files/patch-grive_CMakeLists.txt
  head/net/grive2/files/patch-libgrive_src_util_File.cc
Modified:
  head/net/grive2/Makefile
  head/net/grive2/distinfo
  head/net/grive2/files/patch-libgrive_CMakeLists.txt

Modified: head/net/grive2/Makefile
==============================================================================
--- head/net/grive2/Makefile	Fri Jul 27 21:17:00 2018	(r475466)
+++ head/net/grive2/Makefile	Fri Jul 27 21:17:18 2018	(r475467)
@@ -4,6 +4,7 @@
 PORTNAME=	grive2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1-dev
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	cpm at 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>

Modified: head/net/grive2/distinfo
==============================================================================
--- head/net/grive2/distinfo	Fri Jul 27 21:17:00 2018	(r475466)
+++ head/net/grive2/distinfo	Fri Jul 27 21:17:18 2018	(r475467)
@@ -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

Added: head/net/grive2/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/grive2/files/patch-CMakeLists.txt	Fri Jul 27 21:17:18 2018	(r475467)
@@ -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
++	

Modified: head/net/grive2/files/patch-libgrive_CMakeLists.txt
==============================================================================
--- head/net/grive2/files/patch-libgrive_CMakeLists.txt	Fri Jul 27 21:17:00 2018	(r475466)
+++ head/net/grive2/files/patch-libgrive_CMakeLists.txt	Fri Jul 27 21:17:18 2018	(r475467)
@@ -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