Skip to content

Commit

Permalink
devel/magit-devel: Update to latest snapshot
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Yasuhiro Kimura authored and Yasuhiro Kimura committed Oct 2, 2021
1 parent b071a30 commit 7261220
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
7 changes: 4 additions & 3 deletions devel/magit-devel/Makefile
Original file line number Diff line number Diff line change
@@ -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}

Expand All @@ -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*

Expand Down
6 changes: 3 additions & 3 deletions devel/magit-devel/distinfo
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions devel/magit-devel/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7261220

Please sign in to comment.