--- libgit2/Makefile	2015-01-15 15:01:25.000000000 +0400
+++ libgit2/Makefile	2015-01-15 17:39:20.000000000 +0400
@@ -1,25 +1,26 @@ 
 # $FreeBSD: head/devel/libgit2/Makefile 377075 2015-01-15 11:01:25Z wg $
 
 PORTNAME=	libgit2
-PORTVERSION=	0.21.1
-PORTREVISION=	1
+PORTVERSION=	0.22.0
 CATEGORIES=	devel
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Portable, pure C implementation of the Git core
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libgit2
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	b4d00c1
+GH_COMMIT=	04bdd97
 
 USES=		cmake python:build
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
+CMAKE_ARGS+=	-DBUILD_CLAR:BOOL=OFF
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:E}
+PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E}
 
 OPTIONS_DEFINE=	SSH THREADS
 OPTIONS_DEFAULT=SSH THREADS
@@ -39,7 +40,9 @@ 
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
-		/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
+		/LIBGIT2_PC_REQUIRES.*zlib/d ; \
+		s/PKG_CHECK_MODULES(LIBSSH2 libssh2)/FIND_PACKAGE(LIBSSH2)/" \
+		${WRKSRC}/CMakeLists.txt
 .if defined(WITH_OPENSSL_BASE)
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
 		${WRKSRC}/CMakeLists.txt
--- libgit2/distinfo	2014-09-29 18:09:10.000000000 +0400
+++ libgit2/distinfo	2015-01-15 15:20:54.000000000 +0400
@@ -1,2 +1,2 @@ 
-SHA256 (libgit2-0.21.1.tar.gz) = 7faed833d59890ca11957610e020aef3d91e56027408e956d5eb3c9f35dbcb29
-SIZE (libgit2-0.21.1.tar.gz) = 3428317
+SHA256 (libgit2-0.22.0.tar.gz) = 5359a7256a3c7ba8293029dd31528d6d60d3e396c1b95c157c0f32de15471af8
+SIZE (libgit2-0.22.0.tar.gz) = 3587964
--- libgit2/files/patch-src_openssl_stream.c	1970-01-01 03:00:00.000000000 +0300
+++ libgit2/files/patch-src_openssl_stream.c	2015-01-15 16:48:50.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- src/openssl_stream.c.orig	2015-01-12 11:59:46.000000000 +0400
++++ src/openssl_stream.c	2015-01-15 16:46:27.000000000 +0400
+@@ -7,6 +7,8 @@
+ 
+ #ifdef GIT_SSL
+ 
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+ #include <openssl/x509v3.h>
--- libgit2/pkg-plist	2014-10-27 14:40:06.000000000 +0400
+++ libgit2/pkg-plist	2015-01-15 17:17:37.000000000 +0400
@@ -1,4 +1,4 @@ 
-include/git2.h
+include/git2/annotated_commit.h
 include/git2/attr.h
 include/git2/blame.h
 include/git2/blob.h
@@ -11,9 +11,11 @@ 
 include/git2/common.h
 include/git2/config.h
 include/git2/cred_helpers.h
+include/git2/describe.h
 include/git2/diff.h
 include/git2/errors.h
 include/git2/filter.h
+include/git2/global.h
 include/git2/graph.h
 include/git2/ignore.h
 include/git2/index.h
@@ -27,10 +29,12 @@ 
 include/git2/odb.h
 include/git2/odb_backend.h
 include/git2/oid.h
+include/git2/oidarray.h
 include/git2/pack.h
 include/git2/patch.h
 include/git2/pathspec.h
 include/git2/push.h
+include/git2/rebase.h
 include/git2/refdb.h
 include/git2/reflog.h
 include/git2/refs.h
@@ -47,25 +51,30 @@ 
 include/git2/stdint.h
 include/git2/strarray.h
 include/git2/submodule.h
-include/git2/tag.h
-include/git2/threads.h
-include/git2/trace.h
-include/git2/transport.h
-include/git2/tree.h
-include/git2/types.h
-include/git2/version.h
 include/git2/sys/commit.h
 include/git2/sys/config.h
 include/git2/sys/diff.h
 include/git2/sys/filter.h
+include/git2/sys/hashsig.h
 include/git2/sys/index.h
 include/git2/sys/mempack.h
 include/git2/sys/odb_backend.h
+include/git2/sys/openssl.h
 include/git2/sys/refdb_backend.h
 include/git2/sys/reflog.h
 include/git2/sys/refs.h
 include/git2/sys/repository.h
+include/git2/sys/stream.h
+include/git2/sys/transport.h
+include/git2/tag.h
+include/git2/trace.h
+include/git2/transaction.h
+include/git2/transport.h
+include/git2/tree.h
+include/git2/types.h
+include/git2/version.h
+include/git2.h
 lib/libgit2.so
-lib/libgit2.so.0.%%SHLIB_VER%%.0
+lib/libgit2.so.%%PORTVERSION%%
 lib/libgit2.so.%%SHLIB_VER%%
 libdata/pkgconfig/libgit2.pc