Date: Fri, 16 Aug 2024 07:20:43 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: 4639a4af58eb - main - devel/{magit,magit-devel}: Update to 4.0.0
Message-ID: <202408160720.47G7KhBd040555@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=4639a4af58eb56969acfe62ab752d76b5ee746a7 commit 4639a4af58eb56969acfe62ab752d76b5ee746a7 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2024-08-16 04:37:10 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2024-08-16 07:17:32 +0000 devel/{magit,magit-devel}: Update to 4.0.0 Remove LIBEGIT2 option as support of libegit2 is dropped. ReleaseNotes: https://github.com/magit/magit/blob/main/docs/RelNotes/4.0.0.org --- devel/magit-devel/Makefile | 43 +++++++++---------- devel/magit-devel/distinfo | 6 +-- devel/magit-devel/pkg-plist | 2 - devel/magit/Makefile | 49 ++++++++++------------ devel/magit/distinfo | 6 +-- ...-Documentation_Makefile => patch-docs_Makefile} | 6 +-- devel/magit/pkg-plist | 12 ++---- 7 files changed, 54 insertions(+), 70 deletions(-) diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile index 72366e2bec1c..2e28975fe13a 100644 --- a/devel/magit-devel/Makefile +++ b/devel/magit-devel/Makefile @@ -1,8 +1,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v -DISTVERSION= 3.3.0-995 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -gf9268a95 +DISTVERSION= 4.0.0 +DISTVERSIONSUFFIX= CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} @@ -13,14 +12,16 @@ WWW= https://magit.vc/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.5:misc/compat.el@${EMACS_FLAVOR} \ +BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \ dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \ - transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.3:devel/transient-devel@${EMACS_FLAVOR} \ - with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.3.2:editors/with-editor-devel@${EMACS_FLAVOR} -RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.5:misc/compat.el@${EMACS_FLAVOR} \ + git:devel/git \ + transient-devel${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient-devel@${EMACS_FLAVOR} \ + with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.4.1:editors/with-editor-devel@${EMACS_FLAVOR} +RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \ dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \ - transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.3:devel/transient-devel@${EMACS_FLAVOR} \ - with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.3.2:editors/with-editor-devel@${EMACS_FLAVOR} + git:devel/git \ + transient-devel${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient-devel@${EMACS_FLAVOR} \ + with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.4.1:editors/with-editor-devel@${EMACS_FLAVOR} USES= emacs gmake makeinfo USE_GITHUB= yes @@ -29,7 +30,7 @@ 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}/compat" \ + LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat" \ VERSION=${PORTVERSION} # Parallel build fails if Emacs is built with native compilation enabled MAKE_JOBS_UNSAFE= yes @@ -44,24 +45,18 @@ INFO= magit magit-section PLIST_SUB+= ELISPDIR=${ELISPDIR} PORTDOCS= *.html *.md RelNotes/* -OPTIONS_DEFINE= DOCS LIBEGIT2 PDF +OPTIONS_DEFINE= DOCS PDF OPTIONS_SUB= yes -LIBEGIT2_DESC= Use libegit2 as backend (EXPERIMENTAL) PDF_DESC= Build and install PDF document -DOCS_BUILD_DEPENDS= gsed:textproc/gsed -DOCS_ALL_TARGET= html -DOCS_BINARY_ALIAS= sed=gsed -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= MAKE_ENV+=BUILD_MAGIT_LIBGIT=true -PDF_BUILD_DEPENDS= texi2pdf:print/texinfo -PDF_USES= tex -PDF_USE= TEX=dvipdfmx:build -PDF_ALL_TARGET= pdf +DOCS_BUILD_DEPENDS= gsed:textproc/gsed +DOCS_ALL_TARGET= html +DOCS_BINARY_ALIAS= sed=gsed +PDF_BUILD_DEPENDS= texi2pdf:print/texinfo +PDF_USES= tex +PDF_USE= TEX=dvipdfmx:build +PDF_ALL_TARGET= pdf ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/devel/magit-devel/distinfo b/devel/magit-devel/distinfo index 63ca891b3e70..326f2dcbe86a 100644 --- a/devel/magit-devel/distinfo +++ b/devel/magit-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717204197 -SHA256 (magit-magit-v3.3.0-995-gf9268a95_GH0.tar.gz) = 97efca6d6567240aed4576c4f984d3c0c9c8c92cfe51c71c38d3ebef42793eb6 -SIZE (magit-magit-v3.3.0-995-gf9268a95_GH0.tar.gz) = 673531 +TIMESTAMP = 1723782811 +SHA256 (magit-magit-v4.0.0_GH0.tar.gz) = d3002b55dbf1d3f3aa5c7bcc36fce7902fce0edb18ec42cec8b3ba6f28aa9197 +SIZE (magit-magit-v4.0.0_GH0.tar.gz) = 676167 diff --git a/devel/magit-devel/pkg-plist b/devel/magit-devel/pkg-plist index 479648be49fa..de0f3e3fceff 100644 --- a/devel/magit-devel/pkg-plist +++ b/devel/magit-devel/pkg-plist @@ -39,8 +39,6 @@ %%ELISPDIR%%/magit-git.elc %%ELISPDIR%%/magit-gitignore.el %%ELISPDIR%%/magit-gitignore.elc -%%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.el -%%LIBEGIT2%%%%ELISPDIR%%/magit-libgit.elc %%ELISPDIR%%/magit-log.el %%ELISPDIR%%/magit-log.elc %%ELISPDIR%%/magit-margin.el diff --git a/devel/magit/Makefile b/devel/magit/Makefile index 38a33c659d89..e7eacc5c6ffe 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -1,7 +1,6 @@ PORTNAME= magit DISTVERSIONPREFIX= v -DISTVERSION= 3.3.0 -PORTREVISION= 15 +DISTVERSION= 4.0.0 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -12,12 +11,16 @@ WWW= https://magit.vc/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.18.1:devel/dash.el@${EMACS_FLAVOR} \ - transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \ - with-editor${EMACS_PKGNAMESUFFIX}>=3.0.4:editors/with-editor@${EMACS_FLAVOR} -RUN_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>=2.18.1:devel/dash.el@${EMACS_FLAVOR} \ - transient${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient@${EMACS_FLAVOR} \ - with-editor${EMACS_PKGNAMESUFFIX}>=3.0.4:editors/with-editor@${EMACS_FLAVOR} +BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \ + dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \ + git:devel/git \ + transient${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient@${EMACS_FLAVOR} \ + with-editor${EMACS_PKGNAMESUFFIX}>=3.4.1:editors/with-editor@${EMACS_FLAVOR} +RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \ + dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \ + git:devel/git \ + transient${EMACS_PKGNAMESUFFIX}>=0.7.4:devel/transient@${EMACS_FLAVOR} \ + with-editor${EMACS_PKGNAMESUFFIX}>=3.4.1:editors/with-editor@${EMACS_FLAVOR} USES= emacs gmake makeinfo USE_GITHUB= yes @@ -41,36 +44,28 @@ INFO= magit magit-section PLIST_SUB+= ELISPDIR=${ELISPDIR} PORTDOCS= *.html *.md RelNotes/* -OPTIONS_DEFINE= DOCS LIBEGIT2 PDF +OPTIONS_DEFINE= DOCS PDF OPTIONS_SUB= yes -LIBEGIT2_DESC= Use libegit2 as backend (EXPERIMENTAL) PDF_DESC= Build and install PDF document -DOCS_BUILD_DEPENDS= gsed:textproc/gsed -DOCS_ALL_TARGET= html -DOCS_BINARY_ALIAS= sed=gsed -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 -PDF_BUILD_DEPENDS= texi2pdf:print/texinfo -PDF_USES= tex -PDF_USE= TEX=dvipdfmx:build -PDF_ALL_TARGET= pdf +DOCS_BUILD_DEPENDS= gsed:textproc/gsed +DOCS_ALL_TARGET= html +DOCS_BINARY_ALIAS= sed=gsed +PDF_BUILD_DEPENDS= texi2pdf:print/texinfo +PDF_USES= tex +PDF_USE= TEX=dvipdfmx:build +PDF_ALL_TARGET= pdf ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes - ${INSTALL_DATA} ${WRKSRC}/Documentation/*.md \ - ${WRKSRC}/Documentation/*.html ${STAGEDIR}${DOCSDIR} - ${COPYTREE_SHARE} ${WRKSRC}/Documentation/RelNotes \ - ${STAGEDIR}${DOCSDIR}/RelNotes + ${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR} + ${COPYTREE_SHARE} ${WRKSRC}/docs/RelNotes ${STAGEDIR}${DOCSDIR}/RelNotes do-install-PDF-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Documentation/*.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/devel/magit/distinfo b/devel/magit/distinfo index 469576cec66c..326f2dcbe86a 100644 --- a/devel/magit/distinfo +++ b/devel/magit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633411068 -SHA256 (magit-magit-v3.3.0_GH0.tar.gz) = 8c03f69b9f86cb515572d877b4e9677ceed7034be1abaa1b90c01904cd9bb8d6 -SIZE (magit-magit-v3.3.0_GH0.tar.gz) = 629283 +TIMESTAMP = 1723782811 +SHA256 (magit-magit-v4.0.0_GH0.tar.gz) = d3002b55dbf1d3f3aa5c7bcc36fce7902fce0edb18ec42cec8b3ba6f28aa9197 +SIZE (magit-magit-v4.0.0_GH0.tar.gz) = 676167 diff --git a/devel/magit/files/patch-Documentation_Makefile b/devel/magit/files/patch-docs_Makefile similarity index 55% rename from devel/magit/files/patch-Documentation_Makefile rename to devel/magit/files/patch-docs_Makefile index f21a259c78d5..b7fc9b806068 100644 --- a/devel/magit/files/patch-Documentation_Makefile +++ b/devel/magit/files/patch-docs_Makefile @@ -1,6 +1,6 @@ ---- Documentation/Makefile.orig 2021-10-04 19:55:06 UTC -+++ Documentation/Makefile -@@ -51,7 +51,7 @@ html-dir: $(TEXIFILES) +--- docs/Makefile.orig 2024-08-08 18:52:29 UTC ++++ docs/Makefile +@@ -60,7 +60,7 @@ html-dir: $(TEXIFILES) %.pdf: %.texi @printf "Generating $@\n" diff --git a/devel/magit/pkg-plist b/devel/magit/pkg-plist index a2a37e279314..9ccb5f97ed47 100644 --- a/devel/magit/pkg-plist +++ b/devel/magit/pkg-plist @@ -1,3 +1,5 @@ +%%ELISPDIR%%/magit-base.el +%%ELISPDIR%%/magit-base.elc %%ELISPDIR%%/git-commit.el %%ELISPDIR%%/git-commit.elc %%ELISPDIR%%/git-rebase.el @@ -37,10 +39,6 @@ %%ELISPDIR%%/magit-git.elc %%ELISPDIR%%/magit-gitignore.el %%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 @@ -51,8 +49,6 @@ %%ELISPDIR%%/magit-mode.elc %%ELISPDIR%%/magit-notes.el %%ELISPDIR%%/magit-notes.elc -%%ELISPDIR%%/magit-obsolete.el -%%ELISPDIR%%/magit-obsolete.elc %%ELISPDIR%%/magit-patch.el %%ELISPDIR%%/magit-patch.elc %%ELISPDIR%%/magit-process.el @@ -75,6 +71,8 @@ %%ELISPDIR%%/magit-section.elc %%ELISPDIR%%/magit-sequence.el %%ELISPDIR%%/magit-sequence.elc +%%ELISPDIR%%/magit-sparse-checkout.el +%%ELISPDIR%%/magit-sparse-checkout.elc %%ELISPDIR%%/magit-stash.el %%ELISPDIR%%/magit-stash.elc %%ELISPDIR%%/magit-status.el @@ -87,8 +85,6 @@ %%ELISPDIR%%/magit-tag.elc %%ELISPDIR%%/magit-transient.el %%ELISPDIR%%/magit-transient.elc -%%ELISPDIR%%/magit-utils.el -%%ELISPDIR%%/magit-utils.elc %%ELISPDIR%%/magit-version.el %%ELISPDIR%%/magit-wip.el %%ELISPDIR%%/magit-wip.elc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408160720.47G7KhBd040555>