Attachment #158931 for bug #201654




# $FreeBSD$

PORTNAME=	magit
PORTVERSION=	2.1.0
PORTREVISION=	1
CATEGORIES=	devel elisp
PKGNAMESUFFIX=	-${EMACS_PORT_NAME}


MAINTAINER=	kuriyama@FreeBSD.org
COMMENT=	Interface to Git for Emacs

LICENSE=	GPLv3
LICENSE_COMB=	multi

BUILD_DEPENDS=	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 magit-popup with-editor
PORTDOCS=	AUTHORS.md

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+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
		VERSION=${PORTVERSION} \
		lispdir=${PREFIX}/${ELISPDIR} \
		infodir=${PREFIX}/${INFO_PATH} \
		docdir=${DOCSDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (magit-magit-1.4.0_GH0.tar.gz) = 03cdc29fe5d5d3c5b1d975bccfcf0bb12318c6e5c198575c395caa3eb14e3878	1	SHA256 (magit-magit-2.1.0_GH0.tar.gz) = e1c246ce1ea51cbf59b04eecaee9280a31429a725ad81b3eb497c6e8246d68d9
2	SIZE (magit-magit-1.4.0_GH0.tar.gz) = 132600	2	SIZE (magit-magit-2.1.0_GH0.tar.gz) = 293857




--- 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))")

Lines 1-10 Link Here

(-)pkg-plist (-2 / +40 lines)
		1	%%ELISPDIR%%/git-commit.el
		2	%%ELISPDIR%%/git-commit.elc
		3	%%ELISPDIR%%/git-rebase.el
		4	%%ELISPDIR%%/git-rebase.elc
		5	%%ELISPDIR%%/magit-apply.el
		6	%%ELISPDIR%%/magit-apply.elc
1	%%ELISPDIR%%/magit-autoloads.el	7	%%ELISPDIR%%/magit-autoloads.el
		8	%%ELISPDIR%%/magit-bisect.el
		9	%%ELISPDIR%%/magit-bisect.elc
2	%%ELISPDIR%%/magit-blame.el	10	%%ELISPDIR%%/magit-blame.el
3	%%ELISPDIR%%/magit-blame.elc	11	%%ELISPDIR%%/magit-blame.elc
4	%%ELISPDIR%%/magit-key-mode.el	12	%%ELISPDIR%%/magit-commit.el
5	%%ELISPDIR%%/magit-key-mode.elc	13	%%ELISPDIR%%/magit-commit.elc
		14	%%ELISPDIR%%/magit-core.el
		15	%%ELISPDIR%%/magit-core.elc
		16	%%ELISPDIR%%/magit-diff.el
		17	%%ELISPDIR%%/magit-diff.elc
		18	%%ELISPDIR%%/magit-ediff.el
		19	%%ELISPDIR%%/magit-ediff.elc
		20	%%ELISPDIR%%/magit-extras.el
		21	%%ELISPDIR%%/magit-extras.elc
		22	%%ELISPDIR%%/magit-git.el
		23	%%ELISPDIR%%/magit-git.elc
		24	%%ELISPDIR%%/magit-log.el
		25	%%ELISPDIR%%/magit-log.elc
		26	%%ELISPDIR%%/magit-mode.el
		27	%%ELISPDIR%%/magit-mode.elc
		28	%%ELISPDIR%%/magit-popup.el
		29	%%ELISPDIR%%/magit-popup.elc
		30	%%ELISPDIR%%/magit-process.el
		31	%%ELISPDIR%%/magit-process.elc
		32	%%ELISPDIR%%/magit-remote.el
		33	%%ELISPDIR%%/magit-remote.elc
		34	%%ELISPDIR%%/magit-section.el
		35	%%ELISPDIR%%/magit-section.elc
		36	%%ELISPDIR%%/magit-sequence.el
		37	%%ELISPDIR%%/magit-sequence.elc
		38	%%ELISPDIR%%/magit-stash.el
		39	%%ELISPDIR%%/magit-stash.elc
		40	%%ELISPDIR%%/magit-utils.el
		41	%%ELISPDIR%%/magit-utils.elc
6	%%ELISPDIR%%/magit-version.el	42	%%ELISPDIR%%/magit-version.el
7	%%ELISPDIR%%/magit-wip.el	43	%%ELISPDIR%%/magit-wip.el
8	%%ELISPDIR%%/magit-wip.elc	44	%%ELISPDIR%%/magit-wip.elc
9	%%ELISPDIR%%/magit.el	45	%%ELISPDIR%%/magit.el
10	%%ELISPDIR%%/magit.elc	46	%%ELISPDIR%%/magit.elc
		47	%%ELISPDIR%%/with-editor.el
		48	%%ELISPDIR%%/with-editor.elc

Return to bug 201654

Lines 2-9 Link Here

(-)Makefile (-9 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= magit	4	PORTNAME= magit
5	PORTVERSION= 1.4.0	5	PORTVERSION= 2.1.0
6	PORTREVISION= 1
7	CATEGORIES= devel elisp	6	CATEGORIES= devel elisp
8	PKGNAMESUFFIX= -${EMACS_PORT_NAME}	7	PKGNAMESUFFIX= -${EMACS_PORT_NAME}
9		8
Lines 10-34 Link Here
10	MAINTAINER= kuriyama@FreeBSD.org	9	MAINTAINER= kuriyama@FreeBSD.org
11	COMMENT= Interface to Git for Emacs	10	COMMENT= Interface to Git for Emacs
12		11
13	LICENSE= GFDL GPLv3	12	LICENSE= GPLv3
14	LICENSE_COMB= multi
15		13
16	BUILD_DEPENDS= git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes	14	BUILD_DEPENDS= dash.el>0:${PORTSDIR}/devel/dash.el
17	RUN_DEPENDS= git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes	15	RUN_DEPENDS= dash.el>0:${PORTSDIR}/devel/dash.el
18		16
19	USE_GITHUB= yes	17	USE_GITHUB= yes
20		18
21	USES= gmake makeinfo	19	USES= gmake makeinfo
22	USE_EMACS= YES	20	USE_EMACS= YES
23	INFO= magit	21	INFO= magit magit-popup with-editor
24	PORTDOCS= AUTHORS.md	22	PORTDOCS= AUTHORS.md
25		23
26	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS GIT_SUBVERSION
		25	GIT_SUBVERSION_DESC= Use devel/git-subversion as backend
		26	GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:${PORTSDIR}/devel/git-subversion
		27	GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:${PORTSDIR}/devel/git
27		28
28	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
29		30
30	ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}	31	ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
31	MAKE_ENV+= EFLAGS="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/git-modes" \	32	MAKE_ENV+= LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
		33	VERSION=${PORTVERSION} \
32	lispdir=${PREFIX}/${ELISPDIR} \	34	lispdir=${PREFIX}/${ELISPDIR} \
33	infodir=${PREFIX}/${INFO_PATH} \	35	infodir=${PREFIX}/${INFO_PATH} \
34	docdir=${DOCSDIR}	36	docdir=${DOCSDIR}

Line 0 Link Here

(-)files/patch-default.mk (+14 lines)
	1	--- default.mk.orig 2015-07-18 04:15:03 UTC
	2	+++ default.mk
	3	@@ -71,11 +71,3 @@ EMACSOLD := $(shell $(BATCH) --eval \
	4	ifeq "$(EMACSOLD)" "true"
	5	$(error At least version 24.4 of Emacs is required)
	6	endif
	7	-
	8	-VERSION := $(shell \
	9	- test -e $(TOP).git\
	10	- && git describe --tags --dirty 2> /dev/null\
	11	- \|\| $(BATCH) --eval "(progn\
	12	- (fset 'message (lambda (&rest _)))\
	13	- (load-file \"magit-version.el\")\
	14	- (princ magit-version))")