Index: head/devel/mergify/Makefile
===================================================================
--- head/devel/mergify/Makefile	(revision 472303)
+++ head/devel/mergify/Makefile	(revision 472304)
@@ -1,34 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	mergify
-PORTVERSION=	g20170106
+PORTVERSION=	g20180512
 CATEGORIES=	devel
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Merge changes from a branch one commit at a time
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	git:devel/git
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	brooksdavis
 GH_PROJECT=	mergify
-GH_TAGNAME=	02519f69ab096797fc626487610cab9acdcba26f
+GH_TAGNAME=	606ffbe2df73e4c4edfe399573d2f1df782aefbc
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/mergify
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS GIT_SUBVERSION
+
+GIT_SUBVERSION_DESC=	Use devel/git-subversion as backend
+GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_RUN_DEPENDS_OFF=	git:devel/git
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mergify ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/mergify/distinfo
===================================================================
--- head/devel/mergify/distinfo	(revision 472303)
+++ head/devel/mergify/distinfo	(revision 472304)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520837648
-SHA256 (brooksdavis-mergify-g20170106-02519f69ab096797fc626487610cab9acdcba26f_GH0.tar.gz) = e9904e0d8556b30d1748ecd84ce8c209b236a5f3c2315847c6ce2f8f28477809
-SIZE (brooksdavis-mergify-g20170106-02519f69ab096797fc626487610cab9acdcba26f_GH0.tar.gz) = 3983
+TIMESTAMP = 1528844337
+SHA256 (brooksdavis-mergify-g20180512-606ffbe2df73e4c4edfe399573d2f1df782aefbc_GH0.tar.gz) = b6df007af2c2de89f4d46dfcb7011d580cc80f15fc977044ce4da8698e005321
+SIZE (brooksdavis-mergify-g20180512-606ffbe2df73e4c4edfe399573d2f1df782aefbc_GH0.tar.gz) = 4386