aboutsummaryrefslogtreecommitdiffstats
path: root/devel/git
diff options
context:
space:
mode:
authorwxs <wxs@FreeBSD.org>2008-09-23 09:32:19 +0800
committerwxs <wxs@FreeBSD.org>2008-09-23 09:32:19 +0800
commit575703726e7672bf830dac79c2370b3cea268807 (patch)
tree7cf500f9847bf3c68182583e6e9266abc0cabbd4 /devel/git
parent095201026e99422e25efabbe945cd32b30355496 (diff)
downloadfreebsd-ports-gnome-575703726e7672bf830dac79c2370b3cea268807.tar.gz
freebsd-ports-gnome-575703726e7672bf830dac79c2370b3cea268807.tar.zst
freebsd-ports-gnome-575703726e7672bf830dac79c2370b3cea268807.zip
- Update to 1.6.0.2
- Restore fix for "git help foo" bug.
Diffstat (limited to 'devel/git')
-rw-r--r--devel/git/Makefile2
-rw-r--r--devel/git/distinfo18
-rw-r--r--devel/git/files/patch-Makefile17
3 files changed, 24 insertions, 13 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index ecd5e9adde1c..39a090c73bea 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= git
-PORTVERSION= 1.6.0.1
+PORTVERSION= 1.6.0.2
CATEGORIES= devel
MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 32915879d5f3..4e08926837fe 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.0.1.tar.bz2) = 264701ebd9036ca2458358f01aa6c093
-SHA256 (git-1.6.0.1.tar.bz2) = 0bd0f4eb5da015913c6415d5f8ffecd4f6233daef7f275b99f6120935fc1f6ee
-SIZE (git-1.6.0.1.tar.bz2) = 1861853
-MD5 (git-manpages-1.6.0.1.tar.bz2) = 07b357210b59a1140200815c682fda34
-SHA256 (git-manpages-1.6.0.1.tar.bz2) = 7e0708f61157beee32dbf8c6630bcbc6e83168ce28cea7242e61b7211db94da5
-SIZE (git-manpages-1.6.0.1.tar.bz2) = 221756
-MD5 (git-1.6.0.1.tar.bz2.sign) = 0a0f36b460f63e479b456a7e1068cbf6
-SHA256 (git-1.6.0.1.tar.bz2.sign) = 813a88ab4d124e3f02fd5d3f8669b00ce789dc908dc336ae16c4ac9547ba0181
-SIZE (git-1.6.0.1.tar.bz2.sign) = 248
+MD5 (git-1.6.0.2.tar.bz2) = 1e4d9bfc1cb0abf165d4de93b5172324
+SHA256 (git-1.6.0.2.tar.bz2) = a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8
+SIZE (git-1.6.0.2.tar.bz2) = 1865485
+MD5 (git-manpages-1.6.0.2.tar.bz2) = 30bd29d96b4576ef8b7b48ad791f613e
+SHA256 (git-manpages-1.6.0.2.tar.bz2) = 198472533f9c8abe124ce93fda5639e07b6ee73e67d02d393648b20dd79476c7
+SIZE (git-manpages-1.6.0.2.tar.bz2) = 222534
+MD5 (git-1.6.0.2.tar.bz2.sign) = 4b8166895f67a159070a7b6f3c82d036
+SHA256 (git-1.6.0.2.tar.bz2.sign) = d644c056aadc169448ca76dc9e4e64fac6aa80cd50cec185ed71dff37479431d
+SIZE (git-1.6.0.2.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 305c77df3537..4c733573a948 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig 2008-08-27 08:55:18.000000000 -0400
-+++ ./Makefile 2008-08-27 08:57:19.000000000 -0400
+--- ./Makefile.orig 2008-08-24 19:41:58.000000000 -0400
++++ ./Makefile 2008-09-18 13:32:34.000000000 -0400
@@ -164,8 +164,8 @@
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,6 +11,17 @@
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
+@@ -182,8 +182,8 @@
+
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+-mandir = $(prefix)/share/man
+-infodir = $(prefix)/share/info
++mandir = $(prefix)/man
++infodir = $(prefix)/info
+ gitexecdir = $(prefix)/libexec/git-core
+ sharedir = $(prefix)/share
+ template_dir = $(sharedir)/git-core/templates
@@ -217,15 +217,15 @@
export prefix bindir sharedir htmldir sysconfdir
@@ -36,7 +47,7 @@
export TCL_PATH TCLTK_PATH
-@@ -826,9 +826,9 @@
+@@ -827,9 +827,9 @@
endif
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl