Fixes since v1.7.12.1

---------------------
 * When "git am" is fed an input that has multiple "Content-type: ..."
   header, it did not grok charset= attribute correctly.

 * Even during a conflicted merge, "git blame $path" always meant to
   blame uncommitted changes to the "working tree" version; make it
   more useful by showing cleanly merged parts as coming from the other
   branch that is being merged.

 * "git blame MAKEFILE" run in a history that has "Makefile" but not
   "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
   confused on a case insensitive filesystem and failed to do so.

 * "git fetch --all", when passed "--no-tags", did not honor the
   "--no-tags" option while fetching from individual remotes (the same
   issue existed with "--tags", but combination "--all --tags" makes
   much less sense than "--all --no-tags").

 * "git log/diff/format-patch --stat" showed the "N line(s) added"
   comment in user's locale and caused careless submitters to send
   patches with such a line in them to projects whose project language
   is not their language, mildly irritating others. Localization to
   the line has been disabled for now.

 * "git log --all-match --grep=A --grep=B" ought to show commits that
   mention both A and B, but when these three options are used with
   --author or --committer, it showed commits that mention either A or
   B (or both) instead.

 * The subcommand to remove the definition of a remote in "git remote"
   was named "rm" even though all other subcommands were spelled out.
   Introduce "git remote remove" to remove confusion, and keep "rm" as
   a backward compatible synonym.

Also contains a handful of documentation updates.

4 files changed, 11 insertions, 14 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 8bc94365ca8..cfb5638ae90 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2012/10/03 21:55:55 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2012/10/06 18:28:13 adam Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=	scmgit-base-${GIT_VERSION}
-PKGREVISION=	2
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -13,11 +12,10 @@ CONFLICTS+=		git<4.9.5nb1		# misc/git
 DEPENDS+=		p5-Error>=0.17015:../../devel/p5-Error
 # for git-send-email
 DEPENDS+=		p5-MIME-Base64>=3.13:../../converters/p5-MIME-Base64
+DEPENDS+=		p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
+DEPENDS+=		p5-MailTools>=2.11:../../mail/p5-MailTools
+DEPENDS+=		p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
 DEPENDS+=		p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
-# PR pkg/46109 points out that other modules are missing as well, including:
-# Email::Valid
-# Mail::Address
-# Net::SMTP::SSL
 
 USE_LANGUAGES=		c99
 USE_TOOLS+=		perl:run sh:run msgfmt
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 66f7c8e3c4b..60a8140e7ce 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.61 2012/09/25 14:22:48 taca Exp $
+$NetBSD: distinfo,v 1.62 2012/10/06 18:28:13 adam Exp $
 
-SHA1 (git-1.7.12.tar.gz) = 42ec1037f1ee5bfeb405710c83b73c0515ad26e6
-RMD160 (git-1.7.12.tar.gz) = 60d421d15ebb9bbf6146c5c8e7b7c94d05be0ad9
-Size (git-1.7.12.tar.gz) = 4092043 bytes
+SHA1 (git-1.7.12.2.tar.gz) = 277b759139ddb62c6935da37de8a483e2c234a97
+RMD160 (git-1.7.12.2.tar.gz) = 8b50f2fe3c04e3bf7c3489e14f0cf2512eee251e
+Size (git-1.7.12.2.tar.gz) = 4106910 bytes
 SHA1 (patch-aa) = 5d94f08d4ee6146401e84f8ca1bde8eb1459731a
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile
index c3e2d11dfb8..725c8c7a1f9 100644
--- a/devel/scmgit-docs/Makefile
+++ b/devel/scmgit-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 21:55:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/06 18:28:13 adam Exp $
 
 PKGNAME=	scmgit-docs-${GIT_VERSION}
-PKGREVISION=	2
 COMMENT=	GIT Tree History Storage Tool (documentation)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 475d498e8ed..e6b990d5ade 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.47 2012/09/04 12:17:11 adam Exp $
+# $NetBSD: Makefile.version,v 1.48 2012/10/06 18:28:12 adam Exp $
 #
 # used by devel/scmgit/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.7.12
+GIT_VERSION=	1.7.12.2