Update libgit2 to 0.23.1.

Add curl option for HTTP support.

Submitted by:	Andrey Cherkashin <andoriyu@gmail.com>
Approved by:	wg@
Differential Revision:	https://reviews.freebsd.org/D3494

12 files changed, 27 insertions, 23 deletions

diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index bca78a1e10f5..f981ebd8288e 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitg
-PORTVERSION=	3.16.1
-PORTREVISION=	1
+PORTVERSION=	3.17.1
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
 
@@ -25,7 +24,7 @@ RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-sc
 
 CONFLICTS=	gitg0-[0-9]*
 
-USES=		desktop-file-utils gmake libtool pathfix pkgconfig tar:xz
+USES=		compiler:c11 desktop-file-utils gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
 		--disable-maintainer-mode \
diff --git a/devel/gitg/distinfo b/devel/gitg/distinfo
index ef89b42c1b7f..d42f9b718884 100644
--- a/devel/gitg/distinfo
+++ b/devel/gitg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gitg-3.16.1.tar.xz) = 914e964402dadda152c7e034906d84e266c474603f58bc1a300f2a1659615569
-SIZE (gitg-3.16.1.tar.xz) = 1322412
+SHA256 (gitg-3.17.1.tar.xz) = 2bdacc1db4bfcb0fb95d42700fa40130458a1d7f3ded6cacc8f1f5a469efd83f
+SIZE (gitg-3.17.1.tar.xz) = 1372732
diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index 2c1fc709ede9..80903f85fced 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgit2-glib
-PORTVERSION=	0.22.8
+PORTVERSION=	0.23.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
 		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
 LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
 
-USES=		gmake libtool pathfix pkgconfig tar:xz
+USES=		compiler:c11 gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomeprefix gtk30 intlhack introspection
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libgit2-glib/distinfo b/devel/libgit2-glib/distinfo
index 937a76380869..4a6557933677 100644
--- a/devel/libgit2-glib/distinfo
+++ b/devel/libgit2-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/libgit2-glib-0.22.8.tar.xz) = 05c9453b195f1af0df2a5d8bc71472c9fb26d14bb8fbb5b688ad1b8ef7a30959
-SIZE (gnome3/libgit2-glib-0.22.8.tar.xz) = 429300
+SHA256 (gnome3/libgit2-glib-0.23.4.tar.xz) = e0ae2b2f4cc90fdbf603a89406a07daf01d485b8f837bac9a818b4285e5ce84e
+SIZE (gnome3/libgit2-glib-0.23.4.tar.xz) = 430524
diff --git a/devel/libgit2-glib/pkg-plist b/devel/libgit2-glib/pkg-plist
index a151d5dca4ab..3738214d567f 100644
--- a/devel/libgit2-glib/pkg-plist
+++ b/devel/libgit2-glib/pkg-plist
@@ -15,6 +15,8 @@ include/libgit2-glib-1.0/libgit2-glib/ggit-cred-plaintext.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-cred-ssh-interactive.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-cred-ssh-key-from-agent.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-cred.h
+include/libgit2-glib-1.0/libgit2-glib/ggit-diff-binary.h
+include/libgit2-glib-1.0/libgit2-glib/ggit-diff-binary-file.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-diff-delta.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-diff-file.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-diff-find-options.h
@@ -26,6 +28,7 @@ include/libgit2-glib-1.0/libgit2-glib/ggit-diff-similarity-metric.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-diff.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-enum-types.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-error.h
+include/libgit2-glib-1.0/libgit2-glib/ggit-fetch-options.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry-resolve-undo.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-index-entry.h
 include/libgit2-glib-1.0/libgit2-glib/ggit-index.h
@@ -108,7 +111,6 @@ libdata/pkgconfig/libgit2-glib-1.0.pc
 %%PORTDOCS%%%%DOCSDIR%%-1.0/api-index-full.html
 %%PORTDOCS%%%%DOCSDIR%%-1.0/home.png
 %%PORTDOCS%%%%DOCSDIR%%-1.0/index.html
-%%PORTDOCS%%%%DOCSDIR%%-1.0/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%-1.0/left-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%-1.0/left.png
 %%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-Ggit-Main.html
diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
index 53335f6b19d9..07cf0f10a7d8 100644
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgit2
-PORTVERSION=	0.22.3
+PORTVERSION=	0.23.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -19,15 +19,19 @@ USE_OPENSSL=	yes
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:E}
 
-OPTIONS_DEFINE=	SSH THREADS
-OPTIONS_DEFAULT=SSH THREADS
+OPTIONS_DEFINE=	SSH THREADS CURL
+OPTIONS_DEFAULT=SSH THREADS CURL
 SSH_DESC=	Enable SSH support through libssh2
+CURL_DESC= Enable HTTP support through cURL
 
 SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
 SSH_CMAKE_ON=		-DUSE_SSH=ON
 SSH_CMAKE_OFF=		-DUSE_SSH=OFF
 THREADS_CMAKE_ON=	-DTHREADSAFE=ON
 THREADS_CMAKE_OFF=	-DTHREADSAFE=OFF
+CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CMAKE_ON=		-DCURL=ON
+CURL_CMAKE_OFF=		-DCURL=OFF
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libgit2/distinfo b/devel/libgit2/distinfo
index 5b1f66d304b5..5d0b1d0b82f1 100644
--- a/devel/libgit2/distinfo
+++ b/devel/libgit2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgit2-libgit2-v0.22.3_GH0.tar.gz) = 511fe60e7c12c3525b4e0489861e5c1fe0e331d604bee9a3dfb8420c2f288f60
-SIZE (libgit2-libgit2-v0.22.3_GH0.tar.gz) = 3594098
+SHA256 (libgit2-libgit2-v0.23.1_GH0.tar.gz) = 113748018e5876bea84af5c749af25b62f58cb4ca82730dcbffaac90c87f7056
+SIZE (libgit2-libgit2-v0.23.1_GH0.tar.gz) = 3717102
diff --git a/devel/libgit2/pkg-plist b/devel/libgit2/pkg-plist
index ae2372195b3f..e8106428a7c1 100644
--- a/devel/libgit2/pkg-plist
+++ b/devel/libgit2/pkg-plist
@@ -34,7 +34,6 @@ 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
@@ -75,6 +74,6 @@ include/git2/tree.h
 include/git2/types.h
 include/git2/version.h
 lib/libgit2.so
-lib/libgit2.so.0.%%SHLIB_VER%%.3
+lib/libgit2.so.0.%%SHLIB_VER%%.1
 lib/libgit2.so.%%SHLIB_VER%%
 libdata/pkgconfig/libgit2.pc
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 215f8d53539f..99881bb75696 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pygit2
-PORTVERSION=	0.22.0
+PORTVERSION=	0.23.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pygit2/distinfo b/devel/py-pygit2/distinfo
index 545332832a18..fa6b1dd215aa 100644
--- a/devel/py-pygit2/distinfo
+++ b/devel/py-pygit2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pygit2-0.22.0.tar.gz) = d67045c8f6d6e8c23fc2bb6ba51f084177c7b7617c42bc433c6fec5ac0bf42e4
-SIZE (pygit2-0.22.0.tar.gz) = 423840
+SHA256 (pygit2-0.23.0.tar.gz) = 90101a7a4b3c3563662c4047d5b6c52d84d9150570a7262e88892c604545dcb2
+SIZE (pygit2-0.23.0.tar.gz) = 453779
diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile
index 419930374f82..70ae1f11185c 100644
--- a/devel/rubygem-rugged/Makefile
+++ b/devel/rubygem-rugged/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rugged
-PORTVERSION=	0.22.2
+PORTVERSION=	0.23.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-rugged/distinfo b/devel/rubygem-rugged/distinfo
index ca4513f22df2..1173fb597ff0 100644
--- a/devel/rubygem-rugged/distinfo
+++ b/devel/rubygem-rugged/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/rugged-0.22.2.gem) = f7e6c8304eb5ec06c7366fb13e203eb738e20bf190c3aa99498d674db7b5379d
-SIZE (rubygem/rugged-0.22.2.gem) = 988672
+SHA256 (rubygem/rugged-0.23.2.gem) = 6dd00edb3cbe7648a2f040ef94590f916e63c9eff82f15bfd2d21c9ef124375e
+SIZE (rubygem/rugged-0.23.2.gem) = 1037824