Update devel/libgit2 to 0.23.3.

Simplify Github distfile handling.
Backport a futimes fix from upstream master, fixes build on SunOS.

Changes since 0.23.2:
- blame: guard xdiff calls for large files
- diff: don't feed large files to xdiff
- merge_file: treat large files as binary
- xdiff: convert size variables to size_t
- GITERR_CHECK_ALLOC_ADDn: multi-arg adders

4 files changed, 72 insertions, 11 deletions

diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
index 531b4192af8..d5678f1cb1d 100644
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2015/09/13 12:21:13 taca Exp $
+# $NetBSD: Makefile,v 1.7 2015/10/06 14:56:12 fhajny Exp $
 
-DISTNAME=	v0.23.2
-PKGNAME=	libgit2-${DISTNAME:S/v//1}
+DISTNAME=	libgit2-0.23.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libgit2/}
-GITHUB_PROJECT=	libgit2
-GITHUB_TAG=	v0.23.2
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://libgit2.github.com/
 COMMENT=	Portable, pure C implementation of the Git core methods
 LICENSE=	gnu-gpl-v2 # linking exception (linking allowed in more ways)
 
-DIST_SUBDIR=	${PKGBASE}
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 EXTRACT_USING=	bsdtar
 USE_TOOLS+=	pkg-config
 USE_CMAKE=	yes
diff --git a/devel/libgit2/distinfo b/devel/libgit2/distinfo
index ced2088d05a..f6c22759604 100644
--- a/devel/libgit2/distinfo
+++ b/devel/libgit2/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/09/13 12:21:13 taca Exp $
+$NetBSD: distinfo,v 1.4 2015/10/06 14:56:12 fhajny Exp $
 
-SHA1 (libgit2/v0.23.2.tar.gz) = 2f8c066456bbc67c2b0209f0e3ef72eed585fb46
-RMD160 (libgit2/v0.23.2.tar.gz) = 345e5757a89f27befb9a52654e66ba55f9b82b34
-Size (libgit2/v0.23.2.tar.gz) = 3717748 bytes
+SHA1 (libgit2-0.23.3.tar.gz) = 1e85799534f1431dfb7858d7b67deca4ff86cc2a
+RMD160 (libgit2-0.23.3.tar.gz) = 9a0818ba91082a89a1a702872bc706d9900655fd
+Size (libgit2-0.23.3.tar.gz) = 3718675 bytes
+SHA1 (patch-CMakeLists.txt) = a4b8742e51bf2733aa25044d3f3fa73ca944693c
+SHA1 (patch-src_unix_posix.h) = 01ee06606bf7c01f3c17ab4ee56d37b9af6183aa
diff --git a/devel/libgit2/patches/patch-CMakeLists.txt b/devel/libgit2/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..2274bf4061e
--- /dev/null
+++ b/devel/libgit2/patches/patch-CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/06 14:56:12 fhajny Exp $
+
+Backport futimens/futimes fix from master.
+
+https://github.com/ethomson/libgit2/commit/8649dfd8df4f0d840a64c1d6c5fc80b8e94a68d1
+
+--- CMakeLists.txt.orig	2015-10-05 21:37:22.000000000 +0000
++++ CMakeLists.txt
+@@ -19,6 +19,7 @@ CMAKE_POLICY(SET CMP0015 NEW)
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
+ 
+ INCLUDE(CheckLibraryExists)
++INCLUDE(CheckFunctionExists)
+ INCLUDE(AddCFlagIfSupported)
+ INCLUDE(FindPkgConfig)
+ 
+@@ -430,6 +431,11 @@ ELSE ()
+ 	ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-const-variable)
+ 	ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-function)
+ 
++	CHECK_FUNCTION_EXISTS(futimens HAVE_FUTIMENS)
++	IF (HAVE_FUTIMENS)
++		ADD_DEFINITIONS(-DHAVE_FUTIMENS)
++	ENDIF ()
++
+ 	IF (APPLE) # Apple deprecated OpenSSL
+ 		ADD_C_FLAG_IF_SUPPORTED(-Wno-deprecated-declarations)
+ 	ENDIF()
diff --git a/devel/libgit2/patches/patch-src_unix_posix.h b/devel/libgit2/patches/patch-src_unix_posix.h
new file mode 100644
index 00000000000..a2ea25e727d
--- /dev/null
+++ b/devel/libgit2/patches/patch-src_unix_posix.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_unix_posix.h,v 1.1 2015/10/06 14:56:12 fhajny Exp $
+
+Backport futimens/futimes fix from master.
+
+https://github.com/ethomson/libgit2/commit/8649dfd8df4f0d840a64c1d6c5fc80b8e94a68d1
+
+--- src/unix/posix.h.orig	2015-10-05 21:37:22.000000000 +0000
++++ src/unix/posix.h
+@@ -22,7 +22,6 @@ typedef int GIT_SOCKET;
+ #define p_stat(p,b) stat(p, b)
+ 
+ #define p_utimes(f, t) utimes(f, t)
+-#define p_futimes(f, t) futimes(f, t)
+ 
+ #define p_readlink(a, b, c) readlink(a, b, c)
+ #define p_symlink(o,n) symlink(o, n)
+@@ -53,4 +52,18 @@ extern char *p_realpath(const char *, ch
+ #define p_localtime_r(c, r) localtime_r(c, r)
+ #define p_gmtime_r(c, r) gmtime_r(c, r)
+ 
++#ifdef HAVE_FUTIMENS
++GIT_INLINE(int) p_futimes(int f, const struct timeval t[2])
++{
++	struct timespec s[2];
++	s[0].tv_sec = t[0].tv_sec;
++	s[0].tv_nsec = t[0].tv_usec * 1000;
++	s[1].tv_sec = t[1].tv_sec;
++	s[1].tv_nsec = t[1].tv_usec * 1000;
++	return futimens(f, s);
++}
++#else
++# define p_futimes futimes
++#endif
++
+ #endif