Index: head/devel/gitolite/Makefile
===================================================================
--- head/devel/gitolite/Makefile	(revision 532451)
+++ head/devel/gitolite/Makefile	(revision 532452)
@@ -1,69 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	gitolite
 DISTVERSIONPREFIX=v
 DISTVERSION=	3.6.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Access control layer on top of git
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	git>=0:devel/git \
 		p5-JSON>=0:converters/p5-JSON
 
 USES=		cpe perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
 
 CONFLICTS=	gitolite-[^3]*
 
 CPE_VENDOR=	sitaram_chamarty
 NO_ARCH=	yes
 
 SHEBANG_REGEX=	.*
 bash_CMD=	/bin/sh
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GITUSER DOCS CONTRIB
 OPTIONS_DEFAULT=	CONTRIB
 OPTIONS_SUB=	yes
 
 CONTRIB_DESC=	Install additionnal contrib files
 GITUSER_DESC=	Create git user as gitolite provider
 
 GITUSER_VARS=	USERS=git GROUPS=git
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,#!/usr/bin/perl,#!${PERL},' \
 		${WRKSRC}/src/lib/Gitolite/Hooks/*.pm
 
 do-build:
 	echo "${GH_TAGNAME}" > ${WRKSRC}/src/VERSION
 	${MKDIR} ${WRKSRC}/lib
 	${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/
 	${RMDIR} ${WRKSRC}/src/lib
 	${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/
 	${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/
 	${FIND} ${WRKSRC} '(' -name '*.bak' -o -name '*.orig' ')' -delete
 
 do-install:
 	(cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite)
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/)
 	${RLN} ${STAGEDIR}${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
 
 do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/share/vim
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${MV} ${STAGEDIR}${DATADIR}/vim ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 
 .include <bsd.port.mk>
Index: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys
===================================================================
--- head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys	(nonexistent)
+++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys	(revision 532452)
@@ -0,0 +1,34 @@
+From 7db6332d9be1879d97c57c35d53d97c4b15663d5 Mon Sep 17 00:00:00 2001
+From: Gleb Smirnoff <glebius@FreeBSD.org>
+Date: Thu, 13 Feb 2020 09:38:33 -0800
+Subject: [PATCH] When prepending our options to a key, check if key file
+ already has any options.  In this case put comma after end of our options
+ instead of space.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To tell key with options against bare key we check if key starts
+with (ecdsa|ssh)-.  At the moment of this commit OpenSSH supports
+the following algorithms “ecdsa-sha2-nistp256”, “ecdsa-sha2-nistp384”,
+“ecdsa-sha2-nistp521”, “ssh-ed25519”, “ssh-dss” or “ssh-rsa”.  If
+a different algorithm to be introduce to OpenSSH in future, this
+code would be broken.  However, adding a full key parser to this
+subroutine seems to be overkill now.
+---
+ src/triggers/post-compile/ssh-authkeys | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys
+index cd59aec83..6325373d7 100755
+--- src/triggers/post-compile/ssh-authkeys
++++ src/triggers/post-compile/ssh-authkeys
+@@ -137,6 +137,7 @@ sub optionise {
+         return '';
+     }
+     chomp(@line);
+-    return "command=\"$glshell $user" . ( $kfn ? " $f" : "" ) . "\",$auth_options $line[0]";
++    return "command=\"$glshell $user" . ( $kfn ? " $f" : "" ) . "\",$auth_options" .
++        ($line[0] =~ /^(ecdsa|ssh)-/ ? " " : "," ) . $line[0];
+ }
+ 

Property changes on: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys
___________________________________________________________________
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