Index: head/devel/gitolite/Makefile
===================================================================
--- head/devel/gitolite/Makefile	(revision 408774)
+++ head/devel/gitolite/Makefile	(revision 408775)
@@ -1,69 +1,66 @@
 # $FreeBSD$
 
 PORTNAME=	gitolite
-PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTVERSION=	3.6.4
+DISTVERSIONPREFIX=v
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	GH \
-		LOCAL/milki \
-		LOCAL/tdb
+MASTER_SITES=	GH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Access control layer on top of git
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git \
 		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
-GH_TAGNAME=	3455375
 
 CONFLICTS=	gitolite-[^3]*
 
 USES=		cpe perl5
 CPE_VENDOR=	sitaram_chamarty
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GITUSER DOCS
 OPTIONS_SUB=	yes
 
 GITUSER_DESC=	Create git user as gitolite provider
 GITUSER_VARS=	USERS=git GROUPS=git
 
 post-patch:
 	@${FIND} ${WRKSRC} \
 		-exec ${GREP} -qs \#\!/usr/bin/perl {} \; \
 		-exec ${REINPLACE_CMD} -Ee 's|#!/usr/bin/perl|#!${PERL}|' {} \;
 	@${FIND} ${WRKSRC} \
 		-exec ${GREP} -qs \#\!/bin/bash {} \; \
 		-exec ${REINPLACE_CMD} -Ee 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} \;
 
 do-build:
-	echo "v${PORTVERSION}-0-g${GH_TAGNAME}" > ${WRKSRC}/src/VERSION
+	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/
 
 post-build:
 	${FIND} ${WRKSRC} -name "*.bak" -delete
 	${FIND} ${WRKSRC} -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}/)
 	${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/gitolite/distinfo
===================================================================
--- head/devel/gitolite/distinfo	(revision 408774)
+++ head/devel/gitolite/distinfo	(revision 408775)
@@ -1,2 +1,2 @@
-SHA256 (sitaramc-gitolite-3.6.1-3455375_GH0.tar.gz) = 007d7f171a1985b01689619ec60434dfaf355c5415a51e139de199cc11012df5
-SIZE (sitaramc-gitolite-3.6.1-3455375_GH0.tar.gz) = 165504
+SHA256 (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 15b19181dcc00233e4d031f07d769cf930e93963a925a71d684748068f38dd63
+SIZE (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 180619
Index: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split
===================================================================
--- head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split	(nonexistent)
+++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split	(revision 408775)
@@ -0,0 +1,17 @@
+--- src/triggers/post-compile/ssh-authkeys-split.orig	2015-11-01 12:01:20 UTC
++++ src/triggers/post-compile/ssh-authkeys-split
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/bash
++#!/bin/sh
+ 
+ #   split multi-key files into separate keys like ssh-authkeys likes
+ 
+@@ -60,7 +60,7 @@ do
+     while read line
+     do
+         echo "$line" > $SKD/$base@$seq.pub
+-        (( seq++ ))
++        seq=$(( $seq + 1 ))
+     done < $k
+ 
+     # now delete the original file

Property changes on: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split
___________________________________________________________________
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: head/devel/gitolite/pkg-plist
===================================================================
--- head/devel/gitolite/pkg-plist	(revision 408774)
+++ head/devel/gitolite/pkg-plist	(revision 408775)
@@ -1,89 +1,93 @@
 bin/gitolite
 %%SITE_PERL%%/Gitolite/Cache.pm
 %%SITE_PERL%%/Gitolite/Common.pm
 %%SITE_PERL%%/Gitolite/Conf.pm
 %%SITE_PERL%%/Gitolite/Conf/Explode.pm
 %%SITE_PERL%%/Gitolite/Conf/Load.pm
 %%SITE_PERL%%/Gitolite/Conf/Store.pm
 %%SITE_PERL%%/Gitolite/Conf/Sugar.pm
 %%SITE_PERL%%/Gitolite/Easy.pm
 %%SITE_PERL%%/Gitolite/Hooks/PostUpdate.pm
 %%SITE_PERL%%/Gitolite/Hooks/Update.pm
 %%SITE_PERL%%/Gitolite/Rc.pm
 %%SITE_PERL%%/Gitolite/Setup.pm
 %%SITE_PERL%%/Gitolite/Test.pm
 %%SITE_PERL%%/Gitolite/Test/Tsh.pm
 %%SITE_PERL%%/Gitolite/Triggers.pm
 %%SITE_PERL%%/Gitolite/Triggers/Alias.pm
 %%SITE_PERL%%/Gitolite/Triggers/AutoCreate.pm
 %%SITE_PERL%%/Gitolite/Triggers/CpuTime.pm
 %%SITE_PERL%%/Gitolite/Triggers/Kindergarten.pm
 %%SITE_PERL%%/Gitolite/Triggers/Mirroring.pm
 %%SITE_PERL%%/Gitolite/Triggers/Motd.pm
 %%SITE_PERL%%/Gitolite/Triggers/RefexExpr.pm
 %%SITE_PERL%%/Gitolite/Triggers/RepoUmask.pm
 %%SITE_PERL%%/Gitolite/Triggers/Shell.pm
+%%SITE_PERL%%/Gitolite/Triggers/TProxy.pm
 %%SITE_PERL%%/Gitolite/Triggers/Writable.pm
 libexec/gitolite/VERSION
 libexec/gitolite/VREF/COUNT
 libexec/gitolite/VREF/EMAIL-CHECK
 libexec/gitolite/VREF/FILETYPE
 libexec/gitolite/VREF/MAX_NEWBIN_SIZE
 libexec/gitolite/VREF/MERGE-CHECK
+libexec/gitolite/VREF/NAME_NC
 libexec/gitolite/VREF/VOTES
 libexec/gitolite/VREF/lock
 libexec/gitolite/VREF/partial-copy
 libexec/gitolite/VREF/refex-expr
 libexec/gitolite/check-g2-compat
 libexec/gitolite/commands/D
 libexec/gitolite/commands/access
+libexec/gitolite/commands/config
 libexec/gitolite/commands/create
 libexec/gitolite/commands/creator
 libexec/gitolite/commands/desc
 libexec/gitolite/commands/fork
 libexec/gitolite/commands/git-annex-shell
 libexec/gitolite/commands/git-config
 libexec/gitolite/commands/help
 libexec/gitolite/commands/htpasswd
 libexec/gitolite/commands/info
 libexec/gitolite/commands/list-dangling-repos
 libexec/gitolite/commands/lock
 libexec/gitolite/commands/mirror
 libexec/gitolite/commands/motd
+libexec/gitolite/commands/option
 libexec/gitolite/commands/owns
 libexec/gitolite/commands/perms
 libexec/gitolite/commands/print-default-rc
 libexec/gitolite/commands/push
 libexec/gitolite/commands/readme
 libexec/gitolite/commands/rsync
 libexec/gitolite/commands/sshkeys-lint
 libexec/gitolite/commands/sskm
 libexec/gitolite/commands/sudo
 libexec/gitolite/commands/svnserve
 libexec/gitolite/commands/symbolic-ref
 libexec/gitolite/commands/who-pushed
 libexec/gitolite/commands/writable
 libexec/gitolite/convert-gitosis-conf
 libexec/gitolite/gitolite
 libexec/gitolite/gitolite-shell
 libexec/gitolite/syntactic-sugar/continuation-lines
 libexec/gitolite/syntactic-sugar/keysubdirs-as-groups
 libexec/gitolite/syntactic-sugar/macros
 libexec/gitolite/syntactic-sugar/refex-expr
 libexec/gitolite/triggers/bg
 libexec/gitolite/triggers/expand-deny-messages
 libexec/gitolite/triggers/partial-copy
 libexec/gitolite/triggers/post-compile/ssh-authkeys
 libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users
 libexec/gitolite/triggers/post-compile/ssh-authkeys-split
 libexec/gitolite/triggers/post-compile/update-description-file
 libexec/gitolite/triggers/post-compile/update-git-configs
 libexec/gitolite/triggers/post-compile/update-git-daemon-access-list
 libexec/gitolite/triggers/post-compile/update-gitweb-access-list
 libexec/gitolite/triggers/post-compile/update-gitweb-daemon-from-options
 libexec/gitolite/triggers/renice
 libexec/gitolite/triggers/repo-specific-hooks
 libexec/gitolite/triggers/set-default-roles
 libexec/gitolite/triggers/upstream
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.markdown