From owner-svn-ports-head@FreeBSD.ORG Fri Nov 29 14:19:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79EF351C; Fri, 29 Nov 2013 14:19:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 65D43193C; Fri, 29 Nov 2013 14:19:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATEJ9JW067283; Fri, 29 Nov 2013 14:19:09 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATEJ8r1067276; Fri, 29 Nov 2013 14:19:08 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201311291419.rATEJ8r1067276@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 29 Nov 2013 14:19:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335180 - in head/net/grive: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Nov 2013 14:19:09 -0000 Author: danfe Date: Fri Nov 29 14:19:08 2013 New Revision: 335180 URL: http://svnweb.freebsd.org/changeset/ports/335180 Log: - Update to version 0.3.0 (sadly, not tagged at GitHub) - Do not manually strip installed binary, use install/strip target - Remove no longer required build dependency on `devel/binutils' - Use more accurate __FreeBSD_version in one of the patches Prodded by: Christopher Haglund Approved by: maintainer (per earlier email) Added: head/net/grive/files/patch-libgrive_src_drive_State.cc (contents, props changed) Modified: head/net/grive/Makefile head/net/grive/distinfo head/net/grive/files/patch-st_ctimespec Modified: head/net/grive/Makefile ============================================================================== --- head/net/grive/Makefile Fri Nov 29 14:14:26 2013 (r335179) +++ head/net/grive/Makefile Fri Nov 29 14:19:08 2013 (r335180) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= grive -PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTVERSION= 0.3.0 CATEGORIES= net MAINTAINER= ktsin@acm.org @@ -11,29 +10,31 @@ COMMENT= Open source client for Google D LICENSE= GPLv2 -BUILD_DEPENDS= ${LOCALBASE}/lib/libiberty.a:${PORTSDIR}/devel/binutils LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \ libcurl.so:${PORTSDIR}/ftp/curl \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libjson.so:${PORTSDIR}/devel/json-c + libjson.so:${PORTSDIR}/devel/json-c \ + libyajl.so:${PORTSDIR}/devel/yajl USE_GITHUB= yes GH_ACCOUNT= Grive GH_PROJECT= ${PORTNAME} -GH_COMMIT= 93d696a -GH_TAGNAME= v${PORTVERSION} +GH_COMMIT= 27817e8 +GH_TAGNAME= ${GH_COMMIT} USES= cmake CXXFLAGS+= -I${LOCALBASE}/include +INSTALL_TARGET= install/strip PLIST_FILES= bin/grive man/man1/grive.1.gz -# Allow to build with GCC 4.2 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 -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/grive - .include Modified: head/net/grive/distinfo ============================================================================== --- head/net/grive/distinfo Fri Nov 29 14:14:26 2013 (r335179) +++ head/net/grive/distinfo Fri Nov 29 14:19:08 2013 (r335180) @@ -1,2 +1,2 @@ -SHA256 (grive-0.2.0.tar.gz) = f9b32eb9da9f2d47b6642248e1e25606e9ab2cd5b3e94730b23399250ec7f2ec -SIZE (grive-0.2.0.tar.gz) = 144474 +SHA256 (grive-0.3.0.tar.gz) = a4e01d76f0e4c3e84fccae0580631117fad7989363c3308a7542b554230f5d76 +SIZE (grive-0.3.0.tar.gz) = 162465 Added: head/net/grive/files/patch-libgrive_src_drive_State.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/grive/files/patch-libgrive_src_drive_State.cc Fri Nov 29 14:19:08 2013 (r335180) @@ -0,0 +1,18 @@ +--- libgrive/src/drive/State.cc.orig 2013-05-03 00:40:04.000000000 +0800 ++++ libgrive/src/drive/State.cc 2013-11-27 15:17:50.000000000 +0800 +@@ -248,12 +248,12 @@ void State::Read( const fs::path& filena + void State::Write( const fs::path& filename ) const + { + Json last_sync ; +- last_sync.Add( "sec", Json(m_last_sync.Sec() ) ); +- last_sync.Add( "nsec", Json(m_last_sync.NanoSec() ) ); ++ last_sync.Add( "sec", Json((boost::uint64_t)m_last_sync.Sec() ) ); ++ last_sync.Add( "nsec", Json((boost::uint64_t)m_last_sync.NanoSec() ) ); + + Json result ; + result.Add( "last_sync", last_sync ) ; +- result.Add( "change_stamp", Json(m_cstamp) ) ; ++ result.Add( "change_stamp", Json((boost::uint64_t)m_cstamp) ) ; + + std::ofstream fs( filename.string().c_str() ) ; + fs << result ; Modified: head/net/grive/files/patch-st_ctimespec ============================================================================== --- head/net/grive/files/patch-st_ctimespec Fri Nov 29 14:14:26 2013 (r335179) +++ head/net/grive/files/patch-st_ctimespec Fri Nov 29 14:19:08 2013 (r335180) @@ -7,7 +7,7 @@ index 0d51136..469e373 100644 } -#if defined __APPLE__ && defined __DARWIN_64_BIT_INO_T -+#if defined(__FreeBSD__) && __FreeBSD_version < 900000 ++#if defined(__FreeBSD__) && __FreeBSD_version < 900010 return DateTime( s.st_ctimespec.tv_sec, s.st_ctimespec.tv_nsec ) ; #else return DateTime( s.st_ctim.tv_sec, s.st_ctim.tv_nsec);