CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Nov  8 12:24:31 UTC 2019

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: Makefile PLIST distinfo
        pkgsrc/devel/git-gitk: Makefile PLIST
Added Files:
        pkgsrc/devel/git-base/patches: patch-Documentation_Makefile
            patch-git-gui_Makefile patch-gitk-git_Makefile
            patch-templates_Makefile
Removed Files:
        pkgsrc/devel/git-base/patches: patch-ac patch-af patch-ag patch-ah

Log Message:
git: updated to 2.24.0

Git 2.24 Release Notes
======================

Updates since v2.23
-------------------

Backward compatibility note

 * "filter-branch" is showing its age and alternatives are available.
   From this release, we started to discourage its use and hint
   people about filter-repo.

UI, Workflows & Features

 * We now have an active interim maintainer for the Git-Gui part of
   the system.  Praise and thank Pratyush Yadav for volunteering.

 * The command line parser learned "--end-of-options" notation; the
   standard convention for scripters to have hardcoded set of options
   first on the command line, and force the command to treat end-user
   input as non-options, has been to use "--" as the delimiter, but
   that would not work for commands that use "--" as a delimiter
   between revs and pathspec.

 * A mechanism to affect the default setting for a (related) group of
   configuration variables is introduced.

 * "git fetch" learned "--set-upstream" option to help those who first
   clone from their private fork they intend to push to, add the true
   upstream via "git remote add" and then "git fetch" from it.

 * Device-tree files learned their own userdiff patterns.
   (merge 3c81760bc6 sb/userdiff-dts later to maint).

 * "git rebase --rebase-merges" learned to drive different merge
   strategies and pass strategy specific options to them.

 * A new "pre-merge-commit" hook has been introduced.

 * Command line completion updates for "git -c var.name=val" have been
   added.

 * The lazy clone machinery has been taught that there can be more
   than one promisor remote and consult them in order when downloading
   missing objects on demand.

 * The list-objects-filter API (used to create a sparse/lazy clone)
   learned to take a combined filter specification.

 * The documentation and tests for "git format-patch" have been
   cleaned up.

 * On Windows, the root level of UNC share is now allowed to be used
   just like any other directory.

 * The command line completion support (in contrib/) learned about the
   "--skip" option of "git revert" and "git cherry-pick".

 * "git rebase --keep-base <upstream>" tries to find the original base
   of the topic being rebased and rebase on top of that same base,
   which is useful when running the "git rebase -i" (and its limited
   variant "git rebase -x").

   The command also has learned to fast-forward in more cases where it
   can instead of replaying to recreate identical commits.

 * A configuration variable tells "git fetch" to write the commit
   graph after finishing.

 * "git add -i" has been taught to show the total number of hunks and
   the hunks that has been processed so far when showing prompts.

 * "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
   submodules, but this did not apply to "git fetch --multiple" that
   fetches from multiple remote repositories.  It now does.

 * The installation instruction for zsh completion script (in
   contrib/) has been a bit improved.

Performance, Internal Implementation, Development Support etc.

 * The code to write commit-graph over given commit object names has
   been made a bit more robust.

 * The first line of verbose output from each test piece now carries
   the test name and number to help scanning with eyeballs.

 * Further clean-up of the initialization code.

 * xmalloc() used to have a mechanism to ditch memory and address
   space resources as the last resort upon seeing an allocation
   failure from the underlying malloc(), which made the code complex
   and thread-unsafe with dubious benefit, as major memory resource
   users already do limit their uses with various other mechanisms.
   It has been simplified away.

 * Unnecessary full-tree diff in "git log -L" machinery has been
   optimized away.

 * The http transport lacked some optimization the native transports
   learned to avoid unnecessary ref advertisement, which has been
   corrected.

 * Preparation for SHA-256 upgrade continues in the test department.
   (merge 0c37c41d13 bc/hash-independent-tests-part-5 later to maint).

 * The memory ownership model of the "git fast-import" got
   straightened out.

 * Output from trace2 subsystem is formatted more prettily now.

 * The internal code originally invented for ".gitignore" processing
   got reshuffled and renamed to make it less tied to "excluding" and
   stress more that it is about "matching", as it has been reused for
   things like sparse checkout specification that want to check if a
   path is "included".

 * "git stash" learned to write refreshed index back to disk.

 * Coccinelle checks are done on more source files than before now.

 * The cache-tree code has been taught to be less aggressive in
   attempting to see if a tree object it computed already exists in
   the repository.

 * The code to parse and use the commit-graph file has been made more
   robust against corrupted input.

 * The hg-to-git script (in contrib/) has been updated to work with
   Python 3.

 * Update the way build artifacts in t/helper/ directory are ignored.

 * Preparation for SHA-256 upgrade continues.

 * "git log --graph" for an octopus merge is sometimes colored
   incorrectly, which is demonstrated and documented but not yet
   fixed.

 * The trace2 output, when sending them to files in a designated
   directory, can populate the directory with too many files; a
   mechanism is introduced to set the maximum number of files and
   discard further logs when the maximum is reached.

 * We have adopted a Code-of-conduct document.
   (merge 3f9ef874a7 jk/coc later to maint).

Fixes since v2.23
-----------------

 * "git grep --recurse-submodules" that looks at the working tree
   files looked at the contents in the index in submodules, instead of
   files in the working tree.
   (merge 6a289d45c0 mt/grep-submodules-working-tree later to maint).

 * Codepaths to walk tree objects have been audited for integer
   overflows and hardened.
   (merge 5aa02f9868 jk/tree-walk-overflow later to maint).

 * "git pack-refs" can lose refs that are created while running, which
   is getting corrected.
   (merge a613d4f817 sc/pack-refs-deletion-racefix later to maint).

 * "git checkout" and "git restore" to re-populate the index from a
   tree-ish (typically HEAD) did not work correctly for a path that
   was removed and then added again with the intent-to-add bit, when
   the corresponding working tree file was empty.  This has been
   corrected.

 * Compilation fix.
   (merge 70597e8386 rs/nedalloc-fixlets later to maint).

 * "git gui" learned to call the clean-up procedure before exiting.
   (merge 0d88f3d2c5 py/git-gui-do-quit later to maint).

 * We promoted the "indent heuristics" that decides where to split
   diff hunks from experimental to the default a few years ago, but
   some stale documentation still marked it as experimental, which has
   been corrected.
   (merge 64e5e1fba1 sg/diff-indent-heuristic-non-experimental later to maint).

 * Fix a mismerge that happened in 2.22 timeframe.
   (merge acb7da05ac en/checkout-mismerge-fix later to maint).

 * "git archive" recorded incorrect length in extended pax header in
   some corner cases, which has been corrected.
   (merge 71d41ff651 rs/pax-extended-header-length-fix later to maint).

 * On-demand object fetching in lazy clone incorrectly tried to fetch
   commits from submodule projects, while still working in the
   superproject, which has been corrected.
   (merge a63694f523 jt/diff-lazy-fetch-submodule-fix later to maint).

 * Prepare get_short_oid() codepath to be thread-safe.
   (merge 7cfcb16b0e rs/sort-oid-array-thread-safe later to maint).

 * "for-each-ref" and friends that show refs did not protect themselves
   against ancient tags that did not record tagger names when asked to
   show "%(taggername)", which have been corrected.
   (merge 8b3f33ef11 mp/for-each-ref-missing-name-or-email later to maint).

 * The "git am" based backend of "git rebase" ignored the result of
   updating ".gitattributes" done in one step when replaying
   subsequent steps.
   (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint).

 * Tell cURL library to use the same malloc() implementation, with the
   xmalloc() wrapper, as the rest of the system, for consistency.
   (merge 93b980e58f cb/curl-use-xmalloc later to maint).

 * Build fix to adjust .gitignore to unignore a path that we started to track.
   (merge aac6ff7b5b js/visual-studio later to maint).

 * A few implementation fixes in the notes API.
   (merge 60fe477a0b mh/notes-duplicate-entries later to maint).

 * Fix an earlier regression to "git push --all" which should have
   been forbidden when the target remote repository is set to be a
   mirror.
   (merge 8e4c8af058 tg/push-all-in-mirror-forbidden later to maint).

 * Fix an earlier regression in the test suite, which mistakenly
   stopped running HTTPD tests.
   (merge 3960290675 sg/git-test-boolean later to maint).

 * "git rebase --autostash <upstream> <branch>", when <branch> is
   different from the current branch, incorrectly moved the tip of the
   current branch, which has been corrected.
   (merge bf1e28e0ad bw/rebase-autostash-keep-current-branch later to maint).

 * Update support for Asciidoctor documentation toolchain.
   (merge 83b0b8953e ma/asciidoctor-refmiscinfo later to maint).

 * Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0
   no longer works with the older one.
   (merge f6461b82b9 bc/doc-use-docbook-5 later to maint).

 * The markup used in user-manual has been updated to work better with
   asciidoctor.
   (merge c4d2f6143a ma/user-manual-markup-update later to maint).

 * Make sure the grep machinery does not abort when seeing a payload
   that is not UTF-8 even when JIT is not in use with PCRE1.
   (merge ad7c543e3b cb/skip-utf8-check-with-pcre1 later to maint).

 * The name of the blob object that stores the filter specification
   for sparse cloning/fetching was interpreted in a wrong place in the
   code, causing Git to abort.

 * "git log --decorate-refs-exclude=<pattern>" was incorrectly
   overruled when the "--simplify-by-decoration" option is used, which
   has been corrected.
   (merge 0cc7380d88 rs/simplify-by-deco-with-deco-refs-exclude later to maint).

 * The "upload-pack" (the counterpart of "git fetch") needs to disable
   commit-graph when responding to a shallow clone/fetch request, but
   the way this was done made Git panic, which has been corrected.

 * The object traversal machinery has been optimized not to load tree
   objects when we are only interested in commit history.
   (merge 72ed80c784 jk/list-objects-optim-wo-trees later to maint).

 * The object name parser for "Nth parent" syntax has been made more
   robust against integer overflows.
   (merge 59fa5f5a25 rs/nth-parent-parse later to maint).

 * The code used in following tags in "git fetch" has been optimized.
   (merge b7e2d8bca5 ms/fetch-follow-tag-optim later to maint).

 * Regression fix for progress output.
   (merge 2bb74b53a4 sg/progress-fix later to maint).

 * A bug in merge-recursive code that triggers when a branch with a
   symbolic link is merged with a branch that replaces it with a
   directory has been fixed.
   (merge 83e3ad3b12 jt/merge-recursive-symlink-is-not-a-dir-in-way later to maint).

 * The rename detection logic sorts a list of rename source candidates
   by similarity to pick the best candidate, which means that a tie
   between sources with the same similarity is broken by the original
   location in the original candidate list (which is sorted by path).
   Force the sorting by similarity done with a stable sort, which is
   not promised by system supplied qsort(3), to ensure consistent
   results across platforms.
   (merge 2049b8dc65 js/diff-rename-force-stable-sort later to maint).

 * The code to skip "UTF" and "UTF-" prefix, when computing an advice
   message, did not work correctly when the prefix was "UTF", which
   has been fixed.
   (merge b181676ce9 rs/convert-fix-utf-without-dash later to maint).

 * The author names taken from SVN repositories may have extra leading
   or trailing whitespaces, which are now munged away.
   (merge 4ddd4bddb1 tk/git-svn-trim-author-name later to maint).

 * "git rebase -i" showed a wrong HEAD while "reword" open the editor.
   (merge b0a3186140 pw/rebase-i-show-HEAD-to-reword later to maint).

 * A few simplification and bugfixes to PCRE interface.
   (merge c581e4a749 ab/pcre-jit-fixes later to maint).

 * PCRE fixes.
   (merge ff61681b46 cb/pcre1-cleanup later to maint).

 * "git range-diff" segfaulted when diff.noprefix configuration was
   used, as it blindly expected the patch it internally generates to
   have the standard a/ and b/ prefixes.  The command now forces the
   internal patch to be built without any prefix, not to be affected
   by any end-user configuration.
   (merge 937b76ed49 js/range-diff-noprefix later to maint).

 * "git stash apply" in a subdirectory of a secondary worktree failed
   to access the worktree correctly, which has been corrected.
   (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).

 * The merge-recursive machinery is one of the most complex parts of
   the system that accumulated cruft over time.  This large series
   cleans up the implementation quite a bit.
   (merge b657047719 en/merge-recursive-cleanup later to maint).

 * Pretty-printed command line formatter (used in e.g. reporting the
   command being run by the tracing API) had a bug that lost an
   argument that is an empty string, which has been corrected.
   (merge ce2d7ed2fd gs/sq-quote-buf-pretty later to maint).

 * "git range-diff" failed to handle mode-only change, which has been
   corrected.
   (merge 2b6a9b13ca tg/range-diff-output-update later to maint).

 * Dev support update.
   (merge 4f3c1dc5d6 dl/allow-running-cocci-verbosely later to maint).

 * "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>"
   not "mkdir -p <outdir>", which was corrected.

 * "git stash save" lost local changes to submodules, which has been
   corrected.
   (merge 556895d0c8 jj/stash-reset-only-toplevel later to maint).

 * The atomic push over smart HTTP transport did not work, which has
   been corrected.
   (merge 6f1194246a bc/smart-http-atomic-push later to maint).

 * Other code cleanup, docfix, build fix, etc.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.90 -r1.91 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/git-base/patches/patch-Documentation_Makefile \
    pkgsrc/devel/git-base/patches/patch-git-gui_Makefile \
    pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile \
    pkgsrc/devel/git-base/patches/patch-templates_Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/git-base/patches/patch-ac \
    pkgsrc/devel/git-base/patches/patch-af
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/git-base/patches/patch-ag \
    pkgsrc/devel/git-base/patches/patch-ah
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/git-gitk/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/git-gitk/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.80 pkgsrc/devel/git/Makefile.version:1.81
--- pkgsrc/devel/git/Makefile.version:1.80      Tue Aug 20 13:00:02 2019
+++ pkgsrc/devel/git/Makefile.version   Fri Nov  8 12:24:31 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.80 2019/08/20 13:00:02 adam Exp $
+# $NetBSD: Makefile.version,v 1.81 2019/11/08 12:24:31 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.23.0
+GIT_VERSION=   2.24.0

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.68 pkgsrc/devel/git-base/Makefile:1.69
--- pkgsrc/devel/git-base/Makefile:1.68 Thu Aug 22 12:23:00 2019
+++ pkgsrc/devel/git-base/Makefile      Fri Nov  8 12:24:31 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.68 2019/08/22 12:23:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/08 12:24:31 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.26 pkgsrc/devel/git-base/PLIST:1.27
--- pkgsrc/devel/git-base/PLIST:1.26    Tue Aug 20 13:00:02 2019
+++ pkgsrc/devel/git-base/PLIST Fri Nov  8 12:24:31 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2019/08/20 13:00:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2019/11/08 12:24:31 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -226,6 +226,7 @@ share/examples/git/templates/hooks/fsmon
 share/examples/git/templates/hooks/post-update.sample
 share/examples/git/templates/hooks/pre-applypatch.sample
 share/examples/git/templates/hooks/pre-commit.sample
+share/examples/git/templates/hooks/pre-merge-commit.sample
 share/examples/git/templates/hooks/pre-push.sample
 share/examples/git/templates/hooks/pre-rebase.sample
 share/examples/git/templates/hooks/pre-receive.sample

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.90 pkgsrc/devel/git-base/distinfo:1.91
--- pkgsrc/devel/git-base/distinfo:1.90 Tue Aug 20 13:00:02 2019
+++ pkgsrc/devel/git-base/distinfo      Fri Nov  8 12:24:31 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.90 2019/08/20 13:00:02 adam Exp $
+$NetBSD: distinfo,v 1.91 2019/11/08 12:24:31 adam Exp $
 
-SHA1 (git-2.23.0.tar.xz) = fc627f8cb994c60ae6c4580ca514af2a18c464d7
-RMD160 (git-2.23.0.tar.xz) = fc260e2f2e762f0156ba0639853d8708cffe5b38
-SHA512 (git-2.23.0.tar.xz) = c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
-Size (git-2.23.0.tar.xz) = 5707148 bytes
+SHA1 (git-2.24.0.tar.xz) = 851537fc03f5a99419ef20e9b836de965c7928bd
+RMD160 (git-2.24.0.tar.xz) = 28b19ca928fcf8182f27031b3e2ec3e08a2b0584
+SHA512 (git-2.24.0.tar.xz) = 31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3
+Size (git-2.24.0.tar.xz) = 5766056 bytes
+SHA1 (patch-Documentation_Makefile) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
-SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
-SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
-SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
-SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
+SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
+SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98
+SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0

Index: pkgsrc/devel/git-gitk/Makefile
diff -u pkgsrc/devel/git-gitk/Makefile:1.4 pkgsrc/devel/git-gitk/Makefile:1.5
--- pkgsrc/devel/git-gitk/Makefile:1.4  Sun Nov  3 10:39:12 2019
+++ pkgsrc/devel/git-gitk/Makefile      Fri Nov  8 12:24:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/11/03 10:39:12 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/08 12:24:31 adam Exp $
 
 PKGNAME=       git-gitk-${GIT_VERSION}
 COMMENT=       GIT Tree History Storage Tool (gitk)
@@ -17,7 +17,6 @@ USE_TOOLS+=           wish:run
 CONFIGURE_ARGS+=       --with-tcltk=${WISH:Q}
 
 INSTALLATION_DIRS+=    bin
-PLIST_VARS+=           macosx
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,7 +27,6 @@ WISH_APP=     Wish
 WISH_APP=      Wish Shell
 .  endif
 PLIST_SUBST+=  WISH_APP=${WISH_APP:Q}
-PLIST.macosx=  yes
 .endif
 
 .include "../../devel/git/Makefile.common"

Index: pkgsrc/devel/git-gitk/PLIST
diff -u pkgsrc/devel/git-gitk/PLIST:1.8 pkgsrc/devel/git-gitk/PLIST:1.9
--- pkgsrc/devel/git-gitk/PLIST:1.8     Sat Aug 31 23:51:52 2019
+++ pkgsrc/devel/git-gitk/PLIST Fri Nov  8 12:24:31 2019
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2019/08/31 23:51:52 maya Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/11/08 12:24:31 adam Exp $
 bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
 libexec/git-core/git-gui--askpass
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/Wish
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns
 share/git-gui/lib/about.tcl
 share/git-gui/lib/blame.tcl
 share/git-gui/lib/branch.tcl
@@ -28,7 +24,6 @@ share/git-gui/lib/diff.tcl
 share/git-gui/lib/encoding.tcl
 share/git-gui/lib/error.tcl
 share/git-gui/lib/git-gui.ico
-${PLIST.macosx}share/git-gui/lib/git-gui.tcl
 share/git-gui/lib/index.tcl
 share/git-gui/lib/line.tcl
 share/git-gui/lib/logo.tcl
@@ -77,3 +72,4 @@ share/gitk/lib/msgs/pt_pt.msg
 share/gitk/lib/msgs/ru.msg
 share/gitk/lib/msgs/sv.msg
 share/gitk/lib/msgs/vi.msg
+share/gitk/lib/msgs/zh_cn.msg

Added files:

Index: pkgsrc/devel/git-base/patches/patch-Documentation_Makefile
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-Documentation_Makefile:1.1
--- /dev/null   Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/patches/patch-Documentation_Makefile  Fri Nov  8 12:24:31 2019
@@ -0,0 +1,41 @@
+$NetBSD: patch-Documentation_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $
+
+* Use BSR_INSTALL_*.
+* FIXME: Add "--skip-validation" to xmlto command.
+
+--- Documentation/Makefile.orig        2014-11-26 22:39:03.000000000 +0000
++++ Documentation/Makefile
+@@ -107,7 +107,7 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC
+ TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
+ TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
+ MANPAGE_XSL = manpage-normal.xsl
+-XMLTO = xmlto
++XMLTO = xmlto --skip-validation
+ XMLTO_EXTRA =
+ INSTALL ?= install
+ RM ?= rm -f
+@@ -228,16 +228,16 @@ pdf: user-manual.pdf
+ install: install-man
+ 
+ install-man: man
+-      $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+-      $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+-      $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
+-      $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+-      $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
+-      $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
++      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir)
++      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir)
++      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
++      $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir)
++      $(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir)
++      $(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir)
+ 
+ install-info: info
+-      $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
+-      $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir)
++      $(BSD_INSTALL_DATA) git.info gitman.info $(DESTDIR)$(infodir)
+       if test -r $(DESTDIR)$(infodir)/dir; then \
+         $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
+         $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
Index: pkgsrc/devel/git-base/patches/patch-git-gui_Makefile
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-git-gui_Makefile:1.1
--- /dev/null   Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/patches/patch-git-gui_Makefile        Fri Nov  8 12:24:31 2019
@@ -0,0 +1,46 @@
+$NetBSD: patch-git-gui_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $
+
+Fix installation.
+Do not build Git Gui.app on Darwin.
+
+--- git-gui/Makefile.orig      2019-11-04 05:07:07.000000000 +0000
++++ git-gui/Makefile
+@@ -48,11 +48,11 @@ endif
+ RM_RF     ?= rm -rf
+ RMDIR     ?= rmdir
+ 
+-INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
++INSTALL_D0 = $(BSD_INSTALL_DATA_DIR) # space is required here
+ INSTALL_D1 =
+-INSTALL_R0 = $(INSTALL) -m 644 # space is required here
++INSTALL_R0 = $(BSD_INSTALL_DATA)  # space is required here
+ INSTALL_R1 =
+-INSTALL_X0 = $(INSTALL) -m 755 # space is required here
++INSTALL_X0 = $(BSD_INSTALL_SCRIPT) # space is required here
+ INSTALL_X1 =
+ INSTALL_A0 = find # space is required here
+ INSTALL_A1 = | cpio -pud
+@@ -76,11 +76,11 @@ ifndef V
+       QUIET_2DEVNULL = 2>/dev/null
+ 
+       INSTALL_D0 = dir=
+-      INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
++      INSTALL_D1 = && echo ' ' DEST $$dir && $(BSD_INSTALL_DATA_DIR) "$$dir"
+       INSTALL_R0 = src=
+-      INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
++      INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(BSD_INSTALL_DATA) $$src
+       INSTALL_X0 = src=
+-      INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
++      INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(BSD_INSTALL_SCRIPT) $$src
+       INSTALL_A0 = src=
+       INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
+ 
+@@ -157,7 +157,7 @@ else
+ endif
+ ifeq ($(uname_S),Darwin)
+       ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
+-              GITGUI_MACOSXAPP := YesPlease
++              GITGUI_MACOSXAPP :=
+       endif
+ endif
+ ifneq (,$(findstring MINGW,$(uname_S)))
Index: pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile:1.1
--- /dev/null   Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile       Fri Nov  8 12:24:31 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-gitk-git_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $
+
+--- gitk-git/Makefile.orig     2017-02-24 19:17:39.000000000 +0000
++++ gitk-git/Makefile
+@@ -50,10 +50,9 @@ endif
+ all:: gitk-wish $(ALL_MSGFILES)
+ 
+ install:: all
+-      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+-      $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+-      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
+-      $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
++      $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
++      $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)'
++      $(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
+ 
+ uninstall::
+       $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
Index: pkgsrc/devel/git-base/patches/patch-templates_Makefile
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.1
--- /dev/null   Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/patches/patch-templates_Makefile      Fri Nov  8 12:24:31 2019
@@ -0,0 +1,30 @@
+$NetBSD: patch-templates_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $
+
+--- templates/Makefile.orig    2010-10-22 03:49:16.000000000 +0000
++++ templates/Makefile
+@@ -8,7 +8,7 @@ INSTALL ?= install
+ TAR ?= tar
+ RM ?= rm -f
+ prefix ?= $(HOME)
+-template_instdir ?= $(prefix)/share/git-core/templates
++template_instdir = ${GIT_TEMPLATE_INSTDIR}
+ # 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" : '\(.*\)/'` && \
+-              mkdir -p blt/$$dir && \
++              $(BSD_INSTALL_DATA_DIR) blt/$$dir && \
+               case "$$boilerplate" in \
+               *--) continue;; \
+               esac && \
+@@ -61,6 +61,6 @@ clean:
+       $(RM) -r blt boilerplates.made
+ 
+ install: all
+-      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_instdir_SQ)'
++      $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_instdir_SQ)'
+       (cd blt && $(TAR) cf - .) | \
+       (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xof -)