Updated net/grive2 to 0.4.1

Changelog only has "Bug fixes"
Several pkgsrc patches merged

pkgsrc changes: Switch to new Github handling

5 files changed, 9 insertions, 67 deletions

diff --git a/net/grive2/Makefile b/net/grive2/Makefile
index 060427000ec..455b5fae2a9 100644
--- a/net/grive2/Makefile
+++ b/net/grive2/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2015/06/25 07:37:58 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/09 14:52:34 abs Exp $
 
-DISTNAME=	${GHNAME}-${GHDATE}-${GHCOMMIT}
-PKGNAME=	${GHNAME}-0.4.0.${GHDATE}
+DISTNAME=	grive2-0.4.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GITHUB:=${GHACCOUNT}/${GHNAME}/archive/${GHCOMMIT}/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=vitalif/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/vitalif/Grive2
 COMMENT=	Independent open source implementation of Google Drive client
 LICENSE=	gnu-gpl-v2
 
-GHACCOUNT=	vitalif
-GHNAME=		grive2
-GHDATE=		20150531
-GHCOMMIT=	06eb1a7df2032144f99473fd812412514834a1ee
+GITHUB_TAG=v${PKGVERSION_NOREV}
 
-WRKSRC=		${WRKDIR}/grive2-${GHCOMMIT}
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
diff --git a/net/grive2/distinfo b/net/grive2/distinfo
index 35b40cfe934..773f4414877 100644
--- a/net/grive2/distinfo
+++ b/net/grive2/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 00:35:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2015/11/09 14:52:34 abs Exp $
 
-SHA1 (grive2-20150531-06eb1a7df2032144f99473fd812412514834a1ee.tar.gz) = e77a4d64f2fa2dbb69d9a7df1998424d261c263e
-RMD160 (grive2-20150531-06eb1a7df2032144f99473fd812412514834a1ee.tar.gz) = 3affce2d7b3112cc49941e4ea5cf81f6e2af49fe
-SHA512 (grive2-20150531-06eb1a7df2032144f99473fd812412514834a1ee.tar.gz) = 6a766fbc89360092e3d90e0518e30eb2b4c4769adf1eb9b3b0481cf81a95a42f4c1d89e5d4203d404de930d94f05fc20c44c42913b1832c777e5432a6a49a9ef
-Size (grive2-20150531-06eb1a7df2032144f99473fd812412514834a1ee.tar.gz) = 158413 bytes
+SHA1 (grive2-0.4.1.tar.gz) = f20da164b63f0acb1d15620d44f5596feed3344b
+RMD160 (grive2-0.4.1.tar.gz) = 46ecbfa294e5e804c8837e3ba2667a13a54a57a8
+SHA512 (grive2-0.4.1.tar.gz) = 55523f09afaad3e249fad6a085bcbb19d785f200bbe4ef45d48e6f6a44a41d13f0b8e77de348def819bf5409f1a995147fbb058191cda991aef023c76f2dbcf0
+Size (grive2-0.4.1.tar.gz) = 158861 bytes
 SHA1 (patch-libgrive_CMakeLists.txt) = fa81eae7f6c70478c757c897fab3fb1d297b25b0
 SHA1 (patch-libgrive_src_util_OS.cc) = ac5a59b717af6029134eb299b36a5862df193c38
-SHA1 (patch-libgrive_test_drive_EntryTest.cc) = 16627f2bb0f1b547a1be287c65c82793ac3a3f45
-SHA1 (patch-libgrive_test_drive_ResourceTest.cc) = b2337741b60c3f98481ecbe65f42e3dbf2382c09
-SHA1 (patch-libgrive_test_drive_ResourceTreeTest.cc) = a2e8e44f82996cbe506475c9c451e44eb04507b3
diff --git a/net/grive2/patches/patch-libgrive_test_drive_EntryTest.cc b/net/grive2/patches/patch-libgrive_test_drive_EntryTest.cc
deleted file mode 100644
index 09a30543701..00000000000
--- a/net/grive2/patches/patch-libgrive_test_drive_EntryTest.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libgrive_test_drive_EntryTest.cc,v 1.1.1.1 2015/06/16 16:15:37 abs Exp $
-
-Fix include
-
---- libgrive/test/drive/EntryTest.cc.orig	2015-05-31 19:35:15.000000000 +0000
-+++ libgrive/test/drive/EntryTest.cc
-@@ -21,7 +21,7 @@
- 
- #include "Assert.hh"
- 
--#include "drive/Entry.hh"
-+#include "base/Entry.hh"
- #include "xml/Node.hh"
- #include "xml/NodeSet.hh"
- #include "xml/TreeBuilder.hh"
diff --git a/net/grive2/patches/patch-libgrive_test_drive_ResourceTest.cc b/net/grive2/patches/patch-libgrive_test_drive_ResourceTest.cc
deleted file mode 100644
index cdc5f03d5d5..00000000000
--- a/net/grive2/patches/patch-libgrive_test_drive_ResourceTest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-libgrive_test_drive_ResourceTest.cc,v 1.1.1.1 2015/06/16 16:15:37 abs Exp $
-
-Fix include
-
---- libgrive/test/drive/ResourceTest.cc.orig	2015-05-31 19:35:15.000000000 +0000
-+++ libgrive/test/drive/ResourceTest.cc
-@@ -21,9 +21,9 @@
- 
- #include "Assert.hh"
- 
--#include "drive/Resource.hh"
-+#include "base/Resource.hh"
- 
--#include "drive/Entry.hh"
-+#include "base/Entry.hh"
- #include "xml/Node.hh"
- 
- #include <iostream>
diff --git a/net/grive2/patches/patch-libgrive_test_drive_ResourceTreeTest.cc b/net/grive2/patches/patch-libgrive_test_drive_ResourceTreeTest.cc
deleted file mode 100644
index 15de4633c09..00000000000
--- a/net/grive2/patches/patch-libgrive_test_drive_ResourceTreeTest.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libgrive_test_drive_ResourceTreeTest.cc,v 1.1.1.1 2015/06/16 16:15:37 abs Exp $
-
-Fix include
-
---- libgrive/test/drive/ResourceTreeTest.cc.orig	2015-05-31 19:35:15.000000000 +0000
-+++ libgrive/test/drive/ResourceTreeTest.cc
-@@ -21,8 +21,8 @@
- 
- #include "Assert.hh"
- 
--#include "drive/ResourceTree.hh"
--#include "drive/Resource.hh"
-+#include "base/ResourceTree.hh"
-+#include "base/Resource.hh"
- 
- #include <iostream>
-