Update to 1.5.1.1:

GIT v1.5.1.1 Release Notes
==========================

Fixes since v1.5.1
------------------

* Documentation updates

  - The --left-right option of rev-list and friends is documented.

  - The documentation for cvsimport has been majorly improved.

  - "git-show-ref --exclude-existing" was documented.

* Bugfixes

  - The implementation of -p option in "git cvsexportcommit" had
    the meaning of -C (context reduction) option wrong, and
    loosened the context requirements when it was told to be
    strict.

  - "git cvsserver" did not behave like the real cvsserver when
    client side removed a file from the working tree without
    doing anything else on the path.  In such a case, it should
    restore it from the checked out revision.

  - "git fsck" issued an alarming error message on detached
    HEAD.  It is not an error since at least 1.5.0.

  - "git send-email" produced of References header of unbounded length;
    fixed this with line-folding.

  - "git archive" to download from remote site should not
    require you to be in a git repository, but it incorrectly
    did.

  - "git apply" ignored -p<n> for "diff --git" formatted
    patches.

  - "git rerere" recorded a conflict that had one side empty
    (the other side adds) incorrectly; this made merging in the
    other direction fail to use previously recorded resolution.

  - t4200 test was broken where "wc -l" pads its output with
    spaces.

  - "git branch -m old new" to rename branch did not work
    without a configuration file in ".git/config".

  - The sample hook for notification e-mail was misnamed.

  - gitweb did not show type-changing patch correctly in the
    blobdiff view.

  - git-svn did not error out with incorrect command line options.

  - git-svn fell into an infinite loop when insanely long commit
    message was found.

  - git-svn dcommit and rebase was confused by patches that were
    merged from another branch that is managed by git-svn.

----------------------------------------------------------------

Changes since v1.5.1 are as follows:

Arjen Laarhoven (4):
      usermanual.txt: some capitalization nits
      t3200-branch.sh: small language nit
      t5300-pack-object.sh: portability issue using /usr/bin/stat
      Makefile: iconv() on Darwin has the old interface

Brian Gernhardt (3):
      Fix t4200-rerere for white-space from "wc -l"
      Document --left-right option to rev-list.
      Distinguish branches by more than case in tests.

Dana How (1):
      Fix lseek(2) calls with args 2 and 3 swapped

Eric Wong (3):
      git-svn: bail out on incorrect command-line options
      git-svn: dcommit/rebase confused by patches with git-svn-id: lines
      git-svn: fix log command to avoid infinite loop on long commit messages

Frank Lichtenheld (7):
      cvsimport: sync usage lines with existing options
      cvsimport: Improve documentation of CVSROOT and CVS module determination
      cvsimport: Improve usage error reporting
      cvsimport: Reorder options in documentation for better understanding
      cvsimport: Improve formating consistency
      cvsserver: small corrections to asciidoc documentation
      cvsserver: Fix handling of diappeared files on update

Geert Bosch (1):
      Fix renaming branch without config file

Gerrit Pape (1):
      rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.

Jakub Narebski (1):
      gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches

Jim Meyering (1):
      (encode_85, decode_85): Mark source buffer pointer as "const".

Julian Phillips (1):
      Documentation: show-ref: document --exclude-existing

Junio C Hamano (7):
      rerere: make sorting really stable.
      Fix dependency of common-cmds.h
      Documentation: tighten dependency for git.{html,txt}
      Prepare for 1.5.1.1
      Add Documentation/cmd-list.made to .gitignore
      fsck: do not complain on detached HEAD.
      GIT 1.5.1.1

Lars Hjemli (2):
      rename_ref(): only print a warning when config-file update fails
      Make builtin-branch.c handle the git config file

René Scharfe (1):
      Revert "builtin-archive: use RUN_SETUP"

Shawn O. Pearce (1):
      Honor -p<n> when applying git diffs

Tomash Brechko (1):
      cvsexportcommit -p : fix the usage of git-apply -C.

Ville Skyttä (1):
      DESTDIR support for git/contrib/emacs

YOSHIFUJI Hideaki (1):
      Avoid composing too long "References" header.

GIT v1.5.1 Release Notes
========================
Updates since v1.5.0
--------------------
* Deprecated commands and options.

  - git-diff-stages and git-resolve have been removed.

* New commands and options.

  - "git log" and friends take --reverse, which instructs them
    to give their output in the order opposite from their usual.
    They typically output from new to old, but with this option
    their output would read from old to new.  "git shortlog"
    usually lists older commits first, but with this option,
    they are shown from new to old.

  - "git log --pretty=format:<string>" to allow more flexible
    custom log output.

  - "git diff" learned --ignore-space-at-eol.  This is a weaker
    form of --ignore-space-change.

  - "git diff --no-index pathA pathB" can be used as diff
    replacement with git specific enhancements.

  - "git diff --no-index" can read from '-' (standard input).

  - "git diff" also learned --exit-code to exit with non-zero
    status when it found differences.  In the future we might
    want to make this the default but that would be a rather big
    backward incompatible change; it will stay as an option for
    now.

  - "git diff --quiet" is --exit-code with output turned off,
    meant for scripted use to quickly determine if there is any
    tree-level difference.

  - Textual patch generation with "git diff" without -w/-b
    option has been significantly optimized.  "git blame" got
    faster because of the same change.

  - "git log" and "git rev-list" has been optimized
    significantly when they are used with pathspecs.

  - "git branch --track" can be used to set up configuration
    variables to help it easier to base your work on branches
    you track from a remote site.

  - "git format-patch --attach" now emits attachments.  Use
    --inline to get an inlined multipart/mixed.

  - "git name-rev" learned --refs=<pattern>, to limit the tags
    used for naming the given revisions only to the ones
    matching the given pattern.

  - "git remote update" is to run "git fetch" for defined remotes
    to update tracking branches.

  - "git cvsimport" can now take '-d' to talk with a CVS
    repository different from what are recorded in CVS/Root
    (overriding it with environment CVSROOT does not work).

  - "git bundle" can help sneaker-netting your changes between
    repositories.

  - "git mergetool" can help 3-way file-level conflict
    resolution with your favorite graphical merge tools.

  - A new configuration "core.symlinks" can be used to disable
    symlinks on filesystems that do not support them; they are
    checked out as regular files instead.

  - You can name a commit object with its first line of the
    message.  The syntax to use is ':/message text'.  E.g.

    $ git show ":/object name: introduce ':/<oneline prefix>' notation"

    means the same thing as:

    $ git show 28a4d940443806412effa246ecc7768a21553ec7

  - "git bisect" learned a new command "run" that takes a script
    to run after each revision is checked out to determine if it
    is good or bad, to automate the bisection process.

  - "git log" family learned a new traversal option --first-parent,
    which does what the name suggests.


* Updated behavior of existing commands.

  - "git-merge-recursive" used to barf when there are more than
    one common ancestors for the merge, and merging them had a
    rename/rename conflict.  This has been fixed.

  - "git fsck" does not barf on corrupt loose objects.

  - "git rm" does not remove newly added files without -f.

  - "git archimport" allows remapping when coming up with git
    branch names from arch names.

  - git-svn got almost a rewrite.

  - core.autocrlf configuration, when set to 'true', makes git
    to convert CRLF at the end of lines in text files to LF when
    reading from the filesystem, and convert in reverse when
    writing to the filesystem.  The variable can be set to
    'input', in which case the conversion happens only while
    reading from the filesystem but files are written out with
    LF at the end of lines.  Currently, which paths to consider
    'text' (i.e. be subjected to the autocrlf mechanism) is
    decided purely based on the contents, but the plan is to
    allow users to explicitly override this heuristic based on
    paths.

  - The behavior of 'git-apply', when run in a subdirectory,
    without --index nor --cached were inconsistent with that of
    the command with these options.  This was fixed to match the
    behavior with --index.  A patch that is meant to be applied
    with -p1 from the toplevel of the project tree can be
    applied with any custom -p<n> option.  A patch that is not
    relative to the toplevel needs to be applied with -p<n>
    option with or without --index (or --cached).

  - "git diff" outputs a trailing HT when pathnames have embedded
    SP on +++/--- header lines, in order to help "GNU patch" to
    parse its output.  "git apply" was already updated to accept
    this modified output format since ce74618d (Sep 22, 2006).

  - "git cvsserver" runs hooks/update and honors its exit status.

  - "git cvsserver" can be told to send everything with -kb.

  - "git diff --check" also honors the --color output option.

  - "git name-rev" used to stress the fact that a ref is a tag too
    much, by saying something like "v1.2.3^0~22".  It now says
    "v1.2.3~22" in such a case (it still says "v1.2.3^0" if it does
    not talk about an ancestor of the commit that is tagged, which
    makes sense).

  - "git rev-list --boundary" now shows boundary markers for the
    commits omitted by --max-age and --max-count condition.

  - The configuration mechanism now reads $(prefix)/etc/gitconfig.

  - "git apply --verbose" shows what preimage lines were wanted
    when it couldn't find them.

  - "git status" in a read-only repository got a bit saner.

  - "git fetch" (hence "git clone" and "git pull") are less
    noisy when the output does not go to tty.

  - "git fetch" between repositories with many refs were slow
    even when there are not many changes that needed
    transferring.  This has been sped up by partially rewriting
    the heaviest parts in C.

  - "git mailinfo" which splits an e-mail into a patch and the
    meta-information was rewritten, thanks to Don Zickus.  It
    handles nested multipart better.  The command was broken for
    a brief period on 'master' branch since 1.5.0 but the
    breakage is fixed now.

  - send-email learned configurable bcc and chain-reply-to.

  - "git remote show $remote" also talks about branches that
    would be pushed if you run "git push remote".

  - Using objects from packs is now seriously optimized by clever
    use of a cache.  This should be most noticeable in git-log
    family of commands that involve reading many tree objects.
    In addition, traversing revisions while filtering changes
    with pathspecs is made faster by terminating the comparison
    between the trees as early as possible.


* Hooks

  - The part to send out notification e-mails was removed from
    the sample update hook, as it was not an appropriate place
    to do so.  The proper place to do this is the new post-receive
    hook.  An example hook has been added to contrib/hooks/.


* Others

  - git-revert, git-gc and git-cherry-pick are now built-ins.

Fixes since v1.5.0
------------------
These are all in v1.5.0.x series.

* Documentation updates

  - Clarifications and corrections to 1.5.0 release notes.

  - The main documentation did not link to git-remote documentation.

  - Clarified introductory text of git-rebase documentation.

  - Converted remaining mentions of update-index on Porcelain
    documents to git-add/git-rm.

  - Some i18n.* configuration variables were incorrectly
    described as core.*; fixed.

  - added and clarified core.bare, core.legacyheaders configurations.

  - updated "git-clone --depth" documentation.

  - user-manual updates.

  - Options to 'git remote add' were described insufficiently.

  - Configuration format.suffix was not documented.

  - Other formatting and spelling fixes.

  - user-manual has better cross references.

  - gitweb installation/deployment procedure is now documented.


* Bugfixes

  - git-upload-pack closes unused pipe ends; earlier this caused
    many zombies to hang around.

  - git-rerere was recording the contents of earlier hunks
    duplicated in later hunks.  This prevented resolving the same
    conflict when performing the same merge the other way around.

  - git-add and git-update-index on a filesystem on which
    executable bits are unreliable incorrectly reused st_mode
    bits even when the path changed between symlink and regular
    file.

  - git-daemon marks the listening sockets with FD_CLOEXEC so
    that it won't be leaked into the children.

  - segfault from git-blame when the mandatory pathname
    parameter was missing was fixed; usage() message is given
    instead.

  - git-rev-list did not read $GIT_DIR/config file, which means
    that did not honor i18n.logoutputencoding correctly.

  - Automated merge conflict handling when changes to symbolic
    links conflicted were completely broken.  The merge-resolve
    strategy created a regular file with conflict markers in it
    in place of the symbolic link.  The default strategy,
    merge-recursive was even more broken.  It removed the path
    that was pointed at by the symbolic link.  Both of these
    problems have been fixed.

  - 'git diff maint master next' did not correctly give combined
    diff across three trees.

  - 'git fast-import' portability fix for Solaris.

  - 'git show-ref --verify' without arguments did not error out
    but segfaulted.

  - 'git diff :tracked-file `pwd`/an-untracked-file' gave an extra
    slashes after a/ and b/.

  - 'git format-patch' produced too long filenames if the commit
    message had too long line at the beginning.

  - Running 'make all' and then without changing anything
    running 'make install' still rebuilt some files.  This
    was inconvenient when building as yourself and then
    installing as root (especially problematic when the source
    directory is on NFS and root is mapped to nobody).

  - 'git-rerere' failed to deal with two unconflicted paths that
    sorted next to each other.

  - 'git-rerere' attempted to open(2) a symlink and failed if
    there was a conflict.  Since a conflicting change to a
    symlink would not benefit from rerere anyway, the command
    now ignores conflicting changes to symlinks.

  - 'git-repack' did not like to pass more than 64 arguments
    internally to underlying 'rev-list' logic, which made it
    impossible to repack after accumulating many (small) packs
    in the repository.

  - 'git-diff' to review the combined diff during a conflicted
    merge were not reading the working tree version correctly
    when changes to a symbolic link conflicted.  It should have
    read the data using readlink(2) but read from the regular
    file the symbolic link pointed at.

  - 'git-remote' did not like period in a remote's name.

  - 'git.el' honors the commit coding system from the configuration.

  - 'blameview' in contrib/ correctly digs deeper when a line is
    clicked.

  - 'http-push' correctly makes sure the remote side has leading
    path.  Earlier it started in the middle of the path, and
    incorrectly.

  - 'git-merge' did not exit with non-zero status when the
    working tree was dirty and cannot fast forward.  It does
    now.

  - 'cvsexportcommit' does not lose yet-to-be-used message file.

  - int-vs-size_t typefix when running combined diff on files
    over 2GB long.

  - 'git apply --whouch unmodified
    lines.

  - 'git-mailinfo' choke when a logical header line was too long.

  - 'git show A..B' did not error out.  Negative ref ("not A" in
    this example) does not make sense for the purpose of the
    command, so now it errors out.

  - 'git fmt-merge-msg --file' without file parameter did not
    correctly error out.

  - 'git archimport' barfed upon encountering a commit without
    summary.

  - 'git index-pack' did not protect itself from getting a short
    read out of pread(2).

  - 'git http-push' had a few buffer overruns.

  - Build dependency fixes to rebuild fetch.o when other headers
    change.

  - git.el does not add duplicate sign-off lines.

  - git-commit shows the full stat of the resulting commit, not
    just about the files in the current directory, when run from
    a subdirectory.

  - "git-checkout -m '@{8 hours ago}'" had a funny failure from
    eval; fixed.
  - git-merge (hence git-pull) did not refuse fast-forwarding
    when the working tree had local changes that would have
    conflicted with it.

  - a handful small fixes to gitweb.

  - build procedure for user-manual is fixed not to require locally
    installed stylesheets.

  - "git commit $paths" on paths whose earlier contents were
    already updated in the index were failing out.


* Tweaks

  - sliding mmap() inefficiently mmaped the same region of a
    packfile with an access pattern that used objects in the
    reverse order.  This has been made more efficient.

6 files changed, 37 insertions, 37 deletions

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index e4403837b1c..99b4ec98615 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/03/18 21:18:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/04/15 21:46:41 wiz Exp $
 #
 
-DISTNAME=	git-1.5.0.3
+DISTNAME=	git-1.5.1.1
 PKGNAME=	scm${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index b00ef62fd3e..69b3948e13c 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/18 22:38:43 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/04/15 21:46:41 wiz Exp $
 bin/git
 bin/git-add
 bin/git-add--interactive
@@ -12,6 +12,7 @@ bin/git-archive
 bin/git-bisect
 bin/git-blame
 bin/git-branch
+bin/git-bundle
 bin/git-cat-file
 bin/git-check-ref-format
 bin/git-checkout
@@ -34,10 +35,10 @@ bin/git-describe
 bin/git-diff
 bin/git-diff-files
 bin/git-diff-index
-bin/git-diff-stages
 bin/git-diff-tree
 bin/git-fast-import
 bin/git-fetch
+bin/git-fetch--tool
 bin/git-fetch-pack
 bin/git-fmt-merge-msg
 bin/git-for-each-ref
@@ -75,6 +76,7 @@ bin/git-merge-recursive
 bin/git-merge-resolve
 bin/git-merge-stupid
 bin/git-merge-tree
+bin/git-mergetool
 bin/git-mktag
 bin/git-mktree
 bin/git-mv
@@ -101,7 +103,6 @@ bin/git-repo-config
 bin/git-request-pull
 bin/git-rerere
 bin/git-reset
-bin/git-resolve
 bin/git-rev-list
 bin/git-rev-parse
 bin/git-revert
@@ -151,6 +152,7 @@ man/man1/git-archive.1
 man/man1/git-bisect.1
 man/man1/git-blame.1
 man/man1/git-branch.1
+man/man1/git-bundle.1
 man/man1/git-cat-file.1
 man/man1/git-check-ref-format.1
 man/man1/git-checkout-index.1
@@ -171,7 +173,6 @@ man/man1/git-daemon.1
 man/man1/git-describe.1
 man/man1/git-diff-files.1
 man/man1/git-diff-index.1
-man/man1/git-diff-stages.1
 man/man1/git-diff-tree.1
 man/man1/git-diff.1
 man/man1/git-fast-import.1
@@ -207,6 +208,7 @@ man/man1/git-merge-index.1
 man/man1/git-merge-one-file.1
 man/man1/git-merge-tree.1
 man/man1/git-merge.1
+man/man1/git-mergetool.1
 man/man1/git-mktag.1
 man/man1/git-mktree.1
 man/man1/git-mv.1
@@ -234,7 +236,6 @@ man/man1/git-repo-config.1
 man/man1/git-request-pull.1
 man/man1/git-rerere.1
 man/man1/git-reset.1
-man/man1/git-resolve.1
 man/man1/git-rev-list.1
 man/man1/git-rev-parse.1
 man/man1/git-revert.1
@@ -276,14 +277,13 @@ share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
 share/git-core/templates/hooks/commit-msg
 share/git-core/templates/hooks/post-commit
+share/git-core/templates/hooks/post-receive
 share/git-core/templates/hooks/post-update
 share/git-core/templates/hooks/pre-applypatch
 share/git-core/templates/hooks/pre-commit
 share/git-core/templates/hooks/pre-rebase
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
-@exec ${MKDIR} %D/share/git-core/templates/remotes
-@dirrm share/git-core/templates/remotes
 @dirrm share/git-core/templates/info
 @dirrm share/git-core/templates/hooks
 @exec ${MKDIR} %D/share/git-core/templates/branches
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index c12ab5ddbbf..acc6108e3f4 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2007/03/18 21:18:36 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/04/15 21:46:41 wiz Exp $
 
-SHA1 (git-1.5.0.3.tar.gz) = a5efd2cd36daad60718ed9b1f5a4f0de1eade25c
-RMD160 (git-1.5.0.3.tar.gz) = 2af313d5414770abad82babd0b4aee9b7e0bbc5b
-Size (git-1.5.0.3.tar.gz) = 1245187 bytes
-SHA1 (patch-aa) = ea9c34ec5390e626e13ed7e499c10adc9011d4d6
-SHA1 (patch-ab) = 89872ba1d182230359582c8c2c35424c045ee381
+SHA1 (git-1.5.1.1.tar.gz) = 6d0607e125e8466e85af411fde894ee7ef96098d
+RMD160 (git-1.5.1.1.tar.gz) = efbc8e5b49831561915f2b674efca5a6c5ffc6a2
+Size (git-1.5.1.1.tar.gz) = 1322959 bytes
+SHA1 (patch-aa) = 88f6e964616d45c3141c1afb5b465e40afc927f8
+SHA1 (patch-ab) = 59aaf91ef1f0d5a9ded006157467d8bd12d7b87b
 SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc
-SHA1 (patch-ae) = 54ed9a535c13b9d5e33763d53a14fb81152f6970
+SHA1 (patch-ae) = d267e41f5f883bde801728328c67fd733d3bd351
diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa
index fa3891d9568..42164c4db3d 100644
--- a/devel/scmgit/patches/patch-aa
+++ b/devel/scmgit/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2007/02/18 22:38:43 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/15 21:46:41 wiz Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig	2007-02-14 03:46:46.000000000 +0100
-+++ Makefile	2007-02-18 22:54:11.000000000 +0100
-@@ -114,8 +114,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+--- Makefile.orig	2007-04-12 01:41:44.000000000 +0000
++++ Makefile
+@@ -123,8 +123,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -15,7 +15,7 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -344,6 +342,7 @@ ifeq ($(uname_S),Darwin)
+@@ -360,6 +358,7 @@ ifeq ($(uname_S),Darwin)
  	NO_STRLCPY = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -23,7 +23,7 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
-@@ -391,9 +390,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -408,9 +407,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -34,12 +34,12 @@ CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -594,7 +591,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
+@@ -648,7 +645,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  
 -LIBS = $(GITLIBS) $(EXTLIBS)
 +LIBS += $(GITLIBS) $(EXTLIBS)
  
- BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
- LIB_OBJS += $(COMPAT_OBJS)
+ BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
+ 	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
diff --git a/devel/scmgit/patches/patch-ab b/devel/scmgit/patches/patch-ab
index e690c4411c4..4ef9702ff06 100644
--- a/devel/scmgit/patches/patch-ab
+++ b/devel/scmgit/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/01/22 14:33:31 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/15 21:46:41 wiz Exp $
 
---- git-compat-util.h.orig	2006-07-02 08:23:24.000000000 +0200
-+++ git-compat-util.h	2006-09-16 14:44:18.951236060 +0200
-@@ -4,6 +4,8 @@
+--- git-compat-util.h.orig	2007-04-12 01:41:44.000000000 +0000
++++ git-compat-util.h
+@@ -6,6 +6,8 @@
  #ifndef FLEX_ARRAY
  #if defined(__GNUC__) && (__GNUC__ < 3)
  #define FLEX_ARRAY 0
diff --git a/devel/scmgit/patches/patch-ae b/devel/scmgit/patches/patch-ae
index b1c71849a70..3491c823818 100644
--- a/devel/scmgit/patches/patch-ae
+++ b/devel/scmgit/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.2 2007/02/19 17:27:50 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2007/04/15 21:46:41 wiz Exp $
 
 In pkgsrc, all Perl modules are installed into vendor_perl, not
 site_perl.
 
---- perl/Makefile.orig	2007-02-14 03:46:46.000000000 +0100
-+++ perl/Makefile	2007-02-18 23:25:33.000000000 +0100
-@@ -7,7 +7,7 @@
- prefix_SQ = $(subst ','\'',$(prefix))
+--- perl/Makefile.orig	2007-04-12 01:41:44.000000000 +0000
++++ perl/Makefile
+@@ -11,7 +11,7 @@ ifndef V
+ endif
  
  all install instlibdir: $(makfile)
--	$(MAKE) -f $(makfile) $@
-+	$(MAKE) -f $(makfile) INSTALLDIRS=vendor $@
+-	$(QUIET)$(MAKE) -f $(makfile) $@
++	$(QUIET)$(MAKE) -f $(makfile) INSTALLDIRS=vendor $@
  
  clean:
- 	test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0
+ 	$(QUIET)test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0