pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc grive: remove, deprecated since 2017/2018
details: https://anonhg.NetBSD.org/pkgsrc/rev/aad61dcc83e2
branches: trunk
changeset: 450375:aad61dcc83e2
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Apr 15 10:45:33 2021 +0000
description:
grive: remove, deprecated since 2017/2018
Use net/grive2 instead.
diffstat:
doc/CHANGES-2021 | 3 +-
net/Makefile | 3 +-
net/grive/DESCR | 9 -
net/grive/Makefile | 44 ------
net/grive/PLIST | 3 -
net/grive/distinfo | 9 -
net/grive/patches/patch-cmake_Modules_FindJSONC.cmake | 17 --
net/grive/patches/patch-libgrive_src_protocol_Json.cc | 122 ------------------
net/grive/patches/patch-libgrive_src_util_OS.cc | 15 --
9 files changed, 3 insertions(+), 222 deletions(-)
diffs (278 lines):
diff -r 79703e99692f -r aad61dcc83e2 doc/CHANGES-2021
--- a/doc/CHANGES-2021 Thu Apr 15 10:43:01 2021 +0000
+++ b/doc/CHANGES-2021 Thu Apr 15 10:45:33 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.2153 2021/04/15 08:55:03 wiz Exp $
+$NetBSD: CHANGES-2021,v 1.2154 2021/04/15 10:45:33 wiz Exp $
Changes to the packages collection and infrastructure in 2021:
@@ -3458,3 +3458,4 @@
Updated chat/ejabberd to 21.04nb1 [triaxx 2021-04-15]
Updated net/grive2 to 0.5.1 [wiz 2021-04-15]
Updated devel/nss to 3.63nb2 [wiz 2021-04-15]
+ Removed net/grive successor net/grive2 [wiz 2021-04-15]
diff -r 79703e99692f -r aad61dcc83e2 net/Makefile
--- a/net/Makefile Thu Apr 15 10:43:01 2021 +0000
+++ b/net/Makefile Thu Apr 15 10:45:33 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1396 2021/04/01 14:19:16 taca Exp $
+# $NetBSD: Makefile,v 1.1397 2021/04/15 10:45:33 wiz Exp $
#
COMMENT= Networking tools
@@ -207,7 +207,6 @@
SUBDIR+= gopher
SUBDIR+= grilo
SUBDIR+= grilo-plugins
-SUBDIR+= grive
SUBDIR+= grive2
SUBDIR+= grpc
SUBDIR+= gsnmp
diff -r 79703e99692f -r aad61dcc83e2 net/grive/DESCR
--- a/net/grive/DESCR Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-The purpose of this project is to provide an independent open
-source implementation of Google Drive client for GNU/Linux. It
-uses the Google Document List API to talk to the servers in Google.
-The code is written in standard C++.
-
-Currently as of version 0.2.0, grive can do two-side synchronization
-between the Google Drive and local directory. It can download and
-upload changed files. New directories in Google Drive and local
-directory will also be downloaded/uploaded.
diff -r 79703e99692f -r aad61dcc83e2 net/grive/Makefile
--- a/net/grive/Makefile Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2021/01/01 08:24:53 ryoon Exp $
-
-DISTNAME= ${GHNAME}-${GHDATE}-${GHCOMMIT}
-PKGNAME= ${GHNAME}-0.3.0.${GHDATE}
-PKGREVISION= 22
-CATEGORIES= net
-MASTER_SITES= https://github.com/${GHACCOUNT}/${GHNAME}/archive/${GHCOMMIT}/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://www.lbreda.com/grive/start
-COMMENT= Independent open source implementation of Google Drive client
-LICENSE= gnu-gpl-v2
-
-GHACCOUNT= Grive
-GHNAME= grive
-GHDATE= 20130502
-GHCOMMIT= 27817e835fe115ebbda5410ec904aa49a2ad01f1
-
-WRKSRC= ${WRKDIR}/grive-${GHCOMMIT}
-USE_CMAKE= yes
-USE_LANGUAGES= c c++11
-
-SUBST_CLASSES+= disableqt
-SUBST_MESSAGE.disableqt= Disable QT frontend
-SUBST_STAGE.disableqt= pre-configure
-SUBST_FILES.disableqt= CMakeLists.txt
-SUBST_SED.disableqt= -e '/ bgrive/d'
-
-SUBST_CLASSES+= manpath
-SUBST_MESSAGE.manpath= Fix manpath
-SUBST_STAGE.manpath= pre-configure
-SUBST_FILES.manpath= bgrive/CMakeLists.txt grive/CMakeLists.txt
-SUBST_SED.manpath= -e 's,DESTINATION share/man,DESTINATION ${PKGMANDIR},g'
-
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../textproc/json-c/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/cppunit/buildlink3.mk"
-.include "../../devel/libiberty/buildlink3.mk"
-.include "../../devel/yajl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 79703e99692f -r aad61dcc83e2 net/grive/PLIST
--- a/net/grive/PLIST Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2014/06/06 14:57:00 abs Exp $
-bin/grive
-man/man1/grive.1
diff -r 79703e99692f -r aad61dcc83e2 net/grive/distinfo
--- a/net/grive/distinfo Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2020/09/14 18:20:57 joerg Exp $
-
-SHA1 (grive-20130502-27817e835fe115ebbda5410ec904aa49a2ad01f1.tar.gz) = e3059b0ce32ea05d7b5457948317b39358dbb239
-RMD160 (grive-20130502-27817e835fe115ebbda5410ec904aa49a2ad01f1.tar.gz) = f2a8c3e67f24c01b45ba831f2b3b8c2b5e39fe5c
-SHA512 (grive-20130502-27817e835fe115ebbda5410ec904aa49a2ad01f1.tar.gz) =
bd96a02366af47c5fde8e044066616c72a33607818d5e9cf4bea5fe70c0d63f83a2b726ce9a763cb907c78b2a563d7b2296b25e55743288dacef98adea3de729
-Size (grive-20130502-27817e835fe115ebbda5410ec904aa49a2ad01f1.tar.gz) = 162471 bytes
-SHA1 (patch-cmake_Modules_FindJSONC.cmake) = 3038261ef82ad501ffeae18abbba562cc73ae435
-SHA1 (patch-libgrive_src_protocol_Json.cc) = 8a37a880493c369aae5ebfbb3e397514c49b7149
-SHA1 (patch-libgrive_src_util_OS.cc) = 79cdfe8f89e28901b44c1e8dc5f054a9ca03f061
diff -r 79703e99692f -r aad61dcc83e2 net/grive/patches/patch-cmake_Modules_FindJSONC.cmake
--- a/net/grive/patches/patch-cmake_Modules_FindJSONC.cmake Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-cmake_Modules_FindJSONC.cmake,v 1.1.1.1 2014/06/06 14:57:00 abs Exp $
-
-Update for json-c 0.11 and later
-
---- cmake/Modules/FindJSONC.cmake.orig 2013-05-02 16:40:04.000000000 +0000
-+++ cmake/Modules/FindJSONC.cmake
-@@ -6,8 +6,8 @@
- # JSONC_INCLUDE_DIR - The JSON-C include directory.
- # JSONC_LIBRARY - The JSON-C library to link against.
-
--FIND_PATH(JSONC_INCLUDE_DIR json/json.h)
--FIND_LIBRARY(JSONC_LIBRARY NAMES json)
-+FIND_PATH(JSONC_INCLUDE_DIR NAMES json-c/json.h json/json.h)
-+FIND_LIBRARY(JSONC_LIBRARY NAMES json-c json)
-
- IF (JSONC_INCLUDE_DIR AND JSONC_LIBRARY)
- SET(JSONC_FOUND TRUE)
diff -r 79703e99692f -r aad61dcc83e2 net/grive/patches/patch-libgrive_src_protocol_Json.cc
--- a/net/grive/patches/patch-libgrive_src_protocol_Json.cc Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-$NetBSD: patch-libgrive_src_protocol_Json.cc,v 1.3 2020/09/14 18:20:57 joerg Exp $
-
-Update for json-c 0.14 and later
-On NetBSD/ARM, int32_t is not long, so add template specialisation for that.
-
---- libgrive/src/protocol/Json.cc.orig 2013-05-02 16:40:04.000000000 +0000
-+++ libgrive/src/protocol/Json.cc
-@@ -29,8 +29,8 @@
- #pragma warning(push)
- #pragma warning(disable: 4005)
- #endif
--#include <json/json_tokener.h>
--#include <json/linkhash.h>
-+#include <json-c/json_tokener.h>
-+#include <json-c/linkhash.h>
- #ifdef _MSC_VER
- #pragma warning(pop)
- #endif
-@@ -107,6 +107,20 @@ Json::Json( const boost::int32_t& l ) :
- ) ;
- }
-
-+#ifdef __arm__
-+template <>
-+Json::Json( const long& l ) :
-+ m_json( ::json_object_new_int( l ) )
-+{
-+ if ( m_json == 0 )
-+ BOOST_THROW_EXCEPTION(
-+ Error()
-+ << JsonCApi_( "json_object_new_int" )
-+ << ValueErr( l )
-+ ) ;
-+}
-+#endif
-+
- template <>
- Json::Json( const boost::int64_t& l ) :
- m_json( ::json_object_new_int64( l ) )
-@@ -131,6 +145,20 @@ Json::Json( const boost::uint32_t& l ) :
- ) ;
- }
-
-+#ifdef __arm__
-+template <>
-+Json::Json( const unsigned long& l ) :
-+ m_json( ::json_object_new_int( static_cast<int>(l) ) )
-+{
-+ if ( m_json == 0 )
-+ BOOST_THROW_EXCEPTION(
-+ Error()
-+ << JsonCApi_( "json_object_new_int" )
-+ << ValueErr( l )
-+ ) ;
-+}
-+#endif
-+
- template <>
- Json::Json( const boost::uint64_t& l ) :
- m_json( ::json_object_new_int64( l ) )
-@@ -254,7 +282,7 @@ Json Json::operator[]( const std::size_t
- bool Json::Has( const std::string& key ) const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_object_get_ex( m_json, key.c_str(), 0 ) == TRUE ;
-+ return ::json_object_object_get_ex( m_json, key.c_str(), 0 );
- }
-
- bool Json::Get( const std::string& key, Json& json ) const
-@@ -294,14 +322,14 @@ void Json::Add( const Json& json )
- bool Json::Bool() const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_get_boolean( m_json ) == TRUE ;
-+ return ::json_object_get_boolean( m_json );
- }
-
- template <>
- bool Json::Is<bool>() const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_is_type( m_json, json_type_boolean ) == TRUE ;
-+ return ::json_object_is_type( m_json, json_type_boolean );
- }
-
- template <>
-@@ -320,7 +348,7 @@ template <>
- bool Json::Is<std::string>() const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_is_type( m_json, json_type_string ) == TRUE ;
-+ return ::json_object_is_type( m_json, json_type_string );
- }
-
- template <>
-@@ -339,7 +367,7 @@ template <>
- bool Json::Is<int>() const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_is_type( m_json, json_type_int ) == TRUE ;
-+ return ::json_object_is_type( m_json, json_type_int );
- }
-
- template <>
-@@ -402,7 +430,7 @@ template <>
- bool Json::Is<Json::Object>() const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_is_type( m_json, json_type_object ) == TRUE ;
-+ return ::json_object_is_type( m_json, json_type_object );
- }
-
- template <>
-@@ -426,7 +454,7 @@ template <>
- bool Json::Is<Json::Array>() const
- {
- assert( m_json != 0 ) ;
-- return ::json_object_is_type( m_json, json_type_array ) == TRUE ;
-+ return ::json_object_is_type( m_json, json_type_array );
- }
-
- template <>
diff -r 79703e99692f -r aad61dcc83e2 net/grive/patches/patch-libgrive_src_util_OS.cc
--- a/net/grive/patches/patch-libgrive_src_util_OS.cc Thu Apr 15 10:43:01 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-libgrive_src_util_OS.cc,v 1.1.1.1 2014/06/06 14:57:00 abs Exp $
-
-Add __NetBSD__ to the 64bit Apple ctimespec stat case
-
---- libgrive/src/util/OS.cc.orig 2013-05-02 16:40:04.000000000 +0000
-+++ libgrive/src/util/OS.cc
-@@ -57,7 +57,7 @@ DateTime FileCTime( const std::string& f
- ) ;
- }
-
--#if defined __APPLE__ && defined __DARWIN_64_BIT_INO_T
-+#if defined __NetBSD__ || ( defined __APPLE__ && defined __DARWIN_64_BIT_INO_T )
- 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);
Home |
Main Index |
Thread Index |
Old Index