--- libgit2/Makefile	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/Makefile	2015-01-24 01:52:01.000000000 +0400
@@ -1,25 +1,25 @@ 
 # $FreeBSD: head/devel/libgit2/Makefile 377075 2015-01-15 11:01:25Z wg $
 
 PORTNAME=	libgit2
-PORTVERSION=	0.21.1
-PORTREVISION=	1
+PORTVERSION=	0.21.5
 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=	d853fb9
 
 USES=		cmake python:build
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:E}
+PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E}
 
 OPTIONS_DEFINE=	SSH THREADS
 OPTIONS_DEFAULT=SSH THREADS
@@ -40,6 +40,9 @@ 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
 		/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
+	# This is maintenance release, but with not fixed version
+	@${SED} -i '' -e '/LIBGIT2_VERSION/s/\".*\"/\"${PORTVERSION}\"/' \
+		${WRKSRC}/include/git2/version.h
 .if defined(WITH_OPENSSL_BASE)
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
 		${WRKSRC}/CMakeLists.txt
--- libgit2/distinfo	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/distinfo	2015-01-24 01:35:21.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.21.5.tar.gz) = b283c6cea6f2f97d0719e3bc867cd43b0d993650553278adc39402d65033671d
+SIZE (libgit2-0.21.5.tar.gz) = 3462331
--- libgit2/pkg-plist	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/pkg-plist	2015-01-24 01:32:12.000000000 +0400
@@ -66,6 +66,6 @@ 
 include/git2/sys/refs.h
 include/git2/sys/repository.h
 lib/libgit2.so
-lib/libgit2.so.0.%%SHLIB_VER%%.0
+lib/libgit2.so.%%PORTVERSION%%
 lib/libgit2.so.%%SHLIB_VER%%
 libdata/pkgconfig/libgit2.pc