Attachment #220022 for bug #251148

Lines 1457-1462 Link Here

(-)devel/Makefile (+1 lines)
1457	SUBDIR += m4	1457	SUBDIR += m4
1458	SUBDIR += mage	1458	SUBDIR += mage
1459	SUBDIR += magit	1459	SUBDIR += magit
		1460	SUBDIR += magit-devel
1460	SUBDIR += magit-popup	1461	SUBDIR += magit-popup
1461	SUBDIR += make++	1462	SUBDIR += make++
1462	SUBDIR += makedepend	1463	SUBDIR += makedepend

Lines 27-32 Link Here

(-)devel/magit/Makefile (+2 lines)
27		27
28	USES= emacs gmake makeinfo	28	USES= emacs gmake makeinfo
29		29
		30	CONFLICTS_INSTALL= magit-devel-emacs*
		31
30	INFO= magit	32	INFO= magit
31	PORTDOCS= AUTHORS.md	33	PORTDOCS= AUTHORS.md
32	NO_ARCH= yes	34	NO_ARCH= yes




# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
# $FreeBSD$

PORTNAME=	magit
DISTVERSION=	2.90.1.20201125
PORTREVISION=	4
CATEGORIES=	devel elisp
PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}

MAINTAINER=	yasu@utahime.org
COMMENT=	Interface to Git for Emacs (Development Version)

LICENSE=	GPLv3+
LICENSE_FILE=	${WRKSRC}/LICENSE


BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
		ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
		transient${EMACS_PKGNAMESUFFIX}>=0.2.0.20201103:devel/transient@${EMACS_FLAVOR} \
		magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \
		with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}
RUN_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
		ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
		transient${EMACS_PKGNAMESUFFIX}>=0.2.0.20201103:devel/transient@${EMACS_FLAVOR} \
		magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \
		with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}

USES=		emacs gmake makeinfo

USE_GITHUB=	yes
GH_TAGNAME=	6aa23bb

CONFLICTS_INSTALL=	magit-emacs*

INFO=		magit magit-section
PORTDOCS=	AUTHORS.md ReleaseNote
NO_ARCH=	yes

ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
MAKE_ENV+=	docdir=${DOCSDIR} \
		infodir=${PREFIX}/${INFO_PATH} \
		INSTALL_INFO=install-info \
		lispdir=${PREFIX}/${ELISPDIR} \
		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
		VERSION=${PORTVERSION}

		infodir=${PREFIX}/${INFO_PATH} \
		docdir=${DOCSDIR}
PLIST_SUB+=	ELISPDIR=${ELISPDIR}

OPTIONS_DEFINE=			DOCS LIBEGIT2
OPTIONS_SUB=			yes
LIBEGIT2_DESC=			Use libegit2 as backend (EXPERIMENTAL)
LIBEGIT2_LIB_DEPENDS=		libegit2.so:devel/libegit2@${FLAVOR}
LIBEGIT2_BUILD_DEPENDS_OFF=	git:devel/git
LIBEGIT2_RUN_DEPENDS_OFF=	git:devel/git
LIBEGIT2_VARS_OFF=		MAKE_ENV+=BUILD_MAGIT_LIBGIT=false

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/Documentation/RelNotes/3.0.0.org \
		${STAGEDIR}${DOCSDIR}/ReleaseNote

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/magit-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1542389141	1	TIMESTAMP = 1606440060
2	SHA256 (magit-2.90.1.tar.gz) = 28dbcd68b6a417cf07b5fe63514f7837901639a39a4906ab998e0aa73e20ad6a	2	SHA256 (magit-magit-2.90.1.20201125-6aa23bb_GH0.tar.gz) = f7a3a5f9d36b3bca6a7227d43b37da38a6ef854d9fea002e41d2785e9e0fe90f
3	SIZE (magit-2.90.1.tar.gz) = 378710	3	SIZE (magit-magit-2.90.1.20201125-6aa23bb_GH0.tar.gz) = 598633

Lines 17-24 Link Here

(-)devel/magit-devel/pkg-plist (-2 / +6 lines)
17	%%ELISPDIR%%/magit-branch.elc	17	%%ELISPDIR%%/magit-branch.elc
18	%%ELISPDIR%%/magit-clone.el	18	%%ELISPDIR%%/magit-clone.el
19	%%ELISPDIR%%/magit-clone.elc	19	%%ELISPDIR%%/magit-clone.elc
20	%%ELISPDIR%%/magit-collab.el
21	%%ELISPDIR%%/magit-collab.elc
22	%%ELISPDIR%%/magit-commit.el	20	%%ELISPDIR%%/magit-commit.el
23	%%ELISPDIR%%/magit-commit.elc	21	%%ELISPDIR%%/magit-commit.elc
24	%%ELISPDIR%%/magit-core.el	22	%%ELISPDIR%%/magit-core.el
Lines 39-44 Link Here
39	%%ELISPDIR%%/magit-gitignore.elc	37	%%ELISPDIR%%/magit-gitignore.elc
40	%%ELISPDIR%%/magit-imenu.el	38	%%ELISPDIR%%/magit-imenu.el
41	%%ELISPDIR%%/magit-imenu.elc	39	%%ELISPDIR%%/magit-imenu.elc
		40	%%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.el
		41	%%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.elc
42	%%ELISPDIR%%/magit-log.el	42	%%ELISPDIR%%/magit-log.el
43	%%ELISPDIR%%/magit-log.elc	43	%%ELISPDIR%%/magit-log.elc
44	%%ELISPDIR%%/magit-margin.el	44	%%ELISPDIR%%/magit-margin.el
Lines 59-64 Link Here
59	%%ELISPDIR%%/magit-pull.elc	59	%%ELISPDIR%%/magit-pull.elc
60	%%ELISPDIR%%/magit-push.el	60	%%ELISPDIR%%/magit-push.el
61	%%ELISPDIR%%/magit-push.elc	61	%%ELISPDIR%%/magit-push.elc
		62	%%ELISPDIR%%/magit-reflog.el
		63	%%ELISPDIR%%/magit-reflog.elc
62	%%ELISPDIR%%/magit-refs.el	64	%%ELISPDIR%%/magit-refs.el
63	%%ELISPDIR%%/magit-refs.elc	65	%%ELISPDIR%%/magit-refs.elc
64	%%ELISPDIR%%/magit-remote.el	66	%%ELISPDIR%%/magit-remote.el
Lines 81-86 Link Here
81	%%ELISPDIR%%/magit-subtree.elc	83	%%ELISPDIR%%/magit-subtree.elc
82	%%ELISPDIR%%/magit-tag.el	84	%%ELISPDIR%%/magit-tag.el
83	%%ELISPDIR%%/magit-tag.elc	85	%%ELISPDIR%%/magit-tag.elc
		86	%%ELISPDIR%%/magit-transient.el
		87	%%ELISPDIR%%/magit-transient.elc
84	%%ELISPDIR%%/magit-utils.el	88	%%ELISPDIR%%/magit-utils.el
85	%%ELISPDIR%%/magit-utils.elc	89	%%ELISPDIR%%/magit-utils.elc
86	%%ELISPDIR%%/magit-version.el	90	%%ELISPDIR%%/magit-version.el

Return to bug 251148

Lines 1-15 Link Here

(-)devel/magit-devel/Makefile (-18 / +30 lines)
1	# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= magit	3	PORTNAME= magit
5	PORTVERSION= 2.90.1	4	DISTVERSION= 2.90.1.20201125
6	PORTREVISION= 4
7	CATEGORIES= devel elisp	5	CATEGORIES= devel elisp
8	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/	6	PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
9	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
10		7
11	MAINTAINER= yasu@utahime.org	8	MAINTAINER= yasu@utahime.org
12	COMMENT= Interface to Git for Emacs	9	COMMENT= Interface to Git for Emacs (Development Version)
13		10
14	LICENSE= GPLv3+	11	LICENSE= GPLv3+
15	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
Lines 16-45 Link Here
16		13
17	BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \	14	BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
18	ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \	15	ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
19	git:devel/git \	16	transient${EMACS_PKGNAMESUFFIX}>=0.2.0.20201103:devel/transient@${EMACS_FLAVOR} \
20	magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \
21	with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}	17	with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}
22	RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \	18	RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
23	ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \	19	ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
24	git>0:devel/git \	20	transient${EMACS_PKGNAMESUFFIX}>=0.2.0.20201103:devel/transient@${EMACS_FLAVOR} \
25	magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \
26	with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}	21	with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}
27		22
28	USES= emacs gmake makeinfo	23	USES= emacs gmake makeinfo
29		24
30	INFO= magit	25	USE_GITHUB= yes
31	PORTDOCS= AUTHORS.md	26	GH_TAGNAME= 6aa23bb
		27
		28	CONFLICTS_INSTALL= magit-emacs*
		29
		30	INFO= magit magit-section
		31	PORTDOCS= AUTHORS.md ReleaseNote
32	NO_ARCH= yes	32	NO_ARCH= yes
33		33
34	ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}	34	ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
35	MAKE_ENV+= INSTALL_INFO=install-info \	35	MAKE_ENV+= docdir=${DOCSDIR} \
		36	infodir=${PREFIX}/${INFO_PATH} \
		37	INSTALL_INFO=install-info \
		38	lispdir=${PREFIX}/${ELISPDIR} \
36	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \	39	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
37	VERSION=${PORTVERSION} \	40	VERSION=${PORTVERSION}
38	lispdir=${PREFIX}/${ELISPDIR} \	41
39	infodir=${PREFIX}/${INFO_PATH} \
40	docdir=${DOCSDIR}
41	PLIST_SUB+= ELISPDIR=${ELISPDIR}	42	PLIST_SUB+= ELISPDIR=${ELISPDIR}
42		43
43	OPTIONS_DEFINE= DOCS	44	OPTIONS_DEFINE= DOCS LIBEGIT2
		45	OPTIONS_SUB= yes
		46	LIBEGIT2_DESC= Use libegit2 as backend (EXPERIMENTAL)
		47	LIBEGIT2_LIB_DEPENDS= libegit2.so:devel/libegit2@${FLAVOR}
		48	LIBEGIT2_BUILD_DEPENDS_OFF= git:devel/git
		49	LIBEGIT2_RUN_DEPENDS_OFF= git:devel/git
		50	LIBEGIT2_VARS_OFF= MAKE_ENV+=BUILD_MAGIT_LIBGIT=false
44		51
		52	do-install-DOCS-on:
		53	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		54	${INSTALL_DATA} ${WRKSRC}/Documentation/RelNotes/3.0.0.org \
		55	${STAGEDIR}${DOCSDIR}/ReleaseNote
		56
45	.include <bsd.port.mk>	57	.include <bsd.port.mk>