Attachment #192057 for bug #227141




# $FreeBSD$

PORTNAME=	magit
PORTVERSION=	2.12.1
PORTREVISION=	1
CATEGORIES=	devel elisp
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}


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} \
		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
PORTDOCS=	AUTHORS.md
NO_ARCH=	yes


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1505315661	1	TIMESTAMP = 1522592277
2	SHA256 (magit-magit-2.11.0_GH0.tar.gz) = 5138509a3f5b1be3cbacdf4ddaace4ce4a3b6bafb4f209fffccf69ef99e329f7	2	SHA256 (magit-magit-2.12.1_GH0.tar.gz) = 49b5b0044bc3ee666b096f6fe9534cd6fc5c8bf808e2f0ab2e9de8b5b9ac953a
3	SIZE (magit-magit-2.11.0_GH0.tar.gz) = 451030	3	SIZE (magit-magit-2.12.1_GH0.tar.gz) = 505873




--- default.mk.orig	2018-03-29 20:07:19 UTC
+++ default.mk
@@ -89,8 +89,6 @@ ELGS = magit-autoloads.el magit-version.
 
 ## Versions ##########################################################
 
-VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
-  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))")
-
 MAGIT_VERSION       = 2.11
 ASYNC_VERSION       = 1.9.2
 DASH_VERSION        = 2.13.0
 GHUB_VERSION        = 2.0.0

Lines 15-20 Link Here

(-)pkg-plist (-2 / +8 lines)
15	%%ELISPDIR%%/magit-bookmark.elc	15	%%ELISPDIR%%/magit-bookmark.elc
16	%%ELISPDIR%%/magit-branch.el	16	%%ELISPDIR%%/magit-branch.el
17	%%ELISPDIR%%/magit-branch.elc	17	%%ELISPDIR%%/magit-branch.elc
		18	%%ELISPDIR%%/magit-collab.el
		19	%%ELISPDIR%%/magit-collab.elc
18	%%ELISPDIR%%/magit-commit.el	20	%%ELISPDIR%%/magit-commit.el
19	%%ELISPDIR%%/magit-commit.elc	21	%%ELISPDIR%%/magit-commit.elc
20	%%ELISPDIR%%/magit-core.el	22	%%ELISPDIR%%/magit-core.el
Lines 35-40 Link Here
35	%%ELISPDIR%%/magit-log.elc	37	%%ELISPDIR%%/magit-log.elc
36	%%ELISPDIR%%/magit-margin.el	38	%%ELISPDIR%%/magit-margin.el
37	%%ELISPDIR%%/magit-margin.elc	39	%%ELISPDIR%%/magit-margin.elc
		40	%%ELISPDIR%%/magit-merge.el
		41	%%ELISPDIR%%/magit-merge.elc
38	%%ELISPDIR%%/magit-mode.el	42	%%ELISPDIR%%/magit-mode.el
39	%%ELISPDIR%%/magit-mode.elc	43	%%ELISPDIR%%/magit-mode.elc
40	%%ELISPDIR%%/magit-notes.el	44	%%ELISPDIR%%/magit-notes.el
Lines 41-48 Link Here
41	%%ELISPDIR%%/magit-notes.elc	45	%%ELISPDIR%%/magit-notes.elc
42	%%ELISPDIR%%/magit-obsolete.el	46	%%ELISPDIR%%/magit-obsolete.el
43	%%ELISPDIR%%/magit-obsolete.elc	47	%%ELISPDIR%%/magit-obsolete.elc
44	%%ELISPDIR%%/magit-popup.el
45	%%ELISPDIR%%/magit-popup.elc
46	%%ELISPDIR%%/magit-process.el	48	%%ELISPDIR%%/magit-process.el
47	%%ELISPDIR%%/magit-process.elc	49	%%ELISPDIR%%/magit-process.elc
48	%%ELISPDIR%%/magit-refs.el	50	%%ELISPDIR%%/magit-refs.el
Lines 51-56 Link Here
51	%%ELISPDIR%%/magit-remote.elc	53	%%ELISPDIR%%/magit-remote.elc
52	%%ELISPDIR%%/magit-repos.el	54	%%ELISPDIR%%/magit-repos.el
53	%%ELISPDIR%%/magit-repos.elc	55	%%ELISPDIR%%/magit-repos.elc
		56	%%ELISPDIR%%/magit-reset.el
		57	%%ELISPDIR%%/magit-reset.elc
54	%%ELISPDIR%%/magit-section.el	58	%%ELISPDIR%%/magit-section.el
55	%%ELISPDIR%%/magit-section.elc	59	%%ELISPDIR%%/magit-section.elc
56	%%ELISPDIR%%/magit-sequence.el	60	%%ELISPDIR%%/magit-sequence.el
Lines 63-68 Link Here
63	%%ELISPDIR%%/magit-submodule.elc	67	%%ELISPDIR%%/magit-submodule.elc
64	%%ELISPDIR%%/magit-subtree.el	68	%%ELISPDIR%%/magit-subtree.el
65	%%ELISPDIR%%/magit-subtree.elc	69	%%ELISPDIR%%/magit-subtree.elc
		70	%%ELISPDIR%%/magit-tag.el
		71	%%ELISPDIR%%/magit-tag.elc
66	%%ELISPDIR%%/magit-utils.el	72	%%ELISPDIR%%/magit-utils.el
67	%%ELISPDIR%%/magit-utils.elc	73	%%ELISPDIR%%/magit-utils.elc
68	%%ELISPDIR%%/magit-version.el	74	%%ELISPDIR%%/magit-version.el

Return to bug 227141

Lines 2-9 Link Here

(-)Makefile (-8 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= magit	4	PORTNAME= magit
5	PORTVERSION= 2.11.0	5	PORTVERSION= 2.12.1
6	PORTREVISION= 1
7	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
8	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	7	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
9		8
Lines 11-27 Link Here
11	COMMENT= Interface to Git for Emacs	10	COMMENT= Interface to Git for Emacs
12		11
13	LICENSE= GPLv3+	12	LICENSE= GPLv3+
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/LICENSE
15		14
16	BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \	15	BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \
17	with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}	16	ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \
18	RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \	17	magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.3:devel/magit-popup@${EMACS_FLAVOR} \
19	with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR}	18	with-editor${EMACS_PKGNAMESUFFIX}>=2.7.2:editors/with-editor@${EMACS_FLAVOR}
		19	RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \
		20	ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \
		21	magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.3:devel/magit-popup@${EMACS_FLAVOR} \
		22	with-editor${EMACS_PKGNAMESUFFIX}>=2.7.2:editors/with-editor@${EMACS_FLAVOR}
20		23
21	USES= emacs gmake makeinfo	24	USES= emacs gmake makeinfo
22	USE_GITHUB= yes	25	USE_GITHUB= yes
23		26
24	INFO= magit magit-popup	27	INFO= magit
25	PORTDOCS= AUTHORS.md	28	PORTDOCS= AUTHORS.md
26	NO_ARCH= yes	29	NO_ARCH= yes
27		30

Lines 1-17 Link Here

(-)files/patch-default.mk (-10 / +4 lines)
1	--- default.mk.orig 2017-09-13 10:42:03 UTC	1	--- default.mk.orig 2018-03-29 20:07:19 UTC
2	+++ default.mk	2	+++ default.mk
3	@@ -87,14 +87,6 @@ ELGS = magit-autoloads.el magit-version.	3	@@ -89,8 +89,6 @@ ELGS = magit-autoloads.el magit-version.
4		4
5	## Versions ##########################################################	5	## Versions ##########################################################
6		6
7	-VERSION := $(shell \	7	-VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
8	- test -e $(TOP).git\
9	- && git describe --tags --dirty 2> /dev/null\
10	- \|\| $(BATCH) --eval "(progn\
11	- (fset 'message (lambda (&rest _)))\
12	- (load-file \"magit-version.el\")\
13	- (princ magit-version))")
14	-	8	-
15	MAGIT_VERSION = 2.11
16	ASYNC_VERSION = 1.9.2	9	ASYNC_VERSION = 1.9.2
17	DASH_VERSION = 2.13.0	10	DASH_VERSION = 2.13.0
		11	GHUB_VERSION = 2.0.0