CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 13 14:24:44 UTC 2025

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: distinfo
        pkgsrc/devel/git-base/patches: patch-Makefile patch-templates_Makefile
        pkgsrc/devel/git-contrib: Makefile
        pkgsrc/devel/git-credential-osxkeychain: Makefile
        pkgsrc/devel/git-gitk: Makefile
        pkgsrc/www/gitweb: Makefile PLIST
Removed Files:
        pkgsrc/devel/git-base/patches: patch-builtin_credential-cache.c

Log Message:
git: updated to 2.48.0

Git v2.48 Release Notes
=======================

UI, Workflows & Features
------------------------

 * A new configuration variable remote.<name>.serverOption makes the
   transport layer act as if the --serverOption=<value> option is
   given from the command line.

 * "git rebase --rebase-merges" now uses branch names as labels when
   able.

 * Describe the policy to introduce breaking changes.

 * Teach 'git notes add' and 'git notes append' a new '-e' flag,
   instructing them to open the note in $GIT_EDITOR before saving.

 * Documentation for "git bundle" saw improvements to more prominently
   call out the use of '--all' when creating bundles.

 * Drop support for older libcURL and Perl.

 * End-user experience of "git mergetool" when the command errors out
   has been improved.

 * "git bundle --unbundle" and "git clone" running on a bundle file
   both learned to trigger fsck over the new objects with configurable
   fck check levels.

 * When "git fetch $remote" notices that refs/remotes/$remote/HEAD is
   missing and discovers what branch the other side points with its
   HEAD, refs/remotes/$remote/HEAD is updated to point to it.

 * "git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
   tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".

 * "git range-diff" learned to optionally show and compare merge
   commits in the ranges being compared, with the --diff-merges
   option.

Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------

 * Document "amlog" notes.

 * The way AsciiDoc is used for SYNOPSIS part of the manual pages has
   been revamped.  The sources, at least for the simple cases, got
   vastly more pleasant to work with.

 * The reftable library is now prepared to expect that the memory
   allocation function given to it may fail to allocate and to deal
   with such an error.

 * An extra worktree attached to a repository points at each other to
   allow finding the repository from the worktree (and vice versa)
   possible.  Use relative paths for this linkage.

 * Enable Windows-based CI in GitLab.

 * Commands that can also work outside Git have learned to take the
   repository instance "repo" when we know we are in a repository, and
   NULL when we are not, in a parameter.  The uses of the_repository
   variable in a few of them have been removed using the new calling
   convention.

 * The reftable sub-system grew a new reftable-specific strbuf
   replacement to reduce its dependency on Git-specific data
   structures.

 * The ref-filter machinery learns to recognize and avoid cases where
   sorting would be redundant.

 * Various platform compatibility fixes split out of the larger effort
   to use Meson as the primary build tool.

 * Treat ECONNABORTED the same as ECONNRESET in 'git credential-cache'
   to work around a possible Cygwin regression. This resolves a race
   condition caused by changes in Cygwin's handling of socket
   closures, allowing the client to exit cleanly when encountering
   ECONNABORTED.

 * Demonstrate an assertion failure in 'git mv'.

 * Documentation update to clarify that 'uploadpack.allowAnySHA1InWant'
   implies both 'allowTipSHA1InWant' and 'allowReachableSHA1InWant'.

 * Replace various calls to atoi() with strtol_i() and strtoul_ui(),
   and add improved error handling.

 * Documentation updates to 'git-update-ref(1)'.

 * Update the project's CodingGuidelines to discourage naming functions
   with a "_1()" suffix.

 * Update '.clang-format' to match project conventions.

 * Centralize documentation for repository extensions into a single place.

 * Buildfix and upgrade of Clar to a newer version.

 * Documentation mark-up updates.

 * Renaming a handful of variables and structure fields.

 * Fix for clar unit tests to support CMake build.

 * C23 compatibility updates.

 * GCC 15 compatibility updates.

 * We now ensure "index-pack" is used with the "--promisor" option
   only during a "git fetch".

 * The migration procedure between two ref backends has been optimized.

 * "git fsck" learned to issue warnings on "curiously formatted" ref
   contents that have always been treated as valid but that Git
   wouldn't have written itself (e.g., missing terminating end-of-line
   after the full object name).

 * Work around Coverity warning that would not trigger in practice.

 * Built-in Git subcommands are supplied the repository object to work
   with; they learned to do the same when they invoke sub-subcommands.

 * Drop support for ancient environments in various CI jobs.

 * Isolate the reftable subsystem from the rest of Git's codebase by
   using fewer pieces of Git's infrastructure.

 * Optimize reading random references out of the reftable backend by
   allowing reuse of iterator objects.

 * Backport oss-fuzz tests to our codebase.

 * Introduce a new repository extension to prevent older Git versions
   from mis-interpreting worktrees created with relative paths.

 * Yet another "pass the repository through the callchain" topic.

 * "git describe" learned to stop digging the history needlessly
   deeper.

 * Build procedure update plus introduction of Meson based builds.

 * Recent reftable updates mistook a NULL return from a request for
   0-byte allocation as OOM and died unnecessarily, which has been
   corrected.

 * Reftable backend adds check for upper limit of log's update_index.

 * Start working to make the codebase buildable with -Wsign-compare.

 * Regression fix for 'show-index' when run outside of a repository.

 * The meson-build procedure is integrated into CI to catch and
   prevent bitrotting.

 * "git refs migrate" learned to also migrate the reflog data across
   backends.

 * The developer documentation has been updated to give the latest
   info on gitk and git-gui maintainer.

 * CI jobs that run threaded programs under LSan has been giving false
   positives from time to time, which has been worked around.

Fixes since v2.47
-----------------

 * Doc update to clarify how periodical maintenance are scheduled,
   spread across time to avoid thundering herds.

 * Use after free and double freeing at the end in "git log -L... -p"
   had been identified and fixed.

 * On macOS, fsmonitor can fall into a race condition that results in
   a client waiting forever to be notified about an event that has
   already happened.  This problem has been corrected.

 * "git maintenance start" crashed due to an uninitialized variable
   reference, which has been corrected.

 * Fail gracefully instead of crashing when attempting to write the
   contents of a corrupt in-core index as a tree object.

 * A "git fetch" from the superproject going down to a submodule used
   a wrong remote when the default remote names are set differently
   between them.

 * Fixes compile time warnings with 64-bit MSVC.

 * Teaches 'shortlog' to explicitly use SHA-1 when operating outside
   of a repository.

 * Fix 'git grep' regression on macOS by disabling lookahead when
   encountering invalid UTF-8 byte sequences.

 * The dumb-http code regressed when the result of re-indexing a pack
   yielded an *.idx file that differs in content from the *.idx file
   it downloaded from the remote. This has been corrected by no longer
   relying on the *.idx file we got from the remote.

 * When called with '--left-right' and '--use-bitmap-index', 'rev-list'
   will produce output without any left/right markers, which has been
   corrected.

 * More leakfixes.

 * Test modernization.

 * The "--shallow-exclude=<ref>" option to various history transfer
   commands takes a ref, not an arbitrary revision.

 * A regression where commit objects missing from a commit-graph can
   cause an infinite loop when doing a fetch in a partial clone has
   been fixed.

 * The MinGW compatibility layer has been taught to support POSIX
   semantics for atomic renames when other process(es) have a file
   opened at the destination path.

 * "git gc" discards any objects that are outside promisor packs that
   are referred to by an object in a promisor pack, and we do not
   refetch them from the promisor at runtime, resulting an unusable
   repository.  Work around it by including these objects in the
   referring promisor pack at the receiving end of the fetch.

 * Avoid build/test breakage on a system without working malloc debug
   support dynamic library.
   (merge 72ad6dc368 jk/test-malloc-debug-check later to maint).

 * Double-free fix.
   (merge fe17a25905 jk/fetch-prefetch-double-free-fix later to maint).

 * Use of some uninitialized variables in "git difftool" has been
   corrected.

 * Object reuse code based on multi-pack-index sent an unwanted copy
   of object.
   (merge e199290592 tb/multi-pack-reuse-dupfix later to maint).

 * "git fast-import" can be tricked into a replace ref that maps an
   object to itself, which is a useless thing to do.
   (merge 5e904f1a4a en/fast-import-avoid-self-replace later to maint).

 * The ref-transaction hook triggered for reflog updates, which has
   been corrected.
   (merge b886db48c6 kn/ref-transaction-hook-with-reflog later to maint).

 * Give a bit of advice/hint message when "git maintenance" stops finding a
   lock file left by another instance that still is potentially running.
   (merge ba874d1dac ps/gc-stale-lock-warning later to maint).

 * Use the right helper program to measure file size in performance tests.
   (merge 3f97f1bce6 tb/use-test-file-size-more later to maint).

 * A double-free that may not trigger in practice by luck has been
   corrected in the reference resolution code.
   (merge b6318cf23a sj/refs-symref-referent-fix later to maint).

 * The sequencer failed to honor core.commentString in some places.

 * Describe a case where an option value needs to be spelled as a
   separate argument, i.e. "--opt val", not "--opt=val".
   (merge 1bc1e94091 jc/doc-opt-tilde-expand later to maint).

 * Loosen overly strict ownership check introduced in the recent past,
   to keep the promise "cloning a suspicious repository is a safe
   first step to inspect it".
   (merge 0ffb5a6bf1 bc/allow-upload-pack-from-other-people later to maint).

 * "git fast-import" learned to reject paths with ".."  and "." as
   their components to avoid creating invalid tree objects.
   (merge 8cb4c6e62f en/fast-import-verify-path later to maint).

 * The --ancestry-path option is designed to be given a commit that is
   on the path, which was not documented, which has been corrected.
   (merge bc1a980759 kk/doc-ancestry-path later to maint).

 * "git tag" has been taught to refuse to create refs/tags/HEAD
   since such a tag will be confusing in the context of the UI provided by
   the Git Porcelain commands.
   (merge bbd445d5ef jc/forbid-head-as-tagname later to maint).

 * The advice messages now tell the newer 'git config set' command to
   set the advice.token configuration variable to squelch a message.
   (merge 6c397d0104 bf/explicit-config-set-in-advice-messages later to maint).

 * The syntax ":/<text>" to name the latest commit with the matching
   text was broken with a recent change, which has been corrected.
   (merge 0ff919e87a ps/commit-with-message-syntax-fix later to maint).

 * Fix performance regression of a recent "fatten promisor pack with
   local objects" protection against an unwanted gc.

 * "git log -p --remerge-diff --reverse" was completely broken.
   (merge f94bfa1516 js/log-remerge-keep-ancestry later to maint).

 * "git bundle create" with an annotated tag on the positive end of
   the revision range had a workaround code for older limitation in
   the revision walker, which has become unnecessary.
   (merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint).

 * GitLab CI updates.
   (merge c6b43f663e ps/ci-gitlab-update later to maint).

 * Code to reuse objects based on bitmap contents have been tightened
   to avoid race condition even when multiple packs are involved.
   (merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint).

 * An earlier "csum-file checksum does not have to be computed with
   sha1dc" topic had a few code paths that had initialized an
   implementation of a hash function to be used by an unmatching hash
   by mistake, which have been corrected.
   (merge 599a63409b ps/weak-sha1-for-tail-sum-fix later to maint).

 * Other code cleanup, docfix, build fix, etc.
   (merge 77af53f56f aa/t7300-modernize later to maint).
   (merge dcd590a39d bf/t-readme-mention-reftable later to maint).
   (merge 68e3c69efa kh/trailer-in-glossary later to maint).
   (merge 91f88f76e6 tb/boundary-traversal-fix later to maint).
   (merge 168ebb7159 jc/doc-error-message-guidelines later to maint).
   (merge 18693d7d65 kh/doc-bundle-typofix later to maint).
   (merge e2f5d3b491 kh/doc-update-ref-grammofix later to maint).
   (merge 8525e92886 mh/doc-windows-home-env later to maint).


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.151 -r1.152 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/git-base/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/git-base/patches/patch-builtin_credential-cache.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/git-base/patches/patch-templates_Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/git-contrib/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/git-credential-osxkeychain/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/git-gitk/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/gitweb/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/gitweb/PLIST

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.132 pkgsrc/devel/git/Makefile.version:1.133
--- pkgsrc/devel/git/Makefile.version:1.132     Mon Nov 25 10:29:57 2024
+++ pkgsrc/devel/git/Makefile.version   Mon Jan 13 14:24:43 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.132 2024/11/25 10:29:57 adam Exp $
+# $NetBSD: Makefile.version,v 1.133 2025/01/13 14:24:43 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.47.1
+GIT_VERSION=   2.48.0

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.151 pkgsrc/devel/git-base/distinfo:1.152
--- pkgsrc/devel/git-base/distinfo:1.151        Mon Nov 25 10:29:57 2024
+++ pkgsrc/devel/git-base/distinfo      Mon Jan 13 14:24:43 2025
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.151 2024/11/25 10:29:57 adam Exp $
+$NetBSD: distinfo,v 1.152 2025/01/13 14:24:43 adam Exp $
 
-BLAKE2s (git-2.47.1.tar.xz) = 402beb618ec19e666f7e3468eb759b4ad11d21951e0d651e08150b0c524195f5
-SHA512 (git-2.47.1.tar.xz) = 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea
-Size (git-2.47.1.tar.xz) = 7654244 bytes
+BLAKE2s (git-2.48.0.tar.xz) = 1e20d17a27380f00fec92e99103a6a91d57f7fe2b55abe376d18cd382d88824d
+SHA512 (git-2.48.0.tar.xz) = 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e
+Size (git-2.48.0.tar.xz) = 7723336 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
-SHA1 (patch-Makefile) = bf8cf3ed8168241265b258a29d62210dc59a5f72
-SHA1 (patch-builtin_credential-cache.c) = dfe63a6bc3ac32069d96760a2d3e3b4a48c6942d
+SHA1 (patch-Makefile) = 24b9ed15f5ef59973d17d5217dd4e415a3b4c3e5
 SHA1 (patch-config.mak.uname) = 32b9c120ff3f947ebe3d32107eaaa2be61775a18
 SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e
 SHA1 (patch-dircompat.h) = f0cf20a95f2144c0dee17a2aa45955c57141452d
 SHA1 (patch-git-gui_Makefile) = 1df47148cff8e6ac6883fda6b44e8d1526afc70f
 SHA1 (patch-gitk-git_Makefile) = 028fa483f20f40ae3ec81c2dc7bd2e412a7d17f0
-SHA1 (patch-templates_Makefile) = 0fe03748644aafbd0263c050242eba90ddba11c7
+SHA1 (patch-templates_Makefile) = a5bd26b4e37ab5337f10d52565156c2e21e7ba93

Index: pkgsrc/devel/git-base/patches/patch-Makefile
diff -u pkgsrc/devel/git-base/patches/patch-Makefile:1.7 pkgsrc/devel/git-base/patches/patch-Makefile:1.8
--- pkgsrc/devel/git-base/patches/patch-Makefile:1.7    Fri Jun  9 12:05:14 2023
+++ pkgsrc/devel/git-base/patches/patch-Makefile        Mon Jan 13 14:24:43 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.7 2023/06/09 12:05:14 riastradh Exp $
+$NetBSD: patch-Makefile,v 1.8 2025/01/13 14:24:43 adam Exp $
 
 Do not override compiler/linker flags.
 Provide proper path for Perl module.
@@ -6,9 +6,9 @@ New target for building Perl libraries.
 Do not install git-p4 (requires Python).
 Fix tar operations.
 
---- Makefile.orig      2023-06-01 07:03:05.000000000 +0000
+--- Makefile.orig      2025-01-10 17:43:46.000000000 +0000
 +++ Makefile
-@@ -612,7 +612,7 @@ mergetoolsdir = $(gitexecdir)/mergetools
+@@ -619,7 +619,7 @@ mergetoolsdir = $(gitexecdir)/mergetools
  sharedir = $(prefix)/share
  gitwebdir = $(sharedir)/gitweb
  gitwebstaticdir = $(gitwebdir)/static
@@ -17,7 +17,7 @@ Fix tar operations.
  localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
  htmldir = $(prefix)/share/doc/git-doc
-@@ -633,13 +633,9 @@ perllibdir_relative = $(patsubst $(prefi
+@@ -640,13 +640,9 @@ perllibdir_relative = $(patsubst $(prefi
  export prefix bindir sharedir sysconfdir perllibdir localedir
  
  # Set our default programs
@@ -31,7 +31,7 @@ Fix tar operations.
  TCL_PATH = tclsh
  TCLTK_PATH = wish
  XGETTEXT = xgettext
-@@ -744,7 +740,6 @@ clean-python-script:
+@@ -754,7 +750,6 @@ clean-python-script:
  
  SCRIPTS = $(SCRIPT_SH_GEN) \
          $(SCRIPT_PERL_GEN) \
@@ -39,7 +39,7 @@ Fix tar operations.
          git-instaweb
  
  ETAGS_TARGET = TAGS
-@@ -2304,8 +2299,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -2379,8 +2374,8 @@ ifdef DEFAULT_HELP_FORMAT
  BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
  endif
  
@@ -50,15 +50,15 @@ Fix tar operations.
  
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
  
-@@ -3018,6 +3013,7 @@ endif
+@@ -3079,6 +3074,7 @@ endif
  NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS))
  endif
  
 +build-perl-libs: $(LIB_PERL_GEN) $(LIB_CPAN_GEN)
- perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
+ perl/build/lib/%.pm: perl/%.pm generate-perl.sh GIT-BUILD-OPTIONS GIT-VERSION-FILE GIT-PERL-DEFINES
        $(call mkdir_p_parent_template)
-       $(QUIET_GEN) \
-@@ -3457,12 +3453,12 @@ endif
+       $(QUIET_GEN)$(SHELL_PATH) generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@"
+@@ -3512,12 +3508,12 @@ endif
  ifndef NO_GETTEXT
        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
        (cd po/build/locale && $(TAR) cf - .) | \
@@ -73,7 +73,7 @@ Fix tar operations.
  endif
  ifndef NO_TCLTK
        $(MAKE) -C gitk-git install
-@@ -3529,7 +3525,7 @@ install-man: install-man-perl
+@@ -3584,7 +3580,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-base/patches/patch-templates_Makefile
diff -u pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.2 pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.3
--- pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.2  Mon Jun 12 21:41:59 2023
+++ pkgsrc/devel/git-base/patches/patch-templates_Makefile      Mon Jan 13 14:24:44 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-templates_Makefile,v 1.2 2023/06/12 21:41:59 schmonz Exp $
+$NetBSD: patch-templates_Makefile,v 1.3 2025/01/13 14:24:44 adam Exp $
 
 Install pkgsrcfully.
 
---- templates/Makefile.orig    2010-10-22 03:49:16.000000000 +0000
+--- templates/Makefile.orig    2025-01-10 17:43:46.000000000 +0000
 +++ templates/Makefile
-@@ -8,7 +8,7 @@ INSTALL ?= install
+@@ -6,7 +6,7 @@ INSTALL ?= install
  TAR ?= tar
  RM ?= rm -f
  prefix ?= $(HOME)
@@ -13,16 +13,16 @@ Install pkgsrcfully.
  # DESTDIR=
  
  ifndef SHELL_PATH
-@@ -39,7 +39,7 @@ boilerplates.made : $(bpsrc)
-               case "$$boilerplate" in *~) continue ;; esac && \
-               dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
-               dir=`expr "$$dst" : '\(.*\)/'` && \
+@@ -51,7 +51,7 @@ boilerplates.made: $(TEMPLATES)
+       $(QUIET)umask 022 && for template in $(TEMPLATES); \
+       do \
+               dir=$$(dirname "$$template") && \
 -              mkdir -p blt/$$dir && \
 +              $(BSD_INSTALL_DATA_DIR) blt/$$dir && \
-               case "$$boilerplate" in \
-               *--) continue;; \
-               esac && \
-@@ -61,6 +61,6 @@ clean:
+               sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+                   -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
+                   -e 's|@PERL_PATH@|$(PERL_PATH_SQ)|g' $$template > \
+@@ -70,6 +70,6 @@ clean:
        $(RM) -r blt boilerplates.made
  
  install: all

Index: pkgsrc/devel/git-contrib/Makefile
diff -u pkgsrc/devel/git-contrib/Makefile:1.6 pkgsrc/devel/git-contrib/Makefile:1.7
--- pkgsrc/devel/git-contrib/Makefile:1.6       Tue Jun  6 12:40:37 2023
+++ pkgsrc/devel/git-contrib/Makefile   Mon Jan 13 14:24:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/06/06 12:40:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2025/01/13 14:24:44 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -18,4 +18,8 @@ MAKE_FLAGS+=  XMLTO_EXTRA=--skip-validati
 
 INSTALL_TARGET=        install install-man
 
+pre-build:
+       cd ${WRKSRC}/Documentation && \
+       env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} asciidoc.conf
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/git-credential-osxkeychain/Makefile
diff -u pkgsrc/devel/git-credential-osxkeychain/Makefile:1.1 pkgsrc/devel/git-credential-osxkeychain/Makefile:1.2
--- pkgsrc/devel/git-credential-osxkeychain/Makefile:1.1        Wed Mar 29 16:31:50 2023
+++ pkgsrc/devel/git-credential-osxkeychain/Makefile    Mon Jan 13 14:24:44 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2023/03/29 16:31:50 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2025/01/13 14:24:44 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
-PKGNAME=               git-credential-osxkeychain-${GIT_VERSION}
-COMMENT=               Git macOS Keychain credential manager
+PKGNAME=       git-credential-osxkeychain-${GIT_VERSION}
+COMMENT=       Git macOS Keychain credential manager
 
-DEPENDS+=              git-base-[0-9]*:../../devel/git-base
+DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 
 ONLY_FOR_PLATFORM=     Darwin-*-*
 

Index: pkgsrc/devel/git-gitk/Makefile
diff -u pkgsrc/devel/git-gitk/Makefile:1.8 pkgsrc/devel/git-gitk/Makefile:1.9
--- pkgsrc/devel/git-gitk/Makefile:1.8  Fri Dec 27 11:15:54 2024
+++ pkgsrc/devel/git-gitk/Makefile      Mon Jan 13 14:24:44 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2024/12/27 11:15:54 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2025/01/13 14:24:44 adam Exp $
 
 PKGNAME=       git-gitk-${GIT_VERSION}
-PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (gitk)
 
 CONFLICTS+=    git-base<1.7.12nb1

Index: pkgsrc/www/gitweb/Makefile
diff -u pkgsrc/www/gitweb/Makefile:1.46 pkgsrc/www/gitweb/Makefile:1.47
--- pkgsrc/www/gitweb/Makefile:1.46     Fri Oct  7 10:10:05 2022
+++ pkgsrc/www/gitweb/Makefile  Mon Jan 13 14:24:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2022/10/07 10:10:05 adam Exp $
+# $NetBSD: Makefile,v 1.47 2025/01/13 14:24:44 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -12,37 +12,18 @@ DEPENDS+=   p5-CGI-[0-9]*:../../www/p5-CGI
 
 USE_TOOLS+=    perl:run
 
-BUILD_DIRS=    gitweb
-BUILD_TARGET=  gitweb.cgi static/gitweb.js
-MAKE_FLAGS=    prefix=${PREFIX}
-MAKE_FLAGS+=   GITWEB_FAVICON=/gitweb/git-favicon.png
-MAKE_FLAGS+=   GITWEB_CONFIG=${GITWEB_CONFIG}
-MAKE_FLAGS+=   GITWEB_CSS=/gitweb/gitweb.css
-MAKE_FLAGS+=   GITWEB_HOMETEXT=${GITWEB_HTDOCS}/indextext.html
-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
-# Apache wants files in ${PREFIX}/share/httpd/htdocs/gitweb
-GITWEB_HTDOCS= ${PREFIX}/share/examples/gitweb/htdocs
-GITWEB_EGDIR=  ${PREFIX}/share/examples/gitweb
+BUILD_TARGET=  gitweb
+INSTALL_TARGET=        install-gitweb
+MAKE_ENV+=     INSTALL=${INSTALL:Q}
+REPLACE_PERL+= gitweb/gitweb.perl
 
+GITWEB_EGDIR=  ${PREFIX}/share/examples/gitweb
 CONF_FILES=    ${GITWEB_EGDIR}/gitweb.conf ${PKG_SYSCONFDIR}/gitweb.conf
 MESSAGE_SUBST+=        CONFFILE=${PKG_SYSCONFDIR}/gitweb.conf
 
-INSTALLATION_DIRS=     libexec/cgi-bin share/doc/gitweb \
-                       ${GITWEB_EGDIR} ${GITWEB_HTDOCS}
+INSTALLATION_DIRS=     ${GITWEB_EGDIR}
 
-do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${DESTDIR}${GITWEB_CGIBIN}
-.for f in git-favicon.png git-logo.png gitweb.css gitweb.js
-       ${INSTALL_DATA} ${WRKSRC}/gitweb/static/${f} ${DESTDIR}${GITWEB_HTDOCS}
-.endfor
-       ${INSTALL_DATA} ${WRKSRC}/gitweb/README \
-               ${DESTDIR}${PREFIX}/share/doc/gitweb
+post-install:
        ${INSTALL_DATA} ${FILESDIR}/gitweb.conf ${DESTDIR}${GITWEB_EGDIR}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/gitweb/PLIST
diff -u pkgsrc/www/gitweb/PLIST:1.4 pkgsrc/www/gitweb/PLIST:1.5
--- pkgsrc/www/gitweb/PLIST:1.4 Sun Aug 30 06:56:19 2015
+++ pkgsrc/www/gitweb/PLIST     Mon Jan 13 14:24:44 2025
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2015/08/30 06:56:19 ryoon Exp $
-libexec/cgi-bin/gitweb.cgi
-share/doc/gitweb/README
+@comment $NetBSD: PLIST,v 1.5 2025/01/13 14:24:44 adam Exp $
 share/examples/gitweb/gitweb.conf
-share/examples/gitweb/htdocs/git-favicon.png
-share/examples/gitweb/htdocs/git-logo.png
-share/examples/gitweb/htdocs/gitweb.css
-share/examples/gitweb/htdocs/gitweb.js
+share/gitweb/gitweb.cgi
+share/gitweb/static/git-favicon.png
+share/gitweb/static/git-logo.png
+share/gitweb/static/gitweb.css
+share/gitweb/static/gitweb.js