Update to version 1.7.0.5.

ChangeLogs:

Updates since v1.6.6
--------------------

(subsystems)
 * "git fast-import" updates; adds "option" and "feature" to detect the
   mismatch between fast-import and the frontends that produce the input
   stream.
 * "git svn" support of subversion "merge tickets" and miscellaneous fixes.
 * "gitk" and "git gui" translation updates.
 * "gitweb" updates (code clean-up, load checking etc.)

(portability)
 * Some more MSVC portability patches for msysgit port.
 * Minimum Pthreads emulation for msysgit port.

(performance)
 * More performance improvement patches for msysgit port.

(usability, bells and whistles)
 * More commands learned "--quiet" and "--[no-]progress" options.
 * Various commands given by the end user (e.g. diff.type.textconv,
   and GIT_EDITOR) can be specified with command line arguments.  E.g. it
   is now possible to say "[diff "utf8doc"] textconv = nkf -w".
 * "sparse checkout" feature allows only part of the work tree to be
   checked out.
 * HTTP transfer can use authentication scheme other than basic
   (i.e./e.g. digest).
 * Switching from a version of superproject that used to have a submodule
   to another version of superproject that no longer has it did not remove
   the submodule directory when it should (namely, when you are not
   interested in the submodule at all and didn't clone/checkout).
 * A new attribute conflict-marker-size can be used to change the size of
   the conflict markers from the default 7; this is useful when tracked
   contents (e.g. git-merge documentation) have strings that resemble the
   conflict markers.
* A new syntax "<branch>@{upstream}" can be used on the command line to
   substitute the name of the "upstream" of the branch.  Missing branch
   defaults to the current branch, so "git fetch && git merge @{upstream}"
   will be equivalent to "git pull".
 * "git am --resolved" has a synonym "git am --continue".
 * "git branch --set-upstream" can be used to update the (surprise!) upstream,
   i.e. where the branch is supposed to pull and merge from (or rebase onto).
 * "git checkout A...B" is a way to detach HEAD at the merge base between
   A and B.
 * "git checkout -m path" to reset the work tree file back into the
   conflicted state works even when you already ran "git add path" and
   resolved the conflicts.
 * "git commit --date='<date>'" can be used to override the author date
   just like "git commit --author='<name> <email>'" can be used to
   override the author identity.
 * "git commit --no-status" can be used to omit the listing of the index
   and the work tree status in the editor used to prepare the log message.
 * "git commit" warns a bit more aggressively until you configure user.email,
   whose default value almost always is not (and fundamentally cannot be)
   what you want.
 * "git difftool" has been extended to make it easier to integrate it
   with gitk.
 * "git fetch --all" can now be used in place of "git remote update".
 * "git grep" does not rely on external grep anymore.  It can use more than
   one thread to accelerate the operation.
 * "git grep" learned "--quiet" option.
 * "git log" and friends learned "--glob=heads/*" syntax that is a more
   flexible way to complement "--branches/--tags/--remotes".
 * "git merge" learned to pass options specific to strategy-backends.  E.g.
    - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
      strategy how much to shift the trees explicitly.
    - "git merge -Xtheirs" can be used to auto-merge as much as possible,
      while discarding your own changes and taking merged version in
      conflicted regions.
 * "git push" learned "git push origin --delete branch", a syntactic sugar
   for "git push origin :branch".
 * "git push" learned "git push --set-upstream origin forker:forkee" that
   lets you configure your "forker" branch to later pull from "forkee"
   branch at "origin".
 * "git rebase --onto A...B" means the history is replayed on top of the
   merge base between A and B.
 * "git rebase -i" learned new action "fixup" that squashes the change
   but does not affect existing log message.
 * "git rebase -i" also learned --autosquash option that is useful
   together with the new "fixup" action.
 * "git remote" learned set-url subcommand that updates (surprise!) url
   for an existing remote nickname.
 * "git rerere" learned "forget path" subcommand.  Together with "git
   checkout -m path" it will be useful when you recorded a wrong
   resolution.
 * Use of "git reset --merge" has become easier when resetting away a
   conflicted mess left in the work tree.
 * "git rerere" had rerere.autoupdate configuration but there was no way
   to countermand it from the command line; --no-rerere-autoupdate option
   given to "merge", "revert", etc. fixes this.
 * "git status" learned "-s(hort)" output format.

(developers)
 * The infrastructure to build foreign SCM interface has been updated.
 * Many more commands are now built-in.
 * THREADED_DELTA_SEARCH is no more.  If you build with threads, delta
   compression will always take advantage of it.

Fixes since v1.6.6
------------------

 * "git branch -d branch" used to refuse deleting the branch even when
   the branch is fully merged to its upstream branch if it is not merged
   to the current branch.  It now deletes it in such a case.
 * "fiter-branch" command incorrectly said --prune-empty and --filter-commit
   were incompatible; the latter should be read as --commit-filter.
 * When using "git status" or asking "git diff" to compare the work tree
   with something, they used to consider that a checked-out submodule with
   uncommitted changes is not modified; this could cause people to forget
   committing these changes in the submodule before committing in the
   superproject. They now consider such a change as a modification and
   "git diff" will append a "-dirty" to the work tree side when generating
   patch output or when used with the --submodule option.

Fixes since v1.7.0
------------------

 * In a freshly created repository "rev-parse HEAD^0" complained that
   it is dangling symref, even though "rev-parse HEAD" didn't.
 * "git show :no-such-name" tried to access the index without bounds
   check, leading to a potential segfault.
 * Message from "git cherry-pick" was harder to read and use than necessary
   when it stopped due to conflicting changes.
 * We referred to ".git/refs/" throughout the documentation when we
   meant to talk about abstract notion of "ref namespace".  Because
   people's repositories often have packed refs these days, this was
   confusing.
 * "git diff --output=/path/that/cannot/be/written" did not correctly
   error out.
 * "git grep -e -pattern-that-begin-with-dash paths..." could not be
   spelled as "git grep -- -pattern-that-begin-with-dash paths..." which
   would be a GNU way to use "--" as "end of options".
 * "git grep" compiled with threading support tried to access an
   uninitialized mutex on boxes with a single CPU.
 * "git stash pop -q --index" failed because the unnecessary --index
   option was propagated to "git stash drop" that is internally run at the
   end.

Fixes since v1.7.0.1
--------------------

 * GIT_PAGER was not honored consistently by some scripted Porcelains, most
   notably "git am".
 * updating working tree files after telling git to add them to the
   index and while it is still working created garbage object files in
   the repository without diagnosing it as an error.
 * "git bisect -- pathspec..." did not diagnose an error condition properly when
   the simplification with given pathspec made the history empty.
 * "git rev-list --cherry-pick A...B" now has an obvious optimization when the
   histories haven't diverged (i.e. when one end is an ancestor of the other).
 * "git diff --quiet -w" did not work as expected.
 * "git fast-import" didn't work with a large input, as it lacked support
   for producing the pack index in v2 format.
 * "git imap-send" didn't use CRLF line endings over the imap protocol
   when storing its payload to the draft box, violating RFC 3501.
 * "git log --format='%w(x,y,z)%b'" and friends that rewrap message
   has been optimized for utf-8 payload.
 * Error messages generated on the receiving end did not come back to "git
   push".
 * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X
 * "gitweb" did not diagnose parsing errors properly while reading tis configuration
   file.

Fixes since v1.7.0.2
--------------------

 * Object files are created in a more ACL friendly way in repositories
   where group permission is ACL controlled.
 * "git add -i" didn't handle a deleted path very well.
 * "git blame" padded line numbers with one extra SP when the total number
   of lines was one less than multiple of ten due to an off-by-one error.
 * "git fetch --all/--multi" used to discard information for remotes that
   are fetched earlier.
 * "git log --author=me --grep=it" tried to find commits that have "it"
   or are written by "me", instead of the ones that have "it" _and_ are
   written by "me".
 * "git log -g branch" misbehaved when there was no entries in the reflog
   for the named branch.
 * "git mailinfo" (hence "git am") incorrectly removed initial indent from
   paragraphs.
 * "git prune" and "git reflog" (hence "git gc" as well) didn't honor
   an instruction never to expire by setting gc.reflogexpire to never.
 * "git push" misbehaved when branch.<name>.merge was configured without
   matching branch.<name>.remote.

Fixes since v1.7.0.3
--------------------

 * Optimized ntohl/htonl on big-endian machines were broken.
 * Color values given to "color.<cmd>.<slot>" configuration can now have
   more than one attributes (e.g. "bold ul").
 * "git add -u nonexistent-path" did not complain.
 * "git apply --whitespace=fix" didn't work well when an early patch in
   a patch series adds trailing blank lines and a later one depended on
   such a block of blank lines at the end.
 * "git fast-export" didn't check error status and stop when marks file
   cannot be opened.
 * "git format-patch --ignore-if-in-upstream" gave unwarranted errors
   when the range was empty, instead of silently finishing.
 * "git remote prune" did not detect remote tracking refs that became
   dangling correctly.

Fixes since v1.7.0.4
--------------------

 * "git daemon" failed to compile on platforms without sockaddr_storage type.
 * Output from "git rev-list --pretty=oneline" was unparsable when a
   commit did not have any message, which is abnormal but possible in a
   repository converted from foreign scm.
 * "git stash show <commit-that-is-not-a-stash>" gave an error message
   that was not so useful.  Reworded the message to "<it> is not a
   stash".
 * Python scripts in contrib/ area now start with "#!/usr/bin/env python"
   to honor user's PATH.
 * "git imap-send" used to mistake any line that begins with "From " as a
   message separator in format-patch output.
 * Smart http server backend failed to report an internal server error and
   infinitely looped instead after output pipe was closed.

7 files changed, 62 insertions, 99 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ed9743711a4..be43d806d7a 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/02/22 09:20:30 obache Exp $
+# $NetBSD: Makefile,v 1.24 2010/04/28 22:01:43 morr Exp $
 #
 
 .include "../../devel/scmgit/Makefile.common"
@@ -15,22 +15,21 @@ DEPENDS+=		p5-Error>=0.17015:../../devel/p5-Error
 USE_LANGUAGES=		c99
 USE_TOOLS+=		perl:run sh:run msgfmt
 
-CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
-
-CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl:Q}
-CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat:Q}
-CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv:Q}
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
-
-BUILD_TARGET=		all
-INSTALL_TARGET=		install
-
 PERL5_CONFIGURE=	no
 PERL5_PACKLIST=		auto/Git/.packlist
 REPLACE_PERL+=		*.perl */*.perl */*/*.perl
 REPLACE_PERL+=		contrib/hooks/update-paranoid
 
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
+
+CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+
+BUILD_TARGET=		all
+
 REPLACE_SH+=		contrib/hooks/post-receive-email
 REPLACE_SH+=		contrib/hooks/pre-auto-gc-battery
 
@@ -62,11 +61,13 @@ REQD_FILES+=		${GIT_TEMPLATES:@.t.@\
 			@:M*}
 
 
-CONFIGURE_ENV+=		HOME=${PREFIX:Q}
-CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR:Q}
+CONFIGURE_ENV+=		HOME=${PREFIX}
+CONFIGURE_ENV+=		gitexecdir=${GITCOREDIR}
+
+MAKE_FLAGS+=		INSTALL=${INSTALL:Q}
 
 GIT_TEMPLATE_INSTDIR=	${EGDIR}/${GIT_TEMPLATEDIR}
-MAKE_ENV+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR:Q}
+MAKE_ENV+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
 MESSAGE_SUBST+=		GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
 
 SUBST_CLASSES+=		fix-paths
@@ -89,10 +90,10 @@ SUBST_SED.fix-cd-P=	-e "s/cd -P/cd/g"
 #.include "../../editors/emacs/modules.mk" # XXX TODO (see patch-ad)
 
 .include "options.mk"
-.include "../../lang/perl5/module.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 3a6fb3ed6c8..0cb74f480ee 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2010/03/20 13:55:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/04/28 22:01:43 morr Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -6,6 +6,16 @@ bin/git-shell
 bin/git-upload-archive
 bin/git-upload-pack
 ${PLIST.gui}bin/gitk
+${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
+lib/perl5/vendor_perl/man/man3/Git.3
+${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.pyc
+${PLIST.python}${PYSITELIB}/git_remote_helpers/util.py
+${PLIST.python}${PYSITELIB}/git_remote_helpers/util.pyc
 libexec/git-core/git
 libexec/git-core/git-add
 libexec/git-core/git-add--interactive
@@ -112,7 +122,10 @@ libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
 libexec/git-core/git-relink
 libexec/git-core/git-remote
-libexec/git-core/git-remote-curl
+libexec/git-core/git-remote-ftp
+libexec/git-core/git-remote-ftps
+libexec/git-core/git-remote-http
+libexec/git-core/git-remote-https
 libexec/git-core/git-repack
 libexec/git-core/git-replace
 libexec/git-core/git-repo-config
@@ -146,8 +159,8 @@ 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-pack
 libexec/git-core/git-upload-archive
+libexec/git-core/git-upload-pack
 libexec/git-core/git-var
 libexec/git-core/git-verify-pack
 libexec/git-core/git-verify-tag
@@ -216,6 +229,7 @@ ${PLIST.gui}share/git-gui/lib/spellcheck.tcl
 ${PLIST.gui}share/git-gui/lib/sshkey.tcl
 ${PLIST.gui}share/git-gui/lib/status_bar.tcl
 ${PLIST.gui}share/git-gui/lib/tclIndex
+${PLIST.gui}share/git-gui/lib/themed.tcl
 ${PLIST.gui}share/git-gui/lib/tools.tcl
 ${PLIST.gui}share/git-gui/lib/tools_dlg.tcl
 ${PLIST.gui}share/git-gui/lib/transport.tcl
@@ -223,6 +237,8 @@ ${PLIST.gui}share/git-gui/lib/win32.tcl
 ${PLIST.gui}share/git-gui/lib/win32_shortcut.js
 ${PLIST.gui}share/gitk/lib/msgs/de.msg
 ${PLIST.gui}share/gitk/lib/msgs/es.msg
+${PLIST.gui}share/gitk/lib/msgs/fr.msg
+${PLIST.gui}share/gitk/lib/msgs/hu.msg
 ${PLIST.gui}share/gitk/lib/msgs/it.msg
 ${PLIST.gui}share/gitk/lib/msgs/ja.msg
 ${PLIST.gui}share/gitk/lib/msgs/ru.msg
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index ba1b47bab97..86f09772562 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2010/04/04 08:12:02 obache Exp $
+$NetBSD: distinfo,v 1.26 2010/04/28 22:01:43 morr Exp $
 
-SHA1 (git-1.6.6.2.tar.gz) = 13b339a55982162753d414731ff1b28791800209
-RMD160 (git-1.6.6.2.tar.gz) = f0b465000a5b5deee156dda6c87ef3e2c744b226
-Size (git-1.6.6.2.tar.gz) = 2841821 bytes
-SHA1 (patch-aa) = be3164a456d548bb722456ce97e8ba8bbb5620e2
-SHA1 (patch-ab) = 838642e425b55ae08a3ff05bd8b03b8cc79d9820
+SHA1 (git-1.7.0.5.tar.gz) = 3ac6cd9971c6682df12442ba2b5f79e54311583a
+RMD160 (git-1.7.0.5.tar.gz) = 6b2e294fa3d327ed0e0c61fb7532e75f35fcc4f4
+Size (git-1.7.0.5.tar.gz) = 2951641 bytes
+SHA1 (patch-aa) = 8356e00a82567ecad200b61daa91a453755407dd
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
 SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk
index 37380cd13cc..f60aec4d2d7 100644
--- a/devel/scmgit-base/options.mk
+++ b/devel/scmgit-base/options.mk
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.2 2008/08/01 11:30:20 minskim Exp $
+# $NetBSD: options.mk,v 1.3 2010/04/28 22:01:43 morr Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scmgit
-PKG_SUPPORTED_OPTIONS=	scmgit-gui
-PKG_SUGGESTED_OPTIONS=	scmgit-gui
+PKG_SUPPORTED_OPTIONS=	scmgit-gui python
+PKG_SUGGESTED_OPTIONS=	scmgit-gui python
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		gui
 PLIST_VARS+=		macosx
+PLIST_VARS+=		python
 
 .if !empty(PKG_OPTIONS:Mscmgit-gui)
 PLIST.gui=		yes
@@ -20,3 +21,12 @@ PRIVILEGED_STAGES+=	clean
 .else
 CONFIGURE_ARGS+=	--without-tcltk
 .endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+PY_PATCHPLIST=	yes
+MAKE_FLAGS+=	PYTHON_PATH=${PYTHONBIN}
+PLIST.python=		yes
+.include "../../lang/python/extension.mk"
+.else
+CONFIGURE_ARGS+=	--without-python
+.endif
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index d31143d21b7..ccaf7debf71 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2010/04/28 22:01:43 morr Exp $
 
---- Makefile.orig	2009-12-24 00:00:22.000000000 +0000
-+++ Makefile
-@@ -305,12 +305,8 @@ GITWEB_SITE_FOOTER =
+--- Makefile.orig	2010-04-12 19:23:36.000000000 +0400
++++ Makefile	2010-04-16 14:07:10.000000000 +0400
+@@ -277,12 +277,8 @@
  
  export prefix bindir sharedir sysconfdir
  
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -768,9 +764,10 @@ ifeq ($(uname_S),Darwin)
+@@ -762,9 +758,10 @@
  	USE_ST_TIMESPEC = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
  	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
-@@ -801,8 +798,6 @@ ifeq ($(uname_S),SunOS)
+@@ -793,8 +790,6 @@
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -36,51 +36,3 @@ $NetBSD: patch-aa,v 1.11 2010/01/15 10:36:41 wiz Exp $
  	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -850,15 +845,20 @@ ifeq ($(uname_S),OpenBSD)
- 	THREADED_DELTA_SEARCH = YesPlease
- endif
- ifeq ($(uname_S),NetBSD)
--	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
--		NEEDS_LIBICONV = YesPlease
--	endif
-+	NEEDS_LIBICONV = YesPlease
- 	BASIC_CFLAGS += -I/usr/pkg/include
- 	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
- 	THREADED_DELTA_SEARCH = YesPlease
- 	USE_ST_TIMESPEC = YesPlease
- 	NO_MKSTEMPS = YesPlease
- endif
-+ifeq ($(uname_S),DragonFly)
-+	NEEDS_LIBICONV = YesPlease
-+	BASIC_CFLAGS += -I/usr/pkg/include
-+	BASIC_LDFLAGS += -L/usr/pkg/lib
-+	USE_ST_TIMESPEC = YesPlease
-+	THREADED_DELTA_SEARCH = YesPlease
-+endif
- ifeq ($(uname_S),AIX)
- 	NO_STRCASESTR=YesPlease
- 	NO_MEMMEM = YesPlease
-@@ -1395,7 +1395,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
- PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
- TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
- 
--LIBS = $(GITLIBS) $(EXTLIBS)
-+LIBS += $(GITLIBS) $(EXTLIBS)
- 
- BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
- 	$(COMPAT_CFLAGS)
-@@ -1788,10 +1788,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)$(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 git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
-+	$(BSD_INSTALL_PROGRAM_DIR) '$(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 git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
- 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
- ifndef NO_PERL
- 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
diff --git a/devel/scmgit-base/patches/patch-ab b/devel/scmgit-base/patches/patch-ab
deleted file mode 100644
index 03293a7828a..00000000000
--- a/devel/scmgit-base/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2010/03/31 00:44:40 gdt Exp $
-
-Patch from http://article.gmane.org/gmane.comp.version-control.git/143453
-
---- compat/bswap.h.orig	2009-12-24 00:00:22.000000000 +0000
-+++ compat/bswap.h
-@@ -17,6 +17,8 @@ static inline uint32_t default_swab32(ui
- 		((val & 0x000000ff) << 24));
- }
- 
-+#undef bswap32
-+
- #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
- 
- #define bswap32(x) ({ \
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 9df0db7d6b7..b1b30c55066 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.13 2010/02/11 04:54:55 minskim Exp $
+# $NetBSD: Makefile.version,v 1.14 2010/04/28 22:01:43 morr Exp $
 #
-GIT_VERSION=	1.6.6.2
+GIT_VERSION=	1.7.0.5