Index: head/devel/gitolite/Makefile
===================================================================
--- head/devel/gitolite/Makefile	(revision 444938)
+++ head/devel/gitolite/Makefile	(revision 444939)
@@ -1,66 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	gitolite
-PORTVERSION=	3.6.6
 DISTVERSIONPREFIX=v
+DISTVERSION=	3.6.7
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	GH
 
-MAINTAINER=	ports@FreeBSD.org
+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]*
 
-USES=		cpe perl5
 CPE_VENDOR=	sitaram_chamarty
 NO_ARCH=	yes
 
+SHEBANG_REGEX=	.*
+bash_CMD=	/bin/sh
+
 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 "${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
+	${RLN} -s ${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}
 
 .include <bsd.port.mk>
Index: head/devel/gitolite/distinfo
===================================================================
--- head/devel/gitolite/distinfo	(revision 444938)
+++ head/devel/gitolite/distinfo	(revision 444939)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473435815
-SHA256 (sitaramc-gitolite-v3.6.6_GH0.tar.gz) = 6971db70cf1393bf864cab569adbbd2a71f777f095d13447079a2463901b031f
-SIZE (sitaramc-gitolite-v3.6.6_GH0.tar.gz) = 183469
+TIMESTAMP = 1499082012
+SHA256 (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = f75d15bb438986b77bd8aeda7839dcd3624ae9d09dbfce245c00b906de8dbdc5
+SIZE (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = 186298
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	(revision 444938)
+++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split	(revision 444939)
@@ -1,17 +1,11 @@
---- src/triggers/post-compile/ssh-authkeys-split.orig	2016-02-20 12:48:57 UTC
+--- src/triggers/post-compile/ssh-authkeys-split.orig	2017-07-02 14:01:25 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
- 
-@@ -64,7 +64,7 @@ do
+@@ -66,7 +66,7 @@ do
              echo 1>&2 "ssh-authkeys-split: bad line $seq in keydir/$k"
              rm -f $f
          fi
 -        (( seq++ ))
 +        seq=$(( $seq + 1 ))
      done < $k
  
      # now delete the original file
Index: head/devel/gitolite/pkg-descr
===================================================================
--- head/devel/gitolite/pkg-descr	(revision 444938)
+++ head/devel/gitolite/pkg-descr	(revision 444939)
@@ -1,15 +1,14 @@
 Gitolite is an access control layer on top of git, which allows access control
 down to the branch level, including specifying who can and cannot rewind a
 given branch.
 
 Gitolite lets you use a single user on a server to host many git repositories
 and provide access to many developers, without having to give them real
 userids on or shell access to the server. Authentication is most commonly done
 using sshd, but you can also use httpd if you prefer.
 
 Gitolite can restrict who can read from (clone/fetch) or write to (push) a
 repository. It can also restrict who can push to what branch or tag, which is
 very important in a corporate environment.
 
 WWW: https://github.com/sitaramc/gitolite
-WWW: http://milki.github.com/gitolite