Index: branches/2018Q2/devel/libgit2/Makefile
===================================================================
--- branches/2018Q2/devel/libgit2/Makefile	(revision 471764)
+++ branches/2018Q2/devel/libgit2/Makefile	(revision 471765)
@@ -1,44 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	libgit2
 PORTVERSION=	0.27.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Portable, pure C implementation of the Git core
 
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libgit2
 
 USES=		cmake pathfix pkgconfig python:build ssl
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E}
 
 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: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>
 
 post-patch:
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
 .if ${SSL_DEFAULT} == base
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
-		${WRKSRC}/CMakeLists.txt
+		${WRKSRC}/src/CMakeLists.txt
 .endif
 
 .include <bsd.port.post.mk>
Index: branches/2018Q2/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c
===================================================================
--- branches/2018Q2/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c	(nonexistent)
+++ branches/2018Q2/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c	(revision 471765)
@@ -0,0 +1,13 @@
+Fix the build with libgit2 0.27.
+
+Obtained from:	https://git.archlinux.org/svntogit/packages.git/commit/trunk/libgit2-0.27.0.diff?h=packages/libgit2-glib&id=5c8af6b8236ed9a108ad980899477cb50ffeb324
+--- libgit2-glib/ggit-config.c.orig	2015-08-10 06:33:13 UTC
++++ libgit2-glib/ggit-config.c
+@@ -295,6 +295,7 @@ ggit_config_add_file (GgitConfig      *config,
+ 	ret = git_config_add_file_ondisk (_ggit_native_get (config),
+ 	                                  path,
+ 	                                  (git_config_level_t)level,
++	                                  NULL,
+ 	                                  force);
+ 	g_free (path);
+ 

Property changes on: branches/2018Q2/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
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
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 471764)
+++ branches/2018Q2	(revision 471765)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r469930,470014