Index: head/devel/magit/Makefile =================================================================== --- head/devel/magit/Makefile (revision 447075) +++ head/devel/magit/Makefile (revision 447076) @@ -1,46 +1,45 @@ # Created by: Jun Kuriyama # $FreeBSD$ PORTNAME= magit -PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTVERSION= 2.10.3 CATEGORIES= devel elisp PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= kuriyama@FreeBSD.org COMMENT= Interface to Git for Emacs LICENSE= GPLv3 BUILD_DEPENDS= dash.el>=2.12.1:devel/dash.el \ with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor RUN_DEPENDS= dash.el>=2.12.1:devel/dash.el \ with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor USE_GITHUB= yes USES= gmake makeinfo USE_EMACS= yes INFO= magit magit-popup PORTDOCS= AUTHORS.md NO_ARCH= yes OPTIONS_DEFINE= DOCS GIT_SUBVERSION GIT_SUBVERSION_DESC= Use devel/git-subversion as backend GIT_SUBVERSION_BUILD_DEPENDS= git-subversion>0:devel/git-subversion GIT_SUBVERSION_BUILD_DEPENDS_OFF= git>0:devel/git GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:devel/git-subversion GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:devel/git .include ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} MAKE_ENV+= INSTALL_INFO=install-info \ LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \ VERSION=${PORTVERSION} \ lispdir=${PREFIX}/${ELISPDIR} \ infodir=${PREFIX}/${INFO_PATH} \ docdir=${DOCSDIR} PLIST_SUB+= ELISPDIR=${ELISPDIR} .include Index: head/devel/magit/distinfo =================================================================== --- head/devel/magit/distinfo (revision 447075) +++ head/devel/magit/distinfo (revision 447076) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472128845 -SHA256 (magit-magit-2.8.0_GH0.tar.gz) = 98cc000ffe06d96c59e5e7c150af5f3d62e5876b7e2e78337aebccb4bc05b066 -SIZE (magit-magit-2.8.0_GH0.tar.gz) = 395575 +TIMESTAMP = 1497406352 +SHA256 (magit-magit-2.10.3_GH0.tar.gz) = dc797db8da8683767ffa5d006f6e85d334892979c76057baf03c99bb0c6f669c +SIZE (magit-magit-2.10.3_GH0.tar.gz) = 430343 Index: head/devel/magit/files/patch-default.mk =================================================================== --- head/devel/magit/files/patch-default.mk (revision 447075) +++ head/devel/magit/files/patch-default.mk (revision 447076) @@ -1,14 +1,17 @@ ---- default.mk.orig 2015-07-18 04:15:03 UTC +--- default.mk.orig 2017-06-14 12:34:54 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 -- +@@ -85,14 +85,6 @@ ELGS = magit-autoloads.el magit-version. + + ## Versions ########################################################## + -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))") +- + MAGIT_VERSION = 2.10 + ASYNC_VERSION = 1.9 + DASH_VERSION = 2.13.0 Index: head/devel/magit/pkg-plist =================================================================== --- head/devel/magit/pkg-plist (revision 447075) +++ head/devel/magit/pkg-plist (revision 447076) @@ -1,52 +1,70 @@ %%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-autorevert.el %%ELISPDIR%%/magit-autorevert.elc %%ELISPDIR%%/magit-bisect.el %%ELISPDIR%%/magit-bisect.elc %%ELISPDIR%%/magit-blame.el %%ELISPDIR%%/magit-blame.elc +%%ELISPDIR%%/magit-branch.el +%%ELISPDIR%%/magit-branch.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-files.el +%%ELISPDIR%%/magit-files.elc %%ELISPDIR%%/magit-git.el %%ELISPDIR%%/magit-git.elc %%ELISPDIR%%/magit-log.el %%ELISPDIR%%/magit-log.elc +%%ELISPDIR%%/magit-margin.el +%%ELISPDIR%%/magit-margin.elc %%ELISPDIR%%/magit-mode.el %%ELISPDIR%%/magit-mode.elc +%%ELISPDIR%%/magit-notes.el +%%ELISPDIR%%/magit-notes.elc +%%ELISPDIR%%/magit-obsolete.el +%%ELISPDIR%%/magit-obsolete.elc %%ELISPDIR%%/magit-popup.el %%ELISPDIR%%/magit-popup.elc %%ELISPDIR%%/magit-process.el %%ELISPDIR%%/magit-process.elc +%%ELISPDIR%%/magit-refs.el +%%ELISPDIR%%/magit-refs.elc %%ELISPDIR%%/magit-remote.el %%ELISPDIR%%/magit-remote.elc +%%ELISPDIR%%/magit-repos.el +%%ELISPDIR%%/magit-repos.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-status.el +%%ELISPDIR%%/magit-status.elc %%ELISPDIR%%/magit-submodule.el %%ELISPDIR%%/magit-submodule.elc %%ELISPDIR%%/magit-subtree.el %%ELISPDIR%%/magit-subtree.elc %%ELISPDIR%%/magit-utils.el %%ELISPDIR%%/magit-utils.elc %%ELISPDIR%%/magit-version.el %%ELISPDIR%%/magit-wip.el %%ELISPDIR%%/magit-wip.elc +%%ELISPDIR%%/magit-worktree.el +%%ELISPDIR%%/magit-worktree.elc %%ELISPDIR%%/magit.el %%ELISPDIR%%/magit.elc