--- libgit2/Makefile	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/Makefile	2015-01-28 08:47:02.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
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
+MASTER_SITES=	GHR
 
 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}
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	SSH THREADS
 OPTIONS_DEFAULT=SSH THREADS
@@ -45,4 +45,12 @@ 
 		${WRKSRC}/CMakeLists.txt
 .endif
 
+add-plist-post: build-plist
+
+build-plist: .SILENT
+.for d in include lib libdata
+	${FIND} ${STAGEDIR}${PREFIX}/${d} -type f -o -type l | \
+		${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}
+.endfor
+
 .include <bsd.port.post.mk>
--- libgit2/distinfo	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/distinfo	2015-01-28 08:40:39.000000000 +0400
@@ -1,2 +1,2 @@ 
-SHA256 (libgit2-0.21.1.tar.gz) = 7faed833d59890ca11957610e020aef3d91e56027408e956d5eb3c9f35dbcb29
-SIZE (libgit2-0.21.1.tar.gz) = 3428317
+SHA256 (libgit2-v0.21.5.tar.gz) = 46ca07becbdcda0da96a553d9f45e64ead29276ba14049e4bc8e2730ed1aa494
+SIZE (libgit2-v0.21.5.tar.gz) = 3460366
--- libgit2/pkg-plist	2015-01-24 01:32:12.000000000 +0400
+++ libgit2/pkg-plist	1970-01-01 03:00:00.000000000 +0300
@@ -1,71 +0,0 @@ 
-include/git2.h
-include/git2/attr.h
-include/git2/blame.h
-include/git2/blob.h
-include/git2/branch.h
-include/git2/buffer.h
-include/git2/checkout.h
-include/git2/cherrypick.h
-include/git2/clone.h
-include/git2/commit.h
-include/git2/common.h
-include/git2/config.h
-include/git2/cred_helpers.h
-include/git2/diff.h
-include/git2/errors.h
-include/git2/filter.h
-include/git2/graph.h
-include/git2/ignore.h
-include/git2/index.h
-include/git2/indexer.h
-include/git2/inttypes.h
-include/git2/merge.h
-include/git2/message.h
-include/git2/net.h
-include/git2/notes.h
-include/git2/object.h
-include/git2/odb.h
-include/git2/odb_backend.h
-include/git2/oid.h
-include/git2/pack.h
-include/git2/patch.h
-include/git2/pathspec.h
-include/git2/push.h
-include/git2/refdb.h
-include/git2/reflog.h
-include/git2/refs.h
-include/git2/refspec.h
-include/git2/remote.h
-include/git2/repository.h
-include/git2/reset.h
-include/git2/revert.h
-include/git2/revparse.h
-include/git2/revwalk.h
-include/git2/signature.h
-include/git2/stash.h
-include/git2/status.h
-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/index.h
-include/git2/sys/mempack.h
-include/git2/sys/odb_backend.h
-include/git2/sys/refdb_backend.h
-include/git2/sys/reflog.h
-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%%
-libdata/pkgconfig/libgit2.pc