CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct  7 10:10:05 UTC 2022

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: Makefile PLIST distinfo
        pkgsrc/devel/git-base/patches: patch-Makefile
        pkgsrc/devel/git-docs: PLIST
        pkgsrc/www/gitweb: Makefile

Log Message:
git: updated to 2.38.0

Git v2.38 Release Notes
=======================

UI, Workflows & Features

 * "git remote show [-n] frotz" now pays attention to negative
   pathspec.

 * "git push" sometimes performs poorly when reachability bitmaps are
   used, even in a repository where other operations are helped by
   bitmaps.  The push.useBitmaps configuration variable is introduced
   to allow disabling use of reachability bitmaps only for "git push".

 * "git grep -m<max-hits>" is a way to limit the hits shown per file.

 * "git merge-tree" learned a new mode where it takes two commits and
   computes a tree that would result in the merge commit, if the
   histories leading to these two commits were to be merged.

 * "git mv A B" in a sparsely populated working tree can be asked to
   move a path between directories that are "in cone" (i.e. expected
   to be materialized in the working tree) and "out of cone"
   (i.e. expected to be hidden).  The handling of such cases has been
   improved.

 * Earlier, HTTP transport clients learned to tell the server side
   what locale they are in by sending Accept-Language HTTP header, but
   this was done only for some requests but not others.

 * Introduce a safe.barerepository configuration variable that
   allows users to forbid discovery of bare repositories.

 * Various messages that come from the pack-bitmap codepaths have been
   tweaked.

 * "git rebase -i" learns to update branches whose tip appear in the
   rebased range with "--update-refs" option.

 * "git ls-files" learns the "--format" option to tweak its output.

 * "git cat-file" learned an option to use the mailmap when showing
   commit and tag objects.

 * When "git merge" finds that it cannot perform a merge, it should
   restore the working tree to the state before the command was
   initiated, but in some corner cases it didn't.

 * Operating modes like "--batch" of "git cat-file" command learned to
   take NUL-terminated input, instead of one-item-per-line.

 * "git rm" has become more aware of the sparse-index feature.

 * "git rev-list --disk-usage" learned to take an optional value
   "human" to show the reported value in human-readable format, like
   "3.40MiB".

 * The "diagnose" feature to create a zip archive for diagnostic
   material has been lifted from "scalar" and made into a feature of
   "git bugreport".

 * The namespaces used by "log --decorate" from "refs/" hierarchy by
   default has been tightened.

 * "git rev-list --ancestry-path=C A..B" is a natural extension of
   "git rev-list A..B"; instead of choosing a subset of A..B to those
   that have ancestry relationship with A, it lets a subset with
   ancestry relationship with C.

 * "scalar" now enables built-in fsmonitor on enlisted repositories,
   when able.

 * The bash prompt (in contrib/) learned to optionally indicate when
   the index is unmerged.

 * "git clone" command learned the "--bundle-uri" option to coordinate
   with hosting sites the use of pre-prepared bundle files.

 * "git range-diff" learned to honor pathspec argument if given.

 * "git format-patch --from=<ident>" can be told to add an in-body
   "From:" line even for commits that are authored by the given
   <ident> with "--force-in-body-from" option.

 * The built-in fsmonitor refuses to work on a network mounted
   repositories; a configuration knob for users to override this has
   been introduced.

 * The "scalar" addition from Microsoft is now part of the core Git
   installation.

Performance, Internal Implementation, Development Support etc.

 * Collection of what is referenced by objects in promisor packs have
   been optimized to inspect these objects in the in-pack order.

 * Introduce a helper to see if a branch is already being worked on
   (hence should not be newly checked out in a working tree), which
   performs much better than the existing find_shared_symref() to
   replace many uses of the latter.

 * Teach "git archive" to (optionally and then by default) avoid
   spawning an external "gzip" process when creating ".tar.gz" (and
   ".tgz") archives.

 * Allow large objects read from a packstream to be streamed into a
   loose object file straight, without having to keep it in-core as a
   whole.

 * Further preparation to turn git-submodule.sh into a builtin
   continues.

 * Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
   macro, which would improve maintainability and readability.

 * Teach "make all" to build gitweb as well.

 * Tweak tests so that they still work when the "git init" template
   did not create .git/info directory.

 * Add Coccinelle rules to detect the pattern of initializing and then
   finalizing a structure without using it in between at all, which
   happens after code restructuring and the compilers fail to
   recognize as an unused variable.

 * The code to convert between GPG trust level strings and internal
   constants we use to represent them have been cleaned up.

 * Support for libnettle as SHA256 implementation has been added.

 * The way "git multi-pack" uses parse-options API has been improved.

 * A Coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
   macro has been improved.

 * API tweak to make it easier to run fuzz testing on commit-graph parser.

 * Omit fsync-related trace2 entries when their values are all zero.

 * The codepath to write multi-pack index has been taught to release a
   large chunk of memory that holds an array of objects in the packs,
   as soon as it is done with the array, to reduce memory consumption.

 * Add a level of redirection to array allocation API in xdiff part,
   to make it easier to share with the libgit2 project.

 * "git fetch" client logs the partial clone filter used in the trace2
   output.

 * The "bundle URI" design gets documented.

 * The common ancestor negotiation exchange during a "git fetch"
   session now leaves trace log.

 * Test portability improvements.
   (merge 4d1d843be7 mt/rot13-in-c later to maint).

 * The "subcommand" mode is introduced to parse-options API and update
   the command line parser of Git commands with subcommands.

 * The pack bitmap file gained a bitmap-lookup table to speed up
   locating the necessary bitmap for a given commit.

 * The assembly version of SHA-1 implementation for PPC has been
   removed.

 * The server side that responds to "git fetch" and "git clone"
   request has been optimized by allowing it to send objects in its
   object store without recomputing and validating the object names.

 * Annotate function parameters that are not used (but cannot be
   removed for structural reasons), to prepare us to later compile
   with -Wunused warning turned on.

 * Share the text used to explain configuration variables used by "git
   <subcmd>" in "git help <subcmd>" with the text from "git help config".

 * "git mv A B" in a sparsely populated working tree can be asked to
   move a path from a directory that is "in cone" to another directory
   that is "out of cone".  Handling of such a case has been improved.

 * The chainlint script for our tests has been revamped.

Fixes since v2.37
-----------------

 * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
   correctly record a removed file to the index, which was fixed.

 * Certain diff options are currently ignored when combined-diff is
   shown; mark them as incompatible with the feature.

 * Adjust technical/bitmap-format to be formatted by AsciiDoc, and
   add some missing information to the documentation.

 * Fixes for tests when the source directory has unusual characters in
   its path, e.g. whitespaces, double-quotes, etc.

 * "git mktree --missing" lazily fetched objects that are missing from
   the local object store, which was totally unnecessary for the purpose
   of creating the tree object(s) from its input.

 * Give _() markings to fatal/warning/usage: labels that are shown in
   front of these messages.

 * References to commands-to-be-typed-literally in "git rebase"
   documentation mark-up have been corrected.

 * In a non-bare repository, the behavior of Git when the
   core.worktree configuration variable points at a directory that has
   a repository as its subdirectory, regressed in Git 2.27 days.

 * Recent update to vimdiff layout code has been made more robust
   against different end-user vim settings.

 * Plug various memory leaks, both in the main code and in test-tool
   commands.

 * Fixes a long-standing corner case bug around directory renames in
   the merge-ort strategy.

 * The resolve-undo information in the index was not protected against
   GC, which has been corrected.

 * A corner case bug where lazily fetching objects from a promisor
   remote resulted in infinite recursion has been corrected.

 * "git clone" from a repository with some ref whose HEAD is unborn
   did not set the HEAD in the resulting repository correctly, which
   has been corrected.

 * An earlier attempt to plug leaks placed a clean-up label to jump to
   at a bogus place, which as been corrected.

 * Variable quoting fix in the vimdiff driver of "git mergetool"

 * "git shortlog -n" relied on the underlying qsort() to be stable,
   which shouldn't have.  Fixed.

 * A fix for a regression in test framework.

 * mkstemp() emulation on Windows has been improved.

 * Add missing documentation for "include" and "includeIf" features in
   "git config" file format, which incidentally teaches the command
   line completion to include them in its offerings.

 * Avoid "white/black-list" in documentation and code comments.

 * Workaround for a compiler warning against use of die() in
   osx-keychain (in contrib/).

 * Workaround for a false positive compiler warning.

 * "git p4" working on UTF-16 files on Windows did not implement
   CRLF-to-LF conversion correctly, which has been corrected.

 * "git p4" did not handle non-ASCII client name well, which has been
   corrected.

 * "rerere-train" script (in contrib/) used to honor commit.gpgSign
   while recreating the throw-away merges.

 * "git checkout" miscounted the paths it updated, which has been
   corrected.

 * Fix for a bug that makes write-tree to fail to write out a
   non-existent index as a tree, introduced in 2.37.

 * There was a bug in the codepath to upgrade generation information
   in commit-graph from v1 to v2 format, which has been corrected.

 * Gitweb had legacy URL shortener that is specific to the way
   projects hosted on kernel.org used to (but no longer) work, which
   has been removed.

 * Fix build procedure for Windows that uses CMake so that it can pick
   up the shell interpreter from local installation location.

 * Conditionally allow building Python interpreter on Windows

 * Fix to lstat() emulation on Windows.

 * Older gcc with -Wall complains about the universal zero initializer
   "struct s = { 0 };" idiom, which makes developers' lives
   inconvenient (as -Werror is enabled by DEVELOPER=YesPlease).  The
   build procedure has been tweaked to help these compilers.

 * Plug memory leaks in the failure code path in the "merge-ort" merge
   strategy backend.

 * "git symbolic-ref symref non..sen..se" is now diagnosed as an error.

 * A follow-up fix to a fix for a regression in 2.36 around hooks.

 * Avoid repeatedly running getconf to ask libc version in the test
   suite, and instead just as it once per script.

 * Platform-specific code that determines if a directory is OK to use
   as a repository has been taught to report more details, especially
   on Windows.

 * "vimdiff3" regression fix.

 * "git fsck" reads mode from tree objects but canonicalizes the mode
   before passing it to the logic to check object sanity, which has
   hid broken tree objects from the checking logic.  This has been
   corrected, but to help existing projects with broken tree objects
   that they cannot fix retroactively, the severity of anomalies this
   code detects has been demoted to "info" for now.

 * Fixes to sparse index compatibility work for "reset" and "checkout"
   commands.

 * An earlier optimization discarded a tree-object buffer that is
   still in use, which has been corrected.

 * Fix deadlocks between main Git process and subprocess spawned via
   the pipe_command() API, that can kill "git add -p" that was
   reimplemented in C recently.

 * The sequencer machinery translated messages left in the reflog by
   mistake, which has been corrected.

 * xcalloc(), imitating calloc(), takes "number of elements of the
   array", and "size of a single element", in this order.  A call that
   does not follow this ordering has been corrected.

 * The preload-index codepath made copies of pathspec to give to
   multiple threads, which were left leaked.

 * Update the version of Ubuntu used for GitHub Actions CI from 18.04
   to 22.04.

 * The auto-stashed local changes created by "git merge --autostash"
   was mixed into a conflicted state left in the working tree, which
   has been corrected.

 * Multi-pack index got corrupted when preferred pack changed from one
   pack to another in a certain way, which has been corrected.
   (merge 99e4d084ff tb/midx-with-changing-preferred-pack-fix later to maint).

 * The clean-up of temporary files created via mks_tempfile_dt() was
   racy and attempted to unlink() the leading directory when signals
   are involved, which has been corrected.
   (merge babe2e0559 rs/tempfile-cleanup-race-fix later to maint).

 * FreeBSD portability fix for "git maintenance" that spawns "crontab"
   to schedule tasks.
   (merge ee69e7884e bc/gc-crontab-fix later to maint).

 * Those who use diff-so-fancy as the diff-filter noticed a regression
   or two in the code that parses the diff output in the built-in
   version of "add -p", which has been corrected.
   (merge 0a101676e5 js/add-p-diff-parsing-fix later to maint).

 * Segfault fix-up to an earlier fix to the topic to teach "git reset"
   and "git checkout" work better in a sparse checkout.
   (merge 037f8ea6d9 vd/sparse-reset-checkout-fixes later to maint).

 * "git diff --no-index A B" managed its the pathnames of its two
   input files rather haphazardly, sometimes leaking them.  The
   command line argument processing has been straightened out to clean
   it up.
   (merge 2b43dd0eb5 rs/diff-no-index-cleanup later to maint).

 * "git rev-list --verify-objects" ought to inspect the contents of
   objects and notice corrupted ones, but it didn't when the commit
   graph is in use, which has been corrected.
   (merge b27ccae34b jk/rev-list-verify-objects-fix later to maint).

 * More fixes to "add -p"
   (merge 64ec8efb83 js/builtin-add-p-portability-fix later to maint).

 * The parser in the script interface to parse-options in "git
   rev-parse" has been updated to diagnose a bogus input correctly.
   (merge f20b9c36d0 ow/rev-parse-parseopt-fix later to maint).

 * The code that manages list-object-filter structure, used in partial
   clones, leaked the instances, which has been plugged.
   (merge 66eede4a37 jk/plug-list-object-filter-leaks later to maint).

 * Fix another UI regression in the reimplemented "add -p".
   (merge f6f0ee247f rs/add-p-worktree-mode-prompt-fix later to maint).

 * "git fetch" over protocol v2 sent an incorrect ref prefix request
   to the server and made "git pull" with configured fetch refspec
   that does not cover the remote branch to merge with fail, which has
   been corrected.
   (merge 49ca2fba39 jk/proto-v2-ref-prefix-fix later to maint).

 * A result from opendir() was leaking in the commit-graph expiration
   codepath, which has been plugged.
   (merge 12f1ae5324 ml/commit-graph-expire-dir-leak-fix later to maint).

 * Just like we have coding guidelines, we now have guidelines for
   reviewers.
   (merge e01b851923 vd/doc-reviewing-guidelines later to maint).

 * Other code cleanup, docfix, build fix, etc.
   (merge 77b9e85c0f vd/fix-perf-tests later to maint).
   (merge 0682bc43f5 jk/test-crontab-fixes later to maint).
   (merge b46dd1726c cc/doc-trailer-whitespace-rules later to maint).


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.98 -r1.99 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.123 -r1.124 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-base/patches/patch-Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/git-docs/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/gitweb/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/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.109 pkgsrc/devel/git/Makefile.version:1.110
--- pkgsrc/devel/git/Makefile.version:1.109     Thu Sep  1 07:47:28 2022
+++ pkgsrc/devel/git/Makefile.version   Fri Oct  7 10:10:05 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.109 2022/09/01 07:47:28 adam Exp $
+# $NetBSD: Makefile.version,v 1.110 2022/10/07 10:10:05 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.37.3
+GIT_VERSION=   2.38.0

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.98 pkgsrc/devel/git-base/Makefile:1.99
--- pkgsrc/devel/git-base/Makefile:1.98 Tue Aug  9 12:08:28 2022
+++ pkgsrc/devel/git-base/Makefile      Fri Oct  7 10:10:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2022/08/09 12:08:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.99 2022/10/07 10:10:05 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -67,6 +67,7 @@ CONFIGURE_ENV+=               gitexecdir=${GITCOREDIR
 
 MAKE_FLAGS+=           INSTALL=${INSTALL:Q}
 MAKE_ENV+=             PERLLIBDIR=${PERL5_INSTALLVENDORLIB}
+MAKE_ENV+=             NO_GITWEB=1
 
 GIT_TEMPLATE_INSTDIR=  ${EGDIR}/${GIT_TEMPLATEDIR}
 MAKE_ENV+=             GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.37 pkgsrc/devel/git-base/PLIST:1.38
--- pkgsrc/devel/git-base/PLIST:1.37    Tue May  3 01:26:55 2022
+++ pkgsrc/devel/git-base/PLIST Fri Oct  7 10:10:05 2022
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.37 2022/05/03 01:26:55 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.38 2022/10/07 10:10:05 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
 bin/git-shell
 bin/git-upload-archive
 bin/git-upload-pack
+bin/scalar
 ${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Error.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Mail/Address.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
@@ -65,6 +66,7 @@ libexec/git-core/git-cvsimport
 libexec/git-core/git-cvsserver
 libexec/git-core/git-daemon
 libexec/git-core/git-describe
+libexec/git-core/git-diagnose
 libexec/git-core/git-diff
 libexec/git-core/git-diff-files
 libexec/git-core/git-diff-index
@@ -189,6 +191,7 @@ libexec/git-core/git-var
 libexec/git-core/git-verify-commit
 libexec/git-core/git-verify-pack
 libexec/git-core/git-verify-tag
+libexec/git-core/git-version
 libexec/git-core/git-web--browse
 libexec/git-core/git-whatchanged
 libexec/git-core/git-worktree
@@ -216,6 +219,7 @@ libexec/git-core/mergetools/tortoisemerg
 libexec/git-core/mergetools/vimdiff
 libexec/git-core/mergetools/winmerge
 libexec/git-core/mergetools/xxdiff
+libexec/git-core/scalar
 share/bash-completion/completions/git
 share/examples/git/git-prompt.sh
 share/examples/git/templates/description

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.123 pkgsrc/devel/git-base/distinfo:1.124
--- pkgsrc/devel/git-base/distinfo:1.123        Thu Sep  1 07:47:28 2022
+++ pkgsrc/devel/git-base/distinfo      Fri Oct  7 10:10:05 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.123 2022/09/01 07:47:28 adam Exp $
+$NetBSD: distinfo,v 1.124 2022/10/07 10:10:05 adam Exp $
 
-BLAKE2s (git-2.37.3.tar.xz) = 68d547d013d8575b9993c9af53d9d842d056c4b3ad66f36d903bacd0f236c72d
-SHA512 (git-2.37.3.tar.xz) = 9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f
-Size (git-2.37.3.tar.xz) = 6987464 bytes
+BLAKE2s (git-2.38.0.tar.xz) = 195aecebc553edd44cb410c7dc2db91299d10b3cbeb3c7cb0da4fec94026598a
+SHA512 (git-2.38.0.tar.xz) = 5c475d25b40a01cc62be28478b9b5a1b0cedf91c3e007d4869019a25bdc980b5ef9b761e7ee02d7c581bff6c7dbf2696a624431a718dcd976bad34a3f2be5cb6
+Size (git-2.38.0.tar.xz) = 7086664 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
-SHA1 (patch-Makefile) = e3e07365a22c8612e0f5ff3b7befb2bdd788dfb8
+SHA1 (patch-Makefile) = 683a2fdf69c3cb5814fcc59360be2eba91cb88a7
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
 SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
 SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98

Index: pkgsrc/devel/git-base/patches/patch-Makefile
diff -u pkgsrc/devel/git-base/patches/patch-Makefile:1.5 pkgsrc/devel/git-base/patches/patch-Makefile:1.6
--- pkgsrc/devel/git-base/patches/patch-Makefile:1.5    Fri Jan 28 09:07:59 2022
+++ pkgsrc/devel/git-base/patches/patch-Makefile        Fri Oct  7 10:10:05 2022
@@ -1,23 +1,23 @@
-$NetBSD: patch-Makefile,v 1.5 2022/01/28 09:07:59 adam Exp $
+$NetBSD: patch-Makefile,v 1.6 2022/10/07 10:10:05 adam Exp $
 
 Do not override compiler/linker flags.
 Provide proper path for Perl module.
 Do not install git-p4 (requires Python).
 Fix tar operations.
 
---- Makefile.orig      2022-01-24 18:15:49.000000000 +0000
+--- Makefile.orig      2022-10-02 23:02:46.000000000 +0000
 +++ Makefile
-@@ -522,7 +522,7 @@ gitexecdir = libexec/git-core
- mergetoolsdir = $(gitexecdir)/mergetools
+@@ -549,7 +549,7 @@ mergetoolsdir = $(gitexecdir)/mergetools
  sharedir = $(prefix)/share
  gitwebdir = $(sharedir)/gitweb
+ gitwebstaticdir = $(gitwebdir)/static
 -perllibdir = $(sharedir)/perl5
 +perllibdir = ${PERLLIBDIR}
  localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
  htmldir = $(prefix)/share/doc/git-doc
-@@ -543,13 +543,9 @@ perllibdir_relative = $(patsubst $(prefi
- export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
+@@ -570,13 +570,9 @@ perllibdir_relative = $(patsubst $(prefi
+ export prefix bindir sharedir sysconfdir perllibdir localedir
  
  # Set our default programs
 -CC = cc
@@ -30,7 +30,7 @@ Fix tar operations.
  TCL_PATH = tclsh
  TCLTK_PATH = wish
  XGETTEXT = xgettext
-@@ -652,7 +648,6 @@ clean-python-script:
+@@ -683,7 +679,6 @@ clean-python-script:
  
  SCRIPTS = $(SCRIPT_SH_GEN) \
          $(SCRIPT_PERL_GEN) \
@@ -38,7 +38,7 @@ Fix tar operations.
          git-instaweb
  
  ETAGS_TARGET = TAGS
-@@ -2112,8 +2107,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -2191,8 +2186,8 @@ ifdef DEFAULT_HELP_FORMAT
  BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif
  
@@ -49,7 +49,7 @@ Fix tar operations.
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -3090,13 +3085,12 @@ endif
+@@ -3261,12 +3256,12 @@ endif
  ifndef NO_GETTEXT
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
        (cd po/build/locale && $(TAR) cf - .) | \
@@ -60,12 +60,11 @@ Fix tar operations.
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perllibdir_SQ)'
        (cd perl/build/lib && $(TAR) cf - .) | \
 -      (cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
--      $(MAKE) -C gitweb install
 +      (cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xf -)
  endif
  ifndef NO_TCLTK
        $(MAKE) -C gitk-git install
-@@ -3165,7 +3159,7 @@ install-man: install-man-perl
+@@ -3333,7 +3328,7 @@ install-man: install-man-perl
  install-man-perl: man-perl
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
        (cd perl/build/man/man3 && $(TAR) cf - .) | \

Index: pkgsrc/devel/git-docs/PLIST
diff -u pkgsrc/devel/git-docs/PLIST:1.20 pkgsrc/devel/git-docs/PLIST:1.21
--- pkgsrc/devel/git-docs/PLIST:1.20    Tue May  3 01:26:55 2022
+++ pkgsrc/devel/git-docs/PLIST Fri Oct  7 10:10:05 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2022/05/03 01:26:55 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.21 2022/10/07 10:10:05 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -37,6 +37,7 @@ man/man1/git-cvsimport.1
 man/man1/git-cvsserver.1
 man/man1/git-daemon.1
 man/man1/git-describe.1
+man/man1/git-diagnose.1
 man/man1/git-diff-files.1
 man/man1/git-diff-index.1
 man/man1/git-diff-tree.1
@@ -159,12 +160,24 @@ man/man1/git-write-tree.1
 man/man1/git.1
 man/man1/gitk.1
 man/man1/gitweb.1
+man/man1/scalar.1
 man/man3/Git.3pm
 man/man5/gitattributes.5
+man/man5/gitformat-bundle.5
+man/man5/gitformat-chunk.5
+man/man5/gitformat-commit-graph.5
+man/man5/gitformat-index.5
+man/man5/gitformat-pack.5
+man/man5/gitformat-signature.5
 man/man5/githooks.5
 man/man5/gitignore.5
 man/man5/gitmailmap.5
 man/man5/gitmodules.5
+man/man5/gitprotocol-capabilities.5
+man/man5/gitprotocol-common.5
+man/man5/gitprotocol-http.5
+man/man5/gitprotocol-pack.5
+man/man5/gitprotocol-v2.5
 man/man5/gitrepository-layout.5
 man/man5/gitweb.conf.5
 man/man7/gitcli.7

Index: pkgsrc/www/gitweb/Makefile
diff -u pkgsrc/www/gitweb/Makefile:1.45 pkgsrc/www/gitweb/Makefile:1.46
--- pkgsrc/www/gitweb/Makefile:1.45     Wed Jul  6 11:53:59 2022
+++ pkgsrc/www/gitweb/Makefile  Fri Oct  7 10:10:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2022/07/06 11:53:59 adam Exp $
+# $NetBSD: Makefile,v 1.46 2022/10/07 10:10:05 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -7,9 +7,7 @@ CATEGORIES=     www
 
 COMMENT=       Web interface for GIT repositories
 
-#DEPENDS+=     apache-[0-9]*:../../www/apache24
 DEPENDS+=      git-base>=${GIT_VERSION}:../../devel/git-base
-#DEPENDS+=     {perl>=5.15.8,p5-Time-HiRes>=1.9725}:../../time/p5-Time-HiRes
 DEPENDS+=      p5-CGI-[0-9]*:../../www/p5-CGI
 
 USE_TOOLS+=    perl:run
@@ -24,6 +22,7 @@ MAKE_FLAGS+=  GITWEB_HOMETEXT=${GITWEB_HT
 MAKE_FLAGS+=   GITWEB_LOGO=/gitweb/git-logo.png
 MAKE_FLAGS+=   GITWEB_JS=/gitweb/gitweb.js
 MAKE_FLAGS+=   PERL_PATH=${PERL5:Q}
+MAKE_FLAGS+=   MAK_DIR_GITWEB=./
 
 GITWEB_CONFIG= ${PKG_SYSCONFDIR}/gitweb.conf
 GITWEB_CGIBIN= ${PREFIX}/libexec/cgi-bin