From da37afcf09b620328a85f4cf9b980ec314ff791d Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 16 Sep 2014 08:18:07 +0000
Subject: [PATCH] update to py-git2-0.21.3

---
 devel/libgit2/py-git2/Makefile                |  9 +++----
 devel/libgit2/py-git2/distinfo                |  4 +--
 .../py-git2/patches/patch-pygit2_ffi_py       | 26 -------------------
 devel/libgit2/py-git2/pkg/PLIST               | 22 +++++++++++++---
 4 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 devel/libgit2/py-git2/patches/patch-pygit2_ffi_py

diff --git a/devel/libgit2/py-git2/Makefile b/devel/libgit2/py-git2/Makefile
index abbd60533e2..8d1792c5873 100644
--- a/devel/libgit2/py-git2/Makefile
+++ b/devel/libgit2/py-git2/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2014/07/08 15:34:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2014/09/16 08:18:07 jasper Exp $
 
 COMMENT=		libgit2 bindings in Python
 
-GH_VER=			v0.21.0
+MODPY_EGG_VERSION=	0.21.3
+GH_VER=			v${MODPY_EGG_VERSION}
 V=			${GH_VER:S/v//}
 PROJECT=		pygit2
 PKGNAME=		py-git2-$V
@@ -11,6 +12,7 @@ MASTER_SITES=		https://github.com/libgit2/${PROJECT}/archive/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
 
 MODULES=		lang/python
+MODPY_SETUPTOOLS=	Yes
 
 WANTLIB += 		git2 pthread ${MODPY_WANTLIB}
 
@@ -18,9 +20,6 @@ LIB_DEPENDS=		devel/libgit2/libgit2>=0.21.0
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		devel/py-cffi
 
-pre-configure:
-	${SUBST_CMD} ${WRKSRC}/pygit2/ffi.py
-
 do-test:
 	cd ${WRKSRC} && ${MODPY_BIN} setup.py test
 
diff --git a/devel/libgit2/py-git2/distinfo b/devel/libgit2/py-git2/distinfo
index b14d2d651ab..d42b8f2de09 100644
--- a/devel/libgit2/py-git2/distinfo
+++ b/devel/libgit2/py-git2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgit/pygit2-0.21.0.tar.gz) = CQDdguQLgSOOBOSKRDjM/oMQa173FBJ7+zPC1KlvBWI=
-SIZE (libgit/pygit2-0.21.0.tar.gz) = 145394
+SHA256 (libgit/pygit2-0.21.3.tar.gz) = czhfWJ2dJbs3Twt2w7Mho59wd/LmYBqdMxKzQW3Q2nk=
+SIZE (libgit/pygit2-0.21.3.tar.gz) = 415152
diff --git a/devel/libgit2/py-git2/patches/patch-pygit2_ffi_py b/devel/libgit2/py-git2/patches/patch-pygit2_ffi_py
deleted file mode 100644
index d99c7ec28db..00000000000
--- a/devel/libgit2/py-git2/patches/patch-pygit2_ffi_py
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-pygit2_ffi_py,v 1.1 2014/07/08 15:34:01 jasper Exp $
-
-From b0bf223276ac3a0a522aca4d1c2e8c08636f9081 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-Date: Thu, 3 Jul 2014 10:10:38 +0200
-Subject: [PATCH] Tweak include/lib dir detection in ffi.py
-
---- pygit2/ffi.py.orig	Thu Jul  3 10:49:42 2014
-+++ pygit2/ffi.py	Thu Jul  3 10:50:49 2014
-@@ -112,11 +112,11 @@ with codecs.open(decl_path, 'r', 'utf-8') as header:
- 
- # if LIBGIT2 exists, set build and link against that version
- libgit2_path = getenv('LIBGIT2')
--include_dirs = []
--library_dirs = []
--if libgit2_path:
--    include_dirs = [path.join(libgit2_path, 'include')]
--    library_dirs = [path.join(libgit2_path, 'lib')]
-+if not libgit2_path:
-+    libgit2_path = '${PREFIX}'
-+
-+include_dirs = [path.join(libgit2_path, 'include')]
-+library_dirs = [path.join(libgit2_path, 'lib')]
- 
- C = ffi.verify("#include <git2.h>", libraries=["git2"],
-                include_dirs=include_dirs, library_dirs=library_dirs)
diff --git a/devel/libgit2/py-git2/pkg/PLIST b/devel/libgit2/py-git2/pkg/PLIST
index d1643c5db5f..9d5bc92c47e 100644
--- a/devel/libgit2/py-git2/pkg/PLIST
+++ b/devel/libgit2/py-git2/pkg/PLIST
@@ -1,10 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/07/08 15:34:01 jasper Exp $
-lib/python${MODPY_VERSION}/site-packages/_cffi__x194db310xdd69d84f.so
+@comment $OpenBSD: PLIST,v 1.9 2014/09/16 08:18:07 jasper Exp $
+lib/python${MODPY_VERSION}/site-packages/_cffi__x245ec18bx390834cc.so
 lib/python${MODPY_VERSION}/site-packages/_pygit2.so
 lib/python${MODPY_VERSION}/site-packages/pygit2/
-lib/python${MODPY_VERSION}/site-packages/pygit2-0.21.0-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pygit2/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pygit2/blame.py
+lib/python${MODPY_VERSION}/site-packages/pygit2/blame.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/config.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/config.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/credentials.py
@@ -14,6 +22,12 @@ lib/python${MODPY_VERSION}/site-packages/pygit2/errors.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/errors.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/ffi.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/ffi.pyc
+lib/python${MODPY_VERSION}/site-packages/pygit2/index.py
+lib/python${MODPY_VERSION}/site-packages/pygit2/index.pyc
+lib/python${MODPY_VERSION}/site-packages/pygit2/py2.py
+lib/python${MODPY_VERSION}/site-packages/pygit2/py2.pyc
+lib/python${MODPY_VERSION}/site-packages/pygit2/py3.py
+lib/python${MODPY_VERSION}/site-packages/pygit2/py3.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/refspec.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/refspec.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/remote.py
@@ -22,5 +36,7 @@ lib/python${MODPY_VERSION}/site-packages/pygit2/repository.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/repository.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/settings.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/settings.pyc
+lib/python${MODPY_VERSION}/site-packages/pygit2/utils.py
+lib/python${MODPY_VERSION}/site-packages/pygit2/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/pygit2/version.py
 lib/python${MODPY_VERSION}/site-packages/pygit2/version.pyc