aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Kimura <yasu@FreeBSD.org>2022-01-08 08:08:48 +0000
committerYasuhiro Kimura <yasu@FreeBSD.org>2022-01-08 10:15:23 +0000
commit3e9ce2e3ed97fe085811beadb3e81539d0493d15 (patch)
tree38c0723ed1d1716d699a333d02a0eb2eefad81c0
parent66bda7172f8eafb481c1c4c3f3c24a565f6b4a9c (diff)
downloadports-3e9ce2e3ed97fe085811beadb3e81539d0493d15.tar.gz
ports-3e9ce2e3ed97fe085811beadb3e81539d0493d15.zip
devel/magit-devel: Update to latest snapshot
Remove MAKE_JOBS_UNSAFE as parallel build succeeds even if Emacs is build with native compilation enabled. Changes: https://github.com/magit/magit/commits/a5f6705b
-rw-r--r--devel/magit-devel/Makefile9
-rw-r--r--devel/magit-devel/distinfo6
2 files changed, 6 insertions, 9 deletions
diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile
index a8488084f68f..013431f669b1 100644
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@@ -1,8 +1,7 @@
PORTNAME= magit
DISTVERSIONPREFIX= v
-DISTVERSION= 3.3.0-59
-DISTVERSIONSUFFIX= -g1eb183e7
-PORTREVISION= 1
+DISTVERSION= 3.3.0-86
+DISTVERSIONSUFFIX= -ga5f6705b
CATEGORIES= devel elisp
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
@@ -28,8 +27,6 @@ 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*
@@ -52,7 +49,7 @@ _ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/Documentation/RelNotes/3.1.0.org \
+ ${INSTALL_DATA} ${WRKSRC}/docs/RelNotes/3.4.0.org \
${STAGEDIR}${DOCSDIR}/ReleaseNote
.include <bsd.port.mk>
diff --git a/devel/magit-devel/distinfo b/devel/magit-devel/distinfo
index 3c5b66a2ca94..77845b016ec1 100644
--- a/devel/magit-devel/distinfo
+++ b/devel/magit-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639524858
-SHA256 (magit-magit-v3.3.0-59-g1eb183e7_GH0.tar.gz) = bb87362b9a929ca27d77b6795a252f2bd4577f67aab28a066eed1ea0d43296dd
-SIZE (magit-magit-v3.3.0-59-g1eb183e7_GH0.tar.gz) = 630600
+TIMESTAMP = 1641628854
+SHA256 (magit-magit-v3.3.0-86-ga5f6705b_GH0.tar.gz) = 942cd41ccad1be8f2974885a6f192678d8b89aab275ee3afbd2c330d1d02ac46
+SIZE (magit-magit-v3.3.0-86-ga5f6705b_GH0.tar.gz) = 632015