Changes 1.8.4:

* Cygwin port has been updated for more recent Cygwin 1.7.
* "git rebase -i" now honors --strategy and -X options.
* Git-gui has been updated to its 0.18.0 version.
* MediaWiki remote helper (in contrib/) has been updated to use the
  credential helper interface from Git.pm.
* Update build for Cygwin 1.[57].  Torsten Bögershausen reports that
  this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
  ahead.
* The credential helper to talk to keychain on OS X (in contrib/) has
  been updated to kick in not just when talking http/https but also
  imap(s) and smtp.
* Remote transport helper has been updated to report errors and
  maintain ref hierarchy used to keep track of its own state better.
* With "export" remote-helper protocol, (1) a push that tries to
  update a remote ref whose name is different from the pushing side
  does not work yet, and (2) the helper may not know how to do
  --dry-run; these problematic cases are disabled for now.
* git-remote-hg/bzr (in contrib/) updates.
* git-remote-mw (in contrib/) hints users to check the certificate,
  when https:// connection failed.
* git-remote-mw (in contrib/) adds a command to allow previewing the
  contents locally before pushing it out, when working with a
  MediaWiki remote.
Find more https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.4.txt

6 files changed, 18 insertions, 17 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 9a2c7fde703..6161c212589 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2013/08/17 19:09:14 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2013/08/26 16:32:30 adam Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=	scmgit-base-${GIT_VERSION}
-PKGREVISION=	1
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=		git<4.9.5nb1		# misc/git
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 52ef9ed14a8..7400ba7045b 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2013/08/17 19:09:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.43 2013/08/26 16:32:30 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -59,6 +59,7 @@ libexec/git-core/git-bundle
 libexec/git-core/git-cat-file
 libexec/git-core/git-check-attr
 libexec/git-core/git-check-ignore
+libexec/git-core/git-check-mailmap
 libexec/git-core/git-check-ref-format
 libexec/git-core/git-checkout
 libexec/git-core/git-checkout-index
@@ -161,7 +162,6 @@ 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-remote-testpy
 libexec/git-core/git-remote-testsvn
 libexec/git-core/git-repack
 libexec/git-core/git-replace
@@ -240,6 +240,7 @@ share/examples/scmgit/templates/hooks/update.sample
 share/examples/scmgit/templates/info/exclude
 share/locale/da/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
+share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
 share/locale/nl/LC_MESSAGES/git.mo
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 338632dfad3..42ac75fd689 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.75 2013/08/11 15:44:30 adam Exp $
+$NetBSD: distinfo,v 1.76 2013/08/26 16:32:30 adam Exp $
 
-SHA1 (git-1.8.3.4.tar.gz) = fe633d02f7d964842d7ea804278b75120fc60c11
-RMD160 (git-1.8.3.4.tar.gz) = 3781bcb5b3ff4923d48a88a5d38a563f72d58815
-Size (git-1.8.3.4.tar.gz) = 4479898 bytes
+SHA1 (git-1.8.4.tar.gz) = 2a361a2d185b8bc604f7f2ce2f502d0dea9d3279
+RMD160 (git-1.8.4.tar.gz) = 546720ff4234e0aec4867a81c7fba3130ccae397
+Size (git-1.8.4.tar.gz) = 4657759 bytes
 SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
-SHA1 (patch-af) = bdabf7e3b24171cbdc2117735e83765e6e23648c
+SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-af b/devel/scmgit-base/patches/patch-af
index 413b82467f8..b598f13a206 100644
--- a/devel/scmgit-base/patches/patch-af
+++ b/devel/scmgit-base/patches/patch-af
@@ -1,20 +1,20 @@
-$NetBSD: patch-af,v 1.10 2012/11/16 21:18:39 adam Exp $
+$NetBSD: patch-af,v 1.11 2013/08/26 16:32:30 adam Exp $
 
 * Use BSR_INSTALL_*.
 * FIXME: Add "--skip-validation" to xmlto command.
 
---- Documentation/Makefile.orig	2012-10-21 21:32:15.000000000 +0000
+--- Documentation/Makefile.orig	2013-08-23 19:38:43.000000000 +0000
 +++ Documentation/Makefile
-@@ -47,7 +47,7 @@ man7dir=$(mandir)/man7
+@@ -92,7 +92,7 @@ man7dir = $(mandir)/man7
  ASCIIDOC = asciidoc
  ASCIIDOC_EXTRA =
  MANPAGE_XSL = manpage-normal.xsl
 -XMLTO = xmlto
 +XMLTO = xmlto --skip-validation
  XMLTO_EXTRA =
- INSTALL?=install
+ INSTALL ?= install
  RM ?= rm -f
-@@ -170,16 +170,16 @@ pdf: user-manual.pdf
+@@ -212,16 +212,16 @@ pdf: user-manual.pdf
  install: install-man
  
  install-man: man
diff --git a/devel/scmgit-docs/PLIST b/devel/scmgit-docs/PLIST
index 4ffaba7164a..e4bdb7786a1 100644
--- a/devel/scmgit-docs/PLIST
+++ b/devel/scmgit-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2013/04/08 14:12:25 mef Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/08/26 16:32:31 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -12,6 +12,7 @@ man/man1/git-bundle.1
 man/man1/git-cat-file.1
 man/man1/git-check-attr.1
 man/man1/git-check-ignore.1
+man/man1/git-check-mailmap.1
 man/man1/git-check-ref-format.1
 man/man1/git-checkout-index.1
 man/man1/git-checkout.1
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 7bd393443e6..53e1685da16 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.60 2013/08/11 15:44:30 adam Exp $
+# $NetBSD: Makefile.version,v 1.61 2013/08/26 16:32:30 adam Exp $
 #
 # used by devel/scmgit/Makefile.common
 # used by www/gitweb/Makefile
 
-GIT_VERSION=	1.8.3.4
+GIT_VERSION=	1.8.4