aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortz <tz@FreeBSD.org>2018-06-05 21:42:17 +0800
committertz <tz@FreeBSD.org>2018-06-05 21:42:17 +0800
commit582ee0978f2616577148ad1dc7b21c63a7a79962 (patch)
tree244188f9a6bde8df01919fad0263c2a751688dbe
parent3c21c3e114f439a1566596f18fc2ced946f0c689 (diff)
downloadfreebsd-ports-gnome-582ee0978f2616577148ad1dc7b21c63a7a79962.tar.gz
freebsd-ports-gnome-582ee0978f2616577148ad1dc7b21c63a7a79962.tar.zst
freebsd-ports-gnome-582ee0978f2616577148ad1dc7b21c63a7a79962.zip
devel/magit: Update from 2.12.1 to 2.13.0
Changelog: https://raw.githubusercontent.com/magit/magit/master/Documentation/RelNotes/2.13.0.txt PR: 228717 Submitted by: Yasuhiro KIMURA <yasu@utahime.org> Approved by: Yasuhiro KIMURA (maintainer)
-rw-r--r--devel/magit/Makefile15
-rw-r--r--devel/magit/distinfo6
-rw-r--r--devel/magit/files/patch-default.mk8
3 files changed, 14 insertions, 15 deletions
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 107b95ed80fe..acc17e648d26 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= magit
-PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTVERSION= 2.13.0
CATEGORIES= devel elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
@@ -13,14 +12,14 @@ COMMENT= Interface to Git for Emacs
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \
- ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \
+BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
+ ghub${EMACS_PKGNAMESUFFIX}>=2.0.1: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} \
+ with-editor${EMACS_PKGNAMESUFFIX}>=2.7.3:editors/with-editor@${EMACS_FLAVOR}
+RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
+ ghub${EMACS_PKGNAMESUFFIX}>=2.0.1: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}
+ with-editor${EMACS_PKGNAMESUFFIX}>=2.7.3:editors/with-editor@${EMACS_FLAVOR}
USES= emacs gmake makeinfo
USE_GITHUB= yes
diff --git a/devel/magit/distinfo b/devel/magit/distinfo
index edd1174bc86c..3c65e5bc0ef0 100644
--- a/devel/magit/distinfo
+++ b/devel/magit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522592277
-SHA256 (magit-magit-2.12.1_GH0.tar.gz) = 49b5b0044bc3ee666b096f6fe9534cd6fc5c8bf808e2f0ab2e9de8b5b9ac953a
-SIZE (magit-magit-2.12.1_GH0.tar.gz) = 505873
+TIMESTAMP = 1527999507
+SHA256 (magit-magit-2.13.0_GH0.tar.gz) = dc0a939592f1f00e9206813d9ceb6d56cfab87501adfc87d44913f081d5a0e60
+SIZE (magit-magit-2.13.0_GH0.tar.gz) = 519614
diff --git a/devel/magit/files/patch-default.mk b/devel/magit/files/patch-default.mk
index c6ee64b75273..19884dbee2f0 100644
--- a/devel/magit/files/patch-default.mk
+++ b/devel/magit/files/patch-default.mk
@@ -1,4 +1,4 @@
---- default.mk.orig 2018-03-29 20:07:19 UTC
+--- default.mk.orig 2018-06-03 00:38:37 UTC
+++ default.mk
@@ -89,8 +89,6 @@ ELGS = magit-autoloads.el magit-version.
@@ -6,6 +6,6 @@
-VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
-
- ASYNC_VERSION = 1.9.2
- DASH_VERSION = 2.13.0
- GHUB_VERSION = 2.0.0
+ ASYNC_VERSION = 1.9.3
+ DASH_VERSION = 2.14.1
+ GHUB_VERSION = 2.0.1