Attachment 220328 Details for Bug 251148 – Updated patch file

[patch] Updated patch file

devel_magit-devel.patch (text/plain), 5.49 KB, created by Yasuhiro Kimura on 2020-12-06 22:28:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-12-06 22:28:58 UTC

Size: 5.49 KB

patch

obsolete

>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 557099)
>+++ devel/Makefile	(working copy)
>@@ -1456,6 +1456,7 @@
>     SUBDIR += m4
>     SUBDIR += mage
>     SUBDIR += magit
>+    SUBDIR += magit-devel
>     SUBDIR += magit-popup
>     SUBDIR += make++
>     SUBDIR += makedepend
>Index: devel/magit/Makefile
>===================================================================
>--- devel/magit/Makefile	(revision 557099)
>+++ devel/magit/Makefile	(working copy)
>@@ -27,6 +27,8 @@
> 
> USES=		emacs gmake makeinfo
> 
>+CONFLICTS_INSTALL=	magit-devel-emacs*
>+
> INFO=		magit
> PORTDOCS=	AUTHORS.md
> NO_ARCH=	yes
>Index: devel/magit-devel/Makefile
>===================================================================
>--- devel/magit-devel/Makefile	(revision 557099)
>+++ devel/magit-devel/Makefile	(working copy)
>@@ -1,15 +1,12 @@
>-# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
> # $FreeBSD$
> 
> PORTNAME=	magit
>-PORTVERSION=	2.90.1
>-PORTREVISION=	4
>+DISTVERSION=	2.90.1.20201205
> CATEGORIES=	devel elisp
>-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
>-PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
>+PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
> 
> MAINTAINER=	yasu@utahime.org
>-COMMENT=	Interface to Git for Emacs
>+COMMENT=	Interface to Git for Emacs (Development Version)
> 
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/LICENSE
>@@ -16,30 +13,45 @@
> 
> BUILD_DEPENDS=	dash.el${EMACS_PKGNAMESUFFIX}>=2.14.1:devel/dash.el@${EMACS_FLAVOR} \
> 		ghub${EMACS_PKGNAMESUFFIX}>=3.0.0:devel/ghub@${EMACS_FLAVOR} \
>-		git:devel/git \
>-		magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \
>+		transient${EMACS_PKGNAMESUFFIX}>=0.2.0.20201103:devel/transient@${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} \
>-		git>0:devel/git \
>-		magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \
>+		transient${EMACS_PKGNAMESUFFIX}>=0.2.0.20201103:devel/transient@${EMACS_FLAVOR} \
> 		with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR}
> 
> USES=		emacs gmake makeinfo
> 
>-INFO=		magit
>-PORTDOCS=	AUTHORS.md
>+USE_GITHUB=	yes
>+GH_TAGNAME=	2e0c697
>+
>+CONFLICTS_INSTALL=	magit-emacs*
>+
>+INFO=		magit magit-section
>+PORTDOCS=	AUTHORS.md ReleaseNote
> NO_ARCH=	yes
> 
> ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
>-MAKE_ENV+=	INSTALL_INFO=install-info \
>+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} \
>-		lispdir=${PREFIX}/${ELISPDIR} \
>-		infodir=${PREFIX}/${INFO_PATH} \
>-		docdir=${DOCSDIR}
>+		VERSION=${PORTVERSION}
>+
> PLIST_SUB+=	ELISPDIR=${ELISPDIR}
> 
>-OPTIONS_DEFINE=			DOCS
>+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>
>Index: devel/magit-devel/distinfo
>===================================================================
>--- devel/magit-devel/distinfo	(revision 557099)
>+++ devel/magit-devel/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1542389141
>-SHA256 (magit-2.90.1.tar.gz) = 28dbcd68b6a417cf07b5fe63514f7837901639a39a4906ab998e0aa73e20ad6a
>-SIZE (magit-2.90.1.tar.gz) = 378710
>+TIMESTAMP = 1607212430
>+SHA256 (magit-magit-2.90.1.20201205-2e0c697_GH0.tar.gz) = 0c5bacedb56b8bcb74892fbfdecbeb111196d23875bd910739b51813ab950143
>+SIZE (magit-magit-2.90.1.20201205-2e0c697_GH0.tar.gz) = 600278
>Index: devel/magit-devel/pkg-descr
>===================================================================
>Index: devel/magit-devel/pkg-message
>===================================================================
>Index: devel/magit-devel/pkg-plist
>===================================================================
>--- devel/magit-devel/pkg-plist	(revision 557099)
>+++ devel/magit-devel/pkg-plist	(working copy)
>@@ -17,8 +17,6 @@
> %%ELISPDIR%%/magit-branch.elc
> %%ELISPDIR%%/magit-clone.el
> %%ELISPDIR%%/magit-clone.elc
>-%%ELISPDIR%%/magit-collab.el
>-%%ELISPDIR%%/magit-collab.elc
> %%ELISPDIR%%/magit-commit.el
> %%ELISPDIR%%/magit-commit.elc
> %%ELISPDIR%%/magit-core.el
>@@ -39,6 +37,8 @@
> %%ELISPDIR%%/magit-gitignore.elc
> %%ELISPDIR%%/magit-imenu.el
> %%ELISPDIR%%/magit-imenu.elc
>+%%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.el
>+%%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.elc
> %%ELISPDIR%%/magit-log.el
> %%ELISPDIR%%/magit-log.elc
> %%ELISPDIR%%/magit-margin.el
>@@ -59,6 +59,8 @@
> %%ELISPDIR%%/magit-pull.elc
> %%ELISPDIR%%/magit-push.el
> %%ELISPDIR%%/magit-push.elc
>+%%ELISPDIR%%/magit-reflog.el
>+%%ELISPDIR%%/magit-reflog.elc
> %%ELISPDIR%%/magit-refs.el
> %%ELISPDIR%%/magit-refs.elc
> %%ELISPDIR%%/magit-remote.el
>@@ -81,6 +83,8 @@
> %%ELISPDIR%%/magit-subtree.elc
> %%ELISPDIR%%/magit-tag.el
> %%ELISPDIR%%/magit-tag.elc
>+%%ELISPDIR%%/magit-transient.el
>+%%ELISPDIR%%/magit-transient.elc
> %%ELISPDIR%%/magit-utils.el
> %%ELISPDIR%%/magit-utils.elc
> %%ELISPDIR%%/magit-version.el

Actions: View | Diff

Attachments on bug 251148: 219697 | 220022 | 220328 | 220939