Index: head/devel/magit/Makefile =================================================================== --- head/devel/magit/Makefile (revision 466265) +++ head/devel/magit/Makefile (revision 466266) @@ -1,44 +1,47 @@ # Created by: Jun Kuriyama # $FreeBSD$ PORTNAME= magit -PORTVERSION= 2.11.0 -PORTREVISION= 1 +PORTVERSION= 2.12.1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= yasu@utahime.org COMMENT= Interface to Git for Emacs LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \ - with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR} -RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.12.1:devel/dash.el@${EMACS_FLAVOR} \ - with-editor${EMACS_PKGNAMESUFFIX}>=2.5.0:editors/with-editor@${EMACS_FLAVOR} +BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \ + ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \ + magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.3:devel/magit-popup@${EMACS_FLAVOR} \ + with-editor${EMACS_PKGNAMESUFFIX}>=2.7.2:editors/with-editor@${EMACS_FLAVOR} +RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.13.0:devel/dash.el@${EMACS_FLAVOR} \ + ghub${EMACS_PKGNAMESUFFIX}>=2.0.0:devel/ghub@${EMACS_FLAVOR} \ + magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.3:devel/magit-popup@${EMACS_FLAVOR} \ + with-editor${EMACS_PKGNAMESUFFIX}>=2.7.2:editors/with-editor@${EMACS_FLAVOR} USES= emacs gmake makeinfo USE_GITHUB= yes -INFO= magit magit-popup +INFO= magit PORTDOCS= AUTHORS.md NO_ARCH= yes 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} 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 Index: head/devel/magit/distinfo =================================================================== --- head/devel/magit/distinfo (revision 466265) +++ head/devel/magit/distinfo (revision 466266) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505315661 -SHA256 (magit-magit-2.11.0_GH0.tar.gz) = 5138509a3f5b1be3cbacdf4ddaace4ce4a3b6bafb4f209fffccf69ef99e329f7 -SIZE (magit-magit-2.11.0_GH0.tar.gz) = 451030 +TIMESTAMP = 1522592277 +SHA256 (magit-magit-2.12.1_GH0.tar.gz) = 49b5b0044bc3ee666b096f6fe9534cd6fc5c8bf808e2f0ab2e9de8b5b9ac953a +SIZE (magit-magit-2.12.1_GH0.tar.gz) = 505873 Index: head/devel/magit/files/patch-default.mk =================================================================== --- head/devel/magit/files/patch-default.mk (revision 466265) +++ head/devel/magit/files/patch-default.mk (revision 466266) @@ -1,17 +1,11 @@ ---- default.mk.orig 2017-09-13 10:42:03 UTC +--- default.mk.orig 2018-03-29 20:07:19 UTC +++ default.mk -@@ -87,14 +87,6 @@ ELGS = magit-autoloads.el magit-version. +@@ -89,8 +89,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))") +-VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0) - - MAGIT_VERSION = 2.11 ASYNC_VERSION = 1.9.2 DASH_VERSION = 2.13.0 + GHUB_VERSION = 2.0.0 Index: head/devel/magit/pkg-plist =================================================================== --- head/devel/magit/pkg-plist (revision 466265) +++ head/devel/magit/pkg-plist (revision 466266) @@ -1,74 +1,80 @@ %%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-bookmark.el %%ELISPDIR%%/magit-bookmark.elc %%ELISPDIR%%/magit-branch.el %%ELISPDIR%%/magit-branch.elc +%%ELISPDIR%%/magit-collab.el +%%ELISPDIR%%/magit-collab.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-imenu.el %%ELISPDIR%%/magit-imenu.elc %%ELISPDIR%%/magit-log.el %%ELISPDIR%%/magit-log.elc %%ELISPDIR%%/magit-margin.el %%ELISPDIR%%/magit-margin.elc +%%ELISPDIR%%/magit-merge.el +%%ELISPDIR%%/magit-merge.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-reset.el +%%ELISPDIR%%/magit-reset.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-tag.el +%%ELISPDIR%%/magit-tag.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