Index: Makefile
===================================================================
--- Makefile	(revision 466037)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	magit
-PORTVERSION=	2.11.0
-PORTREVISION=	1
+PORTVERSION=	2.12.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
@@ -11,17 +10,21 @@
 COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
-		with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
-RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \
-		with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}
+BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \
+		ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \
+		magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.3:devel/magit-popup@${EMACS_FLAVOR} \
+		with-editor${EMACS_PKGNAMESUFFIX}>=2.7.2:editors/with-editor@${EMACS_FLAVOR}
+RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \
+		ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \
+		magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.3:devel/magit-popup@${EMACS_FLAVOR} \
+		with-editor${EMACS_PKGNAMESUFFIX}>=2.7.2:editors/with-editor@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 
-INFO=		magit magit-popup
+INFO=		magit
 PORTDOCS=	AUTHORS.md
 NO_ARCH=	yes
 
Index: distinfo
===================================================================
--- distinfo	(revision 466037)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505315661
-SHA256 (magit-magit-2.11.0_GH0.tar.gz) = 5138509a3f5b1be3cbacdf4ddaace4ce4a3b6bafb4f209fffccf69ef99e329f7
-SIZE (magit-magit-2.11.0_GH0.tar.gz) = 451030
+TIMESTAMP = 1522515005
+SHA256 (magit-magit-2.12.0_GH0.tar.gz) = b6e47beeb17e65d90d116d55a317199ea9e8e3d507e5af220db63caa181187b2
+SIZE (magit-magit-2.12.0_GH0.tar.gz) = 505709
Index: files/patch-default.mk
===================================================================
--- files/patch-default.mk	(revision 466037)
+++ files/patch-default.mk	(working copy)
@@ -1,17 +1,11 @@
---- default.mk.orig	2017-09-13 10:42:03 UTC
+--- default.mk.orig	2018-03-29 20:07:19 UTC
 +++ default.mk
-@@ -87,14 +87,6 @@ ELGS = magit-autoloads.el magit-version.
+@@ -89,8 +89,6 @@ ELGS = magit-autoloads.el magit-version.
  
  ## Versions ##########################################################
  
--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))")
+-VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
 -
- MAGIT_VERSION       = 2.11
  ASYNC_VERSION       = 1.9.2
  DASH_VERSION        = 2.13.0
+ GHUB_VERSION        = 2.0.0
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 466037)
+++ pkg-plist	(working copy)
@@ -15,6 +15,8 @@
 %%ELISPDIR%%/magit-bookmark.elc
 %%ELISPDIR%%/magit-branch.el
 %%ELISPDIR%%/magit-branch.elc
+%%ELISPDIR%%/magit-collab.el
+%%ELISPDIR%%/magit-collab.elc
 %%ELISPDIR%%/magit-commit.el
 %%ELISPDIR%%/magit-commit.elc
 %%ELISPDIR%%/magit-core.el
@@ -35,6 +37,8 @@
 %%ELISPDIR%%/magit-log.elc
 %%ELISPDIR%%/magit-margin.el
 %%ELISPDIR%%/magit-margin.elc
+%%ELISPDIR%%/magit-merge.el
+%%ELISPDIR%%/magit-merge.elc
 %%ELISPDIR%%/magit-mode.el
 %%ELISPDIR%%/magit-mode.elc
 %%ELISPDIR%%/magit-notes.el
@@ -41,8 +45,6 @@
 %%ELISPDIR%%/magit-notes.elc
 %%ELISPDIR%%/magit-obsolete.el
 %%ELISPDIR%%/magit-obsolete.elc
-%%ELISPDIR%%/magit-popup.el
-%%ELISPDIR%%/magit-popup.elc
 %%ELISPDIR%%/magit-process.el
 %%ELISPDIR%%/magit-process.elc
 %%ELISPDIR%%/magit-refs.el
@@ -51,6 +53,8 @@
 %%ELISPDIR%%/magit-remote.elc
 %%ELISPDIR%%/magit-repos.el
 %%ELISPDIR%%/magit-repos.elc
+%%ELISPDIR%%/magit-reset.el
+%%ELISPDIR%%/magit-reset.elc
 %%ELISPDIR%%/magit-section.el
 %%ELISPDIR%%/magit-section.elc
 %%ELISPDIR%%/magit-sequence.el
@@ -63,6 +67,8 @@
 %%ELISPDIR%%/magit-submodule.elc
 %%ELISPDIR%%/magit-subtree.el
 %%ELISPDIR%%/magit-subtree.elc
+%%ELISPDIR%%/magit-tag.el
+%%ELISPDIR%%/magit-tag.elc
 %%ELISPDIR%%/magit-utils.el
 %%ELISPDIR%%/magit-utils.elc
 %%ELISPDIR%%/magit-version.el