diff -ruN libgit2.orig/Makefile libgit2/Makefile
--- libgit2.orig/Makefile	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/Makefile	2015-04-09 03:03:07.000000000 +0400
@@ -1,25 +1,24 @@
 # $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
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 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
 
 USES=		cmake python:build
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:E}
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:E} SHLIB_VER2=${PORTVERSION:R}.4
 
 OPTIONS_DEFINE=	SSH THREADS
 OPTIONS_DEFAULT=SSH THREADS
@@ -41,7 +40,7 @@
 	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
 		/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
 .if defined(WITH_OPENSSL_BASE)
-	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
+	@${SED} -i '.ssl' -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
 		${WRKSRC}/CMakeLists.txt
 .endif
 
diff -ruN libgit2.orig/distinfo libgit2/distinfo
--- libgit2.orig/distinfo	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/distinfo	2015-04-07 19:25: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.21.5_GH0.tar.gz) = 46ca07becbdcda0da96a553d9f45e64ead29276ba14049e4bc8e2730ed1aa494
+SIZE (libgit2-0.21.5_GH0.tar.gz) = 3460366
diff -ruN libgit2.orig/pkg-plist libgit2/pkg-plist
--- libgit2.orig/pkg-plist	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/pkg-plist	2015-01-26 01:49:39.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.%%SHLIB_VER%%
+lib/libgit2.so.%%SHLIB_VER2%%
 libdata/pkgconfig/libgit2.pc