+========================+

|GIT v1.6.0 Release Notes|
+========================+

User visible changes

 - Templates now installed in ${PREFIX}/share/examples/scmgit/templates
   and registered as REQD_FILES.  Template subdirectories are
   registered in MAKE_DIRS.
 - Installing the many git-foo binaries/scripts into libexec/git-core
   is now default and better supported.  If you've written any
   scripts or use any applications which expect the git-foo commands
   to be in ${PREFIX}/bin, please do update them accordingly.

+--------------------+
|Updates since v1.5.6|
+--------------------+

(subsystems)

* git-p4 in contrib learned "allowSubmit" configuration to control on
  which branch to allow "submit" subcommand.

* git-gui learned to stage changes per-line.

(portability)

* Changes for MinGW port have been merged, thanks to Johannes Sixt and
  gangs.

* Sample hook scripts shipped in templates/ are now suffixed with
  *.sample.

(documentation)

* Updated howto/update-hook-example

* Got rid of usage of "git-foo" from the tutorial and made typography
  more consistent.

* Disambiguating "--" between revs and paths is finally documented.

(performance, robustness, sanity etc.)

* index-pack used too much memory when dealing with a deep delta chain.
  This has been optimized.

* reduced excessive inlining to shrink size of the "git" binary.

* verify-pack checks the object CRC when using version 2 idx files.

* When an object is corrupt in a pack, the object became unusable even
  when the same object is available in a loose form,  We now try harder to
  fall back to these redundant objects when able.  In particular, "git
  repack -a -f" can be used to fix such a corruption as long as necessary
  objects are available.

* Performance of "git-blame -C -C" operation is vastly improved.

* git-clone does not create refs in loose form anymore (it behaves as
  if you immediately ran git-pack-refs after cloning).  This will help
  repositories with insanely large number of refs.

* core.fsyncobjectfiles configuration can be used to ensure that the loose
  objects created will be fsync'ed (this is only useful on filesystems
  that does not order data writes properly).

* "git commit-tree" plumbing can make Octopus with more than 16 parents.
  "git commit" has been capable of this for quite some time.

(usability, bells and whistles)

* even more documentation pages are now accessible via "man" and "git help".

* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop
  the discovery process of the toplevel of working tree; this may be useful
  when you are working in a slow network disk and are outside any working
  tree, as bash-completion and "git help" may still need to run in these
  places.

* By default, stash entries never expire.  Set reflogexpire in [gc
  "refs/stash"] to a reasonable value to get traditional auto-expiration
  behaviour back

* Longstanding latency issue with bash completion script has been
  addressed.  This will need to be backmerged to 'maint' later.

* pager.<cmd> configuration variable can be used to enable/disable the
  default paging behaviour per command.

* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk
  manually.

* git-am records the original tip of the branch in ORIG_HEAD before it
  starts applying patches.

* git-apply can handle a patch that touches the same path more than once
  much better than before.

* git-apply can be told not to trust the line counts recorded in the input
  patch but recount, with the new --recount option.

* git-apply can be told to apply a patch to a path deeper than what the
  patch records with --directory option.

* git-archive can be told to omit certain paths from its output using
  export-ignore attributes.

* git-archive uses the zlib default compression level when creating
  zip archive.

* git-archive's command line options --exec and --remote can take their
  parameters as separate command line arguments, similar to other commands.
  IOW, both "--exec=path" and "--exec path" are now supported.

* With -v option, git-branch describes the remote tracking statistics
  similar to the way git-checkout reports by how many commits your branch
  is ahead/behind.

* git-branch's --contains option used to always require a commit parameter
  to limit the branches with; it now defaults to list branches that
  contains HEAD if this parameter is omitted.

* git-branch's --merged and --no-merged option used to always limit the
  branches relative to the HEAD, but they can now take an optional commit
  argument that is used in place of HEAD.

* git-bundle can read the revision arguments from the standard input.

* git-cherry-pick can replay a root commit now.

* git-clone can clone from a remote whose URL would be rewritten by
  configuration stored in $HOME/.gitconfig now.

* "git-clone --mirror" is a handy way to set up a bare mirror repository.

* git-cvsserver learned to respond to "cvs co -c".

* git-diff --check now checks leftover merge conflict markers.

* "git-diff -p" learned to grab a better hunk header lines in
  BibTex, Pascal/Delphi, and Ruby files and also pays attention to
  chapter and part boundary in TeX documents.

* When remote side used to have branch 'foo' and git-fetch finds that now
  it has branch 'foo/bar', it refuses to lose the existing remote tracking
  branch and its reflog.  The error message has been improved to suggest
  pruning the remote if the user wants to proceed and get the latest set
  of branches from the remote, including such 'foo/bar'.

* fast-export learned to export and import marks file; this can be used to
  interface with fast-import incrementally.

* fast-import and fast-export learned to export and import gitlinks.

* "gitk" left background process behind after being asked to dig very deep
  history and the user killed the UI; the process is killed when the UI
  goes away now.

* git-rebase records the original tip of branch in ORIG_HEAD before it is
  rewound.

* "git rerere" can be told to update the index with auto-reused resolution
  with rerere.autoupdate configuration variable.

* git-rev-parse learned $commit^! and $commit^@ notations used in "log"
  family.  These notations are available in gitk as well, because the gitk
  command internally uses rev-parse to interpret its arguments.

* git-rev-list learned --children option to show child commits it
  encountered during the traversal, instead of showing parent commits.

* git-send-mail can talk not just over SSL but over TLS now.

* git-shortlog honors custom output format specified with
  "--pretty=format:".

* "git-stash save" learned --keep-index option.  This lets you stash away
  the local changes and bring the changes staged in the index to your
  working tree for examination and testing.

* git-stash also learned branch subcommand to create a new branch out of
  stashed changes.

* git-status gives the remote tracking statistics similar to the way
  git-checkout reports by how many commits your branch is ahead/behind.

* "git-svn dcommit" is now aware of auto-props setting the subversion user
  has.

* You can tell "git status -u" to even more aggressively omit checking
  untracked files with --untracked-files=no.

* Original SHA-1 value for "update-ref -d" is optional now.

* Error codes from gitweb are made more descriptive where possible, rather
  than "403 forbidden" as we used to issue everywhere.

(internal)

* git-merge has been reimplemented in C.

+------------------+
|Fixes since v1.5.6|
+------------------+

All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.

 * git-clone ignored its -u option; the fix needs to be backported to
   'maint';

 * git-mv used to lose the distinction between changes that are staged
   and that are only in the working tree, by staging both in the index
   after moving such a path.

 * "git-rebase -i -p" rewrote the parents to wrong ones when amending
   (either edit or squash) was involved, and did not work correctly
   when fast forwarding.

16 files changed, 140 insertions, 129 deletions

diff --git a/devel/scmgit-base/MESSAGE b/devel/scmgit-base/MESSAGE
new file mode 100644
index 00000000000..5c3067acea8
--- /dev/null
+++ b/devel/scmgit-base/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2008/08/20 03:04:20 bjs Exp $
+
+NOTE:	Pristine templates are located in:
+	${GIT_TEMPLATE_INSTDIR}.
+
+===========================================================================
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ce3147fa81a..14df8eb544b 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/08/01 10:48:11 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2008/08/20 03:04:20 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
 
 PKGNAME=		scmgit-base-${GIT_VERSION}
-PKGREVISION=		1
 COMMENT=		GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -16,7 +15,7 @@ DEPENDS+=		p5-Error>=0.17015:../../devel/p5-Error
 USE_LANGUAGES=		c99
 USE_TOOLS+=		perl:run sh:run msgfmt
 
-CFLAGS.NetBSD+=	 	-D_NETBSD_SOURCE
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
 
 CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl:Q}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat:Q}
@@ -27,14 +26,59 @@ CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
 BUILD_TARGET=		all
 INSTALL_TARGET=		install
 
-PERL5_CONFIGURE= 	no
+PERL5_CONFIGURE=	no
 PERL5_PACKLIST=		auto/Git/.packlist
 REPLACE_PERL+=		*.perl */*.perl */*/*.perl
+REPLACE_PERL+=		contrib/hooks/update-paranoid
 
-GITCOREDIR=		${PREFIX}/libexec/git-core
+REPLACE_SH+=		contrib/hooks/post-receive-email
+REPLACE_SH+=		contrib/hooks/pre-auto-gc-battery
 
+EGDIR=			${PREFIX}/share/examples/scmgit
+
+GIT_COREDIR=		git-core
+GIT_TEMPLATEDIR=	templates
+
+GIT_TEMPLATES=		description info/exclude
+GIT_TEMPLATES.samples=	hooks/applypatch-msg hooks/commit-msg 	\
+			hooks/post-commit hooks/post-receive	\
+			hooks/post-update hooks/pre-applypatch	\
+			hooks/pre-commit hooks/pre-rebase	\
+			hooks/prepare-commit-msg hooks/update
+GIT_TEMPLATES+=
+
+# XXX unused as of now
+#GIT_CORE_EXECDIR=	libexec/${GIT_COREDIR}
+GIT_CORE_DATADIR=	share/${GIT_COREDIR}
+GIT_CORE_TEMPLATEDIR=	${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
+
+MAKE_DIRS=		${GIT_CORE_TEMPLATEDIR}
+MAKE_DIRS+=		${GIT_CORE_TEMPLATEDIR}/hooks
+MAKE_DIRS+=		${GIT_CORE_TEMPLATEDIR}/info
+
+REQD_FILES+=		${GIT_TEMPLATES.samples:@.t.@\
+				${EGDIR}/${GIT_TEMPLATEDIR}/${.t.:=.sample}\
+				${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
+			@:M*}
+REQD_FILES+=		${GIT_TEMPLATES:@.t.@\
+				${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\
+				${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
+			@:M*}
+
+
+CONFIGURE_ENV+=		HOME=${PREFIX:Q}
 CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR:Q}
 
+GIT_TEMPLATE_INSTDIR=	${EGDIR}/${GIT_TEMPLATEDIR}
+MAKE_ENV+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR:Q}
+MESSAGE_SUBST+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
+
+SUBST_CLASSES+=		fix-paths
+SUBST_FILES.fix-paths=	templates/hooks--post-receive.sample
+SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
+SUBST_STAGE.fix-paths=	pre-build
+SUBST_VARS.fix-paths=	PREFIX
+
 #.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
 
 .include "options.mk"
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 44f25c37b0e..74c7c4b1e32 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2008/08/01 10:48:11 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/08/20 03:04:20 bjs Exp $
 bin/git
+bin/git-receive-pack
+bin/git-upload-archive
+bin/git-upload-pack
 ${PLIST.gui}bin/gitk
-libexec/git-core/git
 libexec/git-core/git-add
 libexec/git-core/git-add--interactive
 libexec/git-core/git-am
@@ -75,7 +77,6 @@ libexec/git-core/git-merge-one-file
 libexec/git-core/git-merge-ours
 libexec/git-core/git-merge-recursive
 libexec/git-core/git-merge-resolve
-libexec/git-core/git-merge-stupid
 libexec/git-core/git-merge-subtree
 libexec/git-core/git-merge-tree
 libexec/git-core/git-mergetool
@@ -132,26 +133,26 @@ libexec/git-core/git-unpack-objects
 libexec/git-core/git-update-index
 libexec/git-core/git-update-ref
 libexec/git-core/git-update-server-info
-libexec/git-core/git-upload-archive
 libexec/git-core/git-upload-pack
+libexec/git-core/git-upload-archive
 libexec/git-core/git-var
 libexec/git-core/git-verify-pack
 libexec/git-core/git-verify-tag
 libexec/git-core/git-web--browse
 libexec/git-core/git-whatchanged
 libexec/git-core/git-write-tree
-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/prepare-commit-msg
-share/git-core/templates/hooks/update
-share/git-core/templates/info/exclude
+share/examples/scmgit/templates/description
+share/examples/scmgit/templates/hooks/applypatch-msg.sample
+share/examples/scmgit/templates/hooks/commit-msg.sample
+share/examples/scmgit/templates/hooks/post-commit.sample
+share/examples/scmgit/templates/hooks/post-receive.sample
+share/examples/scmgit/templates/hooks/post-update.sample
+share/examples/scmgit/templates/hooks/pre-applypatch.sample
+share/examples/scmgit/templates/hooks/pre-commit.sample
+share/examples/scmgit/templates/hooks/pre-rebase.sample
+share/examples/scmgit/templates/hooks/prepare-commit-msg.sample
+share/examples/scmgit/templates/hooks/update.sample
+share/examples/scmgit/templates/info/exclude
 ${PLIST.gui}share/git-gui/lib/about.tcl
 ${PLIST.gui}share/git-gui/lib/blame.tcl
 ${PLIST.gui}share/git-gui/lib/branch.tcl
@@ -203,6 +204,10 @@ ${PLIST.gui}share/gitk/lib/msgs/de.msg
 ${PLIST.gui}share/gitk/lib/msgs/es.msg
 ${PLIST.gui}share/gitk/lib/msgs/it.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
+@dirrm share/examples/scmgit/templates/hooks
+@dirrm share/examples/scmgit/templates/info
+@dirrm share/examples/scmgit/templates
+@dirrm share/examples/scmgit
 ${PLIST.gui}@dirrm share/gitk/lib/msgs
 ${PLIST.gui}@dirrm share/gitk/lib
 ${PLIST.gui}@dirrm share/gitk
@@ -214,10 +219,4 @@ ${PLIST.macosx}@dirrm share/git-gui/lib/Git Gui.app/Contents
 ${PLIST.macosx}@dirrm share/git-gui/lib/Git Gui.app
 ${PLIST.gui}@dirrm share/git-gui/lib
 ${PLIST.gui}@dirrm share/git-gui
-@dirrm share/git-core/templates/info
-@dirrm share/git-core/templates/hooks
-@exec ${MKDIR} %D/share/git-core/templates/branches
-@dirrm share/git-core/templates/branches
-@dirrm share/git-core/templates
-@dirrm share/git-core
 @dirrm libexec/git-core
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 2e78c15f51b..57d7556a003 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.12 2008/08/01 12:05:55 minskim Exp $
+$NetBSD: distinfo,v 1.13 2008/08/20 03:04:20 bjs Exp $
 
-SHA1 (git-1.5.6.4.tar.gz) = 85d7b109af3746f47840ca0ad018fa406f701854
-RMD160 (git-1.5.6.4.tar.gz) = 227f6c85e5ab9d700a228665419da5727fd24364
-Size (git-1.5.6.4.tar.gz) = 2100615 bytes
-SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
-SHA1 (patch-ab) = 519c6b2892d9483c08b08f7874790ab05bc3f2d6
-SHA1 (patch-ac) = 1f358de94d7476212c02374de888fbc372b60f32
-SHA1 (patch-ad) = 1b5ea997ea60206857b385a670509897637d5078
-SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
-SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
-SHA1 (patch-ag) = 8918a23e50f4e1f9aa0bb5dda4404140cda3c5b5
-SHA1 (patch-ah) = 755a28fcfaed842a503674b63cb9d59540876414
-SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
-SHA1 (patch-aj) = 54c2200363b4d2cc5eb6266c4b62d4a7fc43dd07
-SHA1 (patch-ak) = 0ebbc84a5ab56e6f7e52284e9aeef81ca7fd7f30
+SHA1 (git-1.6.0.tar.gz) = 766fbc3e0964cdecd195536746781851678f1285
+RMD160 (git-1.6.0.tar.gz) = b2a39c70a5416782ae5a36bc3f8b935249e4c7a1
+Size (git-1.6.0.tar.gz) = 2229997 bytes
+SHA1 (patch-aa) = 58483a554d681c33a66a0ad43f2141e42ba87543
+SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
+SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
+SHA1 (patch-ad) = 50def978931bd72c0ad86cebcafc2dd68a06f578
+SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
+SHA1 (patch-af) = 3a86d5563bcfb9069d31f480a7271f6eb18ea1bd
+SHA1 (patch-ag) = 427c5ca3bb0177a8f2c3f0747e7b0249a91829d1
+SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
+SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index 4877c0a1562..2bf474461cf 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,29 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2008/02/10 19:00:27 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2008/08/20 03:04:20 bjs Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig	2008-02-02 05:09:01.000000000 +0100
+--- Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ Makefile
-@@ -150,13 +150,11 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+@@ -217,12 +217,8 @@ GITWEB_SITE_FOOTER =
  
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
- 
--prefix = $(HOME)
-+prefix = $(PREFIX)
- bindir = $(prefix)/bin
- mandir = $(prefix)/share/man
- infodir = $(prefix)/share/info
-@@ -192,12 +190,8 @@ GITWEB_SITE_FOOTER =
- 
- export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
+ export prefix bindir sharedir htmldir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -34,7 +19,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -421,9 +415,10 @@ ifeq ($(uname_S),Darwin)
+@@ -628,9 +624,10 @@ ifeq ($(uname_S),Darwin)
  	NO_MEMMEM = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -46,7 +31,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_HSTRERROR = YesPlease
-@@ -441,8 +436,6 @@ ifeq ($(uname_S),SunOS)
+@@ -648,8 +645,6 @@ ifeq ($(uname_S),SunOS)
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -55,7 +40,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -476,9 +469,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -684,9 +679,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -66,7 +51,7 @@ AR, CC, 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
-@@ -779,7 +770,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -1046,7 +1039,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -75,18 +60,18 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
  	$(COMPAT_CFLAGS)
-@@ -1047,10 +1038,10 @@ remove-dashes:
- ### Installation rules
+@@ -1348,10 +1341,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+ export gitexec_instdir
  
  install: all
 -	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
--	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
--	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
--	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+-	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
-+	$(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-+	$(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-+	$(BSD_INSTALL_SCRIPT) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
++	$(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
++	$(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
++	$(BSD_INSTALL_SCRIPT) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
index 863aae58099..bb860ec47ef 100644
--- a/devel/scmgit-base/patches/patch-ab
+++ b/devel/scmgit-base/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2008/06/24 08:21:04 bjs Exp $
+$NetBSD: patch-ab,v 1.4 2008/08/20 03:04:20 bjs Exp $
 
---- git-compat-util.h.orig	2008-06-18 18:49:49.000000000 -0400
+--- git-compat-util.h.orig	2008-08-17 16:43:06.000000000 -0400
 +++ git-compat-util.h
 @@ -39,7 +39,7 @@
  /* Approximation of the length of the decimal representation of this type. */
diff --git a/devel/scmgit-base/patches/patch-ac b/devel/scmgit-base/patches/patch-ac
index abb0b121b30..4ae46969c06 100644
--- a/devel/scmgit-base/patches/patch-ac
+++ b/devel/scmgit-base/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2008/06/24 08:21:04 bjs Exp $
+$NetBSD: patch-ac,v 1.3 2008/08/20 03:04:20 bjs Exp $
 
---- gitk-git/Makefile.orig	2008-06-18 18:49:49.000000000 -0400
+--- gitk-git/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ gitk-git/Makefile
 @@ -40,9 +40,9 @@ endif
  all:: gitk-wish $(ALL_MSGFILES)
diff --git a/devel/scmgit-base/patches/patch-ad b/devel/scmgit-base/patches/patch-ad
index d530b9b770a..72a9cbe9361 100644
--- a/devel/scmgit-base/patches/patch-ad
+++ b/devel/scmgit-base/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2008/03/15 05:09:07 bjs Exp $
+$NetBSD: patch-ad,v 1.2 2008/08/20 03:04:20 bjs Exp $
 
---- date.c.orig	2008-03-09 06:18:13.000000000 -0400
+--- date.c.orig	2008-08-17 16:43:06.000000000 -0400
 +++ date.c
-@@ -831,13 +832,19 @@ unsigned long approxidate(const char *da
+@@ -832,13 +832,19 @@ unsigned long approxidate(const char *da
  	int number = 0;
  	struct tm tm, now;
  	struct timeval tv;
diff --git a/devel/scmgit-base/patches/patch-ae b/devel/scmgit-base/patches/patch-ae
index 722ba108ac7..d9b67d28e35 100644
--- a/devel/scmgit-base/patches/patch-ae
+++ b/devel/scmgit-base/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2008/02/06 07:53:32 bjs Exp $
+$NetBSD: patch-ae,v 1.3 2008/08/20 03:04:20 bjs Exp $
 
 In pkgsrc, all Perl modules are installed into vendor_perl, not
 site_perl.
 
---- perl/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
+--- perl/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ perl/Makefile
 @@ -11,7 +11,7 @@ ifndef V
  endif
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 79a92de4624..94cb854c465 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2008/02/06 07:53:32 bjs Exp $
+$NetBSD: patch-af,v 1.3 2008/08/20 03:04:20 bjs Exp $
 
---- Documentation/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
+--- Documentation/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ Documentation/Makefile
-@@ -90,16 +90,16 @@ man7: $(DOC_MAN7)
+@@ -87,16 +87,16 @@ man7: $(DOC_MAN7)
  info: git.info gitman.info
  
  install: man
diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag
index 06a66129918..613030400d7 100644
--- a/devel/scmgit-base/patches/patch-ag
+++ b/devel/scmgit-base/patches/patch-ag
@@ -1,7 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2008/03/15 05:09:07 bjs Exp $
+$NetBSD: patch-ag,v 1.4 2008/08/20 03:04:20 bjs Exp $
 
---- templates/Makefile.orig	2008-03-09 06:18:13.000000000 -0400
+--- templates/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ 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=
+ 
+ # Shell quote (do not use $(call) to accommodate ancient setups);
 @@ -29,7 +29,7 @@ boilerplates.made : $(bpsrc)
  		case "$$boilerplate" in *~) continue ;; esac && \
  		dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
@@ -15,7 +24,7 @@ $NetBSD: patch-ag,v 1.3 2008/03/15 05:09:07 bjs Exp $
  	$(RM) -r blt boilerplates.made
  
  install: all
--	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
-+	$(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(template_dir_SQ)'
+-	$(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_dir_SQ)' && umask 022 && $(TAR) xf -)
+ 	(cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xf -)
diff --git a/devel/scmgit-base/patches/patch-ah b/devel/scmgit-base/patches/patch-ah
index b6d8aa9a6a0..b430a99485a 100644
--- a/devel/scmgit-base/patches/patch-ah
+++ b/devel/scmgit-base/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2008/08/01 12:05:55 minskim Exp $
+$NetBSD: patch-ah,v 1.5 2008/08/20 03:04:20 bjs Exp $
 
---- git-gui/Makefile.orig	2008-07-20 02:23:11.000000000 +0200
+--- git-gui/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ git-gui/Makefile
-@@ -44,11 +44,11 @@ endif
+@@ -48,11 +48,11 @@ endif
  RM_RF     ?= rm -rf
  RMDIR     ?= rmdir
  
@@ -17,7 +17,7 @@ $NetBSD: patch-ah,v 1.4 2008/08/01 12:05:55 minskim Exp $
  INSTALL_X1 =
  INSTALL_A0 = find # space is required here
  INSTALL_A1 = | cpio -pud
-@@ -72,11 +72,11 @@ ifndef V
+@@ -76,11 +76,11 @@ ifndef V
  	QUIET_2DEVNULL = 2>/dev/null
  
  	INSTALL_D0 = dir=
diff --git a/devel/scmgit-base/patches/patch-ai b/devel/scmgit-base/patches/patch-ai
index c9829a9da09..db9a8cc02a0 100644
--- a/devel/scmgit-base/patches/patch-ai
+++ b/devel/scmgit-base/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2008/02/06 07:53:32 bjs Exp $
+$NetBSD: patch-ai,v 1.3 2008/08/20 03:04:20 bjs Exp $
 
 Beginnings of emacs support, not enabled yet.  We must use mk/emacs.mk.
 
---- contrib/emacs/Makefile.orig	2008-02-01 23:09:01.000000000 -0500
+--- contrib/emacs/Makefile.orig	2008-08-17 16:43:06.000000000 -0400
 +++ contrib/emacs/Makefile
 @@ -12,8 +12,8 @@ RM ?= rm -f
  all: $(ELC)
diff --git a/devel/scmgit-base/patches/patch-aj b/devel/scmgit-base/patches/patch-aj
deleted file mode 100644
index 028852b6c09..00000000000
--- a/devel/scmgit-base/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2008/06/24 08:21:04 bjs Exp $
-
---- config.mak.in.orig	2008-06-18 18:49:49.000000000 -0400
-+++ config.mak.in
-@@ -11,7 +11,7 @@ TCLTK_PATH = @TCLTK_PATH@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--#gitexecdir = @libexecdir@/git-core/
-+gitexecdir = @libexecdir@/git-core/
- datarootdir = @datarootdir@
- template_dir = @datadir@/git-core/templates/
- 
diff --git a/devel/scmgit-base/patches/patch-ak b/devel/scmgit-base/patches/patch-ak
deleted file mode 100644
index ff12996e78d..00000000000
--- a/devel/scmgit-base/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2008/07/24 23:22:54 bjs Exp $
-
---- perl/Makefile.PL.orig	2008-07-19 20:23:11.000000000 -0400
-+++ perl/Makefile.PL
-@@ -1,4 +1,5 @@
- use ExtUtils::MakeMaker;
-+use Config;
- 
- sub MY::postamble {
- 	return <<'MAKE_FRAG';
-@@ -26,5 +27,6 @@ WriteMakefile(
- 	VERSION_FROM    => 'Git.pm',
- 	PM		=> \%pm,
- 	MAKEFILE	=> 'perl.mak',
--	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
-+	INSTALLARCHLIB  => $Config{installsitearch},
-+	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
- );
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 85772c4f4f3..992ed826d9f 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.3 2008/07/24 23:22:54 bjs Exp $
+# $NetBSD: Makefile.version,v 1.4 2008/08/20 03:04:20 bjs Exp $
 #
-GIT_VERSION=	1.5.6.4
+GIT_VERSION=	1.6.0