diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile --- 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 @@ 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 --- 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 --- 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