Attachment 158931 Details for Bug 201654 – Updated patch.

[patch] Updated patch.

patch-devel_magit (text/plain), 4.45 KB, created by Yasuhiro Kimura on 2015-07-18 04:23:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2015-07-18 04:23:34 UTC

Size: 4.45 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 392397)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	magit
>-PORTVERSION=	1.4.0
>-PORTREVISION=	1
>+PORTVERSION=	2.1.0
> CATEGORIES=	devel elisp
> PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
> 
>@@ -10,25 +9,28 @@
> MAINTAINER=	kuriyama@FreeBSD.org
> COMMENT=	Interface to Git for Emacs
> 
>-LICENSE=	GFDL GPLv3
>-LICENSE_COMB=	multi
>+LICENSE=	GPLv3
> 
>-BUILD_DEPENDS=	git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes
>-RUN_DEPENDS=	git-modes-${EMACS_PORT_NAME}>0:${PORTSDIR}/devel/git-modes
>+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
>+INFO=		magit magit-popup with-editor
> PORTDOCS=	AUTHORS.md
> 
>-OPTIONS_DEFINE=			DOCS
>+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+=	EFLAGS="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/git-modes" \
>+MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR}" \
>+		VERSION=${PORTVERSION} \
> 		lispdir=${PREFIX}/${ELISPDIR} \
> 		infodir=${PREFIX}/${INFO_PATH} \
> 		docdir=${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 392397)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (magit-magit-1.4.0_GH0.tar.gz) = 03cdc29fe5d5d3c5b1d975bccfcf0bb12318c6e5c198575c395caa3eb14e3878
>-SIZE (magit-magit-1.4.0_GH0.tar.gz) = 132600
>+SHA256 (magit-magit-2.1.0_GH0.tar.gz) = e1c246ce1ea51cbf59b04eecaee9280a31429a725ad81b3eb497c6e8246d68d9
>+SIZE (magit-magit-2.1.0_GH0.tar.gz) = 293857
>Index: files/patch-default.mk
>===================================================================
>--- files/patch-default.mk	(revision 0)
>+++ files/patch-default.mk	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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))")
>
>Property changes on: files/patch-default.mk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 392397)
>+++ pkg-plist	(working copy)
>@@ -1,10 +1,48 @@
>+%%ELISPDIR%%/git-commit.el
>+%%ELISPDIR%%/git-commit.elc
>+%%ELISPDIR%%/git-rebase.el
>+%%ELISPDIR%%/git-rebase.elc
>+%%ELISPDIR%%/magit-apply.el
>+%%ELISPDIR%%/magit-apply.elc
> %%ELISPDIR%%/magit-autoloads.el
>+%%ELISPDIR%%/magit-bisect.el
>+%%ELISPDIR%%/magit-bisect.elc
> %%ELISPDIR%%/magit-blame.el
> %%ELISPDIR%%/magit-blame.elc
>-%%ELISPDIR%%/magit-key-mode.el
>-%%ELISPDIR%%/magit-key-mode.elc
>+%%ELISPDIR%%/magit-commit.el
>+%%ELISPDIR%%/magit-commit.elc
>+%%ELISPDIR%%/magit-core.el
>+%%ELISPDIR%%/magit-core.elc
>+%%ELISPDIR%%/magit-diff.el
>+%%ELISPDIR%%/magit-diff.elc
>+%%ELISPDIR%%/magit-ediff.el
>+%%ELISPDIR%%/magit-ediff.elc
>+%%ELISPDIR%%/magit-extras.el
>+%%ELISPDIR%%/magit-extras.elc
>+%%ELISPDIR%%/magit-git.el
>+%%ELISPDIR%%/magit-git.elc
>+%%ELISPDIR%%/magit-log.el
>+%%ELISPDIR%%/magit-log.elc
>+%%ELISPDIR%%/magit-mode.el
>+%%ELISPDIR%%/magit-mode.elc
>+%%ELISPDIR%%/magit-popup.el
>+%%ELISPDIR%%/magit-popup.elc
>+%%ELISPDIR%%/magit-process.el
>+%%ELISPDIR%%/magit-process.elc
>+%%ELISPDIR%%/magit-remote.el
>+%%ELISPDIR%%/magit-remote.elc
>+%%ELISPDIR%%/magit-section.el
>+%%ELISPDIR%%/magit-section.elc
>+%%ELISPDIR%%/magit-sequence.el
>+%%ELISPDIR%%/magit-sequence.elc
>+%%ELISPDIR%%/magit-stash.el
>+%%ELISPDIR%%/magit-stash.elc
>+%%ELISPDIR%%/magit-utils.el
>+%%ELISPDIR%%/magit-utils.elc
> %%ELISPDIR%%/magit-version.el
> %%ELISPDIR%%/magit-wip.el
> %%ELISPDIR%%/magit-wip.elc
> %%ELISPDIR%%/magit.el
> %%ELISPDIR%%/magit.elc
>+%%ELISPDIR%%/with-editor.el
>+%%ELISPDIR%%/with-editor.elc

Actions: View | Diff

Attachments on bug 201654: 158914 | 158931