summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-09-13 00:36:37 +0000
committerbjs <bjs@pkgsrc.org>2008-09-13 00:36:37 +0000
commit5ed1cc309bab8d2f597017c41d0811f2cd634a92 (patch)
treefd46d8781272f97c60358e03695b21a8b9d6d961 /devel
parent16fe845a0c5cda74711b6caeda88738d71e98ddb (diff)
downloadpkgsrc-5ed1cc309bab8d2f597017c41d0811f2cd634a92.tar.gz
Update to scmgit-1.6.0.1.
GIT v1.6.0.1 Release Notes ========================== Fixes since v1.6.0 ------------------ * "git diff --cc" did not honor content mangling specified by gitattributes and core.autocrlf when reading from the work tree. * "git diff --check" incorrectly detected new trailing blank lines when whitespace check was in effect. * "git for-each-ref" tried to dereference NULL when asked for '%(body)" on a tag with a single incomplete line as its payload. * "git format-patch" peeked before the beginning of a string when "format.headers" variable is empty (a misconfiguration). * "git help help" did not work correctly. * "git mailinfo" (hence "git am") was unhappy when MIME multipart message contained garbage after the finishing boundary. * "git mailinfo" also was unhappy when the "From: " line only had a bare e-mail address. * "git merge" did not refresh the index correctly when a merge resulted in a fast-forward. * "git merge" did not resolve a truly trivial merges that can be done without content level merges. * "git svn dcommit" to a repository with URL that has embedded usernames did not work correctly. * Contains other various documentation fixes.
Diffstat (limited to 'devel')
-rw-r--r--devel/scmgit-base/distinfo10
-rw-r--r--devel/scmgit-base/patches/patch-ag6
-rw-r--r--devel/scmgit/Makefile.version4
3 files changed, 10 insertions, 10 deletions
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 57d7556a003..2c06b385ba6 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2008/08/20 03:04:20 bjs Exp $
+$NetBSD: distinfo,v 1.14 2008/09/13 00:36:37 bjs Exp $
-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 (git-1.6.0.1.tar.gz) = ea91349101ef64c881e3d7c1ab294cbbcc76fca0
+RMD160 (git-1.6.0.1.tar.gz) = e3a505121b1e67247530b22d8a3054963c65ce99
+Size (git-1.6.0.1.tar.gz) = 2232053 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-ag) = b108c7a849b8d2c0a3431fcc3e903fd27b7db9c9
SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff --git a/devel/scmgit-base/patches/patch-ag b/devel/scmgit-base/patches/patch-ag
index 613030400d7..dda2c53261b 100644
--- a/devel/scmgit-base/patches/patch-ag
+++ b/devel/scmgit-base/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.4 2008/08/20 03:04:20 bjs Exp $
+$NetBSD: patch-ag,v 1.5 2008/09/13 00:36:37 bjs Exp $
---- templates/Makefile.orig 2008-08-17 16:43:06.000000000 -0400
+--- templates/Makefile.orig 2008-08-24 19:41:58.000000000 -0400
+++ templates/Makefile
@@ -8,7 +8,7 @@ INSTALL ?= install
TAR ?= tar
@@ -27,4 +27,4 @@ $NetBSD: patch-ag,v 1.4 2008/08/20 03:04:20 bjs Exp $
- $(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_instdir_SQ)' && umask 022 && $(TAR) xf -)
+ (cd '$(DESTDIR_SQ)$(template_instdir_SQ)' && umask 022 && $(TAR) xfo -)
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 992ed826d9f..0bf32ced090 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.4 2008/08/20 03:04:20 bjs Exp $
+# $NetBSD: Makefile.version,v 1.5 2008/09/13 00:36:37 bjs Exp $
#
-GIT_VERSION= 1.6.0
+GIT_VERSION= 1.6.0.1