[Midnightbsd-cvs] mports [22657] trunk/devel/libgit2: update to 0.25

[laffer1 at midnightbsd.org]

Revision: 22657
          http://svnweb.midnightbsd.org/mports/?rev=22657
Author:   laffer1
Date:     2017-09-29 13:15:04 -0400 (Fri, 29 Sep 2017)
Log Message:
-----------
update to 0.25

Modified Paths:
--------------
    trunk/devel/libgit2/Makefile
    trunk/devel/libgit2/distinfo
    trunk/devel/libgit2/pkg-plist

Added Paths:
-----------
    trunk/devel/libgit2/files/
    trunk/devel/libgit2/files/patch-src_openssl__stream.h

Modified: trunk/devel/libgit2/Makefile
===================================================================
--- trunk/devel/libgit2/Makefile	2017-09-29 17:10:51 UTC (rev 22656)
+++ trunk/devel/libgit2/Makefile	2017-09-29 17:15:04 UTC (rev 22657)
@@ -2,7 +2,8 @@
 # $FreeBSD: head/devel/libgit2/Makefile 391072 2015-07-01 15:09:52Z kwm $
 
 PORTNAME=	libgit2
-PORTVERSION=	0.22.3
+PORTVERSION=	0.25.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -20,17 +21,21 @@
 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
+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_LIB_DEPENDS=	libssh2.so: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:ftp/curl
+CURL_CMAKE_ON=		-DCURL=ON
+CURL_CMAKE_OFF=		-DCURL=OFF
 
 .include <bsd.port.pre.mk>
 

Modified: trunk/devel/libgit2/distinfo
===================================================================
--- trunk/devel/libgit2/distinfo	2017-09-29 17:10:51 UTC (rev 22656)
+++ trunk/devel/libgit2/distinfo	2017-09-29 17:15:04 UTC (rev 22657)
@@ -1,2 +1,3 @@
-SHA256 (libgit2-v0.22.3_GH0.tar.gz) = 511fe60e7c12c3525b4e0489861e5c1fe0e331d604bee9a3dfb8420c2f288f60
-SIZE (libgit2-v0.22.3_GH0.tar.gz) = 3594098
+TIMESTAMP = 1506705199
+SHA256 (libgit2-v0.25.1_GH0.tar.gz) = 465c7c0a3d9b3edf151d4ada31597f2805b7c2e80b92c03062a6345e03ef8c7b
+SIZE (libgit2-v0.25.1_GH0.tar.gz) = 4252139

Added: trunk/devel/libgit2/files/patch-src_openssl__stream.h
===================================================================
--- trunk/devel/libgit2/files/patch-src_openssl__stream.h	                        (rev 0)
+++ trunk/devel/libgit2/files/patch-src_openssl__stream.h	2017-09-29 17:15:04 UTC (rev 22657)
@@ -0,0 +1,15 @@
+Fix build with LibreSSL
+
+https://github.com/libgit2/libgit2/commit/42ad85e
+
+--- src/openssl_stream.h.orig	2017-01-09 20:26:45 UTC
++++ src/openssl_stream.h
+@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_stream **out, co
+ 
+ 
+ 
+-# if OPENSSL_VERSION_NUMBER < 0x10100000L
++# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
+ {


Property changes on: trunk/devel/libgit2/files/patch-src_openssl__stream.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/libgit2/pkg-plist
===================================================================
--- trunk/devel/libgit2/pkg-plist	2017-09-29 17:10:51 UTC (rev 22656)
+++ trunk/devel/libgit2/pkg-plist	2017-09-29 17:15:04 UTC (rev 22657)
@@ -34,7 +34,7 @@
 include/git2/pack.h
 include/git2/patch.h
 include/git2/pathspec.h
-include/git2/push.h
+include/git2/proxy.h
 include/git2/rebase.h
 include/git2/refdb.h
 include/git2/reflog.h
@@ -59,13 +59,16 @@
 include/git2/sys/hashsig.h
 include/git2/sys/index.h
 include/git2/sys/mempack.h
+include/git2/sys/merge.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/remote.h
 include/git2/sys/repository.h
 include/git2/sys/stream.h
+include/git2/sys/time.h
 include/git2/sys/transport.h
 include/git2/tag.h
 include/git2/trace.h
@@ -75,6 +78,6 @@
 include/git2/types.h
 include/git2/version.h
 lib/libgit2.so
-lib/libgit2.so.0.%%SHLIB_VER%%.3
+lib/libgit2.so.%%PORTVERSION%%
 lib/libgit2.so.%%SHLIB_VER%%
 libdata/pkgconfig/libgit2.pc