diff -ruN libgit2.orig/Makefile libgit2/Makefile --- libgit2.orig/Makefile 2015-01-24 01:32:12.000000000 +0400 +++ libgit2/Makefile 2015-04-11 13:29:38.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.22.2 CATEGORIES= devel +DISTNAME= ${PORTNAME}-${DISTVERSIONFULL} 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 +USES= cmake pkgconfig 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} 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-09 02:28: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.22.2_GH0.tar.gz) = 3109f2579180d561fc736bad8bd917d7241477aab11633755c8a273beac53cdc +SIZE (libgit2-0.22.2_GH0.tar.gz) = 3591643 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-04-09 02:37:50.000000000 +0400 @@ -1,4 +1,5 @@ include/git2.h +include/git2/annotated_commit.h include/git2/attr.h include/git2/blame.h include/git2/blob.h @@ -11,9 +12,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 +30,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 @@ -48,8 +53,8 @@ include/git2/strarray.h include/git2/submodule.h include/git2/tag.h -include/git2/threads.h include/git2/trace.h +include/git2/transaction.h include/git2/transport.h include/git2/tree.h include/git2/types.h @@ -60,12 +65,16 @@ include/git2/sys/filter.h include/git2/sys/index.h include/git2/sys/mempack.h +include/git2/sys/hashsig.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 lib/libgit2.so -lib/libgit2.so.0.%%SHLIB_VER%%.0 lib/libgit2.so.%%SHLIB_VER%% +lib/libgit2.so.%%SHLIB_VER2%% libdata/pkgconfig/libgit2.pc