Index: head/devel/magit/Makefile
===================================================================
--- head/devel/magit/Makefile	(revision 395102)
+++ head/devel/magit/Makefile	(revision 395103)
@@ -1,43 +1,43 @@
 # Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	magit
-PORTVERSION=	2.1.0
+PORTVERSION=	2.2.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		dash.el>0:${PORTSDIR}/devel/dash.el
+BUILD_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
 RUN_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
 
-BROKEN_FreeBSD_9=	does not build
-
 USE_GITHUB=	yes
 
 USES=		gmake makeinfo
 USE_EMACS=	YES
 INFO=		magit magit-popup with-editor
 PORTDOCS=	AUTHORS.md
 NO_ARCH=	YES
 
 OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
+GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
+GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
 GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
 GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
 
 .include <bsd.port.pre.mk>
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
+MAKE_ENV+=	INSTALL_INFO=install-info \
+		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
 		VERSION=${PORTVERSION} \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		docdir=${DOCSDIR}
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 
 .include <bsd.port.post.mk>
Index: head/devel/magit/distinfo
===================================================================
--- head/devel/magit/distinfo	(revision 395102)
+++ head/devel/magit/distinfo	(revision 395103)
@@ -1,2 +1,2 @@
-SHA256 (magit-magit-2.1.0_GH0.tar.gz) = e1c246ce1ea51cbf59b04eecaee9280a31429a725ad81b3eb497c6e8246d68d9
-SIZE (magit-magit-2.1.0_GH0.tar.gz) = 293857
+SHA256 (magit-magit-2.2.0_GH0.tar.gz) = 947c47961d5adbcbccda2ed50b7ef59e82ff91e089dedd645f14eeeb7d9acac9
+SIZE (magit-magit-2.2.0_GH0.tar.gz) = 320300