summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/scmgit-base/distinfo10
-rw-r--r--devel/scmgit-base/patches/patch-aa12
-rw-r--r--devel/scmgit/Makefile.version4
3 files changed, 13 insertions, 13 deletions
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index d2866923fcf..5a48f8e2f6b 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.47 2012/02/06 13:11:35 adam Exp $
+$NetBSD: distinfo,v 1.48 2012/02/14 22:46:36 gdt Exp $
-SHA1 (git-1.7.9.tar.gz) = ed51ef5ef250daaa6e98515cf2641820cd268d4c
-RMD160 (git-1.7.9.tar.gz) = 60aa60c076d0e398f7bc07d6cfab3c5ed28fdadc
-Size (git-1.7.9.tar.gz) = 3606326 bytes
-SHA1 (patch-aa) = 52a8bd8aec6dcb54dafe9414a00e627a6b04e4a0
+SHA1 (git-1.7.9.1.tar.gz) = bd85327627f96c4e98071a4d1d32c30f210aa54a
+RMD160 (git-1.7.9.1.tar.gz) = acff1b02a507220e51a86b63d38a5ae4ec01f70f
+Size (git-1.7.9.1.tar.gz) = 3608449 bytes
+SHA1 (patch-aa) = 08d1214d864ce00f829a40b931b2cc62e8e7fb25
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = d420c0a1db0de77bd9713d066434981b20bd4299
SHA1 (patch-af) = d6c942f7d8a0fe0074ea3edb7e6d858354c85232
diff --git a/devel/scmgit-base/patches/patch-aa b/devel/scmgit-base/patches/patch-aa
index 851866a0a52..e229f24e48e 100644
--- a/devel/scmgit-base/patches/patch-aa
+++ b/devel/scmgit-base/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.14 2012/02/06 13:11:35 adam Exp $
+$NetBSD: patch-aa,v 1.15 2012/02/14 22:46:36 gdt Exp $
---- Makefile.orig 2012-01-27 20:51:04.000000000 +0000
+--- Makefile.orig 2012-02-14 19:01:35.000000000 +0000
+++ Makefile
@@ -303,8 +303,6 @@ endif
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.14 2012/02/06 13:11:35 adam Exp $
export prefix bindir sharedir sysconfdir gitwebdir localedir
--CC = gcc
+-CC = cc
-AR = ar
RM = rm -f
DIFF = diff
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.14 2012/02/06 13:11:35 adam Exp $
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
-@@ -928,9 +922,10 @@ ifeq ($(uname_S),Darwin)
+@@ -931,9 +925,10 @@ ifeq ($(uname_S),Darwin)
HAVE_DEV_TTY = YesPlease
endif
ifeq ($(uname_S),SunOS)
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.14 2012/02/06 13:11:35 adam Exp $
SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
-@@ -972,8 +967,6 @@ ifeq ($(uname_S),SunOS)
+@@ -975,8 +970,6 @@ ifeq ($(uname_S),SunOS)
NO_STRTOUMAX = YesPlease
GIT_TEST_CMP = cmp
endif
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.14 2012/02/06 13:11:35 adam Exp $
BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
endif
ifeq ($(uname_O),Cygwin)
-@@ -1814,8 +1807,8 @@ DEFAULT_PAGER_CQ_SQ = $(subst ','\'',$(D
+@@ -1817,8 +1810,8 @@ DEFAULT_PAGER_CQ_SQ = $(subst ','\'',$(D
BASIC_CFLAGS += -DDEFAULT_PAGER='$(DEFAULT_PAGER_CQ_SQ)'
endif
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 48d45e495e6..bcaedb5d569 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.33 2012/02/06 13:11:35 adam Exp $
+# $NetBSD: Makefile.version,v 1.34 2012/02/14 22:46:36 gdt Exp $
-GIT_VERSION= 1.7.9
+GIT_VERSION= 1.7.9.1