diff --git a/devel/git-filter-repo/Makefile b/devel/git-filter-repo/Makefile index 20efac49cb4e..d6ff6efc027a 100644 --- a/devel/git-filter-repo/Makefile +++ b/devel/git-filter-repo/Makefile @@ -1,52 +1,51 @@ PORTNAME= git-filter-repo DISTVERSIONPREFIX= v -DISTVERSION= 2.38.0 -PORTREVISION= 1 +DISTVERSION= 2.45.0 CATEGORIES= devel MAINTAINER= cy@FreeBSD.org COMMENT= git filter-repo is a versatile tool for rewriting history WWW= https://github.com/newren/git-filter-repo LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING.mit RUN_DEPENDS= git:devel/git USES= python shebangfix SHEBANG_FILES= git-filter-repo USE_GITHUB= yes GH_ACCOUNT= newren NO_BUILD= yes NO_ARCH= yes # # XXX: The man page only exists in the upstream docs branch. Unfortunately # there is no clean way to extract just one file from a different # upstream branch. Therefore we include it in files. To discover # which version of the git-filter-repo.1 file in the docs branch # corresponds with the extracted tag, # # - git clone https://github.com/newren/git-filter-repo.git # - git log, looking for the current tag's hash. # - git switch docs # - git log and look for the matching hash in the commit log. # - git checkout HASH # - copy the file to the files subdirectory of this port # # Until a better approach can be discovered. # post-extract: @${MKDIR} ${WRKSRC}/Documentation/man1; ${CP} ${FILESDIR}/git-filter-repo.1.in ${WRKSRC}/Documentation/man1/git-filter-repo.1 do-install: cd ${WRKSRC}; \ ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/git-core; \ ${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}; \ ${MAKE} prefix=${STAGEDIR}/${PREFIX} pythondir=${STAGEDIR}/${PYTHON_SITELIBDIR} install .include diff --git a/devel/git-filter-repo/distinfo b/devel/git-filter-repo/distinfo index a103e8f8db61..7e82918a57a1 100644 --- a/devel/git-filter-repo/distinfo +++ b/devel/git-filter-repo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686595869 -SHA256 (newren-git-filter-repo-v2.38.0_GH0.tar.gz) = e12e030fc4ebb887c0c3dcb492018674ca4221af5717c3c6fbd1f436e7c2ebc7 -SIZE (newren-git-filter-repo-v2.38.0_GH0.tar.gz) = 165795 +TIMESTAMP = 1721361543 +SHA256 (newren-git-filter-repo-v2.45.0_GH0.tar.gz) = 0187ef4748e586c32939987ee28780aeb8c4b01682082353b1ec665f8830e658 +SIZE (newren-git-filter-repo-v2.45.0_GH0.tar.gz) = 168436 diff --git a/devel/git-filter-repo/files/patch-Makefile b/devel/git-filter-repo/files/patch-Makefile index a11a4dd84a3c..6427cf430496 100644 --- a/devel/git-filter-repo/files/patch-Makefile +++ b/devel/git-filter-repo/files/patch-Makefile @@ -1,26 +1,26 @@ ---- Makefile.orig 2022-10-09 00:42:32.000000000 -0400 -+++ Makefile 2023-06-12 14:53:55.459124000 -0400 -@@ -24,7 +24,7 @@ fixup_locale: +--- Makefile.orig 2024-07-17 21:46:36.000000000 -0700 ++++ Makefile 2024-07-18 21:01:20.340858000 -0700 +@@ -25,7 +25,7 @@ # html/git-filter-repo.html. But let's support people installing from a git # clone too; for them, just cheat and snag a copy of the built docs that I # record in a different branch. -snag_docs: Documentation/man1/git-filter-repo.1 Documentation/html/git-filter-repo.html +snag_docs: Documentation/man1/git-filter-repo.1 Documentation/man1/git-filter-repo.1: mkdir -p Documentation/man1 -@@ -34,12 +34,11 @@ Documentation/html/git-filter-repo.html: +@@ -35,12 +35,11 @@ mkdir -p Documentation/html git show origin/docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html -install: snag_docs #fixup_locale +install: - install -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo" - install -dm0755 "$(DESTDIR)/$(pythondir)" + $(INSTALL) -Dm0755 git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo" + $(INSTALL) -dm0755 "$(DESTDIR)/$(pythondir)" - ln -sf "$(bindir)/git-filter-repo" "$(DESTDIR)/$(pythondir)/git_filter_repo.py" + ( cd "$(pythondir)" && ln -sf ../../../libexec/git-core/git-filter-repo git_filter_repo.py ) - install -Dm0644 Documentation/man1/git-filter-repo.1 "$(DESTDIR)/$(mandir)/man1/git-filter-repo.1" -- install -Dm0644 Documentation/html/git-filter-repo.html "$(DESTDIR)/$(htmldir)/git-filter-repo.html" + $(INSTALL) -Dm0644 Documentation/man1/git-filter-repo.1 "$(DESTDIR)/$(mandir)/man1/git-filter-repo.1" +- $(INSTALL) -Dm0644 Documentation/html/git-filter-repo.html "$(DESTDIR)/$(htmldir)/git-filter-repo.html" if which mandb > /dev/null; then mandb; fi