diff options
Diffstat (limited to 'devel/magit')
| -rw-r--r-- | devel/magit/Makefile | 40 | ||||
| -rw-r--r-- | devel/magit/distinfo | 6 | ||||
| -rw-r--r-- | devel/magit/pkg-plist | 8 |
3 files changed, 32 insertions, 22 deletions
diff --git a/devel/magit/Makefile b/devel/magit/Makefile index 389bd15d7968..3f5dfe164ebb 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -1,8 +1,7 @@ # Created by: Jun Kuriyama <kuriyama@FreeBSD.org> PORTNAME= magit -PORTVERSION= 2.90.1 -PORTREVISION= 5 +PORTVERSION= 3.0.0 CATEGORIES= devel elisp MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -15,32 +14,39 @@ 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} \ - git:devel/git \ - magit-popup${EMACS_PKGNAMESUFFIX}>=2.12.4:devel/magit-popup@${EMACS_FLAVOR} \ + transient${EMACS_PKGNAMESUFFIX}>=0: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:devel/transient@${EMACS_FLAVOR} \ with-editor${EMACS_PKGNAMESUFFIX}>=2.8.0:editors/with-editor@${EMACS_FLAVOR} USES= emacs gmake makeinfo +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} + CONFLICTS_INSTALL= magit-devel-emacs* -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} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \ - VERSION=${PORTVERSION} \ - lispdir=${PREFIX}/${ELISPDIR} \ - infodir=${PREFIX}/${INFO_PATH} \ - docdir=${DOCSDIR} -PLIST_SUB+= ELISPDIR=${ELISPDIR} +INFO= magit magit-section +PLIST_SUB+= ELISPDIR=${_ELISPDIR} +PORTDOCS= AUTHORS.md + +OPTIONS_DEFINE= DOCS LIBEGIT2 +OPTIONS_SUB= yes +LIBEGIT2_DESC= Use libegit2 as backend (EXPERIMENTAL) +LIBEGIT2_BUILD_DEPENDS= libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR} +LIBEGIT2_BUILD_DEPENDS_OFF= git:devel/git +LIBEGIT2_RUN_DEPENDS= libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR} +LIBEGIT2_RUN_DEPENDS_OFF= git:devel/git +LIBEGIT2_VARS_OFF= MAKE_ENV+=BUILD_MAGIT_LIBGIT=false -OPTIONS_DEFINE= DOCS +_ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/magit/distinfo b/devel/magit/distinfo index 1ec723f18dd4..a5c411d75b64 100644 --- a/devel/magit/distinfo +++ b/devel/magit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542389141 -SHA256 (magit-2.90.1.tar.gz) = 28dbcd68b6a417cf07b5fe63514f7837901639a39a4906ab998e0aa73e20ad6a -SIZE (magit-2.90.1.tar.gz) = 378710 +TIMESTAMP = 1621937544 +SHA256 (magit-3.0.0.tar.gz) = 845fb2248e0a1f4586dd334fb74b37c6d438ca9d0da01214c27316a13114867a +SIZE (magit-3.0.0.tar.gz) = 425689 diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist index 5267c34a9a2c..ac90f82027cb 100644 --- a/devel/magit/pkg-plist +++ b/devel/magit/pkg-plist @@ -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 |