- Upgrade to 2.1.0.

PR:		ports/201654
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>

4 files changed, 69 insertions, 13 deletions

diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index b0a903abf057..958753104a4a 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -2,33 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	magit
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Interface to Git for Emacs
 
-LICENSE=	GFDL GPLv3
-LICENSE_COMB=	multi
+LICENSE=	GPLv3
 
-BUILD_DEPENDS=	git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes
-RUN_DEPENDS=	git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes
+BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
+		dash.el>0:${PORTSDIR}/devel/dash.el
+RUN_DEPENDS=	dash.el>0:${PORTSDIR}/devel/dash.el
 
 USE_GITHUB=	yes
 
 USES=		gmake makeinfo
 USE_EMACS=	YES
-INFO=		magit
+INFO=		magit magit-popup with-editor
 PORTDOCS=	AUTHORS.md
+NO_ARCH=	YES
 
-OPTIONS_DEFINE=			DOCS
+OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
+GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
+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+=	EFLAGS="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/git-modes" \
+MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
+		VERSION=${PORTVERSION} \
 		lispdir=${PREFIX}/${ELISPDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		docdir=${DOCSDIR}
diff --git a/devel/magit/distinfo b/devel/magit/distinfo
index 3b8dadd9a8d6..56cbd13c6055 100644
--- a/devel/magit/distinfo
+++ b/devel/magit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (magit-magit-1.4.0_GH0.tar.gz) = 03cdc29fe5d5d3c5b1d975bccfcf0bb12318c6e5c198575c395caa3eb14e3878
-SIZE (magit-magit-1.4.0_GH0.tar.gz) = 132600
+SHA256 (magit-magit-2.1.0_GH0.tar.gz) = e1c246ce1ea51cbf59b04eecaee9280a31429a725ad81b3eb497c6e8246d68d9
+SIZE (magit-magit-2.1.0_GH0.tar.gz) = 293857
diff --git a/devel/magit/files/patch-default.mk b/devel/magit/files/patch-default.mk
new file mode 100644
index 000000000000..130bdb819578
--- /dev/null
+++ b/devel/magit/files/patch-default.mk
@@ -0,0 +1,14 @@
+--- default.mk.orig	2015-07-18 04:15:03 UTC
++++ default.mk
+@@ -71,11 +71,3 @@ EMACSOLD := $(shell $(BATCH) --eval \
+ ifeq "$(EMACSOLD)" "true"
+   $(error At least version 24.4 of Emacs is required)
+ endif
+-
+-VERSION := $(shell \
+-  test -e $(TOP).git\
+-  && git describe --tags --dirty 2> /dev/null\
+-  || $(BATCH) --eval "(progn\
+-  (fset 'message (lambda (&rest _)))\
+-  (load-file \"magit-version.el\")\
+-  (princ magit-version))")
diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist
index 61e576338cf3..385b54ef3f8b 100644
--- a/devel/magit/pkg-plist
+++ b/devel/magit/pkg-plist
@@ -1,10 +1,48 @@
+%%ELISPDIR%%/git-commit.el
+%%ELISPDIR%%/git-commit.elc
+%%ELISPDIR%%/git-rebase.el
+%%ELISPDIR%%/git-rebase.elc
+%%ELISPDIR%%/magit-apply.el
+%%ELISPDIR%%/magit-apply.elc
 %%ELISPDIR%%/magit-autoloads.el
+%%ELISPDIR%%/magit-bisect.el
+%%ELISPDIR%%/magit-bisect.elc
 %%ELISPDIR%%/magit-blame.el
 %%ELISPDIR%%/magit-blame.elc
-%%ELISPDIR%%/magit-key-mode.el
-%%ELISPDIR%%/magit-key-mode.elc
+%%ELISPDIR%%/magit-commit.el
+%%ELISPDIR%%/magit-commit.elc
+%%ELISPDIR%%/magit-core.el
+%%ELISPDIR%%/magit-core.elc
+%%ELISPDIR%%/magit-diff.el
+%%ELISPDIR%%/magit-diff.elc
+%%ELISPDIR%%/magit-ediff.el
+%%ELISPDIR%%/magit-ediff.elc
+%%ELISPDIR%%/magit-extras.el
+%%ELISPDIR%%/magit-extras.elc
+%%ELISPDIR%%/magit-git.el
+%%ELISPDIR%%/magit-git.elc
+%%ELISPDIR%%/magit-log.el
+%%ELISPDIR%%/magit-log.elc
+%%ELISPDIR%%/magit-mode.el
+%%ELISPDIR%%/magit-mode.elc
+%%ELISPDIR%%/magit-popup.el
+%%ELISPDIR%%/magit-popup.elc
+%%ELISPDIR%%/magit-process.el
+%%ELISPDIR%%/magit-process.elc
+%%ELISPDIR%%/magit-remote.el
+%%ELISPDIR%%/magit-remote.elc
+%%ELISPDIR%%/magit-section.el
+%%ELISPDIR%%/magit-section.elc
+%%ELISPDIR%%/magit-sequence.el
+%%ELISPDIR%%/magit-sequence.elc
+%%ELISPDIR%%/magit-stash.el
+%%ELISPDIR%%/magit-stash.elc
+%%ELISPDIR%%/magit-utils.el
+%%ELISPDIR%%/magit-utils.elc
 %%ELISPDIR%%/magit-version.el
 %%ELISPDIR%%/magit-wip.el
 %%ELISPDIR%%/magit-wip.elc
 %%ELISPDIR%%/magit.el
 %%ELISPDIR%%/magit.elc
+%%ELISPDIR%%/with-editor.el
+%%ELISPDIR%%/with-editor.elc