CVS commit: pkgsrc/devel/git-filter-repo

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 16 15:05:12 UTC 2023

Modified Files:
        pkgsrc/devel/git-filter-repo: Makefile distinfo
        pkgsrc/devel/git-filter-repo/patches: patch-Makefile

Log Message:
Update to 2.38.0. From the changelog:

- INSTALL.md: correct a filename with mixed underscore and dash
- filter-repo: prepend the header line to the "ref-map" file
- Makefile: support DESTDIR
- doc: fix some typos
- Update expected test data for git 2.35
- git-filter-repo.txt: add missing git- prefix to fast-import link
- git-filter-repo.txt: fix small grammar error
- clean-ignore: move commands under main function
- clean-ignore: use arguments provided as input instead of enforced defaults
- lint-history: Add --refs argument
- Correct mailmapping of empty email addresses
- lint-history: fix broken --refs option
- contrib: new tool to convert svn:externals to Git submodules
- filter-repo: pass raw bytestring to regex compilation


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-filter-repo/Makefile \
    pkgsrc/devel/git-filter-repo/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/git-filter-repo/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git-filter-repo/Makefile
diff -u pkgsrc/devel/git-filter-repo/Makefile:1.5 pkgsrc/devel/git-filter-repo/Makefile:1.6
--- pkgsrc/devel/git-filter-repo/Makefile:1.5   Thu Jun 30 11:18:14 2022
+++ pkgsrc/devel/git-filter-repo/Makefile       Fri Jun 16 15:05:12 2023
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2022/06/30 11:18:14 nia Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/16 15:05:12 schmonz Exp $
 
-DISTNAME=      git-filter-repo-2.34.0
-EXTRACT_SUFX=  .tar.xz
-GITHUB_PROJECT=        git-filter-repo
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
-GITHUB_TYPE=   release
-PKGREVISION=   1
+DISTNAME=      git-filter-repo-2.38.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=newren/}
+EXTRACT_SUFX=  .tar.xz
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/newren/git-filter-repo/
@@ -16,7 +13,7 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 USE_TOOLS+=    gmake
-BUILD_TARGET=  build
+NO_BUILD=      yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 REPLACE_PYTHON+=               git-filter-repo
Index: pkgsrc/devel/git-filter-repo/distinfo
diff -u pkgsrc/devel/git-filter-repo/distinfo:1.5 pkgsrc/devel/git-filter-repo/distinfo:1.6
--- pkgsrc/devel/git-filter-repo/distinfo:1.5   Fri Mar 11 21:28:33 2022
+++ pkgsrc/devel/git-filter-repo/distinfo       Fri Jun 16 15:05:12 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2022/03/11 21:28:33 tnn Exp $
+$NetBSD: distinfo,v 1.6 2023/06/16 15:05:12 schmonz Exp $
 
-BLAKE2s (git-filter-repo-2.34.0.tar.xz) = 453abda27842f518a267c801b1a6b14e618ff17ee857aba26064792cb3d3ecc5
-SHA512 (git-filter-repo-2.34.0.tar.xz) = debd638f22d3543607b3d26dbdca867975ce2fd2ce03d4088e4e1d4e1be1db4655aeb8ef9de5b3930df4006511653e0b517646d1be51ab55807d19f404e14450
-Size (git-filter-repo-2.34.0.tar.xz) = 149112 bytes
-SHA1 (patch-Makefile) = 288cb9f2ea4cbd1c57d36f5942008e19e3ff8228
+BLAKE2s (git-filter-repo-2.38.0.tar.xz) = 16e293fea1886df839589dbb0919ec146e7c1a3e4533adc700a9363d68c0662c
+SHA512 (git-filter-repo-2.38.0.tar.xz) = 786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8
+Size (git-filter-repo-2.38.0.tar.xz) = 153772 bytes
+SHA1 (patch-Makefile) = 847dff06a9d2f62cf39ef4520b6d6244314ac223

Index: pkgsrc/devel/git-filter-repo/patches/patch-Makefile
diff -u pkgsrc/devel/git-filter-repo/patches/patch-Makefile:1.1 pkgsrc/devel/git-filter-repo/patches/patch-Makefile:1.2
--- pkgsrc/devel/git-filter-repo/patches/patch-Makefile:1.1     Sun Oct 25 19:31:17 2020
+++ pkgsrc/devel/git-filter-repo/patches/patch-Makefile Fri Jun 16 15:05:12 2023
@@ -1,33 +1,37 @@
-$NetBSD: patch-Makefile,v 1.1 2020/10/25 19:31:17 tnn Exp $
+$NetBSD: patch-Makefile,v 1.2 2023/06/16 15:05:12 schmonz Exp $
 
 install fixup for pkgsrc
 
---- Makefile.orig      2020-10-19 19:01:00.000000000 +0000
+--- Makefile.orig      2022-10-10 18:10:19.000000000 +0000
 +++ Makefile
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,8 @@
  # A bunch of installation-related paths people can override on the command line
+-DESTDIR = /
 -prefix = $(HOME)
--bindir = $(prefix)/libexec/git-core
--localedir = $(prefix)/share/locale
--mandir = $(prefix)/share/man
--htmldir = $(prefix)/share/doc/git-doc
 +prefix = ${PREFIX}
-+bindir = ${DESTDIR}$(prefix)/libexec/git-core
-+localedir = ${DESTDIR}$(prefix)/share/locale
-+mandir = ${DESTDIR}$(prefix)/${PKGMANDIR}
-+htmldir = ${DESTDIR}$(prefix)/share/doc/git-doc
+ bindir = $(prefix)/libexec/git-core
+ localedir = $(prefix)/share/locale
+-mandir = $(prefix)/share/man
++mandir = $(prefix)/${PKGMANDIR}
+ htmldir = $(prefix)/share/doc/git-doc
  pythondir = $(prefix)/lib64/python3.6/site-packages
  
- default: build
-@@ -35,9 +35,9 @@ Documentation/html/git-filter-repo.html:
+@@ -35,12 +34,12 @@ Documentation/html/git-filter-repo.html:
+       git show origin/docs:html/git-filter-repo.html >Documentation/html/git-filter-repo.html
  
  install: snag_docs #fixup_locale
-       cp -a git-filter-repo "$(bindir)/"
--      ln -sf "$(bindir)/git-filter-repo" "$(pythondir)/git_filter_repo.py"
-+      #ln -sf "$(bindir)/git-filter-repo" "$(pythondir)/git_filter_repo.py"
-       cp -a Documentation/man1/git-filter-repo.1 "$(mandir)/man1/git-filter-repo.1"
--      cp -a Documentation/html/git-filter-repo.html "$(htmldir)/git-filter-repo.html"
-+      #cp -a Documentation/html/git-filter-repo.html "$(htmldir)/git-filter-repo.html"
+-      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"
+-      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
++      ${BSD_INSTALL_SCRIPT} git-filter-repo "$(DESTDIR)/$(bindir)/git-filter-repo"
++      #install -dm0755 "$(DESTDIR)/$(pythondir)"
++      #ln -sf "$(bindir)/git-filter-repo" "$(DESTDIR)/$(pythondir)/git_filter_repo.py"
++      ${BSD_INSTALL_MAN} 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
  
  
  #