View | Details | Raw Unified | Return to bug 219984 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	magit
4
PORTNAME=	magit
5
PORTVERSION=	2.8.0
5
PORTVERSION=	2.10.3
6
PORTREVISION=	1
7
CATEGORIES=	devel elisp
6
CATEGORIES=	devel elisp
8
PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
7
PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
9
8
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1472128845
1
TIMESTAMP = 1497406352
2
SHA256 (magit-magit-2.8.0_GH0.tar.gz) = 98cc000ffe06d96c59e5e7c150af5f3d62e5876b7e2e78337aebccb4bc05b066
2
SHA256 (magit-magit-2.10.3_GH0.tar.gz) = dc797db8da8683767ffa5d006f6e85d334892979c76057baf03c99bb0c6f669c
3
SIZE (magit-magit-2.8.0_GH0.tar.gz) = 395575
3
SIZE (magit-magit-2.10.3_GH0.tar.gz) = 430343
(-)files/patch-default.mk (-6 / +9 lines)
Lines 1-10 Link Here
1
--- default.mk.orig	2015-07-18 04:15:03 UTC
1
--- default.mk.orig	2017-06-14 12:34:54 UTC
2
+++ default.mk
2
+++ default.mk
3
@@ -71,11 +71,3 @@ EMACSOLD := $(shell $(BATCH) --eval \
3
@@ -85,14 +85,6 @@ ELGS = magit-autoloads.el magit-version.
4
 ifeq "$(EMACSOLD)" "true"
4
 
5
   $(error At least version 24.4 of Emacs is required)
5
 ## Versions ##########################################################
6
 endif
6
 
7
-
8
-VERSION := $(shell \
7
-VERSION := $(shell \
9
-  test -e $(TOP).git\
8
-  test -e $(TOP).git\
10
-  && git describe --tags --dirty 2> /dev/null\
9
-  && git describe --tags --dirty 2> /dev/null\
Lines 12-14 Link Here
12
-  (fset 'message (lambda (&rest _)))\
11
-  (fset 'message (lambda (&rest _)))\
13
-  (load-file \"magit-version.el\")\
12
-  (load-file \"magit-version.el\")\
14
-  (princ magit-version))")
13
-  (princ magit-version))")
14
-
15
 MAGIT_VERSION       = 2.10
16
 ASYNC_VERSION       = 1.9
17
 DASH_VERSION        = 2.13.0
(-)pkg-plist (+18 lines)
Lines 11-16 Link Here
11
%%ELISPDIR%%/magit-bisect.elc
11
%%ELISPDIR%%/magit-bisect.elc
12
%%ELISPDIR%%/magit-blame.el
12
%%ELISPDIR%%/magit-blame.el
13
%%ELISPDIR%%/magit-blame.elc
13
%%ELISPDIR%%/magit-blame.elc
14
%%ELISPDIR%%/magit-branch.el
15
%%ELISPDIR%%/magit-branch.elc
14
%%ELISPDIR%%/magit-commit.el
16
%%ELISPDIR%%/magit-commit.el
15
%%ELISPDIR%%/magit-commit.elc
17
%%ELISPDIR%%/magit-commit.elc
16
%%ELISPDIR%%/magit-core.el
18
%%ELISPDIR%%/magit-core.el
Lines 21-38 Link Here
21
%%ELISPDIR%%/magit-ediff.elc
23
%%ELISPDIR%%/magit-ediff.elc
22
%%ELISPDIR%%/magit-extras.el
24
%%ELISPDIR%%/magit-extras.el
23
%%ELISPDIR%%/magit-extras.elc
25
%%ELISPDIR%%/magit-extras.elc
26
%%ELISPDIR%%/magit-files.el
27
%%ELISPDIR%%/magit-files.elc
24
%%ELISPDIR%%/magit-git.el
28
%%ELISPDIR%%/magit-git.el
25
%%ELISPDIR%%/magit-git.elc
29
%%ELISPDIR%%/magit-git.elc
26
%%ELISPDIR%%/magit-log.el
30
%%ELISPDIR%%/magit-log.el
27
%%ELISPDIR%%/magit-log.elc
31
%%ELISPDIR%%/magit-log.elc
32
%%ELISPDIR%%/magit-margin.el
33
%%ELISPDIR%%/magit-margin.elc
28
%%ELISPDIR%%/magit-mode.el
34
%%ELISPDIR%%/magit-mode.el
29
%%ELISPDIR%%/magit-mode.elc
35
%%ELISPDIR%%/magit-mode.elc
36
%%ELISPDIR%%/magit-notes.el
37
%%ELISPDIR%%/magit-notes.elc
38
%%ELISPDIR%%/magit-obsolete.el
39
%%ELISPDIR%%/magit-obsolete.elc
30
%%ELISPDIR%%/magit-popup.el
40
%%ELISPDIR%%/magit-popup.el
31
%%ELISPDIR%%/magit-popup.elc
41
%%ELISPDIR%%/magit-popup.elc
32
%%ELISPDIR%%/magit-process.el
42
%%ELISPDIR%%/magit-process.el
33
%%ELISPDIR%%/magit-process.elc
43
%%ELISPDIR%%/magit-process.elc
44
%%ELISPDIR%%/magit-refs.el
45
%%ELISPDIR%%/magit-refs.elc
34
%%ELISPDIR%%/magit-remote.el
46
%%ELISPDIR%%/magit-remote.el
35
%%ELISPDIR%%/magit-remote.elc
47
%%ELISPDIR%%/magit-remote.elc
48
%%ELISPDIR%%/magit-repos.el
49
%%ELISPDIR%%/magit-repos.elc
36
%%ELISPDIR%%/magit-section.el
50
%%ELISPDIR%%/magit-section.el
37
%%ELISPDIR%%/magit-section.elc
51
%%ELISPDIR%%/magit-section.elc
38
%%ELISPDIR%%/magit-sequence.el
52
%%ELISPDIR%%/magit-sequence.el
Lines 39-44 Link Here
39
%%ELISPDIR%%/magit-sequence.elc
53
%%ELISPDIR%%/magit-sequence.elc
40
%%ELISPDIR%%/magit-stash.el
54
%%ELISPDIR%%/magit-stash.el
41
%%ELISPDIR%%/magit-stash.elc
55
%%ELISPDIR%%/magit-stash.elc
56
%%ELISPDIR%%/magit-status.el
57
%%ELISPDIR%%/magit-status.elc
42
%%ELISPDIR%%/magit-submodule.el
58
%%ELISPDIR%%/magit-submodule.el
43
%%ELISPDIR%%/magit-submodule.elc
59
%%ELISPDIR%%/magit-submodule.elc
44
%%ELISPDIR%%/magit-subtree.el
60
%%ELISPDIR%%/magit-subtree.el
Lines 48-52 Link Here
48
%%ELISPDIR%%/magit-version.el
64
%%ELISPDIR%%/magit-version.el
49
%%ELISPDIR%%/magit-wip.el
65
%%ELISPDIR%%/magit-wip.el
50
%%ELISPDIR%%/magit-wip.elc
66
%%ELISPDIR%%/magit-wip.elc
67
%%ELISPDIR%%/magit-worktree.el
68
%%ELISPDIR%%/magit-worktree.elc
51
%%ELISPDIR%%/magit.el
69
%%ELISPDIR%%/magit.el
52
%%ELISPDIR%%/magit.elc
70
%%ELISPDIR%%/magit.elc

Return to bug 219984