Date: Sat, 2 Oct 2021 07:58:00 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 72612200fbef - main - devel/magit-devel: Update to latest snapshot Message-ID: <202110020758.1927w0U8004264@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=72612200fbefbca47ebfd9c635e6b615eccac263 commit 72612200fbefbca47ebfd9c635e6b615eccac263 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2021-09-30 15:04:48 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2021-10-02 07:56:05 +0000 devel/magit-devel: Update to latest snapshot Mark MAKE_JOBS_UNSAFE as parallel build fails if Emacs is built with native compilation enabled. Changes: https://github.com/magit/magit/commits/b4194014 Approved by: ygy (mentor) Differential Revision: https://reviews.freebsd.org/D32276 --- devel/magit-devel/Makefile | 7 ++++--- devel/magit-devel/distinfo | 6 +++--- devel/magit-devel/pkg-plist | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile index b6b547d665cc..e01f33f317fc 100644 --- a/devel/magit-devel/Makefile +++ b/devel/magit-devel/Makefile @@ -1,8 +1,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v -DISTVERSION= 3.2.1-32 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gde1dc8e7 +DISTVERSION= 3.2.1-76 +DISTVERSIONSUFFIX= -gb4194014 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} @@ -28,6 +27,8 @@ MAKE_ENV+= docdir=${DOCSDIR} \ 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} +# Parallel build fails if Emacs is built with native compilation enabled +MAKE_JOBS_UNSAFE= yes CONFLICTS_INSTALL= magit-emacs* diff --git a/devel/magit-devel/distinfo b/devel/magit-devel/distinfo index 2d209c0ef959..81f87c9a51d8 100644 --- a/devel/magit-devel/distinfo +++ b/devel/magit-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629156669 -SHA256 (magit-magit-v3.2.1-32-gde1dc8e7_GH0.tar.gz) = 8aa9006a80a7102f210a835e4261426f67bdd64bba29913fd805e4ab791ca2b5 -SIZE (magit-magit-v3.2.1-32-gde1dc8e7_GH0.tar.gz) = 622368 +TIMESTAMP = 1633136590 +SHA256 (magit-magit-v3.2.1-76-gb4194014_GH0.tar.gz) = 9ff03a8a39c6b877cc9e5d813354d5a9611c946af54cb9fe2227b25e4cbec5dc +SIZE (magit-magit-v3.2.1-76-gb4194014_GH0.tar.gz) = 628327 diff --git a/devel/magit-devel/pkg-plist b/devel/magit-devel/pkg-plist index ac90f82027cb..db2495cbeeeb 100644 --- a/devel/magit-devel/pkg-plist +++ b/devel/magit-devel/pkg-plist @@ -7,6 +7,8 @@ %%ELISPDIR%%/magit-autoloads.el %%ELISPDIR%%/magit-autorevert.el %%ELISPDIR%%/magit-autorevert.elc +%%ELISPDIR%%/magit-bundle.el +%%ELISPDIR%%/magit-bundle.elc %%ELISPDIR%%/magit-bisect.el %%ELISPDIR%%/magit-bisect.elc %%ELISPDIR%%/magit-blame.el
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110020758.1927w0U8004264>